Support relative paths in path dependencies.

utils/pub/git_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 git_source;
 
 import 'dart:async';
 
 import '../../pkg/path/lib/path.dart' as path;
 
 import 'git.dart' as git;
 import 'io.dart';
+import 'log.dart' as log;
 import 'package.dart';
 import 'source.dart';
 import 'source_registry.dart';
 import 'utils.dart';
 
 /// A package source that installs packages from Git repos.
 class GitSource extends Source {
   final String name = "git";
 
   final bool shouldCache = true;
@@ skipping 37 matching lines @@
     });
   }
 
   /// Returns the path to the revision-specific cache of [id].
   Future<String> systemCacheDirectory(PackageId id) {
     return _revisionAt(id).then((rev) {
       var revisionCacheName = '${id.name}-$rev';
       return path.join(systemCacheRoot, revisionCacheName);
     });
   }
+
   /// Ensures [description] is a Git URL.
-  void validateDescription(description, {bool fromLockFile: false}) {
+  dynamic parseDescription(String containingPath, description,
+                           {bool fromLockFile: false}) {
+    // TODO(rnystrom): Handle git URLs that are relative file paths.

[nweiz, 2013/02/15 23:09:24]

Add a bug number. Also, it would be nice if we could detect this and throw a
useful error.

[Bob Nystrom, 2013/02/16 00:09:57]

Added a bug. I don't want to add any code here unless I also add tests, and
that's a bit out of scope for this change.

     // A single string is assumed to be a Git URL.
-    if (description is String) return;
+    if (description is String) return description;

[nweiz, 2013/02/15 23:09:24]

It would make other code nicer if we canonicalized the format here by returning
{'url': description, 'ref': null}.

[Bob Nystrom, 2013/02/16 00:09:57]

Added a TODO.

     if (description is! Map || !description.containsKey('url')) {
       throw new FormatException("The description must be a Git URL or a map "
           "with a 'url' key.");
     }
-    description = new Map.from(description);
-    description.remove('url');
-    description.remove('ref');
-    if (fromLockFile) description.remove('resolved-ref');
 
-    if (!description.isEmpty) {
-      var plural = description.length > 1;
-      var keys = description.keys.join(', ');
+    var parsed = new Map.from(description);
+    parsed.remove('url');
+    parsed.remove('ref');
+    if (fromLockFile) parsed.remove('resolved-ref');
+
+    if (!parsed.isEmpty) {
+      var plural = parsed.length > 1;
+      var keys = parsed.keys.join(', ');
       throw new FormatException("Invalid key${plural ? 's' : ''}: $keys.");
     }
+
+    return description;
   }
 
   /// Two Git descriptions are equal if both their URLs and their refs are
   /// equal.
   bool descriptionsEqual(description1, description2) {
     // TODO(nweiz): Do we really want to throw an error if you have two
     // dependencies on some repo, one of which specifies a ref and one of which
     // doesn't? If not, how do we handle that case in the version solver?
     return _getUrl(description1) == _getUrl(description2) &&
       _getRef(description1) == _getRef(description2);
@@ skipping 92 matching lines @@
     return description['ref'];
   }
 
   /// Returns [description] if it's a description, or [PackageId.description] if
   /// it's a [PackageId].
   _getDescription(description) {
     if (description is PackageId) return description.description;
     return description;
   }
 }