Refactor the pub tests.

utils/pub/pub.dart

Index: utils/pub/pub.dart
diff --git a/utils/pub/pub.dart b/utils/pub/pub.dart
index 45c6c9815aad625a4abd0c22919f842aea331d9e..d066a6c12d628613186c80029d1ef4310350d254 100644
--- a/utils/pub/pub.dart
+++ b/utils/pub/pub.dart
@@ -35,6 +35,22 @@ main() {
     '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;
@@ -54,22 +70,6 @@ main() {
     }
   }
 
-  // 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);