Remove last templates

AddRugGenerator now uses an actual generator as the origin for creating
a generator.

Clean up variable names a bit.

Author: David Dooling

.atomist/editors/AddRugExecutor.rug

@@ -40,9 +40,9 @@ param description: @any
 @validInput "free text"
 param bot_intent: @any
 
-let executor_filename = { ".atomist/executors/" + executor_name + ".ts" }
+let executor_path = { ".atomist/executors/" + executor_name + ".ts" }
 let default_executor_name = "DefaultExecutor"
-let default_executor_filename = { ".atomist/executors/" + default_executor_name + ".ts" }
+let default_executor_path = { ".atomist/executors/" + default_executor_name + ".ts" }
 let default_executor_function_name = "defaultExecutor"
 let executor_function_name = { executor_name.charAt(0).toLowerCase() + executor_name.slice(1) }
 let default_bot_intent = { "tags: [\"atomist/intent=do something\"]" }
@@ -52,8 +52,8 @@ let full_description = { "description: \"" + description + "\"" }
 
 with Project
   begin
-    do copyEditorBackingFileOrFail default_executor_filename executor_filename
-    with File when name = { executor_name + ".ts" }
+    do copyEditorBackingFileOrFail default_executor_path executor_path
+    with File when path = executor_path
       begin
         do replace default_executor_name executor_name
         do replace default_executor_function_name executor_function_name

.atomist/editors/AddRugGenerator.rug

@@ -23,19 +23,25 @@ precondition IsRugArchive
 
 @displayName "Generator Name"
 @description "name of the generator"
-@validInput "a valid Rug Editor name starting with a capital letter and containing only alphanumberic characters from one to 100 characters long"
+@validInput "a valid Rug Generator name starting with a capital letter and containing only alphanumeric characters, 1-100 characters"
 @minLength 1
 @maxLength 100
 param generator_name: ^[A-Z][A-Za-z0-9]*$
 
-let sampleGeneratorTemplate = "samplegenerator.vm"
-let sampleGeneratorTestTemplate = "samplegeneratortest.vm"
+let default_generator_name = "SampleGenerator"
 
-let generatorFilename = { ".atomist/editors/" + generator_name + ".rug" }
-let generatorTestFilename = { ".atomist/tests/" + generator_name + ".rt" }
+let sample_generator_path = { ".atomist/editors/" + default_generator_name + ".rug" }
+let sample_generator_test_path = { ".atomist/tests/" + default_generator_name + ".rt" }
 
-with Project p
+let generator_path = { ".atomist/editors/" + generator_name + ".rug" }
+let generator_test_path = { ".atomist/tests/" + generator_name + ".rt" }
+
+with Project
   begin
-    do merge sampleGeneratorTemplate to generatorFilename
-    do merge sampleGeneratorTestTemplate to generatorTestFilename
+    do copyEditorBackingFileOrFail sample_generator_path generator_path
+    do copyEditorBackingFileOrFail sample_generator_test_path generator_test_path
+    with File when path = generator_path
+        do replace default_generator_name generator_name
+    with File when path = generator_test_path
+        do replace default_generator_name generator_name
   end

.atomist/templates/samplegenerator.vm renamed to .atomist/editors/SampleGenerator.rug

@@ -1,13 +1,12 @@
 @description "generate a copy of this project"
 @tag "rug"
-@generator
-editor $generator_name
+generator SampleGenerator
 
 @displayName "Project Name"
 @description "name of your new project"
-@validInput "a valid GitHub repo name containing only alphanumeric, ., -, and _ characters and 21 characters or less to avoid Slack truncating the name when creating a channel for the repo"
+@validInput "a valid GitHub repo name containing only alphanumeric, ., -, and _ characters"
 @minLength 1
-@maxLength 21
+@maxLength 100
 param project_name: @project_name
 
 with Project

.atomist/manifest.yml

@@ -1,6 +1,6 @@
 group: atomist-rugs
 artifact: rug-editors
-version: "0.7.0"
+version: "0.8.0"
 requires: "[0.11.0,1.0.0)"
 dependencies:
 - "atomist-rugs:rug-archive:0.11.0"

.atomist/templates/samplegeneratortest.vm

@@ -33,10 +33,11 @@ when
 
 then
   fileExists ".atomist/editors/MyNewGenerator.rug"
-  and fileContains ".atomist/editors/MyNewGenerator.rug" "param project_name: @project_name"
-  and fileContains ".atomist/editors/MyNewGenerator.rug" "editor MyNewGenerator"
+  and fileContains ".atomist/editors/MyNewGenerator.rug" "generator MyNewGenerator"
+  and { !result.fileContains(".atomist/editors/MyNewGenerator.rug", "SampleGenerator") }
   and fileExists ".atomist/tests/MyNewGenerator.rt"
   and fileContains ".atomist/tests/MyNewGenerator.rt" "scenario MyNewGenerator"
+  and { !result.fileContains(".atomist/tests/MyNewGenerator.rt", "SampleGenerator") }
 
 
 scenario AddRugGenerator should fail if not a Rug Archive project

.atomist/templates/sampletemplatetemplate.vm

@@ -34,7 +34,7 @@ then
     and fileContains ".atomist/manifest.yml" "0.0.1"
     and fileExists ".atomist/editors/DefaultGenerator.rug"
     and fileContains ".atomist/editors/DefaultGenerator.rug" "param project_name: @project_name"
-    and fileContains ".atomist/editors/DefaultGenerator.rug" "editor DefaultGenerator"
+    and fileContains ".atomist/editors/DefaultGenerator.rug" "generator DefaultGenerator"
     and fileExists ".atomist/tests/DefaultGenerator.rt"
     and fileContains ".atomist/tests/DefaultGenerator.rt" "scenario DefaultGenerator"
 
@@ -59,7 +59,7 @@ then
     and fileContains ".atomist/manifest.yml" "0.0.1"
     and fileContains ".atomist/editors/NewSpringCloudConfigServer.rug" "param project_name: @project_name"
     and fileExists ".atomist/editors/NewSpringCloudConfigServer.rug"
-    and fileContains ".atomist/editors/NewSpringCloudConfigServer.rug" "editor NewSpringCloudConfigServer"
+    and fileContains ".atomist/editors/NewSpringCloudConfigServer.rug" "generator NewSpringCloudConfigServer"
     and fileExists ".atomist/tests/NewSpringCloudConfigServer.rt"
     and fileContains ".atomist/tests/NewSpringCloudConfigServer.rt" "scenario NewSpringCloudConfigServer"
 

.atomist/tests/AddRugGenerator.rt

@@ -0,0 +1,12 @@
+scenario SampleGenerator should create a new project based on this archive
+
+let project_name = "my-project-name"
+
+given
+  Empty
+
+when
+  SampleGenerator
+
+then
+  fileExists ".atomist.yml"

.atomist/tests/ConvertExistingProjectToRugArchiveWithGenerator.rt

@@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/atomist-rugs/rug-editors/compare/0.7.0...HEAD
+[Unreleased]: https://github.com/atomist-rugs/rug-editors/compare/0.8.0...HEAD
+
+## [0.8.0]
+
+[0.8.0]: https://github.com/atomist-rugs/rug-editors/compare/0.7.0...0.8.0
+
+Templates are bad, mkay release
+
+### Changed
+
+-   Use real generator as basis for AddRugGenerator
 
 ## [0.7.0]