fixed TodoMVC tests to include deploying to JS

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.
 
 /**
  * Temporary deploy command used to create a version of the app that can be
  * compiled with dart2js and deployed. This library should go away once `pub
  * deploy` can be configured to run barback transformers.
  *
  * From an application package you can run this program by calling dart with a
@@ skipping 10 matching lines @@
 import 'package:barback/barback.dart';
 import 'package:path/path.dart' as path;
 import 'package:polymer/src/transform.dart' show phases;
 import 'package:stack_trace/stack_trace.dart';
 import 'package:yaml/yaml.dart';
 import 'package:args/args.dart';
 
 main() {
   var args = _parseArgs(new Options().arguments);
   if (args == null) return;
+
+  var test = args['test'];
+  if (test != null) {
+    _initForTest(test);
+  }
+
   print('polymer/deploy.dart: creating a deploy target for "$_currentPackage"');
   var outDir = args['out'];
-  _run(args['webdir'], outDir).then(
+  _run(outDir, test != null).then(
       (_) => print('Done! All files written to "$outDir"'));
 }
 
+// TODO(jmesserly): the current deploy/barback architecture is very unfriendly
+// to deploying a single test. We need to fix it somehow but it isn't clear yet.
+void _initForTest(String testFile) {
+  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.');
+    exit(1);
+  }
+
+  _currentPackage = '_test';
+  _packageDirs = {'_test' : pubspecDir};
+}
+
+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.
+    if (parentDir == dir) return null;

[Siggi Cherem (dart-lang), 2013/08/30 23:22:13]

maybe define `var root = path.rootPrefix(dir)` upfront and compare against that
here?

[Jennifer Messerly, 2013/09/04 04:36:40]

hmmm. I was woried that dirname does not necessarily converge to rootPrefix in
the case of relative paths:
http://api.dartlang.org/docs/releases/latest/path.html#dirname, 

however it will eventually reach a fixed point, hence checking for that.

however I could move the "path.absolute" inside this function and then it would
be safe to use rootPrefix.

WDYT?

[Siggi Cherem (dart-lang), 2013/09/04 15:23:32]

I see - it seems that in that case it will converge to '.'

I like the idea of using path.absolute inside this function. Even though it's
documented, the fact that `dirname('.') == dirname('foo') == '.')` feels like
it's leaking some implementation detail.

+    dir = parentDir;
+  }
+  return dir;
+}
+
 /**
  * API exposed for testing purposes. Runs this deploy command but prentend that
  * the sources under [webDir] belong to package 'test'.
  */
 Future runForTest(String webDir, String outDir) {
   _currentPackage = 'test';
 
   // associate package dirs with their location in the repo:
   _packageDirs = {'test' : '.'};
-  addPackages(String dir) {
-    for (var packageDir in new Directory(dir).listSync().map((d) => d.path)) {
-      _packageDirs[path.basename(packageDir)] = packageDir;
-    }
-  }
-  addPackages('..');
-  addPackages('../third_party');
-  addPackages('../../third_party/pkg');
+  _addPackages('..');
+  _addPackages('../third_party');
+  _addPackages('../../third_party/pkg');
   return _run(webDir, outDir);
 }
 
-Future _run(String webDir, String outDir) {
+_addPackages(String dir) {
+  for (var packageDir in new Directory(dir).listSync().map((d) => d.path)) {
+    _packageDirs[path.basename(packageDir)] = packageDir;
+  }
+}
+
+Future _run(String outDir, bool includeTests) {
   var barback = new Barback(new _PolymerDeployProvider());
-  _initializeBarback(barback, webDir);
+

[Siggi Cherem (dart-lang), 2013/08/30 23:22:13]

delete empty line?

[Jennifer Messerly, 2013/09/04 04:36:40]

Done.

+  _initializeBarback(barback, includeTests);
   _attachListeners(barback);
-  return _emitAllFiles(barback, webDir, outDir);
+  return _emitAllFiles(barback, 'web', outDir).then(
+      (_) => includeTests ? _emitAllFiles(barback, 'test', outDir) : null);
 }
 
 /** Tell barback which transformers to use and which assets to process. */
-void _initializeBarback(Barback barback, String webDir) {
+void _initializeBarback(Barback barback, bool includeTests) {
   var assets = [];
+  void addAssets(String package, String subDir) {
+    for (var filepath in _listDir(package, subDir)) {
+      assets.add(new AssetId(package, filepath));
+    }
+  }
+
   for (var package in _packageDirs.keys) {
     // Do not process packages like 'polymer' where there is nothing to do.
     if (_ignoredPackages.contains(package)) continue;
     barback.updateTransformers(package, phases);
 
     // notify barback to process anything under 'lib' and 'asset'
-    for (var filepath in _listDir(package, 'lib')) {
-      assets.add(new AssetId(package, filepath));
-    }
-
-    for (var filepath in _listDir(package, 'asset')) {
-      assets.add(new AssetId(package, filepath));
-    }
+    addAssets(package, 'lib');
+    addAssets(package, 'asset');
   }
 
   // In case of the current package, include also 'web'.
-  for (var filepath in _listDir(_currentPackage, webDir)) {
-    assets.add(new AssetId(_currentPackage, filepath));
-  }
+  addAssets(_currentPackage, 'web');
+  if (includeTests) addAssets(_currentPackage, 'test');
+
   barback.updateSources(assets);
 }
 
 /** Return the relative path of each file under [subDir] in a [package]. */
 Iterable<String> _listDir(String package, String subDir) {
   var packageDir = _packageDirs[package];
   if (packageDir == null) return const [];
   var dir = new Directory(path.join(packageDir, subDir));
   if (!dir.existsSync()) return const [];
   return dir.listSync(recursive: true, followLinks: false)
@@ skipping 127 matching lines @@
     (const [ 'analyzer_experimental', 'args', 'barback', 'browser', 'csslib',
              'custom_element', 'fancy_syntax', 'html5lib', 'html_import', 'js',
              'logging', 'mdv', 'meta', 'mutation_observer', 'observe', 'path',
              'polymer', 'polymer_expressions', 'serialization', 'shadow_dom',
              'source_maps', 'stack_trace', 'unittest',
              'unmodifiable_collection', 'yaml'
            ]).toSet();
 
 ArgResults _parseArgs(arguments) {
   var parser = new ArgParser()
-      ..addFlag('help', abbr: 'h', help: 'Displays this help message',
+      ..addFlag('help', abbr: 'h', help: 'Displays this help message.',
           defaultsTo: false, negatable: false)
-      ..addOption('webdir', help: 'Directory containing the application',
-          defaultsTo: 'web')
-      ..addOption('out', abbr: 'o', help: 'Directory where to generated files',
-          defaultsTo: 'out');
+      ..addOption('out', abbr: 'o', help: 'Directory where to generated files.',
+          defaultsTo: 'out')
+      ..addOption('test', help: 'Deploy the test at the given path.');

[Siggi Cherem (dart-lang), 2013/08/30 23:22:13]

minor nit: maybe indicate that this is to limit deploy to run on that test only
(hopefully one day)

[Jennifer Messerly, 2013/09/04 04:36:40]

thought about that, was worried about length making --help unreadable since
"args" doesn't know the TERM width. I played around with it and discovered that
"\n" works. Hopefully the message is better now.

   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:polymer/deploy.dart [options]');
   print(parser.getUsage());
 }