more work testing transport-service, added fubu-content to ignored to C…

…lose GH-101
FubuMvcArchive · Dec 4, 2013 · e48cb77 · e48cb77
1 parent 8be79f3
commit e48cb77
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 9 deletions.
diff --git a/ripple.config b/ripple.config
@@ -15,7 +15,7 @@
   <Nugets>
     <Dependency Name="Bottles" Version="2.0.0.563" Mode="Float" />
     <Dependency Name="FubuCore" Version="1.2.0.267" Mode="Float" />
-    <Dependency Name="FubuCsProjFile" Version="1.1.0.81" Mode="Float" />
+    <Dependency Name="FubuCsProjFile" Version="1.1.0.83" Mode="Float" />
     <Dependency Name="FubuMVC.Core" Version="1.2.0.1601" Mode="Float" />
     <Dependency Name="FubuMVC.Katana" Version="1.2.0.1601" Mode="Float" />
     <Dependency Name="FubuMVC.OwinHost" Version="1.2.0.1601" Mode="Float" />

diff --git a/src/Fubu/Generation/AddCommand.cs b/src/Fubu/Generation/AddCommand.cs
@@ -105,7 +105,8 @@ public static TemplateRequest BuildTemplateRequest(AddInput input, string soluti
                 SolutionName = solutionFile
             };
 
-            request.Substitutions.Set(ProjectPlan.SHORT_NAME, input.DetermineShortName());
+            var shortName = input.DetermineShortName();
+            request.Substitutions.Set(ProjectPlan.SHORT_NAME, shortName);
 
             var choices = input.ToChoices();
 

diff --git a/src/Fubu/Generation/NewCommandInput.cs b/src/Fubu/Generation/NewCommandInput.cs
@@ -124,7 +124,6 @@ public TemplateRequest CreateRequestForSolution()
             return request;
         }
 
-        // TODO -- views?
         public TemplateChoices ToTemplateChoices()
         {
             return new TemplateChoices

diff --git a/src/fubu.Testing/Tests/New/Build_a_basic_FubuTransportation_service.xml b/src/fubu.Testing/Tests/New/Build_a_basic_FubuTransportation_service.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<Test name="Build a basic FubuTransportation service" lifecycle="Regression">
+  <Templating>
+    <Execute isStep="True" command="new Consumers transport-service --floating" />
+    <ForFolder isStep="True" folder="Consumers" />
+    <RakeSucceeds isStep="True" folder="Consumers" />
+    <AllTheFilesShouldBe isStep="True">
+      <Rows>
+        <row isStep="True" expected="ripple.config" />
+        <row isStep="True" expected=".gitignore" />
+        <row isStep="True" expected="src/Consumers.sln" />
+        <row isStep="True" expected="src/CommonAssemblyInfo.cs" />
+        <row isStep="True" expected="VERSION.txt" />
+        <row isStep="True" expected="rakefile" />
+        <row isStep="True" expected="Gemfile" />
+        <row isStep="True" expected="src/Consumers/Consumers.csproj" />
+        <row isStep="True" expected="src/Consumers/ripple.dependencies.config" />
+        <row isStep="True" expected="src/Consumers/ConsumersApplication.cs" />
+        <row isStep="True" expected="src/Consumers/ConsumersRegistry.cs" />
+        <row isStep="True" expected="src/Consumers/Properties/AssemblyInfo.cs" />
+        <row isStep="True" expected="src/Consumers.Testing/Consumers.Testing.csproj" />
+        <row isStep="True" expected="src/Consumers.Testing/ripple.dependencies.config" />
+        <row isStep="True" expected="src/Consumers.Testing/Standin.cs" />
+        <row isStep="True" expected="src/Consumers.Testing/Properties/AssemblyInfo.cs" />
+        <row expected="src/Consumers/bottle-service.config" />
+        <row expected="src/Consumers/FubuTransportationSetup.cs" />
+      </Rows>
+    </AllTheFilesShouldBe>
+  </Templating>
+</Test>
diff --git a/templates/Templates.xml b/templates/Templates.xml
@@ -1,6 +1,6 @@
 <templates>
   <category type="new">
-    <project name="web-app" description="New FubuMVC application project" template="aspnet" alterations="fubumvc-empty">
+    <project name="web-app" description="New FubuMVC application project" template="aspnet" alterations="fubumvc-empty, fubu-rake-tasks">
       <selection name="ioc" description="IoC Container" >
         <option name="structuremap" description="Use StructureMap for IoC" alterations="structuremap"/>
       </selection>
@@ -18,7 +18,7 @@
 
 	  </project>
 
-    <project name="transport-service" description="New FubuTransportation application" template="baseline" alterations="bottle-service, fubutransportation" dotnet="v4.5">
+    <project name="transport-service" description="New FubuTransportation application" template="baseline" alterations="bottle-service, fubutransportation, fubu-rake-tasks" dotnet="v4.5">
       <selection name="ioc" description="IoC Container" >
         <option name="structuremap" description="Use StructureMap for IoC" alterations="ft-structuremap"/>
       </selection>
@@ -34,7 +34,7 @@
     <project name="library" description="Simple Class Library project" template="baseline" alterations="fubucore"></project>
     <project name="web-bottle" description="New FubuMVC Bottle" template="baseline" alterations="fubumvc-bottle"></project>
 
-    <project name="web-app" description="New FubuMVC application project" template="aspnet" alterations="fubumvc-empty">
+    <project name="web-app" description="New FubuMVC application project" template="aspnet" alterations="fubumvc-empty, fubu-rake-tasks">
       <selection name="ioc" description="IoC Container" >
         <option name="structuremap" description="Use StructureMap for IoC" alterations="structuremap"/>
       </selection>

diff --git a/templates/alteration/bottle-service/rake.txt b/templates/alteration/bottle-service/rake.txt
@@ -1,5 +1,5 @@
 FubuRake::BottleServices.new({
-  :prefix => "%SHORT_NAME%", 
+  :prefix => "%RAKE_TASK_PREFIX%", 
 
   :dir => "%PROJECT_FOLDER%/bin/#{@solution.compilemode}", 
   :name => '%SERVICE_NAME%'

diff --git a/templates/alteration/fubumvc-empty/rake.txt → ...lates/alteration/fubu-rake-tasks/rake.txt b/templates/alteration/fubumvc-empty/rake.txt → ...lates/alteration/fubu-rake-tasks/rake.txt
@@ -1 +1 @@
-FubuRake::MvcApp.new({:directory => '%PROJECT_FOLDER%', :name => '%SHORT_NAME%'})
+FubuRake::MvcApp.new({:directory => '%PROJECT_FOLDER%', :name => '%RAKE_TASK_PREFIX%'})
diff --git a/templates/solution/baseline/ignore.txt b/templates/solution/baseline/ignore.txt
@@ -26,4 +26,5 @@ results
 *.DotSettings.user
 Gemfile.lock
 logs
-pak*.zip
+pak*.zip
+fubu-content