fixes to polymer, gets tests back to a stable state

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 126 matching lines @@
  * 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) options = _options;
   if (currentPackage == null) currentPackage = readCurrentPackageFromPubspec();
-  var linterOptions = new TransformOptions(entryPoints);
+  var linterOptions = new TransformOptions(entryPoints: entryPoints);
   var formatter = options.machineFormat ? jsonFormatter : consoleFormatter;
   var linter = new Linter(linterOptions, formatter);
   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) {
@@ skipping 35 matching lines @@
  *
  * The deploy step 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 deploy({List<String> entryPoints, CommandLineOptions options,
     String currentPackage, Map<String, String> packageDirs}) {
   if (options == null) options = _options;
   if (currentPackage == null) currentPackage = readCurrentPackageFromPubspec();
+
+  var transformOptions = new TransformOptions(
+      entryPoints: entryPoints,
+      directlyIncludeJS: options.directlyIncludeJS,
+      contentSecurityPolicy: options.contentSecurityPolicy);
+
   var barbackOptions = new BarbackOptions(
-      (new PolymerTransformerGroup(new TransformOptions(entryPoints))).phases,
+      new PolymerTransformerGroup(transformOptions).phases,
       options.outDir, currentPackage: currentPackage,
       packageDirs: packageDirs);
   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.
@@ skipping 13 matching lines @@
 
   /** Whether to print results using a machine parseable format. */
   final bool machineFormat;
 
   /** Whether the force deploy option was passed in the command line. */
   final bool forceDeploy;
 
   /** Location where to generate output files. */
   final String outDir;
 
+  /** True to use the CSP-compliant JS file. */
+  final bool contentSecurityPolicy;
+
+  /**
+   * True to include the JS script tag directly, with the

[Siggi Cherem (dart-lang), 2013/10/21 21:07:42]

with -> without?

[Jennifer Messerly, 2013/10/21 21:42:56]

Done.

+   * "packages/browser/dart.js" trampoline.
+   */
+  final bool directlyIncludeJS;
+
   CommandLineOptions(this.changedFiles, this.removedFiles, this.clean,
-      this.full, this.machineFormat, this.forceDeploy, this.outDir);
+      this.full, this.machineFormat, this.forceDeploy, this.outDir,
+      this.directlyIncludeJS, this.contentSecurityPolicy);
 }
 
 /** Options parsed directly from the command line arguments. */
 CommandLineOptions _options = parseOptions();
 
 /**
  * Parse command-line arguments and return a [CommandLineOptions] object. The
  * following flags are parsed by this method.
  *
  *   * `--changed file-path`: notify of a file change.
  *   * `--removed file-path`: notify that a file was removed.
  *   * `--clean`: remove temporary artifacts (if any)
  *   * `--full`: build everything, similar to marking every file as changed
  *   * `--machine`: produce output that can be parsed by tools, such as the Dart
  *     Editor.
  *   * `--deploy`: force deploy.
+ *   * `--no-js`: deploy replaces *.dart scripts with *.dart.js. This

[Siggi Cherem (dart-lang), 2013/10/21 21:07:42]

remove 'no-'

[blois, 2013/10/21 21:08:12]

comment is out of sync with code (--no-js vs --js).

[Siggi Cherem (dart-lang), 2013/10/21 21:32:24]

OK - after re-reading I understand this better. Feel free to leave it as it is,
maybe add the words "by default" somewhere to make it more obvious

[Jennifer Messerly, 2013/10/21 21:42:56]

the "--no-" prefix is from args.dart. it's how you negate a boolean option.
attempted to clarify comment.

+ *     flag leaves "packages/browser/dart.js" to do the replacement at runtime.
+ *   * `--csp`: replaces *.dart with *.dart.precompiled.js to comply with
+ *     Content Security Policy restrictions.
  *   * `--help`: print documentation for each option and exit.
  *
  * Currently not all the flags are used by [lint] or [deploy] above, but they
  * are available so they can be used from your `build.dart`. For instance, see
  * the top-level library documentation for an example that uses the force-deploy
  * option to conditionally call [deploy].
  *
  * If this documentation becomes out of date, the best way to discover which
  * flags are supported is to invoke this function from your build.dart, and run
  * it with the `--help` command-line flag.
  */
 CommandLineOptions parseOptions([List<String> args]) {
   var parser = new ArgParser()
     ..addOption('changed', help: 'The file has changed since the last build.',
         allowMultiple: true)
     ..addOption('removed', help: 'The file was removed since the last build.',
         allowMultiple: true)
     ..addFlag('clean', negatable: false,
         help: 'Remove any build artifacts (if any).')
     ..addFlag('full', negatable: false, help: 'perform a full build')
     ..addFlag('machine', negatable: false,
         help: 'Produce warnings in a machine parseable format.')
     ..addFlag('deploy', negatable: false,
         help: 'Whether to force deploying.')
     ..addOption('out', abbr: 'o', help: 'Directory to generate files into.',
         defaultsTo: 'out')
+    ..addFlag('js', help:
+        'deploy replaces *.dart scripts with *.dart.js. This flag \n'
+        'leaves "packages/browser/dart.js" to do the replacement at runtime.'
+        defaultsTo: true)

[Siggi Cherem (dart-lang), 2013/10/21 21:07:42]

eventually I agree that should be the default. I wonder if it should be the
default today though.

[Jennifer Messerly, 2013/10/21 21:42:56]

it should. browser/dart.js needs to go away for 1.0 :)

+    ..addFlag('csp', help:
+        'replaces *.dart with *.dart.precompiled.js to comply with \n'
+        'Content Security Policy restrictions.');
     ..addFlag('help', abbr: 'h',
         negatable: false, help: 'Displays this help and exit.');
   var res = parser.parse(args == null ? new Options().arguments : args);
   if (res['help']) {
     print('A build script that invokes the polymer linter and deploy tools.');
     print('Usage: dart build.dart [options]');
     print('\nThese are valid options expected by build.dart:');
     print(parser.getUsage());
     exit(0);
   }
   return new CommandLineOptions(res['changed'], res['removed'], res['clean'],
-      res['full'], res['machine'], res['deploy'], res['out']);
+      res['full'], res['machine'], res['deploy'], res['out'], res['js'],
+      res['csp']);
 }