Upgrade to Dart 2.0

Author: tejainece

.gitignore

@@ -1,4 +1,5 @@
 # Files and directories created by pub
+.dart_tool
 .packages
 .pub/
 build/

bin/dscript.dart

@@ -7,9 +7,9 @@ main(List<String> arguments) async {
     exit(0);
   }
 
-  final options = new Args.parse(arguments);
+  final options = Args.parse(arguments);
 
-  final DetectedDartSdk sdk = new DartSdk.detect();
+  final DetectedDartSdk sdk = DartSdk.detect();
 
   if (options.verbose) {
     stderr.writeln(
@@ -23,7 +23,7 @@ main(List<String> arguments) async {
       stderr.writeln(
           'dscript: Embedded pubspec not found in script. Providing defualt pubspec');
     }
-    pubspec = new UnmodifiableListView<String>(<String>['name: a_dart_script']);
+    pubspec = UnmodifiableListView<String>(<String>['name: a_dart_script']);
   } else {
     if (options.verbose) {
       stderr.writeln('dscript: Embedded pubspec found in script');
@@ -55,7 +55,7 @@ main(List<String> arguments) async {
       stderr.writeln('dscript: Deleting project');
     }
     try {
-      await new Directory(runner.tempProjectDir).delete(recursive: true);
+      await Directory(runner.tempProjectDir).delete(recursive: true);
     } finally {}
   }
 

lib/src/args.dart

@@ -38,38 +38,37 @@ class Args {
     bool verbose = false;
     bool deleteProject = true;
     String script;
-    UnmodifiableListView<String> args = new UnmodifiableListView<String>([]);
+    UnmodifiableListView<String> args = UnmodifiableListView<String>([]);
 
     for (int i = 0; i < arguments.length; i++) {
       final String argument = arguments[i];
 
       if (argument.startsWith('-')) {
         if (argument == '-v' || argument == '--verbose') {
           if (isRedundant.containsKey('-v'))
-            throw new DuplicateOptionsException('--verbose');
+            throw DuplicateOptionsException('--verbose');
           verbose = true;
           isRedundant['-v'] = true;
         } else if (argument == '-k' || argument == '--keep-project') {
           if (isRedundant.containsKey('-k'))
-            throw new DuplicateOptionsException('--keep-project');
+            throw DuplicateOptionsException('--keep-project');
           deleteProject = false;
           isRedundant['-k'] = true;
         } else {
-          throw new UnknownOption(argument);
+          throw UnknownOption(argument);
         }
         continue;
       }
 
       script = argument;
       if (i != (arguments.length - 1)) {
-        args = new UnmodifiableListView<String>(arguments.sublist(i + 1));
+        args = UnmodifiableListView<String>(arguments.sublist(i + 1));
       }
       break;
     }
 
-    if (script == null) throw new Exception('Script not provided!');
+    if (script == null) throw Exception('Script not provided!');
 
-    return new Args(script, args,
-        verbose: verbose, deleteProject: deleteProject);
+    return Args(script, args, verbose: verbose, deleteProject: deleteProject);
   }
 }

lib/src/dart_sdk.dart

@@ -4,7 +4,7 @@ import 'package:path/path.dart' as p;
 import 'dart:convert';
 
 abstract class DartSdk {
-  factory DartSdk.detect() => new DetectedDartSdk.detect();
+  factory DartSdk.detect() => DetectedDartSdk.detect();
 
   FutureOr<PubGetResult> pubGet({String workingDir});
 
@@ -28,11 +28,11 @@ class DetectedDartSdk implements DartSdk {
 
     if (!executable.contains(s)) {
       if (Platform.isLinux) {
-        executable = new Link("/proc/$pid/exe").resolveSymbolicLinksSync();
+        executable = Link("/proc/$pid/exe").resolveSymbolicLinksSync();
       }
     }
 
-    final file = new File(executable);
+    final file = File(executable);
     if (!file.existsSync()) {
       throw dartSdkNotFound;
     }
@@ -42,11 +42,11 @@ class DetectedDartSdk implements DartSdk {
 
     final String sdkPath = parent.path;
     final String dartApi = "$sdkPath${s}include${s}dart_api.h";
-    if (!new File(dartApi).existsSync()) {
-      throw new Exception('Cannot find Dart SDK!');
+    if (!File(dartApi).existsSync()) {
+      throw Exception('Cannot find Dart SDK!');
     }
 
-    return new DetectedDartSdk(sdkPath);
+    return DetectedDartSdk(sdkPath);
   }
 
   String get dartPath => p.join(sdkPath, 'bin', 'dart');
@@ -61,17 +61,17 @@ class DetectedDartSdk implements DartSdk {
     final ProcessResult res =
         await pub(<String>['get'], workingDir: workingDir);
     if (res.exitCode == 0) {
-      return new PubGetResult(res.stdout);
+      return PubGetResult(res.stdout);
     } else {
-      throw new PubGetException(res.exitCode, res.stdout, res.stderr);
+      throw PubGetException(res.exitCode, res.stdout, res.stderr);
     }
   }
 
   Future<String> get versionString async {
     final ProcessResult res =
         await Process.run(dartPath, <String>['--version']);
     if (res.exitCode != 0) {
-      throw new Exception('Failed!');
+      throw Exception('Failed!');
     }
     return res.stderr;
   }
@@ -84,7 +84,7 @@ class DetectedDartSdk implements DartSdk {
   }
 }
 
-final Exception dartSdkNotFound = new Exception('Dart SDK not found!');
+final Exception dartSdkNotFound = Exception('Dart SDK not found!');
 
 class DepInfo {
   final String name;
@@ -99,20 +99,20 @@ class PubGetResult {
 
   PubGetResult(this.outlog);
 
-  List<DepInfo> get added => new LineSplitter()
+  List<DepInfo> get added => LineSplitter()
       .convert(outlog)
       .where((String line) => line.startsWith('+ '))
       .map((String line) => line.split(' '))
       .where((List<String> parts) => parts.length == 3)
-      .map((List<String> parts) => new DepInfo(parts[1], parts[2]))
+      .map((List<String> parts) => DepInfo(parts[1], parts[2]))
       .toList();
 
-  List<DepInfo> get removed => new LineSplitter()
+  List<DepInfo> get removed => LineSplitter()
       .convert(outlog)
       .where((String line) => line.startsWith('- '))
       .map((String line) => line.split(' '))
       .where((List<String> parts) => parts.length == 3)
-      .map((List<String> parts) => new DepInfo(parts[1], parts[2]))
+      .map((List<String> parts) => DepInfo(parts[1], parts[2]))
       .toList();
 }
 

lib/src/project_creator.dart

@@ -24,7 +24,7 @@ class ProjectCreator {
 
   /// If directory named [projectDir] does not exist, create it.
   Future createProjectDir() async {
-    final directory = new Directory(projectDir);
+    final directory = Directory(projectDir);
 
     if (await directory.exists()) {
       return;
@@ -34,20 +34,20 @@ class ProjectCreator {
   }
 
   Future createLibDir() async {
-    final directory = new Directory("lib");
+    final directory = Directory("lib");
 
     if (!await directory.exists()) {
       return;
     }
 
     final String libDirPath = p.join(projectDir, 'lib');
-    final link = new Link(libDirPath);
+    final link = Link(libDirPath);
     await link.create(directory.absolute.path);
   }
 
   Future createPubspec() async {
     final String filePath = p.join(projectDir, "pubspec.yaml");
-    final file = new File(filePath);
+    final file = File(filePath);
     await file.writeAsString(pubspec.join('\n'));
   }
 }

lib/src/runner.dart

@@ -22,10 +22,10 @@ class ScriptRunner {
       {this.workingDir, this.tempProjectDir});
 
   Future createProject() async {
-    final creator = new ProjectCreator(tempProjectDir, pubspec);
+    final creator = ProjectCreator(tempProjectDir, pubspec);
     await creator.exec();
 
-    final project = new Project(tempProjectDir);
+    final project = Project(tempProjectDir);
     await project.pubGet(withSdk: sdk);
   }
 
@@ -69,7 +69,7 @@ class ScriptRunner {
     workingDir ??= Directory.current.path;
     tempProjectDir ??= Directory.systemTemp.createTempSync().path;
 
-    return new ScriptRunner._(options, sdk, pubspec,
+    return ScriptRunner._(options, sdk, pubspec,
         workingDir: workingDir, tempProjectDir: tempProjectDir);
   }
 }

lib/src/script_parser.dart

@@ -13,17 +13,15 @@ enum _State {
 /// Extracts pubspec embedded in dscript
 Future<UnmodifiableListView<String>> extractPubspec(
     String scriptFilename) async {
-  final file = new File(scriptFilename);
+  final file = File(scriptFilename);
 
   if (!file.existsSync()) {
-    throw new Exception('Script file $scriptFilename not found!');
+    throw Exception('Script file $scriptFilename not found!');
   }
 
   // Read script file as lines
-  final Stream<String> lines = await file
-      .openRead()
-      .transform(UTF8.decoder)
-      .transform(new LineSplitter());
+  final Stream<String> lines =
+      await file.openRead().transform(utf8.decoder).transform(LineSplitter());
 
   List<String> pubspec;
   _State state = _State.notFound;
@@ -67,5 +65,5 @@ Future<UnmodifiableListView<String>> extractPubspec(
 
   if (pubspec == null) return null;
 
-  return new UnmodifiableListView<String>(pubspec);
+  return UnmodifiableListView<String>(pubspec);
 }

pubspec.yaml

@@ -1,17 +1,17 @@
 name: dscript
 description: Execute standalone Dart shell scripts
-version: 1.0.3
+version: 2.0.0
 homepage: https://github.com/tejainece/dscript
 author: Ravi Teja Gudapati <[email protected]>
 
 environment:
-  sdk: '>=1.20.1 <2.0.0'
+  sdk: '>=2.0.0 <3.0.0'
 
 executables:
   dscript:
 
 dependencies:
-  path: ^1.5.1
+  path: ^1.6.2
 
 dev_dependencies:
-  test: ^0.12.0
+  test: ^1.5.0