Get archive creation working on Windows.

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 353 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();
-  var scriptDir = new Path.fromNative(scriptPath).directoryPath;
-  return scriptDir.append(path).canonicalize().toNativePath();
+
+  // Walk up until we hit the "utils" 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;

[nweiz, 2012/11/28 23:37:55]

We should have a reasonable error message if this ever stops working.

[Bob Nystrom, 2012/11/29 00:16:11]

Yeah, I'm not sure exactly how this will fail, but I would definitely like to do
something more robust. This code will change soon(ish) when pub moves in the
repo. I'll try to do something better then.

+  }
+
+  return utilsDir.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 83 matching lines @@
  */
 Future<String> httpGetString(uri) {
   var future = httpGet(uri).chain((stream) => consumeInputStream(stream))
       .transform((bytes) => new String.fromCharCodes(bytes));
   return timeout(future, HTTP_TIMEOUT, 'fetching URL "$uri"');
 }
 
 /**
  * Takes all input from [source] and writes it to [sink].
  *
- * [onClosed] is called when [source] is closed.
+ * Returns a future that completes when [source] is closed.
  */
-void pipeInputToInput(InputStream source, ListInputStream sink,
-    [void onClosed()]) {
+Future pipeInputToInput(InputStream source, ListInputStream sink) {
+  var completer = new Completer();
   source.onClosed = () {
     sink.markEndOfStream();
-    if (onClosed != null) onClosed();
+    completer.complete(null);
   };
   source.onData = () => sink.write(source.read());
   // TODO(nweiz): propagate this error to the sink. See issue 3657.
   source.onError = (e) { throw e; };
+  return completer.future;
 }
 
 /**
  * Buffers all input from an InputStream and returns it as a future.
  */
 Future<List<int>> consumeInputStream(InputStream stream) {
   if (stream.closed) return new Future.immediate(<int>[]);
 
   var completer = new Completer<List<int>>();
   var buffer = <int>[];
@@ skipping 105 matching lines @@
     completer.complete(value);
   });
   return completer.future;
 }
 
 /// Creates a temporary directory and passes its path to [fn]. Once the [Future]
 /// returned by [fn] completes, the temporary directory and all its contents
 /// will be deleted.
 Future withTempDir(Future fn(String path)) {
   var tempDir;
-  var future = new Directory('').createTemp().chain((dir) {
+  var future = createTempDir().chain((dir) {
     tempDir = dir;
     return fn(tempDir.path);
   });
   future.onComplete((_) => tempDir.delete(recursive: true));
   return future;
 }
 
 /// Tests whether or not the git command-line app is available for use.
 Future<bool> get isGitInstalled {
   if (_isGitInstalledCache != null) {
@@ skipping 92 matching lines @@
   // read from stdin instead of a file. Consider resurrecting that version if
   // we can figure out why it fails.
 
   // Note: This line of code gets munged by create_sdk.py to be the correct
   // relative path to 7zip in the SDK.
   var pathTo7zip = '../../third_party/7zip/7za.exe';
   var command = relativeToPub(pathTo7zip);
 
   var tempDir;
 
+  // TODO(rnystrom): Use withTempDir().
   return createTempDir().chain((temp) {
     // Write the archive to a temp file.
     tempDir = temp;
     return createFileFromStream(stream, join(tempDir, 'data.tar.gz'));
   }).chain((_) {
     // 7zip can't unarchive from gzip -> tar -> destination all in one step
     // first we un-gzip it to a tar file.
     // Note: Setting the working directory instead of passing in a full file
     // path because 7zip says "A full path is not allowed here."
     return runProcess(command, ['e', 'data.tar.gz'], workingDir: tempDir);
@@ skipping 68 matching lines @@
     // Create the tar file.
     var tarFile = join(tempDir, "intermediate.tar");
     var args = ["a", "-w$baseDir", tarFile];
     args.addAll(contents.map((entry) => '-i!"$entry"'));
 
     // Note: This line of code gets munged by create_sdk.py to be the correct
     // relative path to 7zip in the SDK.
     var pathTo7zip = '../../third_party/7zip/7za.exe';
     var command = relativeToPub(pathTo7zip);
 
-    return runProcess(command, args).chain((_) {
+    // We're passing 'baseDir' both as '-w' and setting it as the working
+    // directory explicitly here intentionally. The former ensures that the
+    // files added to the archive have the correct relative path in the archive.
+    // The latter enables relative paths in the "-i" args to be resolved.
+    return runProcess(command, args, workingDir: baseDir).chain((_) {
       // GZIP it. 7zip doesn't support doing both as a single operation. Send
       // the output to stdout.
-      args = ["a", "not used", "-so", tarFile];
+      args = ["a", "unused", "-tgzip", "-so", tarFile];
       return startProcess(command, args);
-    }).transform((process) {
-      pipeInputToInput(process.stdout, stream);
+    }).chain((process) {
       process.stderr.pipe(stderr, close: false);
+      return pipeInputToInput(process.stdout, stream);
     });
   });
   return stream;
 }
 
 /**
  * Exception thrown when an HTTP operation fails.
  */
 class PubHttpException implements Exception {
   final int statusCode;
@@ skipping 59 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);
 }