Make Source.getDirectory synchronous.

lib/src/global_packages.dart

 // Copyright (c) 2014, 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 pub.global_packages;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
@@ skipping 264 matching lines @@
     log.message('Deactivated package ${_formatPackage(id)}.');
 
     deleteEntry(dir);
 
     return true;
   }
 
   /// Finds the active package with [name].
   ///
   /// Returns an [Entrypoint] loaded with the active package if found.
-  Future<Entrypoint> find(String name) async {
+  Entrypoint find(String name) {
     var lockFilePath = _getLockFilePath(name);
     var lockFile;
     try {
       lockFile = new LockFile.load(lockFilePath, cache.sources);
     } on IOException {
       var oldLockFilePath = p.join(_directory, '$name.lock');
       try {
         // TODO(nweiz): This looks for Dart 1.6's old lockfile location.
         // Remove it when Dart 1.6 is old enough that we don't think anyone
         // will have these lockfiles anymore (issue 20703).
         lockFile = new LockFile.load(oldLockFilePath, cache.sources);
       } on IOException {
         // If we couldn't read the lock file, it's not activated.
         dataError("No active package ${log.bold(name)}.");
       }
 
       // Move the old lockfile to its new location.
       ensureDir(p.dirname(lockFilePath));
       new File(oldLockFilePath).renameSync(lockFilePath);
     }
 
     // Load the package from the cache.
     var id = lockFile.packages[name];
     lockFile.packages.remove(name);
 
     var source = cache.sources[id.source];
     if (source is CachedSource) {
       // For cached sources, the package itself is in the cache and the
       // lockfile is the one we just loaded.
-      var dir = await cache.sources[id.source].getDirectory(id);
+      var dir = cache.sources[id.source].getDirectory(id);
       var package = new Package.load(name, dir, cache.sources);
       return new Entrypoint.inMemory(package, lockFile, cache);
     }
 
     // For uncached sources (i.e. path), the ID just points to the real
     // directory for the package.
     assert(id.source == "path");
     return new Entrypoint(PathSource.pathFromDescription(id.description),
         cache);
   }
 
   /// Runs [package]'s [executable] with [args].
   ///
   /// If [executable] is available in its precompiled form, that will be
   /// recompiled if the SDK has been upgraded since it was first compiled and
   /// then run. Otherwise, it will be run from source.
   ///
   /// If [checked] is true, the program is run in checked mode. If [mode] is
   /// passed, it's used as the barback mode; it defaults to
   /// [BarbackMode.RELEASE].
   ///
   /// Returns the exit code from the executable.
   Future<int> runExecutable(String package, String executable,
       Iterable<String> args, {bool checked: false, BarbackMode mode}) {
     if (mode == null) mode = BarbackMode.RELEASE;
 
     var binDir = p.join(_directory, package, 'bin');
     if (mode != BarbackMode.RELEASE ||
         !fileExists(p.join(binDir, '$executable.dart.snapshot'))) {
-      return find(package).then((entrypoint) {
-        return exe.runExecutable(entrypoint, package, executable, args,
-            isGlobal: true, checked: checked, mode: mode);
-      });
+      return exe.runExecutable(find(package), package, executable, args,
+          isGlobal: true, checked: checked, mode: mode);
     }
 
     // Unless the user overrides the verbosity, we want to filter out the
     // normal pub output shown while loading the environment.
     if (log.verbosity == log.Verbosity.NORMAL) {
       log.verbosity = log.Verbosity.WARNING;
     }
 
     var snapshotPath = p.join(binDir, '$executable.dart.snapshot');
     return exe.runSnapshot(snapshotPath, args,
         checked: checked,
         packagesFile: _getPackagesFilePath(package),
-        recompile: () {
+        recompile: () async {
       log.fine("$package:$executable is out of date and needs to be "
           "recompiled.");
-      return find(package)
-          .then((entrypoint) => entrypoint.loadPackageGraph())
-          .then((graph) => _precompileExecutables(graph.entrypoint, package));
+      var graph = await find(package).loadPackageGraph();
+      await _precompileExecutables(graph.entrypoint, package);
     });
   }
 
   /// Gets the path to the lock file for an activated cached package with
   /// [name].
   String _getLockFilePath(String name) =>
       p.join(_directory, name, "pubspec.lock");
 
   /// Gets the path to the .packages file for an activated cached package with
   /// [name].
@@ skipping 77 matching lines @@
 
     var successes = [];
     var failures = [];
     if (dirExists(_directory)) {
       for (var entry in listDir(_directory)) {
         var id;
         try {
           id = _loadPackageId(entry);
           log.message("Reactivating ${log.bold(id.name)} ${id.version}...");
 
-          var entrypoint = await find(id.name);
-
+          var entrypoint = find(id.name);
           var graph = await entrypoint.loadPackageGraph();
           var snapshots = await _precompileExecutables(entrypoint, id.name);
           var packageExecutables = executables.remove(id.name);
           if (packageExecutables == null) packageExecutables = [];
           _updateBinStubs(graph.packages[id.name], packageExecutables,
               overwriteBinStubs: true, snapshots: snapshots,
               suggestIfNotOnPath: false);
           successes.add(id.name);
         } catch (error, stackTrace) {
           var message = "Failed to reactivate "
@@ skipping 312 matching lines @@
   }
 
   /// Returns the value of the property named [name] in the bin stub script
   /// [source].
   String _binStubProperty(String source, String name) {
     var pattern = new RegExp(quoteRegExp(name) + r": ([a-zA-Z0-9_-]+)");
     var match = pattern.firstMatch(source);
     return match == null ? null : match[1];
   }
 }