Commit Martin's patch for pub + lib_v2.

utils/pub/io.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.
 
 /// Helper functionality to make working with IO easier.
 library io;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
@@ skipping 263 matching lines @@
       // out files in hidden directories.
       if (recursive) {
         children.add(doList(new Directory(file), listedDirectories));
       }
     };
     lister.onFile = (file) {
       if (!includeHiddenFiles && basename(file).startsWith('.')) return;
       contents.add(join(dir, basename(file)));
     };
 
-    return completer.future.chain((contents) {
-      return Futures.wait(children).transform((childContents) {
+    return completer.future.then((contents) {
+      return Futures.wait(children).then((childContents) {
         contents.addAll(flatten(childContents));
         return contents;
       });
     });
   }
 
   return doList(_getDirectory(dir), new Set<String>());
 }
 
 /// Asynchronously determines if [dir], which can be a [String] directory path
@@ skipping 43 matching lines @@
 /// If that future completes with an error, it will slepp and then [callback]
 /// will be invoked again to retry the operation. It will try a few times before
 /// giving up.
 Future _attemptRetryable(Future callback()) {
   // Only do lame retry logic on Windows.
   if (Platform.operatingSystem != 'windows') return callback();
 
   var attempts = 0;
   makeAttempt(_) {
     attempts++;
-    return callback().transformException((e) {
+    return callback().catchError((e) {
       if (attempts >= 10) {
         throw 'Could not complete operation. Gave up after $attempts attempts.';
       }
 
       // Wait a bit and try again.
       log.fine("Operation failed, retrying (attempt $attempts).");
-      return sleep(500).chain(makeAttempt);
+      return sleep(500).then(makeAttempt);
     });
   }
 
   return makeAttempt(null);
 }
 
 /// Creates a new symlink that creates an alias from [from] to [to], both of
 /// which can be a [String], [File], or [Directory]. Returns a [Future] which
 /// completes to the symlink file (i.e. [to]).
 Future<File> createSymlink(from, to) {
@@ skipping 74 matching lines @@
 
 /// Displays a message and reads a yes/no confirmation from the user. Returns
 /// a [Future] that completes to `true` if the user confirms or `false` if they
 /// do not.
 ///
 /// This will automatically append " (y/n)?" to the message, so [message]
 /// should just be a fragment like, "Are you sure you want to proceed".
 Future<bool> confirm(String message) {
   log.fine('Showing confirm message: $message');
   stdout.writeString("$message (y/n)? ");
-  return readLine().transform((line) => new RegExp(r"^[yY]").hasMatch(line));
+  return readLine().then((line) => new RegExp(r"^[yY]").hasMatch(line));
 }
 
 /// Returns a single line read from a [StringInputStream]. By default, reads
 /// from stdin.
 ///
 /// A [StringInputStream] passed to this should have no callbacks registered.
 Future<String> readLine([StringInputStream stream]) {
   if (stream == null) stream = _stringStdin;
   if (stream.closed) return new Future.immediate('');
   void removeCallbacks() {
@@ skipping 229 matching lines @@
 
 /// Creates a temporary directory and passes its path to [fn]. Once the [Future]
 /// returned by [fn] completes, the temporary directory and all its contents
 /// will be deleted.
 Future withTempDir(Future fn(String path)) {
   var tempDir;
   var future = createTempDir().then((dir) {
     tempDir = dir;
     return fn(tempDir.path);
   });
-  future.catchError((_) {}).then(_) {
+  future.catchError((_) {}).then((_) {
     log.fine('Cleaning up temp directory ${tempDir.path}.');
     deleteDir(tempDir);
   });
   return future;
 }
 
 /// Tests whether or not the git command-line app is available for use.
 Future<bool> get isGitInstalled {
   if (_isGitInstalledCache != null) {
     // TODO(rnystrom): The sleep is to pump the message queue. Can use
@@ skipping 193 matching lines @@
 
     // Note: This line of code gets munged by create_sdk.py to be the correct
     // relative path to 7zip in the SDK.
     var pathTo7zip = '../../third_party/7zip/7za.exe';
     var command = relativeToPub(pathTo7zip);
 
     // We're passing 'baseDir' both as '-w' and setting it as the working
     // directory explicitly here intentionally. The former ensures that the
     // files added to the archive have the correct relative path in the archive.
     // The latter enables relative paths in the "-i" args to be resolved.
-    return runProcess(command, args, workingDir: baseDir).chain((_) {
+    return runProcess(command, args, workingDir: baseDir).then((_) {
       // GZIP it. 7zip doesn't support doing both as a single operation. Send
       // the output to stdout.
       args = ["a", "unused", "-tgzip", "-so", tarFile];
       return startProcess(command, args);
-    }).chain((process) {
+    }).then((process) {
       // Drain and discard 7zip's stderr. 7zip writes its normal output to
       // stderr. We don't want to show that since it's meaningless.
       // TODO(rnystrom): Should log this and display it if an actual error
       // occurs.
       consumeInputStream(process.stderr);
       return pipeInputToInput(process.stdout, stream);
     });
   });
   return stream;
 }
@@ skipping 33 matching lines @@
 Directory _getDirectory(entry) {
   if (entry is Directory) return entry;
   return new Directory(entry);
 }
 
 /// Gets a [Uri] for [uri], which can either already be one, or be a [String].
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return new Uri.fromString(uri);
 }