Log verbose output when testing pub.

sdk/lib/_internal/pub/test/test_pub.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.
 
 /// Test infrastructure for testing pub. Unlike typical unit tests, most pub
 /// tests are integration tests that stage some stuff on the file system, run
 /// pub, and then validate the results. This library provides an API to build
 /// tests like that.
 library test_pub;
 
@@ skipping 15 matching lines @@
 
 import '../lib/src/entrypoint.dart';
 // TODO(rnystrom): Using "gitlib" as the prefix here is ugly, but "git" collides
 // with the git descriptor method. Maybe we should try to clean up the top level
 // scope a bit?
 import '../lib/src/git.dart' as gitlib;
 import '../lib/src/git_source.dart';
 import '../lib/src/hosted_source.dart';
 import '../lib/src/http.dart';
 import '../lib/src/io.dart';
+import '../lib/src/log.dart' as log;
 import '../lib/src/path_source.dart';
 import '../lib/src/safe_http_server.dart';
 import '../lib/src/system_cache.dart';
 import '../lib/src/utils.dart';
 import '../lib/src/validator.dart';
 import 'command_line_config.dart';
 import 'descriptor.dart' as d;
 
 /// This should be called at the top of a test file to set up an appropriate
 /// test configuration for the machine running the tests.
@@ skipping 280 matching lines @@
 /// upload.
 void confirmPublish(ScheduledProcess pub) {
   // TODO(rnystrom): This is overly specific and inflexible regarding different
   // test packages. Should validate this a little more loosely.
   expect(pub.nextLine(), completion(equals('Publishing "test_pkg" 1.0.0:')));
   expect(pub.nextLine(), completion(equals("|-- LICENSE")));
   expect(pub.nextLine(), completion(equals("|-- lib")));
   expect(pub.nextLine(), completion(equals("|   '-- test_pkg.dart")));
   expect(pub.nextLine(), completion(equals("'-- pubspec.yaml")));
   expect(pub.nextLine(), completion(equals("")));
+  expect(pub.nextLine(), completion(equals('Looks great! Are you ready to '
+      'upload your package (y/n)?')));
 
   pub.writeLine("y");
 }
 
 /// Starts a Pub process and returns a [ScheduledProcess] that supports
 /// interaction with that process.
 ///
 /// Any futures in [args] will be resolved before the process is started.
 ScheduledProcess startPub({List args, Future<Uri> tokenEndpoint}) {
   String pathInSandbox(String relPath) {
     return path.join(path.absolute(sandboxDir), relPath);
   }
 
   ensureDir(pathInSandbox(appPath));
 
   // Find a Dart executable we can use to spawn. Use the same one that was
   // used to run this script itself.
   var dartBin = new Options().executable;
 
   // If the executable looks like a path, get its full path. That way we
   // can still find it when we spawn it with a different working directory.
   if (dartBin.contains(Platform.pathSeparator)) {
     dartBin = path.absolute(dartBin);
   }
 
   // Find the main pub entrypoint.
   var pubPath = path.join(testDirectory, '..', 'bin', 'pub.dart');
 
   var dartArgs = ['--package-root=$_packageRoot/', '--checked', pubPath,
-      '--trace'];
+      '--verbose'];
   dartArgs.addAll(args);
 
   if (tokenEndpoint == null) tokenEndpoint = new Future.value();
   var optionsFuture = tokenEndpoint.then((tokenEndpoint) {
     var options = new ProcessOptions();
     options.workingDirectory = pathInSandbox(appPath);
     // TODO(nweiz): remove this when issue 9294 is fixed.
     options.environment = new Map.from(Platform.environment);
     options.environment['_PUB_TESTING'] = 'true';
     options.environment['PUB_CACHE'] = pathInSandbox(cachePath);
     options.environment['DART_SDK'] = pathInSandbox(sdkPath);
     if (tokenEndpoint != null) {
       options.environment['_PUB_TEST_TOKEN_ENDPOINT'] =
         tokenEndpoint.toString();
     }
     return options;
   });
 
-  return new ScheduledProcess.start(dartBin, dartArgs, options: optionsFuture,
+  return new PubProcess.start(dartBin, dartArgs, options: optionsFuture,
       description: args.isEmpty ? 'pub' : 'pub ${args.first}');
 }
 
+/// A subclass of [ScheduledProcess] that parses pub's verbose logging output
+/// and makes [nextLine], [nextErrLine], [remainingStdout], and
+/// [remainingStderr] work as though pub weren't running in verbose mode.
+class PubProcess extends ScheduledProcess {
+  Stream<Pair<log.Level, String>> _log;
+  Stream<String> _stdout;
+  Stream<String> _stderr;
+
+  PubProcess.start(executable, arguments,
+      {options, String description, Encoding encoding: Encoding.UTF_8})
+    : super.start(executable, arguments,
+        options: options,
+        description: description,
+        encoding: encoding);
+
+  Stream<Pair<log.Level, String>> _logStream() {
+    if (_log == null) {
+      _log = mergeStreams(
+        _outputToLog(super.stdoutStream(), log.Level.MESSAGE),
+        _outputToLog(super.stderrStream(), log.Level.ERROR));
+    }
+
+    var pair = tee(_log);
+    _log = pair.first;
+    return pair.last;
+  }
+
+  final _logLineRegExp = new RegExp(r"^([A-Z ]{4})[:|] (.*)$");
+  final _logLevels = [
+    log.Level.ERROR, log.Level.WARNING, log.Level.MESSAGE, log.Level.IO,
+    log.Level.SOLVER, log.Level.FINE
+  ].fold(<String, log.Level>{}, (levels, level) {
+    levels[level.name] = level;
+    return levels;
+  });
+
+  Stream<Pair<log.Level, String>> _outputToLog(Stream<String> stream,
+      log.Level defaultLevel) {
+    var lastLevel;
+    return stream.map((line) {
+      var match = _logLineRegExp.firstMatch(line);
+      if (match == null) return new Pair<log.Level, String>(defaultLevel, line);
+
+      var level = _logLevels[match[1]];
+      if (level == null) level = lastLevel;
+      lastLevel = level;
+      return new Pair<log.Level, String>(level, match[2]);
+    });
+  }
+
+  Stream<String> stdoutStream() {
+    if (_stdout == null) {
+      _stdout = _logStream().expand((entry) {
+        if (entry.first != log.Level.MESSAGE) return [];
+        return [entry.last];
+      });
+    }
+
+    var pair = tee(_stdout);
+    _stdout = pair.first;
+    return pair.last;
+  }
+
+  Stream<String> stderrStream() {
+    if (_stderr == null) {
+      _stderr = _logStream().expand((entry) {
+        if (entry.first != log.Level.ERROR && entry.first != log.Level.WARNING) {
+          return [];
+        }
+        return [entry.last];
+      });
+    }
+
+    var pair = tee(_stderr);
+    _stderr = pair.first;
+    return pair.last;
+  }
+}
+
 // TODO(nweiz): use the built-in mechanism for accessing this once it exists
 // (issue 9119).
 /// The path to the `packages` directory from which pub loads its dependencies.
 String get _packageRoot {
   return path.absolute(path.join(
       path.dirname(new Options().executable), '..', '..', 'packages'));
 }
 
 /// Skips the current test if Git is not installed. This validates that the
 /// current test is running on a buildbot in which case we expect git to be
@@ skipping 214 matching lines @@
   bool matches(item, MatchState matchState) {
     if (item is! Pair) return false;
     return _firstMatcher.matches(item.first, matchState) &&
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }