Replace special-case for projectName in creation

Updated console-full and package-simple to be valid
dart-archive · Dec 2, 2015 · a97e25d · a97e25d
1 parent f18c733
commit a97e25d
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/lib/generators/console_full_data.dart b/lib/generators/console_full_data.dart
@@ -56,7 +56,7 @@ bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
 YWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCcgYXMgX19wcm9qZWN0
 TmFtZV9fOwoKbWFpbihMaXN0PFN0cmluZz4gYXJndW1lbnRzKSB7CiAgcHJpbnQoJ0hlbGxvIHdv
 cmxkOiAke19fcHJvamVjdE5hbWVfXy5jYWxjdWxhdGUoKX0hJyk7Cn0K""",
-  "lib/projectName.dart",
+  "lib/__projectName__.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg

diff --git a/lib/generators/package_simple.dart b/lib/generators/package_simple.dart
@@ -20,6 +20,6 @@ class PackageSimpleGenerator extends DefaultGenerator {
       addTemplateFile(file);
     }
 
-    setEntrypoint(getFile('lib/projectName.dart'));
+    setEntrypoint(getFile('lib/__projectName__.dart'));
   }
 }
diff --git a/lib/generators/package_simple_data.dart b/lib/generators/package_simple_data.dart
@@ -53,15 +53,15 @@ IHsKICAgICAgdmFyIGF3ZXNvbWUgPSBuZXcgQXdlc29tZSgpOwogICAgfQoKIyMgRmVhdHVyZXMg
 YW5kIGJ1Z3MKClBsZWFzZSBmaWxlIGZlYXR1cmUgcmVxdWVzdHMgYW5kIGJ1Z3MgYXQgdGhlIFtp
 c3N1ZSB0cmFja2VyXVt0cmFja2VyXS4KClt0cmFja2VyXTogaHR0cDovL2V4YW1wbGUuY29tL2lz
 c3Vlcy9yZXBsYWNlbWUK""",
-  "example/projectName.dart",
+  "example/__projectName___example.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSBf
 X3Byb2plY3ROYW1lX18uZXhhbXBsZTsKCmltcG9ydCAncGFja2FnZTpfX3Byb2plY3ROYW1lX18v
 X19wcm9qZWN0TmFtZV9fLmRhcnQnOwoKbWFpbigpIHsKICB2YXIgYXdlc29tZSA9IG5ldyBBd2Vz
 b21lKCk7CiAgcHJpbnQoJ2F3ZXNvbWU6ICR7YXdlc29tZS5pc0F3ZXNvbWV9Jyk7Cn0K""",
-  "lib/projectName.dart",
+  "lib/__projectName__.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
@@ -70,7 +70,7 @@ X3Byb2plY3ROYW1lX18gbGlicmFyeS4KLy8vCi8vLyBUaGlzIGlzIGFuIGF3ZXNvbWUgbGlicmFy
 eS4gTW9yZSBkYXJ0ZG9jcyBnbyBoZXJlLgpsaWJyYXJ5IF9fcHJvamVjdE5hbWVfXzsKCi8vIFRP
 RE86IEV4cG9ydCBhbnkgbGlicmFyaWVzIGludGVuZGVkIGZvciBjbGllbnRzIG9mIHRoaXMgcGFj
 a2FnZS4KCmV4cG9ydCAnc3JjL19fcHJvamVjdE5hbWVfX19iYXNlLmRhcnQnOwo=""",
-  "lib/src/projectName_base.dart",
+  "lib/src/__projectName___base.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
@@ -86,7 +86,7 @@ YXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29tPgojaG9tZXBhZ2U6IGh0dHBzOi8vd3d3LmV4YW1w
 bGUuY29tCgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTEuMC4wIDwyLjAuMCcKCiNkZXBlbmRlbmNp
 ZXM6CiMgIGxpYl9uYW1lOiBhbnkKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVzdDogJz49MC4xMi4w
 IDwwLjEzLjAnCg==""",
-  "test/projectName_test.dart",
+  "test/__projectName___test.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg

diff --git a/lib/stagehand.dart b/lib/stagehand.dart
@@ -118,7 +118,6 @@ abstract class Generator implements Comparable<Generator> {
     return Future.forEach(files, (TemplateFile file) {
       var resultFile = file.runSubstitution(vars);
       String filePath = resultFile.path;
-      filePath = filePath.replaceAll('projectName', projectName);
       return target.createFile(filePath, resultFile.content);
     });
   }

diff --git a/templates/console-full/lib/projectName.dart → ...tes/console-full/lib/__projectName__.dart b/templates/console-full/lib/projectName.dart → ...tes/console-full/lib/__projectName__.dart
diff --git a/...s/package-simple/example/projectName.dart → ...mple/example/__projectName___example.dart b/...s/package-simple/example/projectName.dart → ...mple/example/__projectName___example.dart
diff --git a/...lates/package-simple/lib/projectName.dart → ...s/package-simple/lib/__projectName__.dart b/...lates/package-simple/lib/projectName.dart → ...s/package-simple/lib/__projectName__.dart
diff --git a/...kage-simple/lib/src/projectName_base.dart → ...-simple/lib/src/__projectName___base.dart b/...kage-simple/lib/src/projectName_base.dart → ...-simple/lib/src/__projectName___base.dart
diff --git a/...package-simple/test/projectName_test.dart → ...age-simple/test/__projectName___test.dart b/...package-simple/test/projectName_test.dart → ...age-simple/test/__projectName___test.dart