Reverting 7623

utils/pub/package.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.
 
 /**
  * A named, versioned, unit of code and resource reuse.
  */
 class Package implements Hashable {
   /**
    * Loads the package whose root directory is [packageDir].
    */
-  static Future<Package> load(String packageDir, SourceRegistry sources) {
+  static Future<Package> load(String packageDir) {
     final pubspecPath = join(packageDir, 'pubspec');
 
-    return _parsePubspec(pubspecPath, sources).transform((dependencies) {
+    return _parsePubspec(pubspecPath).transform((dependencies) {
       return new Package._(packageDir, dependencies);
     });
   }
 
   /**
    * The path to the directory containing the package.
    */
   final String dir;
 
   /**
@@ skipping 24 matching lines @@
 
   /**
    * Returns a debug string for the package.
    */
   String toString() => '$name ($dir)';
 
   /**
    * Parses the pubspec at the given path and returns the list of package
    * dependencies it exposes.
    */
-  static Future<List<PackageId>> _parsePubspec(String path,
-      SourceRegistry sources) {
+  static Future<List<PackageId>> _parsePubspec(String path) {
     final completer = new Completer<List<PackageId>>();
 
     // TODO(rnystrom): Handle the directory not existing.
     // TODO(rnystrom): Error-handling.
     final readFuture = readTextFile(path);
     readFuture.handleException((error) {
       // If there is no pubspec, we implicitly treat that as a package with no
       // dependencies.
       // TODO(rnystrom): Distinguish file not found from other real errors.
       completer.complete(<PackageId>[]);
@@ skipping 10 matching lines @@
       if (parsedPubspec is! Map) {
         completer.completeException('The pubspec must be a YAML mapping.');
       }
 
       if (!parsedPubspec.containsKey('dependencies')) {
         completer.complete(<String>[]);
         return;
       }
 
       var dependencies = parsedPubspec['dependencies'];
-      if (dependencies is! Map ||
-          dependencies.getKeys().some((e) => e is! String)) {
+      if (dependencies.some((e) => e is! String)) {
         completer.completeException(
-            'The pubspec dependencies must be a map of package names.');
+            'The pubspec dependencies must be a list of package names.');
       }
 
-      var dependencyIds = <PackageId>[];
-      dependencies.forEach((name, spec) {
-        var fullName, source;
-        // TODO(nweiz): parse the version once we have version handling
-        if (spec == null || spec is String) {
-          fullName = name;
-          source = sources.defaultSource;
-        } else if (spec is Map) {
-          spec.remove('version');
-
-          var sourceNames = spec.getKeys();
-          if (sourceNames.length > 1) {
-            completer.completeException(
-                'Dependency $name may not have multiple sources: '
-                '$sourceNames.');
-            return;
-          }
-
-          var sourceName = only(sourceNames);
-          if (sourceName is! String) {
-            completer.completeException(
-                'Source name $sourceName must be a string.');
-            return;
-          }
-          source = sources[sourceName];
-
-          // TODO(nweiz): At some point we want fullName to be able to be an
-          // arbitrary object that's parsed by the source.
-          fullName = spec[sourceName];
-          if (fullName is! String) {
-            completer.completeException(
-                'Source identifier $fullName must be a string.');
-            return;
-          }
-        } else {
-          completer.completeException(
-              'Dependency specification $spec must be a string or a mapping.');
-          return;
-        }
-
-        var id = new PackageId(fullName, source);
-        var nameFromSource = source.packageName(id);
-        if (nameFromSource != name) {
-          completer.completeException(
-              'Dependency name "$name" doesn\'t match name "$nameFromSource" '
-              'from source "${source.name}".');
-          return;
-        }
-
-        dependencyIds.add(id);
-      });
+      var dependencyIds =
+        dependencies.map((name) => new PackageId(name, Source.defaultSource));
       completer.complete(dependencyIds);
     });
 
     return completer.future;
   }
 }
 
 /**
  * A unique identifier for a package. A given package id specifies a single
  * chunk of code and resources.
@@ skipping 38 matching lines @@
 
   String toString() => "$fullName from ${source.name}";
 
   int compareTo(Comparable other) {
     if (other is! PackageId) throw new IllegalArgumentException(other);
     var sourceComp = this.source.name.compareTo(other.source.name);
     if (sourceComp != 0) return sourceComp;
     return this.fullName.compareTo(other.fullName);
   }
 }