Big merge from experimental to bleeding edge.

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 'dart:async';
 import '../../pkg/args/lib/args.dart';
 import '../../pkg/path/lib/path.dart' as path;
 import 'dart:io';
 import 'dart:math';
 import 'http.dart';
 import 'io.dart';
 import 'command_help.dart';
 import 'command_install.dart';
 import 'command_lish.dart';
 import 'command_update.dart';
@@ skipping 219 matching lines @@
     }
 
     var future = new Future.immediate(null);
     if (requiresEntrypoint) {
       // TODO(rnystrom): Will eventually need better logic to walk up
       // subdirectories until we hit one that looks package-like. For now, just
       // assume the cwd is it.
       future = Entrypoint.load(path.current, cache);
     }
 
-    future = future.chain((entrypoint) {
+    future = future.then((entrypoint) {
       this.entrypoint = entrypoint;
       try {
         var commandFuture = onRun();
         if (commandFuture == null) return new Future.immediate(true);
 
         return commandFuture;
       } catch (error, trace) {
         handleError(error, trace);
         return new Future.immediate(null);
       }
     });
 
-    future = future.chain((_) => cache_.deleteTempDir());
 
-    future.handleException((e) {
-      if (e is PubspecNotFoundException && e.name == null) {
-        e = 'Could not find a file named "pubspec.yaml" in the directory '
-          '${path.current}.';
-      } else if (e is PubspecHasNoNameException && e.name == null) {
-        e = 'pubspec.yaml is missing the required "name" field (e.g. "name: '
-          '${basename(path.current)}").';
-      }
+    future
+      .then((_) => cache_.deleteTempDir())
+      .catchError((error) {
+        var e = error.error;
+        if (e is PubspecNotFoundException && e.name == null) {
+          e = 'Could not find a file named "pubspec.yaml" in the directory '
+            '${path.current}.';
+        } else if (e is PubspecHasNoNameException && e.name == null) {
+          e = 'pubspec.yaml is missing the required "name" field (e.g. "name: '
+            '${basename(path.current)}").';
+        }
 
-      handleError(e, future.stackTrace);
-    });
-
-    // Explicitly exit on success to ensure that any dangling dart:io handles
-    // don't cause the process to never terminate.
-    future.then((_) => exit(0));
+        handleError(e, error.stackTrace);
+      })
+      // Explicitly exit on success to ensure that any dangling dart:io handles
+      // don't cause the process to never terminate.
+      .then((_) => exit(0));
   }
 
   /// Override this to perform the specific command. Return a future that
   /// completes when the command is done or fails if the command fails. If the
   /// command is synchronous, it may return `null`.
   Future onRun();
 
   /// Displays usage information for this command. 
   void printUsage([String description]) {
     if (description == null) description = this.description;
@@ skipping 16 matching lines @@
     if (exception is HttpException || exception is HttpParserException ||
         exception is SocketIOException || exception is PubHttpException) {
       return exit_codes.UNAVAILABLE;
     } else if (exception is FormatException) {
       return exit_codes.DATA;
     } else {
       return 1;
     }
   }
 }