Fix relativeToPub() to work in the SDK too.

utils/pub/io.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.
 
 /**
  * Helper functionality to make working with IO easier.
  */
 library io;
 
 import 'dart:io';
@@ skipping 354 matching lines @@
   // Using Path.join here instead of File().fullPathSync() because the former
   // does not require an actual file to exist at that path.
   return new Path.fromNative(currentWorkingDir).join(new Path(path))
       .toNativePath();
 }
 
 /// Resolves [path] relative to the location of pub.dart.
 String relativeToPub(String path) {
   var scriptPath = new File(new Options().script).fullPathSync();
 
-  // Walk up until we hit the "utils" directory. This lets us figure out where
+  // Walk up until we hit the "util(s)" directory. This lets us figure out where
   // we are if this function is called from pub.dart, or one of the tests,
-  // which also live under "utils".
-  var utilsDir = new Path.fromNative(scriptPath).directoryPath;
-  while (utilsDir.filename != 'utils') {
-    utilsDir = utilsDir.directoryPath;
+  // which also live under "utils", or from the SDK where pub is in "util".
+  var utilDir = new Path.fromNative(scriptPath).directoryPath;
+  while ((utilDir.filename != 'utils') && (utilDir.filename != 'util')) {

[nweiz, 2012/11/29 22:12:08]

Unnecessary parentheses. Have faith in operator precedence!

[Bob Nystrom, 2012/12/04 21:38:24]

Done. It is not my faith I question, but those of my so-called peers!

+    if (utilDir.filename == '') throw 'Could not find path to pub.';
+    utilDir = utilDir.directoryPath;
   }
 
-  return utilsDir.append('pub').append(path).canonicalize().toNativePath();
+  return utilDir.append('pub').append(path).canonicalize().toNativePath();
 }
 
 /// A StringInputStream reading from stdin.
 final _stringStdin = new StringInputStream(stdin);
 
 /// Returns a single line read from a [StringInputStream]. By default, reads
 /// from stdin.
 ///
 /// A [StringInputStream] passed to this should have no callbacks registered.
 Future<String> readLine([StringInputStream stream]) {
@@ skipping 529 matching lines @@
   return new Directory(entry);
 }
 
 /**
  * Gets a [Uri] for [uri], which can either already be one, or be a [String].
  */
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return new Uri.fromString(uri);
 }