Big merge from experimental to bleeding edge.

utils/pub/hosted_source.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 hosted_source;
 
+import 'dart:async';
 import 'dart:io' as io;
-import 'dart:json';
+import 'dart:json' as json;
 import 'dart:uri';
 
 // TODO(nweiz): Make this import better.
 import '../../pkg/http/lib/http.dart' as http;
 import 'http.dart';
 import 'io.dart';
 import 'log.dart' as log;
 import 'package.dart';
 import 'pubspec.dart';
 import 'source.dart';
 import 'source_registry.dart';
 import 'utils.dart';
 import 'version.dart';
 
 /// A package source that installs packages from a package hosting site that
 /// uses the same API as pub.dartlang.org.
 class HostedSource extends Source {
   final name = "hosted";
   final shouldCache = true;
 
   /// The URL of the default package repository.
   static final defaultUrl = "http://pub.dartlang.org";
 
   /// Downloads a list of all versions of a package that are available from the
   /// site.
   Future<List<Version>> getVersions(String name, description) {
     var parsed = _parseDescription(description);
     var fullUrl = "${parsed.last}/packages/${parsed.first}.json";
 
-    return httpClient.read(fullUrl).transform((body) {
-      var doc = JSON.parse(body);
-      return doc['versions'].map((version) => new Version.parse(version));
+    return httpClient.read(fullUrl).then((body) {
+      var doc = json.parse(body);
+      return doc['versions']
+          .mappedBy((version) => new Version.parse(version))
+          .toList();
     }).transformException((ex) {
       _throwFriendlyError(ex, parsed.first, parsed.last);
     });
   }
 
   /// Downloads and parses the pubspec for a specific version of a package that
   /// is available from the site.
   Future<Pubspec> describe(PackageId id) {
     var parsed = _parseDescription(id.description);
     var fullUrl = "${parsed.last}/packages/${parsed.first}/versions/"
       "${id.version}.yaml";
 
-    return httpClient.read(fullUrl).transform((yaml) {
+    return httpClient.read(fullUrl).then((yaml) {
       return new Pubspec.parse(yaml, systemCache.sources);
     }).transformException((ex) {
       _throwFriendlyError(ex, id, parsed.last);
     });
   }
 
   /// Downloads a package from the site and unpacks it.
   Future<bool> install(PackageId id, String destPath) {
     var parsedDescription = _parseDescription(id.description);
     var name = parsedDescription.first;
     var url = parsedDescription.last;
 
     var fullUrl = "$url/packages/$name/versions/${id.version}.tar.gz";
 
     log.message('Downloading $id...');
 
     // Download and extract the archive to a temp directory.
     var tempDir;
     return Futures.wait([
       httpClient.send(new http.Request("GET", new Uri.fromString(fullUrl)))
-          .transform((response) => response.stream),
+          .then((response) => response.stream),
       systemCache.createTempDir()
-    ]).chain((args) {
+    ]).then((args) {
       tempDir = args[1];
       return timeout(extractTarGz(args[0], tempDir), HTTP_TIMEOUT,
           'fetching URL "$fullUrl"');
-    }).chain((_) {
+    }).then((_) {
       // Now that the install has succeeded, move it to the real location in
       // the cache. This ensures that we don't leave half-busted ghost
       // directories in the user's pub cache if an install fails.
       return renameDir(tempDir, destPath);
-    }).transform((_) => true);
+    }).then((_) => true);
   }
 
   /// The system cache directory for the hosted source contains subdirectories
   /// for each separate repository URL that's used on the system. Each of these
   /// subdirectories then contains a subdirectory for each package installed
   /// from that site.
   String systemCacheDirectory(PackageId id) {
     var parsed = _parseDescription(id.description);
     var url = parsed.last.replaceAll(new RegExp(r"^https?://"), "");
     var urlDir = replace(url, new RegExp(r'[<>:"\\/|?*%]'), (match) {
@@ skipping 58 matching lines @@
 
     var name = description["name"];
     if (name is! String) {
       throw new FormatException("The 'name' key must have a string value.");
     }
 
     var url = description.containsKey("url") ? description["url"] : defaultUrl;
     return new Pair<String, String>(name, url);
   }
 }