Merge remote-tracking branch 'origin/master' into feature/1323

Author: akhomchenko

.gitignore

@@ -3,7 +3,7 @@
 .idea
 .pub/
 .settings/
-build/
+/build/
 packages
 /.packages
 pubspec.lock

.travis.yml

@@ -0,0 +1,23 @@
+language: dart
+sudo: false
+
+dart:
+  - dev
+
+dart_task:
+  - test: --preset travis
+  - dartfmt
+  - dartanalyzer
+
+# Create a snapshot to improve startup time. Tests will automatically use this
+# snapshot if it's available.
+before_script:
+  - dart --no-checked --snapshot=bin/pub.dart.snapshot --snapshot-kind=app-jit bin/pub.dart --help
+
+# Only building master means that we don't run two builds for each pull request.
+branches:
+  only: [master, travis, features]
+
+cache:
+  directories:
+    - $HOME/.pub-cache

README.md

@@ -59,11 +59,7 @@ included in the repository as [Git submodules][]. To get them, run:
 
 Changes to pub should be accompanied by one or more tests that exercise the new
 functionality. When adding a test, the best strategy is to find a similar test
-in `test/` and follow the same patterns. Note that pub makes wide use of the
-[scheduled_test] package in its tests, so it's usually important to be familiar
-with that when adding tests.
-
-[scheduled_test]: http://pub.dartlang.org/packages/scheduled_test
+in `test/` and follow the same patterns.
 
 Pub tests come in two basic forms. The first, which is usually used to unit test
 classes and libraries internal to pub, has many tests in a single file. This is

analysis_options.yaml

@@ -0,0 +1,2 @@
+analyzer:
+  strong-mode: true

dart_test.yaml

@@ -0,0 +1,8 @@
+presets:
+  travis:
+    # Travis is sloooow.
+    timeout: 3x
+
+    # Pub has a huge number of small suites, which means test is frequently
+    # loading new ones. Keeping concurrency low helps limit load timeouts.
+    concurrency: 4

lib/src/ascii_tree.dart

@@ -60,12 +60,13 @@ import 'utils.dart';
 /// will have their contents truncated. Defaults to `false`.
 String fromFiles(List<String> files, {String baseDir, bool showAllChildren}) {
   // Parse out the files into a tree of nested maps.
-  var root = {};
+  var root = <String, Map>{};
   for (var file in files) {
     if (baseDir != null) file = path.relative(file, from: baseDir);
     var directory = root;
     for (var part in path.split(file)) {
-      directory = directory.putIfAbsent(part, () => {});
+      directory = directory.putIfAbsent(part, () => <String, Map>{})
+          as Map<String, Map>;
     }
   }
 
@@ -97,14 +98,14 @@ String fromFiles(List<String> files, {String baseDir, bool showAllChildren}) {
 ///
 /// If [showAllChildren] is `false`, then directories with more than ten items
 /// will have their contents truncated. Defaults to `false`.
-String fromMap(Map map, {bool showAllChildren}) {
+String fromMap(Map<String, Map> map, {bool showAllChildren}) {
   var buffer = new StringBuffer();
   _draw(buffer, "", null, map, showAllChildren: showAllChildren);
   return buffer.toString();
 }
 
-void _drawLine(StringBuffer buffer, String prefix, bool isLastChild,
-               String name) {
+void _drawLine(
+    StringBuffer buffer, String prefix, bool isLastChild, String name) {
   // Print lines.
   buffer.write(prefix);
   if (name != null) {
@@ -125,8 +126,9 @@ String _getPrefix(bool isRoot, bool isLast) {
   return log.gray("|   ");
 }
 
-void _draw(StringBuffer buffer, String prefix, String name, Map children,
-           {bool showAllChildren, bool isLast: false}) {
+void _draw(
+    StringBuffer buffer, String prefix, String name, Map<String, Map> children,
+    {bool showAllChildren, bool isLast: false}) {
   if (showAllChildren == null) showAllChildren = false;
 
   // Don't draw a line for the root node.
@@ -137,7 +139,8 @@ void _draw(StringBuffer buffer, String prefix, String name, Map children,
 
   drawChild(bool isLastChild, String child) {
     var childPrefix = _getPrefix(name == null, isLast);
-    _draw(buffer, '$prefix$childPrefix', child, children[child],
+    _draw(buffer, '$prefix$childPrefix', child,
+        children[child] as Map<String, Map>,
         showAllChildren: showAllChildren, isLast: isLastChild);
   }
 

lib/src/asset/dart/serialize.dart

@@ -5,14 +5,14 @@
 import 'dart:async';
 import 'dart:isolate';
 
+import 'package:async/async.dart';
 import 'package:barback/barback.dart';
 
 //# if source_span
 import 'package:source_span/source_span.dart';
 //# end
 
 import 'serialize/exception.dart';
-import 'utils.dart';
 
 export 'serialize/aggregate_transform.dart';
 export 'serialize/exception.dart';
@@ -41,10 +41,8 @@ Map serializeSpan(span) {
 
 /// Converts a serializable map into a [SourceSpan].
 SourceSpan deserializeSpan(Map span) {
-  return new SourceSpan(
-      deserializeLocation(span['start']),
-      deserializeLocation(span['end']),
-      span['text']);
+  return new SourceSpan(deserializeLocation(span['start']),
+      deserializeLocation(span['end']), span['text']);
 }
 
 /// Converts [location] into a serializable map.
@@ -77,22 +75,17 @@ SourceLocation deserializeLocation(Map location) {
 /// Converts [stream] into a serializable map.
 ///
 /// [serializeEvent] is used to serialize each event from the stream.
-Map serializeStream(Stream stream, serializeEvent(event)) {
+Map serializeStream/*<T>*/(Stream/*<T>*/ stream, serializeEvent(/*=T*/ event)) {
   var receivePort = new ReceivePort();
   var map = {'replyTo': receivePort.sendPort};
 
   receivePort.first.then((message) {
     var sendPort = message['replyTo'];
     stream.listen((event) {
-      sendPort.send({
-        'type': 'event',
-        'value': serializeEvent(event)
-      });
+      sendPort.send({'type': 'event', 'value': serializeEvent(event)});
     }, onError: (error, stackTrace) {
-      sendPort.send({
-        'type': 'error',
-        'error': serializeException(error, stackTrace)
-      });
+      sendPort.send(
+          {'type': 'error', 'error': serializeException(error, stackTrace)});
     }, onDone: () => sendPort.send({'type': 'done'}));
   });
 
@@ -102,12 +95,14 @@ Map serializeStream(Stream stream, serializeEvent(event)) {
 /// Converts a serializable map into a [Stream].
 ///
 /// [deserializeEvent] is used to deserialize each event from the stream.
-Stream deserializeStream(Map stream, deserializeEvent(event)) {
-  return callbackStream(() {
+Stream/*<T>*/ deserializeStream/*<T>*/(
+    Map stream,
+    /*=T*/ deserializeEvent(event)) {
+  return new LazyStream(() {
     var receivePort = new ReceivePort();
     stream['replyTo'].send({'replyTo': receivePort.sendPort});
 
-    var controller = new StreamController(sync: true);
+    var controller = new StreamController<T>(sync: true);
     receivePort.listen((event) {
       switch (event['type']) {
         case 'event':
@@ -133,15 +128,15 @@ Stream deserializeStream(Map stream, deserializeEvent(event)) {
 ///
 /// The returned Future will complete to the value or error returned by
 /// [respond].
-Future call(SendPort port, message) {
+Future/*<T>*/ call/*<T>*/(SendPort port, message) {
   var receivePort = new ReceivePort();
-  port.send({
-    'message': message,
-    'replyTo': receivePort.sendPort
-  });
+  port.send({'message': message, 'replyTo': receivePort.sendPort});
 
-  return receivePort.first.then((response) {
-    if (response['type'] == 'success') return response['value'];
+  return new Future.sync(() async {
+    var response = await receivePort.first;
+    if (response['type'] == 'success') {
+      return response['value'] as dynamic/*=T*/;
+    }
     assert(response['type'] == 'error');
     var exception = deserializeException(response['error']);
     return new Future.error(exception, exception.stackTrace);
@@ -159,9 +154,7 @@ void respond(wrappedMessage, callback(message)) {
   new Future.sync(() => callback(wrappedMessage['message']))
       .then((result) => replyTo.send({'type': 'success', 'value': result}))
       .catchError((error, stackTrace) {
-    replyTo.send({
-      'type': 'error',
-      'error': serializeException(error, stackTrace)
-    });
+    replyTo.send(
+        {'type': 'error', 'error': serializeException(error, stackTrace)});
   });
 }

lib/src/asset/dart/serialize/aggregate_transform.dart

@@ -19,7 +19,9 @@ import 'get_input_transform.dart';
 /// serialized transform. [methodHandlers] is a set of additional methods. Each
 /// value should take a JSON message and return the response (which may be a
 /// Future).
-Map _serializeBaseAggregateTransform(transform, Map additionalFields,
+Map _serializeBaseAggregateTransform(
+    transform,
+    Map<String, dynamic> additionalFields,
     Map<String, Function> methodHandlers) {
   var receivePort = new ReceivePort();
   receivePort.listen((wrappedMessage) {
@@ -41,10 +43,10 @@ Map _serializeBaseAggregateTransform(transform, Map additionalFields,
       }[message['level']];
       assert(method != null);
 
-      var assetId = message['assetId'] == null ? null :
-        deserializeId(message['assetId']);
-      var span = message['span'] == null ? null :
-        deserializeSpan(message['span']);
+      var assetId =
+          message['assetId'] == null ? null : deserializeId(message['assetId']);
+      var span =
+          message['span'] == null ? null : deserializeSpan(message['span']);
       method(message['message'], asset: assetId, span: span);
     });
   });
@@ -61,7 +63,8 @@ Map serializeAggregateTransform(AggregateTransform transform) {
   return _serializeBaseAggregateTransform(transform, {
     'primaryInputs': serializeStream(transform.primaryInputs, serializeAsset)
   }, {
-    'getInput': (message) => transform.getInput(deserializeId(message['id']))
+    'getInput': (message) => transform
+        .getInput(deserializeId(message['id']))
         .then((asset) => serializeAsset(asset)),
     'addOutput': (message) =>
         transform.addOutput(deserializeAsset(message['output']))
@@ -123,46 +126,37 @@ class _ForeignBaseAggregateTransform {
 ///
 /// This retrieves inputs from and sends outputs and logs to the host isolate.
 class ForeignAggregateTransform extends _ForeignBaseAggregateTransform
-    with GetInputTransform implements AggregateTransform {
+    with GetInputTransform
+    implements AggregateTransform {
   final Stream<Asset> primaryInputs;
 
   /// Creates a transform from a serialized map sent from the host isolate.
   ForeignAggregateTransform(Map transform)
-      : primaryInputs = deserializeStream(
-            transform['primaryInputs'], deserializeAsset),
+      : primaryInputs =
+            deserializeStream(transform['primaryInputs'], deserializeAsset),
         super(transform);
 
   Future<Asset> getInput(AssetId id) {
-    return call(_port, {
-      'type': 'getInput',
-      'id': serializeId(id)
-    }).then(deserializeAsset);
+    return call(_port, {'type': 'getInput', 'id': serializeId(id)})
+        .then(deserializeAsset);
   }
 
   void addOutput(Asset output) {
-    call(_port, {
-      'type': 'addOutput',
-      'output': serializeAsset(output)
-    });
+    call(_port, {'type': 'addOutput', 'output': serializeAsset(output)});
   }
 }
 
 /// A wrapper for a [DeclaringAggregateTransform] that's in the host isolate.
-class ForeignDeclaringAggregateTransform
-    extends _ForeignBaseAggregateTransform
+class ForeignDeclaringAggregateTransform extends _ForeignBaseAggregateTransform
     implements DeclaringAggregateTransform {
   final Stream<AssetId> primaryIds;
 
   /// Creates a transform from a serializable map sent from the host isolate.
   ForeignDeclaringAggregateTransform(Map transform)
-      : primaryIds = deserializeStream(
-            transform['primaryIds'], deserializeId),
+      : primaryIds = deserializeStream(transform['primaryIds'], deserializeId),
         super(transform);
 
   void declareOutput(AssetId id) {
-    call(_port, {
-      'type': 'declareOutput',
-      'output': serializeId(id)
-    });
+    call(_port, {'type': 'declareOutput', 'output': serializeId(id)});
   }
 }

lib/src/asset/dart/serialize/exception.dart

@@ -20,7 +20,8 @@ class CrossIsolateException implements Exception {
 
   /// The exception's message, or its [toString] if it didn't expose a `message`
   /// property.
-  final String message;
+  String get message => _message;
+  final String _message;
 
   /// The exception's stack chain, or `null` if no stack chain was available.
   final Chain stackTrace;
@@ -30,9 +31,9 @@ class CrossIsolateException implements Exception {
   /// [error] should be the result of [CrossIsolateException.serialize].
   CrossIsolateException.deserialize(Map error)
       : type = error['type'],
-        message = error['message'],
-        stackTrace = error['stack'] == null ? null :
-            new Chain.parse(error['stack']);
+        _message = error['message'],
+        stackTrace =
+            error['stack'] == null ? null : new Chain.parse(error['stack']);
 
   /// Serializes [error] to an object that can safely be passed across isolate
   /// boundaries.
@@ -48,7 +49,7 @@ class CrossIsolateException implements Exception {
   String toString() => "$message\n$stackTrace";
 }
 
-/// An [AssetNotFoundException] that was originally raised in another isolate. 
+/// An [AssetNotFoundException] that was originally raised in another isolate.
 class _CrossIsolateAssetNotFoundException extends CrossIsolateException
     implements AssetNotFoundException {
   final AssetId id;

lib/src/asset/dart/serialize/get_input_transform.dart

@@ -5,28 +5,29 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:async/async.dart';
 import 'package:barback/barback.dart';
 
-import '../utils.dart';
-
 /// A mixin for transforms that support [getInput] and the associated suite of
 /// methods.
 abstract class GetInputTransform {
   Future<Asset> getInput(AssetId id);
 
   Future<String> readInputAsString(AssetId id, {Encoding encoding}) {
     if (encoding == null) encoding = UTF8;
-    return getInput(id).then((input) =>
-        input.readAsString(encoding: encoding));
+    return getInput(id).then((input) => input.readAsString(encoding: encoding));
   }
 
   Stream<List<int>> readInput(AssetId id) =>
-      futureStream(getInput(id).then((input) => input.read()));
+      StreamCompleter.fromFuture(getInput(id).then((input) => input.read()));
 
-  Future<bool> hasInput(AssetId id) {
-    return getInput(id).then((_) => true).catchError((error) {
-      if (error is AssetNotFoundException && error.id == id) return false;
-      throw error;
-    });
+  Future<bool> hasInput(AssetId id) async {
+    try {
+      await getInput(id);
+      return true;
+    } on AssetNotFoundException catch (error) {
+      if (error.id == id) return false;
+      rethrow;
+    }
   }
 }