Big merge from experimental to bleeding edge.

utils/pub/pubspec.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 pubspec;
 
 import 'package.dart';
 import 'source.dart';
 import 'source_registry.dart';
 import 'utils.dart';
@@ skipping 115 matching lines @@
     return new Pubspec(name, version, dependencies, parsedPubspec);
   }
 }
 
 List<PackageRef> _parseDependencies(SourceRegistry sources, yaml) {
   var dependencies = <PackageRef>[];
 
   // Allow an empty dependencies key.
   if (yaml == null) return dependencies;
 
-  if (yaml is! Map || yaml.keys.some((e) => e is! String)) {
+  if (yaml is! Map || yaml.keys.any((e) => e is! String)) {
     throw new FormatException(
         'The pubspec dependencies should be a map of package names, but '
         'was ${yaml}.');
   }
 
   yaml.forEach((name, spec) {
     var description, source;
     var versionConstraint = new VersionRange();
     if (spec == null) {
       description = name;
       source = sources.defaultSource;
     } else if (spec is String) {
       description = name;
       source = sources.defaultSource;
       versionConstraint = new VersionConstraint.parse(spec);
     } else if (spec is Map) {
       if (spec.containsKey('version')) {
         versionConstraint = new VersionConstraint.parse(spec.remove('version'));
       }
 
-      var sourceNames = spec.keys;
+      var sourceNames = spec.keys.toList();
       if (sourceNames.length > 1) {
         throw new FormatException(
             'Dependency $name may only have one source: $sourceNames.');
       }
 
       var sourceName = only(sourceNames);
       if (sourceName is! String) {
         throw new FormatException(
             'Source name $sourceName should be a string.');
       }
 
       source = sources[sourceName];
       description = spec[sourceName];
     } else {
       throw new FormatException(
           'Dependency specification $spec should be a string or a mapping.');
     }
 
     source.validateDescription(description, fromLockFile: false);
 
     dependencies.add(new PackageRef(
         name, source, versionConstraint, description));
   });
 
   return dependencies;
 }