Add a pub command for managing uploaders for packages.

utils/tests/pub/test_pub.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Test infrastructure for testing pub. Unlike typical unit tests, most pub
  * tests are integration tests that stage some stuff on the file system, run
  * pub, and then validate the results. This library provides an API to build
  * tests like that.
  */
@@ skipping 578 matching lines @@
         }
 
         throw new ExpectException(Strings.join(failures, '\n'));
       }
 
       return null;
     });
   });
 }
 
-/**
- * A shorthand for [schedulePub] and [run] when no validation needs to be done
- * after Pub has been run.
- */
+/// A shorthand for [schedulePub] and [run] when no validation needs to be done
+/// after Pub has been run.
+///
+/// Any futures in [args] will be resolved before the process is started.
 void runPub({List<String> args, Pattern output, Pattern error,

[Bob Nystrom, 2012/12/17 18:41:58]

List<String> -> List, here and elsewhere.

if it can contain non-strings. Shouldn't you be getting checked mode errors if
there are futures in there now?

[nweiz, 2012/12/17 21:18:48]

Done.
No, because I never actually instantiate a List<String> object.

     int exitCode: 0}) {
   schedulePub(args: args, output: output, error: error, exitCode: exitCode);
   run();
 }
 
 /// Starts a Pub process and returns a [ScheduledProcess] that supports
 /// interaction with that process.
-ScheduledProcess startPub({List<String> args}) {
+///
+/// Any futures in [args] will be resolved before the process is started.
+ScheduledProcess startPub({List<String> args, Future<Uri> tokenEndpoint}) {
   var process = _scheduleValue((sandboxDir) =>
-      _doPub(startProcess, sandboxDir, args));
+      _doPub(startProcess, sandboxDir, args, tokenEndpoint));
   return new ScheduledProcess("pub", process);
 }
 
 /// Like [startPub], but runs `pub lish` in particular with [server] used both
 /// as the OAuth2 server (with "/token" as the token endpoint) and as the
 /// package server.
+///
+/// Any futures in [args] will be resolved before the process is started.
 ScheduledProcess startPubLish(ScheduledServer server, {List<String> args}) {
-  var process = _scheduleValue((sandboxDir) {
-    return server.url.chain((url) {
-      var tokenEndpoint = url.resolve('/token');
-      if (args == null) args = [];
-      args = flatten(['lish', '--server', url.toString(), args]);
-      return _doPub(startProcess, sandboxDir, args, tokenEndpoint);
-    });
-  });
-  return new ScheduledProcess("pub lish", process);
+  var tokenEndpoint = server.url.transform((url) =>
+      url.resolve('/token').toString());
+  if (args == null) args = [];
+  args = flatten(['lish', '--server', tokenEndpoint, args]);
+  return startPub(args: args, tokenEndpoint: tokenEndpoint);
 }
 
 /// Handles the beginning confirmation process for uploading a packages.
 /// Ensures that the right output is shown and then enters "y" to confirm the
 /// upload.
 void confirmPublish(ScheduledProcess pub) {
   // TODO(rnystrom): This is overly specific and inflexible regarding different
   // test packages. Should validate this a little more loosely.
   expectLater(pub.nextLine(), equals('Publishing "test_pkg" 1.0.0:'));
   expectLater(pub.nextLine(), equals("|-- LICENSE"));
   expectLater(pub.nextLine(), equals("|-- lib"));
   expectLater(pub.nextLine(), equals("|   '-- test_pkg.dart"));
   expectLater(pub.nextLine(), equals("'-- pubspec.yaml"));
   expectLater(pub.nextLine(), equals(""));
 
   pub.writeLine("y");
 }
 
 
 /// Calls [fn] with appropriately modified arguments to run a pub process. [fn]
 /// should have the same signature as [startProcess], except that the returned
 /// [Future] may have a type other than [Process].
-Future _doPub(Function fn, sandboxDir, List<String> args, Uri tokenEndpoint) {
+Future _doPub(Function fn, sandboxDir, List<String> args,
+    Future<Uri> tokenEndpoint) {
   String pathInSandbox(path) => join(getFullPath(sandboxDir), path);
 
-  return ensureDir(pathInSandbox(appPath)).chain((_) {
+  return Futures.wait([
+    ensureDir(pathInSandbox(appPath)),
+    _awaitObject(args),
+    tokenEndpoint == null ? new Future.immediate(null) : tokenEndpoint
+  ]).chain((results) {
+    var args = results[1];
+    var tokenEndpoint = results[2];
     // Find a Dart executable we can use to spawn. Use the same one that was
     // used to run this script itself.
     var dartBin = new Options().executable;
 
     // If the executable looks like a path, get its full path. That way we
     // can still find it when we spawn it with a different working directory.
     if (dartBin.contains(Platform.pathSeparator)) {
       dartBin = new File(dartBin).fullPathSync();
     }
 
@@ skipping 992 matching lines @@
 /// calling [completion] is unnecessary.
 void expectLater(Future actual, matcher, {String reason,
     FailureHandler failureHandler, bool verbose: false}) {
   _schedule((_) {
     return actual.transform((value) {
       expect(value, matcher, reason: reason, failureHandler: failureHandler,
           verbose: false);
     });
   });
 }