Support relative paths in path dependencies.

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 '../../pkg/yaml/lib/yaml.dart';
 import '../../pkg/path/lib/path.dart' as path;
 
 import 'io.dart';
@@ skipping 20 matching lines @@
   /// All pubspec fields. This includes the fields from which other properties
   /// are derived.
   final Map<String, Object> fields;
 
   /// Loads the pubspec for a package [name] located in [packageDir].
   factory Pubspec.load(String name, String packageDir, SourceRegistry sources) {
     var pubspecPath = path.join(packageDir, 'pubspec.yaml');
     if (!fileExists(pubspecPath)) throw new PubspecNotFoundException(name);
 
     try {
-      var pubspec = new Pubspec.parse(readTextFile(pubspecPath), sources);
+      var pubspec = new Pubspec.parse(pubspecPath, readTextFile(pubspecPath),
+          sources);
 
       if (pubspec.name == null) {
         throw new PubspecHasNoNameException(name);
       }
 
       if (name != null && pubspec.name != name) {
         throw new PubspecNameMismatchException(name, pubspec.name);
       }
 
       return pubspec;
@@ skipping 10 matching lines @@
     : name = null,
       version = Version.none,
       dependencies = <PackageRef>[],
       environment = new PubspecEnvironment(),
       fields = {};
 
   /// Whether or not the pubspec has no contents.
   bool get isEmpty =>
     name == null && version == Version.none && dependencies.isEmpty;
 
-  // TODO(rnystrom): Make this a static method to match corelib.
-  /// Parses the pubspec whose text is [contents]. If the pubspec doesn't define
-  /// version for itself, it defaults to [Version.none].
-  factory Pubspec.parse(String contents, SourceRegistry sources) {
+  /// Parses the pubspec stored at [filePath] whose text is [contents]. If the
+  /// pubspec doesn't define version for itself, it defaults to [Version.none].
+  /// [filePath] may be `null` if the pubspec is not on the user's local
+  /// file system.
+  factory Pubspec.parse(String filePath, String contents,
+      SourceRegistry sources) {
     var name = null;
     var version = Version.none;
 
     if (contents.trim() == '') return new Pubspec.empty();
 
     var parsedPubspec = loadYaml(contents);
     if (parsedPubspec == null) return new Pubspec.empty();
 
     if (parsedPubspec is! Map) {
       throw new FormatException('The pubspec must be a YAML mapping.');
     }
 
     if (parsedPubspec.containsKey('name')) {
       name = parsedPubspec['name'];
       if (name is! String) {
         throw new FormatException(
             'The pubspec "name" field should be a string, but was "$name".');
       }
     }
 
     if (parsedPubspec.containsKey('version')) {
       version = new Version.parse(parsedPubspec['version']);
     }
 
-    var dependencies = _parseDependencies(sources,
+    var dependencies = _parseDependencies(filePath, sources,
         parsedPubspec['dependencies']);
 
     var environmentYaml = parsedPubspec['environment'];
     var sdkConstraint = VersionConstraint.any;
     if (environmentYaml != null) {
       if (environmentYaml is! Map) {
         throw new FormatException(
             'The pubspec "environment" field should be a map, but was '
             '"$environmentYaml".');
       }
@@ skipping 69 matching lines @@
   }
 
   var goodScheme = new RegExp(r'^https?:');
   if (!goodScheme.hasMatch(url)) {
     throw new FormatException(
         'The "$field" field should be an "http:" or "https:" URL, but '
         'was "$url".');
   }
 }
 
-List<PackageRef> _parseDependencies(SourceRegistry sources, yaml) {
+List<PackageRef> _parseDependencies(String pubspecPath, SourceRegistry sources,
+    yaml) {
   var dependencies = <PackageRef>[];
 
   // Allow an empty dependencies key.
   if (yaml == null) return dependencies;
 
   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}.');
   }
@@ skipping 25 matching lines @@
             '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);
+    description = source.parseDescription(pubspecPath, description,
+        fromLockFile: false);
 
     dependencies.add(new PackageRef(
         name, source, versionConstraint, description));
   });
 
   return dependencies;
 }
 
 /// The environment-related metadata in the pubspec. Corresponds to the data
 /// under the "environment:" key in the pubspec.
 class PubspecEnvironment {
   /// The version constraint specifying which SDK versions this package works
   /// with.
   final VersionConstraint sdkVersion;
 
   PubspecEnvironment([VersionConstraint sdk])
       : sdkVersion = sdk != null ? sdk : VersionConstraint.any;
 }