Fix asset and SDK path detection.

lib/src/io.dart

 // Copyright (c) 2013, 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.
 
 /// Helper functionality to make working with IO easier.
 library pub.io;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
@@ skipping 457 matching lines @@
     {bool isSelfLink: false, bool relative: false}) {
   // See if the package has a "lib" directory. If not, there's nothing to
   // symlink to.
   target = path.join(target, 'lib');
   if (!dirExists(target)) return;
 
   log.fine("Creating ${isSelfLink ? "self" : ""}link for package '$name'.");
   createSymlink(target, symlink, relative: relative);
 }
 
+/// Whether the current process is one of pub's test files.
+final bool runningAsTest =
+    !path.url.basename(Platform.script.path).startsWith('pub.');

[Bob Nystrom, 2015/05/20 22:00:57]

Document why this works. It's because the only *non* test processes will be
"pub(.dart)?.snapshot" or "pub.test(.dart)?.snapshot", right?

[nweiz, 2015/05/21 00:43:10]

Done.

+
+/// Whether the current process is a pub subprocess being run from a test.
+final bool runningFromTest = Platform.script.path.endsWith('.test.snapshot');
+
 /// Whether pub is running from within the Dart SDK, as opposed to from the Dart
 /// source repository.
-final bool runningFromSdk = Platform.script.path.endsWith('.dart.snapshot');
+final bool runningFromSdk =
+    !runningFromTest && Platform.script.path.endsWith('.snapshot');
+
+/// Whether pub is running from source in the Dart repo.
+///
+/// This can happen when building Observatory, for example.
+final bool runningFromDartRepo =
+    Platform.script.path.endsWith('/third_party/pkg/pub/bin/pub.dart');
 
 /// Resolves [target] relative to the path to pub's `asset` directory.
-String assetPath(String target) {
-  if (runningFromSdk) {
-    return path.join(
-        sdk.rootDirectory, 'lib', '_internal', 'pub', 'asset', target);
-  } else {
-    return path.join(pubRoot, 'asset', target);
+String assetPath(String target) => runningFromSdk
+    ? sdkAssetPath(target)
+    : path.join(pubRoot, 'lib', 'src', 'asset', target);
+
+/// Resolves [target] relative to the Dart SDK's `asset` directory.
+///
+/// Throws a [StateError] if called from within the Dart repo.
+String sdkAssetPath(String target) {
+  if (runningFromDartRepo) {
+    throw new StateError("Can't get SDK assets from within the Dart repo.");
   }
+
+  return path.join(
+    sdk.rootDirectory, 'lib', '_internal', 'pub', 'asset', target);
 }
 
-/// Returns the path to the root of pub's sources in the Dart repo.
-String get pubRoot => path.join(repoRoot, 'sdk', 'lib', '_internal', 'pub');
-
-/// Returns the path to the root of the Dart repository.
+/// The path to the root of pub's sources the pub repo.

[Bob Nystrom, 2015/05/20 22:00:57]

"sources the" -> "sources in the"

[nweiz, 2015/05/21 00:43:10]

Done.

 ///
 /// This throws a [StateError] if it's called when running pub from the SDK.
-String get repoRoot {
+final String pubRoot = (() {
   if (runningFromSdk) {
-    throw new StateError("Can't get the repo root from the SDK.");
+    throw new StateError("Can't get pub's root from the SDK.");
   }
 
-  // Get the path to the directory containing this very file.
-  var libDir = path.dirname(libraryPath('pub.io'));
+  var script = path.fromUri(Platform.script);
+  if (runningAsTest) {
+    // Running from "test/../some_test.dart".
+    while (path.basename(script) != 'test') {

[Bob Nystrom, 2015/05/20 22:00:57]

Maybe use path.split() and .lastIndexOf("test")?

[nweiz, 2015/05/21 00:43:10]

Done.

+      var dirname = path.dirname(script);
+      if (dirname == script) throw new StateError("Can't find pub's root.");
+      script = dirname;
+    }
+    return path.dirname(script);
+  }
 
-  // Assume we're running directly from the source location in the repo:
-  //
-  //      <repo>/sdk/lib/_internal/pub/lib/src
-  return path.normalize(path.join(libDir, '..', '..', '..', '..', '..', '..'));
-}
+  // Pub is either run from ".pub/pub.test.snapshot" or "bin/pub.dart".
+  return path.dirname(path.dirname(script));
+})();
+
+/// The path to the root of the Dart repo.
+///
+/// This throws a [StateError] if it's called when not running pub from source
+/// in the Dart repo.
+final String dartRepoRoot = (() {
+  if (!runningFromDartRepo) {
+    throw new StateError("Not running from source in the Dart repo.");
+  }
+
+  // In the Dart repo, the script is in "third_party/pkg/pub/bin".
+  return path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(
+      path.fromUri(Platform.script))))));
+})();
 
 /// A line-by-line stream of standard input.
 final Stream<String> stdinLines = streamToLines(
     new ByteStream(stdin).toStringStream());
 
 /// Displays a message and reads a yes/no confirmation from the user.
 ///
 /// Returns a [Future] that completes to `true` if the user confirms or `false`
 /// if they do not.
 ///
@@ skipping 345 matching lines @@
 
   var match = new RegExp(r"^tar \(GNU tar\) (\d+).(\d+)\n")
       .firstMatch(result.stdout);
   if (match == null) return false;
 
   var major = int.parse(match[1]);
   var minor = int.parse(match[2]);
   return major >= 2 || (major == 1 && minor >= 23);
 }
 
-String get pathTo7zip {
-  if (runningFromSdk) return assetPath(path.join('7zip', '7za.exe'));
-  return path.join(repoRoot, 'third_party', '7zip', '7za.exe');
-}
+final String pathTo7zip = (() {
+  if (!runningFromDartRepo) return sdkAssetPath(path.join('7zip', '7za.exe'));
+  return path.join(dartRepoRoot, 'third_party', '7zip', '7za.exe');
+})();
 
 Future<bool> _extractTarGzWindows(Stream<List<int>> stream,
     String destination) {
   // TODO(rnystrom): In the repo's history, there is an older implementation of
   // this that does everything in memory by piping streams directly together
   // instead of writing out temp files. The code is simpler, but unfortunately,
   // 7zip seems to periodically fail when we invoke it from Dart and tell it to
   // read from stdin instead of a file. Consider resurrecting that version if
   // we can figure out why it fails.
 
@@ skipping 120 matching lines @@
 
   // TODO(rnystrom): Remove this and change to returning one string.
   static List<String> _toLines(String output) {
     var lines = splitLines(output);
     if (!lines.isEmpty && lines.last == "") lines.removeLast();
     return lines;
   }
 
   bool get success => exitCode == exit_codes.SUCCESS;
 }