Refactor the pub tests.

utils/pub/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.
 
 /**
  * The main entrypoint for the pub command line application.
  */
 #library('pub');
 
 #import('yaml/yaml.dart');
@@ skipping 17 matching lines @@
   // TODO(rnystrom): In addition to explicit "help" and "version" commands,
   // should also add special-case support for --help and --version arguments to
   // be consistent with other Unix apps.
   final commands = {
     'list': new ListCommand(),
     'install': new InstallCommand(),
     'update': new UpdateCommand(),
     'version': new VersionCommand()
   };
 
+  // TODO(rnystrom): Hack. This is temporary code to allow the pub tests to
+  // pass in relevant paths. Eventually these should be either environment
+  // variables or at least a cleaner arg parser.
+  var cacheDir, sdkDir;
+  for (var i = 0; i < args.length; i++) {
+    if (args[i].startsWith('--cachedir=')) {
+      cacheDir = args[i].substring('--cachedir='.length);
+      args.removeRange(i, 1);
+      i--;
+    } else if (args[i].startsWith('--sdkdir=')) {
+      sdkDir = args[i].substring('--sdkdir='.length);
+      args.removeRange(i, 1);
+      i--;
+    }
+  }
+
   if (args.length == 0) {
     printUsage(commands);
     return;
   }
 
   // For consistency with expected unix idioms, support --help, -h, and
   // --version in addition to the regular commands.
   if (args.length == 1) {
     if (args[0] == '--help' || args[0] == '-h') {
       printUsage(commands);
       return;
     }
 
     if (args[0] == '--version') {
       printVersion();
       return;
     }
   }
 
-  // TODO(rnystrom): Hack. This is temporary code to allow the pub tests to
-  // pass in relevant paths. Eventually these should be either environment
-  // variables or at least a cleaner arg parser.
-  var cacheDir, sdkDir;
-  for (var i = 0; i < args.length; i++) {
-    if (args[i].startsWith('--cachedir=')) {
-      cacheDir = args[i].substring('--cachedir='.length);
-      args.removeRange(i, 1);
-      i--;
-    } else if (args[i].startsWith('--sdkdir=')) {
-      sdkDir = args[i].substring('--sdkdir='.length);
-      args.removeRange(i, 1);
-      i--;
-    }
-  }
-
   // TODO(rnystrom): Do we want this to be global?
   final cache = new SystemCache(cacheDir);
 
   Source.defaultSource = new SdkSource(sdkDir);
 
   // Select the command.
   final command = commands[args[0]];
   if (command == null) {
     print('Unknown command "${args[0]}".');
     print('Run "pub help" to see available commands.');
@@ skipping 55 matching lines @@
     // subdirectories until we hit one that looks package-like. For now, just
     // assume the cwd is it.
     Package.load(workingDir).then((pkg) {
       packagesDir = new PackagesDir(pkg, cache);
       onRun();
     });
   }
 
   abstract void onRun();
 }