Make createTempDir() synchronous.

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:async';
 import 'dart:io';
 import 'dart:isolate';
@@ skipping 139 matching lines @@
     }
   }
 
   return dir;
 }
 
 /// Creates a temp directory whose name will be based on [dir] with a unique
 /// suffix appended to it. If [dir] is not provided, a temp directory will be
 /// created in a platform-dependent temporary location. Returns a [Future] that
 /// completes when the directory is created.
-Future<Directory> createTempDir([dir = '']) {
-  dir = _getDirectory(dir);
-  return log.ioAsync("create temp directory ${dir.path}",
-      dir.createTemp());
+Directory createTempDir([dir = '']) {
+  var tempDir = _getDirectory(dir).createTempSync();
+  log.io("Created temp directory ${tempDir.path}");
+  return tempDir;
 }
 
 /// Asynchronously recursively deletes [dir], which can be a [String] or a
 /// [Directory]. Returns a [Future] that completes when the deletion is done.
 Future<Directory> deleteDir(dir) {
   dir = _getDirectory(dir);
 
   return _attemptRetryable(() => log.ioAsync("delete directory ${dir.path}",
       dir.delete(recursive: true)));
 }
@@ skipping 541 matching lines @@
     if (completed) return;
     timer.cancel();
     completer.completeError(e.error, e.stackTrace);
   });
   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.
+///
+/// Returns a future that completes to the value that the future returned from
+/// [fn] completes to.
 Future withTempDir(Future fn(String path)) {
-  var tempDir;
-  return createTempDir().then((dir) {
-    tempDir = dir;
-    return fn(tempDir.path);
-  }).whenComplete(() {
-    log.fine('Cleaning up temp directory ${tempDir.path}.');
-    return deleteDir(tempDir);
+  return defer(() {
+    var tempDir = createTempDir();
+    return fn(tempDir.path).whenComplete(() {
+      return deleteDir(tempDir);
+    });
   });
 }
 
 /// Extracts a `.tar.gz` file from [stream] to [destination], which can be a
 /// directory or a path. Returns whether or not the extraction was successful.
 Future<bool> extractTarGz(Stream<List<int>> stream, destination) {
   destination = _getPath(destination);
 
   log.fine("Extracting .tar.gz stream to $destination.");
 
@@ skipping 29 matching lines @@
   // 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.
 
   // 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;
+  return withTempDir((tempDir) {
+    // Write the archive to a temp file.
+    return createFileFromStream(stream, join(tempDir, 'data.tar.gz')).then((_) {
+      // 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);
+    }).then((result) {
+      if (result.exitCode != 0) {
+        throw 'Could not un-gzip (exit code ${result.exitCode}). Error:\n'
+            '${Strings.join(result.stdout, "\n")}\n'
+            '${Strings.join(result.stderr, "\n")}';
+      }
+      // Find the tar file we just created since we don't know its name.
+      return listDir(tempDir);
+    }).then((files) {
+      var tarFile;
+      for (var file in files) {
+        if (path.extension(file) == '.tar') {
+          tarFile = file;
+          break;
+        }
+      }
 
-  // TODO(rnystrom): Use withTempDir().
-  return createTempDir().then((temp) {
-    // Write the archive to a temp file.
-    tempDir = temp;
-    return createFileFromStream(stream, join(tempDir, 'data.tar.gz'));
-  }).then((_) {
-    // 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);
-  }).then((result) {
-    if (result.exitCode != 0) {
-      throw 'Could not un-gzip (exit code ${result.exitCode}). Error:\n'
-          '${Strings.join(result.stdout, "\n")}\n'
-          '${Strings.join(result.stderr, "\n")}';
-    }
-    // Find the tar file we just created since we don't know its name.
-    return listDir(tempDir);
-  }).then((files) {
-    var tarFile;
-    for (var file in files) {
-      if (path.extension(file) == '.tar') {
-        tarFile = file;
-        break;
+      if (tarFile == null) throw 'The gzip file did not contain a tar file.';
+
+      // Untar the archive into the destination directory.
+      return runProcess(command, ['x', tarFile], workingDir: destination);
+    }).then((result) {
+      if (result.exitCode != 0) {
+        throw 'Could not un-tar (exit code ${result.exitCode}). Error:\n'
+            '${Strings.join(result.stdout, "\n")}\n'
+            '${Strings.join(result.stderr, "\n")}';
       }
-    }
-
-    if (tarFile == null) throw 'The gzip file did not contain a tar file.';
-
-    // Untar the archive into the destination directory.
-    return runProcess(command, ['x', tarFile], workingDir: destination);
-  }).then((result) {
-    if (result.exitCode != 0) {
-      throw 'Could not un-tar (exit code ${result.exitCode}). Error:\n'
-          '${Strings.join(result.stdout, "\n")}\n'
-          '${Strings.join(result.stderr, "\n")}';
-    }
-
-    log.fine('Clean up 7zip temp directory ${tempDir.path}.');
-    // TODO(rnystrom): Should also delete this if anything fails.
-    return deleteDir(tempDir);
-  }).then((_) => true);
+      return true;
+    });
+  });
 }
 
 /// Create a .tar.gz archive from a list of entries. Each entry can be a
 /// [String], [Directory], or [File] object. The root of the archive is
 /// considered to be [baseDir], which defaults to the current working directory.
 /// Returns a [ByteStream] that will emit the contents of the archive.
 ByteStream createTarGz(List contents, {baseDir}) {
   var buffer = new StringBuffer();
   buffer.add('Creating .tag.gz stream containing:\n');
   contents.forEach((file) => buffer.add('$file\n'));
@@ skipping 110 matching lines @@
 Directory _getDirectory(entry) {
   if (entry is Directory) return entry;
   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 Uri.parse(uri);
 }