Fix ALL the pub tests.

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' as json;
 import 'dart:uri';
@@ skipping 60 matching lines @@
     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)))
           .then((response) => response.stream),
       systemCache.createTempDir()
     ]).then((args) {
       tempDir = args[1];
-      return timeout(extractTarGz(args[0], tempDir), HTTP_TIMEOUT,
+      var stream = wrapByteStream(args[0]);
+      return timeout(extractTarGz(stream, tempDir), HTTP_TIMEOUT,
           'fetching URL "$fullUrl"');
     }).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);
     }).then((_) => true);
   }
 
   /// The system cache directory for the hosted source contains subdirectories
@@ skipping 19 matching lines @@
   /// There are two valid formats. A plain string refers to a package with the
   /// given name from the default host, while a map with keys "name" and "url"
   /// refers to a package with the given name from the host at the given URL.
   void validateDescription(description, {bool fromLockFile: false}) {
     _parseDescription(description);
   }
 
   /// When an error occurs trying to read something about [package] from [url],
   /// this tries to translate into a more user friendly error message. Always
   /// throws an error, either the original one or a better one.
-  void _throwFriendlyError(ex, package, url) {
-    ex = getRealError(ex);
+  void _throwFriendlyError(asyncError, package, url) {

[Bob Nystrom, 2013/01/09 16:49:23]

Can we type annotate this too?

+    var ex = getRealError(asyncError);
 
     if (ex is PubHttpException && ex.response.statusCode == 404) {
       throw 'Could not find package "$package" at $url.';
     }
 
     if (ex is TimeoutException) {
       throw 'Timed out trying to find package "$package" at $url.';
     }
 
     if (ex is io.SocketIOException) {
       throw 'Got socket error trying to find package "$package" at $url.\n'
           '${ex.osError}';
     }
 
     // Otherwise re-throw the original exception.
-    throw ex;
+    throw asyncError;

[Bob Nystrom, 2013/01/09 16:49:23]

Argh good catch. Completely misleading comment on my part. :(

   }
 
   /// Parses the description for a package.
   ///
   /// If the package parses correctly, this returns a (name, url) pair. If not,
   /// this throws a descriptive FormatException.
   Pair<String, String> _parseDescription(description) {
     if (description is String) {
       return new Pair<String, String>(description, defaultUrl);
     }
@@ skipping 10 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);
   }
 }