Add linter by default for polymer's pub-build, also cleans up the linter code.

pkg/polymer/lib/builder.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.
 
 /**
  * Common logic to make it easy to run the polymer linter and deploy tool.
  *
  * The functions in this library are designed to make it easier to create
  * `build.dart` files. A `build.dart` file is a Dart script that can be invoked
  * from the command line, but that can also invoked automatically by the Dart
@@ skipping 21 matching lines @@
  *        lint();
  *     }
  *
  * **Example 2**: Runs the linter and creates a deployable version of the app
  * every time.
  *
  *     import 'dart:io';
  *     import 'package:polymer/builder.dart';
  *
  *     main() {
- *        lint().then((_) => deploy());
+ *        deploy(); // deploy also calls the linter internally.
  *     }
  *
- * **Example 3**: Runs the linter, but conditionally does the deploy step. See
- * [parseOptions] for a description of options parsed automatically by this
- * helper library.
+ * **Example 3**: Always run the linter, but conditionally build a deployable
+ * version. See [parseOptions] for a description of options parsed automatically
+ * by this helper library.
  *
  *     import 'dart:io';
  *     import 'package:polymer/builder.dart';
  *
  *     main(args) {
  *        var options = parseOptions(args);
- *        lint().then((_) {
- *          if (options.forceDeploy) deploy();
- *        });
+ *        if (options.forceDeploy) {
+ *          deploy();
+ *        } else {
+ *          lint();
+ *        }
  *     }
  *
- * **Example 4**: Same as above, but uses [build] (which internally calls [lint]
- * and optionally calls [deploy]).
+ * **Example 4**: Same as above, but uses [build] (which internally calls either
+ * [lint] or [deploy]).
  *
  *     import 'dart:io';
  *     import 'package:polymer/builder.dart';
  *
  *     main(args) {
  *        build(options: parseOptions(args));
  *     }
  *
  * **Example 5**: Like the previous example, but indicates to the linter and
  * deploy tool which files are actually used as entry point files. See the
@@ skipping 40 matching lines @@
  * ([packageDirs]). This is inferred automatically, but can be overriden if
  * those arguments are provided.
  */
 Future build({List<String> entryPoints, CommandLineOptions options,
     String currentPackage, Map<String, String> packageDirs}) {
   if (options == null) {
     print('warning: now that main takes arguments, you need to explicitly pass'
         ' options to build(). Running as if no options were passed.');
     options = parseOptions([]);
   }
-  return lint(entryPoints: entryPoints, options: options,
-      currentPackage: currentPackage, packageDirs: packageDirs).then((res) {
-    if (options.forceDeploy) {
-      return deploy(entryPoints: entryPoints, options: options,
-          currentPackage: currentPackage, packageDirs: packageDirs);
-    }
-  });
+  return options.forceDeploy
+      ? deploy(entryPoints: entryPoints, options: options,
+            currentPackage: currentPackage, packageDirs: packageDirs)
+      : lint(entryPoints: entryPoints, options: options,
+            currentPackage: currentPackage, packageDirs: packageDirs);
 }
 
 
 /**
  * Runs the polymer linter on any relevant file in your package,
  * such as any .html file under 'lib/', 'asset/', and 'web/'.
  *
  * The [entryPoints] list contains files under web/ that should be treated as
  * entry points. Each entry on this list is a relative path from the package
  * root (for example 'web/index.html'). If null, all files under 'web/' are
  * treated as possible entry points.
  *
  * Options must be passed by passing the [options] argument.
  *
  * The linter needs to know the name of the [currentPackage] and the location
  * where to find the code for any package it depends on ([packageDirs]). This is
  * inferred automatically, but can be overriden if those arguments are provided.
  */
 Future lint({List<String> entryPoints, CommandLineOptions options,
     String currentPackage, Map<String, String> packageDirs}) {
   if (options == null) {
     print('warning: now that main takes arguments, you need to explicitly pass'
         ' options to lint(). Running as if no options were passed.');
     options = parseOptions([]);
   }
   if (currentPackage == null) currentPackage = readCurrentPackageFromPubspec();
   var linterOptions = new TransformOptions(entryPoints: entryPoints);
-  var formatter = options.machineFormat ? jsonFormatter : consoleFormatter;
-  var linter = new Linter(linterOptions, formatter);
+  var linter = new Linter(linterOptions);
   return runBarback(new BarbackOptions([[linter]], null,
-      currentPackage: currentPackage, packageDirs: packageDirs)).then((assets) {
-    var messages = {};
-    var futures = [];
-    for (var asset in assets) {
-      var id = asset.id;
-      if (id.package == currentPackage && id.path.endsWith('.messages')) {
-        futures.add(asset.readAsString().then((content) {
-          if (content.isEmpty) return;
-          messages[id] = content;
-        }));
-      }
-    }
-
-    return Future.wait(futures).then((_) {
-      // Print messages sorting by package and filepath.
-      var orderedKeys = messages.keys.toList();
-      orderedKeys.sort((a, b) {
-        int packageCompare = a.package.compareTo(b.package);
-        if (packageCompare != 0) return packageCompare;
-        return a.path.compareTo(b.path);
-      });
-
-      for (var key in orderedKeys) {
-        print(messages[key]);
-      }
-    });
-  });
+      currentPackage: currentPackage, packageDirs: packageDirs,
+      machineFormat: options.machineFormat));
 }
 
 /**
  * Creates a directory suitable for deploying a Polymer application to a server.
  *
  * **Note**: this function will be replaced in the future by the `pub deploy`
  * command.
  *
  * The [entryPoints] list contains files under web/ that should be treated as
  * entry points. Each entry on this list is a relative path from the package
@@ skipping 18 matching lines @@
 
   var transformOptions = new TransformOptions(
       entryPoints: entryPoints,
       directlyIncludeJS: options.directlyIncludeJS,
       contentSecurityPolicy: options.contentSecurityPolicy,
       releaseMode: options.releaseMode);
 
   var barbackOptions = new BarbackOptions(
       new PolymerTransformerGroup(transformOptions).phases,
       options.outDir, currentPackage: currentPackage,
-      packageDirs: packageDirs);
+      packageDirs: packageDirs, machineFormat: options.machineFormat);
   return runBarback(barbackOptions)
       .then((_) => print('Done! All files written to "${options.outDir}"'));
 }
 
 
 /**
  * Options that may be used either in build.dart or by the linter and deploy
  * tools.
  */
 class CommandLineOptions {
@@ skipping 116 matching lines @@
   }
   if (res['help']) {
     print('A build script that invokes the polymer linter and deploy tools.');
     showUsage();
     exit(0);
   }
   return new CommandLineOptions(res['changed'], res['removed'], res['clean'],
       res['full'], res['machine'], res['deploy'], res['out'], res['js'],
       res['csp'], !res['debug']);
 }