Auto-run "pub get" more for "pub run".

Currently we don't auto-run "pub get" if there's no lockfile and also no
dependencies. We should, in order to create a self-link.

[email protected]

Review URL: https://codereview.chromium.org//1277633004 .

Author: nex3

lib/src/entrypoint.dart

@@ -425,37 +425,26 @@ class Entrypoint {
 
   /// Gets dependencies if the lockfile is out of date with respect to the
   /// pubspec.
-  Future ensureLockFileIsUpToDate() {
-    return new Future.sync(() {
-      // If we don't have a current lock file, we definitely need to install.
-      if (!_isLockFileUpToDate(lockFile)) {
-        if (lockFileExists) {
-          log.message(
-              "Your pubspec has changed, so we need to update your lockfile:");
-        } else {
-          log.message(
-              "You don't have a lockfile, so we need to generate that:");
-        }
-
-        return false;
-      }
-
-      // If we do have a lock file, we still need to make sure the packages
-      // are actually installed. The user may have just gotten a package that
+  Future ensureLockFileIsUpToDate() async {
+    if (!lockFileExists) {
+      log.message(
+          "You don't have a lockfile, so we need to generate that:");
+    } else if (_isLockFileUpToDate(lockFile)) {
+      // If we do have a lock file, we still need to make sure the packages are
+      // actually installed. The user may have just gotten a package that
       // includes a lockfile.
-      return _arePackagesAvailable(lockFile).then((available) {
-        if (!available) {
-          log.message(
-              "You are missing some dependencies, so we need to install them "
-              "first:");
-        }
+      if (await _arePackagesAvailable(lockFile)) return;
 
-        return available;
-      });
-    }).then((upToDate) {
-      if (upToDate) return null;
-      return acquireDependencies(SolveType.GET);
-    });
+      // If we don't have a current lock file, we definitely need to install.
+      log.message(
+          "You are missing some dependencies, so we need to install them "
+          "first:");
+    } else {
+      log.message(
+          "Your pubspec has changed, so we need to update your lockfile:");
+    }
+
+    await acquireDependencies(SolveType.GET);
   }
 
   /// Loads the package graph for the application and all of its transitive

test/run/allows_dart_extension_test.dart

@@ -24,7 +24,7 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: ["script.dart"]);
+    var pub = pubRun(args: ["script.dart"], shouldGetFirst: true);
     pub.stdout.expect("stdout output");
     pub.stderr.expect("stderr output");
     pub.shouldExit(123);

test/run/app_can_read_from_stdin_test.dart

@@ -27,7 +27,7 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: ["bin/script"]);
+    var pub = pubRun(args: ["bin/script"], shouldGetFirst: true);
 
     pub.stdout.expect("started");
     pub.writeLine("first");

test/run/forwards_signal_posix_test.dart

@@ -41,7 +41,7 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: ["bin/script"]);
+    var pub = pubRun(args: ["bin/script"], shouldGetFirst: true);
 
     pub.stdout.expect("ready");
     for (var signal in _catchableSignals) {

test/run/ignores_explicit_dart2js_transformer_test.dart

@@ -17,7 +17,7 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: ["bin/script"]);
+    var pub = pubRun(args: ["bin/script"], shouldGetFirst: true);
     pub.stdout.expect("Hello!");
     pub.shouldExit(0);
   });

test/run/includes_parent_directories_of_entrypoint_test.dart

@@ -31,7 +31,8 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: [path.join("tool", "a", "b", "app")]);
+    var pub = pubRun(args: [path.join("tool", "a", "b", "app")],
+        shouldGetFirst: true);
     pub.stdout.expect("a b");
     pub.shouldExit();
   });

test/run/loads_package_imports_in_a_dependency_test.dart

@@ -27,9 +27,7 @@ main() => print(value);
       })
     ]).create();
 
-    pubGet();
-
-    var pub = pubRun(args: ["foo:bar"]);
+    var pub = pubRun(args: ["foo:bar"], shouldGetFirst: true);
     pub.stdout.expect("foobar");
     pub.shouldExit();
   });

test/run/passes_along_arguments_test.dart

@@ -22,7 +22,8 @@ main() {
 
     // Use some args that would trip up pub's arg parser to ensure that it
     // isn't trying to look at them.
-    var pub = pubRun(args: ["bin/args", "--verbose", "-m", "--", "help"]);
+    var pub = pubRun(args: ["bin/args", "--verbose", "-m", "--", "help"],
+        shouldGetFirst: true);
 
     pub.stdout.expect("--verbose -m -- help");
     pub.shouldExit();

test/run/runs_app_in_directory_in_entrypoint_test.dart

@@ -19,7 +19,7 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: [path.join("tool", "app")]);
+    var pub = pubRun(args: [path.join("tool", "app")], shouldGetFirst: true);
     pub.stdout.expect("tool");
     pub.shouldExit();
 

test/run/runs_app_in_entrypoint_test.dart

@@ -24,7 +24,7 @@ main() {
       ])
     ]).create();
 
-    var pub = pubRun(args: ["bin/script"]);
+    var pub = pubRun(args: ["bin/script"], shouldGetFirst: true);
     pub.stdout.expect("stdout output");
     pub.stderr.expect("stderr output");
     pub.shouldExit(123);

test/run/runs_named_app_in_dependency_test.dart

@@ -20,9 +20,7 @@ main() {
       })
     ]).create();
 
-    pubGet();
-
-    var pub = pubRun(args: ["foo:bar"]);
+    var pub = pubRun(args: ["foo:bar"], shouldGetFirst: true);
     pub.stdout.expect("foobar");
     pub.shouldExit();
   });

test/run/runs_named_app_in_dev_dependency_test.dart

@@ -23,9 +23,7 @@ main() {
       })
     ]).create();
 
-    pubGet();
-
-    var pub = pubRun(args: ["foo:bar"]);
+    var pub = pubRun(args: ["foo:bar"], shouldGetFirst: true);
     pub.stdout.expect("foobar");
     pub.shouldExit();
   });

test/run/runs_shorthand_app_in_dependency_test.dart

@@ -23,9 +23,7 @@ main() {
       })
     ]).create();
 
-    pubGet();
-
-    var pub = pubRun(args: ["foo"]);
+    var pub = pubRun(args: ["foo"], shouldGetFirst: true);
     pub.stdout.expect("foo");
     pub.shouldExit();
   });

test/test_pub.dart

@@ -354,11 +354,19 @@ void pubDowngrade({Iterable<String> args, output, error, warning,
 /// "pub run".
 ///
 /// Returns the `pub run` process.
-ScheduledProcess pubRun({bool global: false, Iterable<String> args}) {
+ScheduledProcess pubRun({bool shouldGetFirst: false, bool global: false,
+    Iterable<String> args}) {
   var pubArgs = global ? ["global", "run"] : ["run"];
   pubArgs.addAll(args);
   var pub = startPub(args: pubArgs);
 
+  if (shouldGetFirst) {
+    pub.stdout.expect(consumeThrough(anyOf([
+      "Got dependencies!",
+      matches(new RegExp(r"^Changed \d+ dependenc"))
+    ])));
+  }
+
   // Loading sources and transformers isn't normally printed, but the pub test
   // infrastructure runs pub in verbose mode, which enables this.
   pub.stdout.expect(consumeWhile(startsWith("Loading")));