Golem.Recipes.NAnt/GRegexTask.cs Golem.Recipes.NAnt/GXmlPeekTask.cs Golem.Recipes.NAnt/Golem.Recipes.Nant.csproj Golem.Recipes.NAnt/NantRecipe.cs Golem.Recipes.NAnt/Properties/AssemblyInfo.cs Golem.Test/NantRecipeFixure.cs @@ -21,15 +21,16 @@ namespace Golem.Core cataloger = aCataloger; } - public void Run(Recipe recipe, Task task) + + public void Run(Recipe recipe, Task task, params object[] parameters ) { - //TODO: Tasks should run in their own appdomain. + //TODO: Tasks should run in their own appdomain? // We need to create an app domain that has the // base dir the same as the target assembly var recipeInstance = Activator.CreateInstance(recipe.Class); SetContextualInformationIfInheritsRecipeBase(recipeInstance); - task.Method.Invoke(recipeInstance, null); + task.Method.Invoke(recipeInstance, parameters); } private void SetContextualInformationIfInheritsRecipeBase(object recipeInstance) @@ -44,10 +45,13 @@ namespace Golem.Core } + + //TODO: Run is Too long //TODO: Nesting depth is too deep - public void Run(string recipeName, string taskName) + public void Run(string recipeName, string taskName, params object[] para) { + if(cataloger.Recipes.Count==0) cataloger.CatalogueRecipes(); @@ -61,9 +65,9 @@ namespace Golem.Core { foreach(var methodInfo in t.DependsOnMethods) { - Run(r, r.GetTaskForMethod(methodInfo)); + Run(r, r.GetTaskForMethod(methodInfo), para); } - Run(r, t); + Run(r, t, para); return; } } Golem.Core/TaskRunner.cs @@ -37,8 +37,17 @@ namespace Golem.Runner var parts = args[0].Split(':'); var runner = new TaskRunner(finder); - if(parts.Length == 2) + if(parts.Length == 2 && args.Length == 1) + { runner.Run(parts[0],parts[1]); + } + else if(parts.Length ==2 && args.Length > 1) + { + //TODO: Tidy this up and refactor + var dest = new string[args.Length-1]; + Array.Copy(args,1,dest,0,args.Length-1); + runner.Run(parts[0],parts[1],dest); + } else { Console.WriteLine("Type golem -? for help, or try one of the following tasks:\n"); Golem.Runner/Program.cs @@ -118,4 +118,14 @@ namespace Golem.Test Console.WriteLine(this.AllRecipes.Count); } } + + [Recipe] + public class Demo5Recipe + { + [Task] + public void Foo(string a, string b) + { + Console.WriteLine("{0},{1}", a, b); + } + } } \ No newline at end of file Golem.Test/DemoRecipe.cs @@ -51,6 +51,7 @@ <ItemGroup> <Compile Include="DemoRecipe.cs" /> <Compile Include="FinderConfigurationFixture.cs" /> + <Compile Include="NantRecipeFixure.cs" /> <Compile Include="RecipeDiscoveryFixture.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> @@ -59,6 +60,10 @@ <Project>{267A8DF5-2B11-470E-8878-BE6E7244B713}</Project> <Name>Golem.Core</Name> </ProjectReference> + <ProjectReference Include="..\Golem.Recipes.NAnt\Golem.Recipes.Nant.csproj"> + <Project>{114B7DE4-297E-4FBC-9E0D-FCF07372464A}</Project> + <Name>Golem.Recipes.Nant</Name> + </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Golem.Test/Golem.Test.csproj @@ -67,6 +67,25 @@ namespace Golem.Test Assert.AreEqual("LIST", AppDomain.CurrentDomain.GetData("TEST")); } + [Test] + public void Can_Execute_Tasks_With_Parameters() + { + var runner = new TaskRunner(cataloger); + var demo5 = found[4]; + Assert.AreEqual("demo5", found[4].Name); + Assert.AreEqual("foo", found[4].Tasks[0].Name); + runner.Run(demo5,demo5.Tasks[0],"TESTING","123"); + } + + [Test] + public void Can_Execute_Tasks_With_Parameters_By_Name() + { + var runner = new TaskRunner(cataloger); + runner.Run("demo5", "foo", "TESTING", "123"); + } + + + [Test, Ignore] public void Can_Run_All_Default_Tasks() Golem.Test/RecipeDiscoveryFixture.cs @@ -11,9 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Golem.Build", "Golem.Build\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{5ADDCA30-41AD-4EFD-BC98-08C7924EADC7}" ProjectSection(SolutionItems) = preProject - README.txt = README.txt + README.markdown = README.markdown EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Golem.Recipes.Nant", "Golem.Recipes.NAnt\Golem.Recipes.Nant.csproj", "{114B7DE4-297E-4FBC-9E0D-FCF07372464A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,6 +38,10 @@ Global {9F3F3B09-AB90-42E0-B099-81E8BB505954}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F3F3B09-AB90-42E0-B099-81E8BB505954}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F3F3B09-AB90-42E0-B099-81E8BB505954}.Release|Any CPU.Build.0 = Release|Any CPU + {114B7DE4-297E-4FBC-9E0D-FCF07372464A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {114B7DE4-297E-4FBC-9E0D-FCF07372464A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {114B7DE4-297E-4FBC-9E0D-FCF07372464A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {114B7DE4-297E-4FBC-9E0D-FCF07372464A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Golem.sln 46b8b854838d5583969765e41171b481f48dcdee Tobin tobin@tobinharris.com http://github.com/tobinharris/golem/commit/e08259048edcae2512e00aafc4359bcacc33707b e08259048edcae2512e00aafc4359bcacc33707b 2008-09-25T16:11:00-07:00 2008-09-25T16:11:00-07:00 We now have a NAnt recipes solution, and working proof of concept for simple NAnt tasks 5ff65ebf8c6f5fe06fc15ff8c24777b525c31764 Tobin tobin@tobinharris.com