update templates; fix a variable substitution problem in the pubspec files

README.md

@@ -13,7 +13,7 @@ It is a Dart project scaffolding generator, inspired by tools like Web Starter
 Kit and Yeoman.
 
 ## Stagehand templates
-* `console-full` - A sample command-line application.
+* `console-full` - A larger command-line application sample.
 * `console-simple` - A simple command-line application.
 * `package-simple` - A starting point for Dart libraries or applications.
 * `server-appengine` - A simple App Engine application.

lib/generators/console_full_data.dart

@@ -71,8 +71,8 @@ LjAnCg==""",
   """Ly8gQ29weXJpZ2h0IChjKSB7e3llYXJ9fSwge3thdXRob3J9fS4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSB7
-e3Byb2plY3ROYW1lfX0udGVzdDsKCmltcG9ydCAncGFja2FnZTp0ZXN0L3Rlc3QuZGFydCc7Cgpp
-bXBvcnQgJ3BhY2thZ2U6e3twcm9qZWN0TmFtZX19L3t7cHJvamVjdE5hbWV9fS5kYXJ0JzsKCnZv
-aWQgbWFpbigpIHsKICB0ZXN0KCdjYWxjdWxhdGUnLCAoKSB7CiAgICBleHBlY3QoY2FsY3VsYXRl
-KCksIDQyKTsKICB9KTsKfQo="""
+e3Byb2plY3ROYW1lfX0udGVzdDsKCmltcG9ydCAncGFja2FnZTp7e3Byb2plY3ROYW1lfX0ve3tw
+cm9qZWN0TmFtZX19LmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6dGVzdC90ZXN0LmRhcnQnOwoKdm9p
+ZCBtYWluKCkgewogIHRlc3QoJ2NhbGN1bGF0ZScsICgpIHsKICAgIGV4cGVjdChjYWxjdWxhdGUo
+KSwgNDIpOwogIH0pOwp9Cg=="""
 ];

lib/generators/console_simple.dart

@@ -6,7 +6,7 @@ library stagehand.console.simple;
 
 import '../stagehand.dart';
 import '../src/common.dart';
-import 'console_full_data.dart';
+import 'console_simple_data.dart';
 
 /**
  * A generator for a hello world command-line application.

lib/generators/package_simple_data.dart

@@ -87,10 +87,10 @@ IDwwLjEzLjAnCg==""",
   """Ly8gQ29weXJpZ2h0IChjKSB7e3llYXJ9fSwge3thdXRob3J9fS4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSB7
-e3Byb2plY3ROYW1lfX0udGVzdDsKCmltcG9ydCAncGFja2FnZTp0ZXN0L3Rlc3QuZGFydCc7Cgpp
-bXBvcnQgJ3BhY2thZ2U6e3twcm9qZWN0TmFtZX19L3t7cHJvamVjdE5hbWV9fS5kYXJ0JzsKCnZv
-aWQgbWFpbigpIHsKICBncm91cCgnQSBncm91cCBvZiB0ZXN0cycsICgpIHsKICAgIEF3ZXNvbWUg
-YXdlc29tZTsKCiAgICBzZXRVcCgoKSB7CiAgICAgIGF3ZXNvbWUgPSBuZXcgQXdlc29tZSgpOwog
-ICAgfSk7CgogICAgdGVzdCgnRmlyc3QgVGVzdCcsICgpIHsKICAgICAgZXhwZWN0KGF3ZXNvbWUu
-aXNBd2Vzb21lLCBpc1RydWUpOwogICAgfSk7CiAgfSk7Cn0K"""
+e3Byb2plY3ROYW1lfX0udGVzdDsKCmltcG9ydCAncGFja2FnZTp7e3Byb2plY3ROYW1lfX0ve3tw
+cm9qZWN0TmFtZX19LmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6dGVzdC90ZXN0LmRhcnQnOwoKdm9p
+ZCBtYWluKCkgewogIGdyb3VwKCdBIGdyb3VwIG9mIHRlc3RzJywgKCkgewogICAgQXdlc29tZSBh
+d2Vzb21lOwoKICAgIHNldFVwKCgpIHsKICAgICAgYXdlc29tZSA9IG5ldyBBd2Vzb21lKCk7CiAg
+ICB9KTsKCiAgICB0ZXN0KCdGaXJzdCBUZXN0JywgKCkgewogICAgICBleHBlY3QoYXdlc29tZS5p
+c0F3ZXNvbWUsIGlzVHJ1ZSk7CiAgICB9KTsKICB9KTsKfQo="""
 ];

lib/stagehand.dart

@@ -167,6 +167,11 @@ class TemplateFile {
   TemplateFile.fromBinary(this.path, this._binaryData) : this.content = null;
 
   FileContents runSubstitution(Map parameters) {
+    if (path == 'pubspec.yaml' && parameters['author'] == '<your name>') {
+      parameters = new Map.from(parameters);
+      parameters['author'] = 'Your Name';
+    }
+
     var newPath = substituteVars(path, parameters);
     var newContents = _createContent(parameters);
 

site/index.html

@@ -85,7 +85,7 @@ $ stagehand webapp
       <p>Stagehand contains a highly curated list of templates:</p>
 
 <ul id="template-list">
-  <li>console-full - <em>A sample command-line application.</em></li>
+  <li>console-full - <em>A larger command-line application sample.</em></li>
   <li>console-simple - <em>A simple command-line application.</em></li>
   <li>package-simple - <em>A starting point for Dart libraries or applications.</em></li>
   <li>server-appengine - <em>A simple App Engine application.</em></li>

templates/console-full/test/projectName_test.dart

@@ -3,9 +3,8 @@
 
 library {{projectName}}.test;
 
-import 'package:test/test.dart';
-
 import 'package:{{projectName}}/{{projectName}}.dart';
+import 'package:test/test.dart';
 
 void main() {
   test('calculate', () {

templates/package-simple/test/projectName_test.dart

@@ -3,9 +3,8 @@
 
 library {{projectName}}.test;
 
-import 'package:test/test.dart';
-
 import 'package:{{projectName}}/{{projectName}}.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('A group of tests', () {