Reverting 9767.

utils/pub/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('source');
 
 #import('io.dart');
 #import('package.dart');
 #import('pubspec.dart');
 #import('system_cache.dart');
@@ skipping 102 matching lines @@
 
   /**
    * Installs the package identified by [id] to the system cache. This is only
    * called for sources with [shouldCache] set to true.
    *
    * By default, this uses [systemCacheDirectory] and [install].
    */
   Future<Package> installToSystemCache(PackageId id) {
     var path = systemCacheDirectory(id);
     return exists(path).chain((exists) {
-      if (exists) return new Future<bool>.immediate(true);
-      return ensureDir(dirname(path)).chain((_) => install(id, path));
+      // TODO(nweiz): better error handling
+      if (exists) throw 'Package $id is already installed.';
+      return ensureDir(dirname(path));
+    }).chain((_) {
+      return install(id, path);
     }).chain((found) {
       if (!found) throw 'Package $id not found.';
       return Package.load(path, systemCache.sources);
     });
   }
 
   /**
    * Returns the directory in the system cache that the package identified by
    * [id] should be installed to. This should return a path to a subdirectory of
    * [systemCacheRoot].
    *
    * This doesn't need to be implemented if [shouldCache] is false, or if
    * [installToSystemCache] is implemented.
    */
   String systemCacheDirectory(PackageId id) =>
     join(systemCacheRoot, packageName(id.description));
 
   /**
-   * When a [Pubspec] or [LockFile] is parsed, it reads in the description for
-   * each dependency. It is up to the dependency's [Source] to determine how
-   * that should be interpreted. This will be called during parsing to validate
-   * that the given [description] is well-formed according to this source. It
-   * should return if the description is valid, or throw a [FormatException] if
-   * not.
-   *
-   * [fromLockFile] is true when the description comes from a [LockFile], to
-   * allow the source to use lockfile-specific descriptions via [resolveId].
+   * When a [Pubspec] is parsed, it reads in the description for each
+   * dependency. It is up to the dependency's [Source] to determine how that
+   * should be interpreted. This will be called during parsing to validate that
+   * the given [description] is well-formed according to this source. It should
+   * return if the description is valid, or throw a [FormatException] if not.
    */
-  void validateDescription(description, [bool fromLockFile=false]) {}
+  void validateDescription(description) {}
 
   /**
    * Returns a human-friendly name for the package described by [description].
    * This method should be light-weight. It doesn't need to validate that the
    * given package exists.
    *
    * The package name should be lower-case and suitable for use in a filename.
    * It may contain forward slashes.
    */
   String packageName(description) => description;
 
   /**
    * Returns whether or not [description1] describes the same package as
    * [description2] for this source. This method should be light-weight. It
    * doesn't need to validate that either package exists.
    *
    * By default, this assumes both descriptions are strings and compares them
    * for equality.
    */
   bool descriptionsEqual(description1, description2) =>
     description1 == description2;
-
-  /**
-   * For some sources, [PackageId]s can point to different chunks of code at
-   * different times. This takes such an [id] and returns a future that
-   * completes to a [PackageId] that will uniquely specify a single chunk of
-   * code forever.
-   *
-   * For example, [GitSource] might take an [id] with description
-   * `http://github.com/dart-lang/some-lib.git` and return an id with a
-   * description that includes the current commit of the Git repository.
-   *
-   * This will be called after the package identified by [id] is installed, so
-   * the source can use the installed package to determine information about the
-   * resolved id.
-   *
-   * The returned [PackageId] may have a description field that's invalid
-   * according to [validateDescription], although it must still be serializable
-   * to JSON and YAML. It must also be equal to [id] according to
-   * [descriptionsEqual].
-   *
-   * By default, this just returns [id].
-   */
-  Future<PackageId> resolveId(PackageId id) => new Future.immediate(id);
 }