fixes to polymer, gets tests back to a stable state

pkg/polymer/lib/deploy.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.
 
 /**
  * **Note**: If you already have a `build.dart` in your application, we
  * recommend to use the `package:polymer/builder.dart` library instead.
 
  * Temporary deploy command used to create a version of the app that can be
  * compiled with dart2js and deployed. Following pub layout conventions, this
@@ skipping 19 matching lines @@
 import 'src/build/common.dart' show TransformOptions;
 import 'src/build/runner.dart';
 import 'transformer.dart';
 
 main() {
   var args = _parseArgs(new Options().arguments);
   if (args == null) exit(1);
 
   var test = args['test'];
   var outDir = args['out'];
+
+  var transformOps = new TransformOptions(
+      directlyIncludeJS: args['js'],
+      contentSecurityPolicy: args['csp']);
+
   var options = (test == null)
-    ? new BarbackOptions(createDeployPhases(new TransformOptions()), outDir)
-    : _createTestOptions(test, outDir);
+    ? new BarbackOptions(createDeployPhases(transformOps), outDir)
+    : _createTestOptions(transformOps, test, outDir);
   if (options == null) exit(1);
 
   print('polymer/deploy.dart: creating a deploy target for '
       '"${options.currentPackage}"');
 
   runBarback(options)
       .then((_) => print('Done! All files written to "$outDir"'))
       .catchError(_reportErrorAndExit);
 }
 
 createDeployPhases(options) => new PolymerTransformerGroup(options).phases;
 
-BarbackOptions _createTestOptions(String testFile, String outDir) {
+BarbackOptions _createTestOptions(TransformOptions transformOps,
+    String testFile, String outDir) {
   var testDir = path.normalize(path.dirname(testFile));
 
   // A test must be allowed to import things in the package.
   // So we must find its package root, given the entry point. We can do this
   // by walking up to find pubspec.yaml.
   var pubspecDir = _findDirWithFile(path.absolute(testDir), 'pubspec.yaml');
   if (pubspecDir == null) {
     print('error: pubspec.yaml file not found, please run this script from '
         'your package root directory or a subdirectory.');
     return null;
   }
 
-  var phases = createDeployPhases(new TransformOptions(
-        [path.relative(testFile, from: pubspecDir)]));
+  transformOps.entryPoints = [path.relative(testFile, from: pubspecDir)];
+  var phases = createDeployPhases(transformOps);
   return new BarbackOptions(phases, outDir,
       currentPackage: '_test',
       packageDirs: {'_test' : pubspecDir},
       transformTests: true);
 }
 
 String _findDirWithFile(String dir, String filename) {
   while (!new File(path.join(dir, filename)).existsSync()) {
     var parentDir = path.dirname(dir);
     // If we reached root and failed to find it, bail.
@@ skipping 11 matching lines @@
 }
 
 ArgResults _parseArgs(arguments) {
   var parser = new ArgParser()
       ..addFlag('help', abbr: 'h', help: 'Displays this help message.',
           defaultsTo: false, negatable: false)
       ..addOption('out', abbr: 'o', help: 'Directory to generate files into.',
           defaultsTo: 'out')
       ..addOption('test', help: 'Deploy the test at the given path.\n'
           'Note: currently this will deploy all tests in its directory,\n'
-          'but it will eventually deploy only the specified test.');
+          'but it will eventually deploy only the specified test.')
+      ..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)
+      ..addFlag('csp', help:
+          'replaces *.dart with *.dart.precompiled.js to comply with \n'
+          'Content Security Policy restrictions.');
   try {
     var results = parser.parse(arguments);
     if (results['help']) {
       _showUsage(parser);
       return null;
     }
     return results;
   } on FormatException catch (e) {
     print(e.message);
     _showUsage(parser);
     return null;
   }
 }
 
 _showUsage(parser) {
   print('Usage: dart --package-root=packages/ '
       'package:polymer/deploy.dart [options]');
   print(parser.getUsage());
 }