Big merge from experimental to bleeding edge.

utils/pub/command_lish.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.
 
 library command_lish;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
@@ skipping 45 matching lines @@
         if (fields is! Map) invalidServerResponse(response);
         fields.forEach((key, value) {
           if (value is! String) invalidServerResponse(response);
           request.fields[key] = value;
         });
 
         request.followRedirects = false;
         request.files.add(new http.MultipartFile.fromBytes(
             'file', packageBytes, filename: 'package.tar.gz'));
         return client.send(request);
-      }).chain(http.Response.fromStream).transform((response) {
+      }).chain(http.Response.fromStream).then((response) {
         var location = response.headers['location'];
         if (location == null) throw new PubHttpException(response);
         return location;
-      }).chain((location) => client.get(location))
-          .transform(handleJsonSuccess);
+      }).then((location) => client.get(location))
+          .then(handleJsonSuccess);
     }).transformException((e) {
       if (e is! PubHttpException) throw e;
       var url = e.response.request.url;
       if (url.toString() == cloudStorageUrl.toString()) {
         // TODO(nweiz): the response may have XML-formatted information about
         // the error. Try to parse that out once we have an easily-accessible
         // XML parser.
         throw 'Failed to upload the package.';
       } else if (url.origin == server.origin) {
         handleJsonError(e.response);
@@ skipping 37 matching lines @@
       git.isInstalled
     ]).chain((results) {
       if (results[0] && results[1]) {
         // List all files that aren't gitignored, including those not checked
         // in to Git.
         return git.run(["ls-files", "--cached", "--others",
                         "--exclude-standard"]);
       }
 
       return listDir(rootDir, recursive: true).chain((entries) {
-        return Futures.wait(entries.map((entry) {
-          return fileExists(entry).transform((isFile) {
+        return Futures.wait(entries.mappedBy((entry) {
+          return fileExists(entry).then((isFile) {
             // Skip directories.
             if (!isFile) return null;
 
             // TODO(rnystrom): Making these relative will break archive
             // creation if the cwd is ever *not* the package root directory.
             // Should instead only make these relative right before generating
             // the tree display (which is what really needs them to be).
             // Make it relative to the package root.
             return relativeTo(entry, rootDir);
           });
         }));
       });
-    }).transform((files) => files.filter((file) {
+    }).then((files) => files.where((file) {
       if (file == null || _BLACKLISTED_FILES.contains(basename(file))) {
         return false;
       }
 
       return !splitPath(file).some(_BLACKLISTED_DIRECTORIES.contains);
-    }));
+    }).toList());
   }
 
   /// Returns the value associated with [key] in [map]. Throws a user-friendly
   /// error if [map] doens't contain [key].
   _expectField(Map map, String key, http.Response response) {
     if (map.containsKey(key)) return map[key];
     invalidServerResponse(response);
   }
 
   /// Validates the package. Throws an exception if it's invalid.
   Future _validate() {
     return Validator.runAll(entrypoint).chain((pair) {
       var errors = pair.first;
       var warnings = pair.last;
 
       if (!errors.isEmpty) {
         throw "Sorry, your package is missing "
             "${(errors.length > 1) ? 'some requirements' : 'a requirement'} "
             "and can't be published yet.\nFor more information, see: "
             "http://pub.dartlang.org/doc/pub-lish.html.\n";
       }
 
       var message = 'Looks great! Are you ready to upload your package';
 
       if (!warnings.isEmpty) {
         var s = warnings.length == 1 ? '' : 's';
         message = "Package has ${warnings.length} warning$s. Upload anyway";
       }
 
-      return confirm(message).transform((confirmed) {
+      return confirm(message).then((confirmed) {
         if (!confirmed) throw "Package upload canceled.";
       });
     });
   }
 }