Golem.Build/Libs/YAML.NET.dll Golem.Core/Configuration.cs @@ -49,6 +49,7 @@ </ItemGroup> <ItemGroup> <Content Include="Docs\Rake Examples.txt" /> + <Content Include="Docs\Welcome.htm" /> </ItemGroup> <ItemGroup> <Folder Include="Configs\" /> Golem.Build/Golem.Build.csproj @@ -45,6 +45,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="Configuration.cs" /> <Compile Include="Locations.cs" /> <Compile Include="Recipe.cs" /> <Compile Include="Task.cs" /> Golem.Core/Golem.Core.csproj @@ -7,8 +7,7 @@ using System.Linq; using Golem.Core; namespace Golem.Core -{ - +{ /// <summary> /// /// </summary> @@ -24,8 +23,11 @@ namespace Golem.Core public RecipeFinder() { + this.startDirs = new string[]{Environment.CurrentDirectory}; } + + public RecipeFinder(params string[] startDirs) : this() { this.startDirs = startDirs; @@ -41,6 +43,9 @@ namespace Golem.Core public ReadOnlyCollection<Assembly> AllAssembliesFound { get; private set; } public ReadOnlyCollection<Recipe> AllRecipesFound { get; private set; } + + public List<Assembly> AssembliesContainingRecipes { get; private set; } + public List<FileInfo> FilesContainingRecipes = new List<FileInfo>(); //TODO: Too many variables public IList<Recipe> FindRecipesInFiles() @@ -60,27 +65,29 @@ namespace Golem.Core AllAssembliesFound = loadedAssemblies.AsReadOnly(); AllRecipesFound = recipeClasses.AsReadOnly(); - - - } return recipeClasses.AsReadOnly(); } + + private List<Assembly> PreLoadAssembliesToPreventAssemblyNotFoundError(FileInfo[] dllFile) { var loaded = new List<Assembly>(); foreach (var dll in dllFile) //loading the core twice is BAD because "if(blah is RecipeAttribute)" etc will always fail - if(! dll.Name.StartsWith("Golem.Core")) + if(! dll.Name.StartsWith("Golem.Core") && ! FilesContainingRecipes.Any(file=>file.FullName == dll.FullName)) + { loaded.Add(Assembly.LoadFrom(dll.FullName)); + FilesContainingRecipes.Add(dll); + } return loaded; } - private static void FindRecipesInAssembly(Assembly loaded, List<Recipe> recipeClasses) + private void FindRecipesInAssembly(Assembly loaded, List<Recipe> recipeClasses) { try { @@ -103,7 +110,7 @@ namespace Golem.Core } - public static RecipeAttribute GetRecipeAttributeOrNull(Type type) + public RecipeAttribute GetRecipeAttributeOrNull(Type type) { //get recipe attributes for type var atts = type.GetCustomAttributes(typeof(RecipeAttribute), true); @@ -116,6 +123,12 @@ namespace Golem.Core if (atts.Length == 0) return null; + if(AssembliesContainingRecipes == null) + AssembliesContainingRecipes = new List<Assembly>(); + + if (! AssembliesContainingRecipes.Contains(type.Assembly)) + AssembliesContainingRecipes.Add(type.Assembly); + var recipeAtt = atts[0] as RecipeAttribute; //throw if bad case. Should cast fine (if not, then might indicate 2 of the same assembly is loaded) @@ -131,7 +144,7 @@ namespace Golem.Core //TODO: Not enough comments //TODO: Too many variables // - private static void FindRecipeInType(Type type, List<Recipe> manifest) + private void FindRecipeInType(Type type, List<Recipe> manifest) { //find the attribute on the assembly if there is one var recipeAtt = GetRecipeAttributeOrNull(type); Golem.Core/RecipeFinder.cs @@ -43,9 +43,10 @@ namespace Golem.Core //TODO: Nesting depth is too deep public void Run(string recipeName, string taskName) { - var found = finder.FindRecipesInFiles(); - - foreach(var r in found) + if(finder.AllRecipesFound.Count==0) + finder.FindRecipesInFiles(); + + foreach (var r in finder.AllRecipesFound) { if(r.Name.ToLower() == recipeName.ToLower()) { Golem.Core/TaskRunner.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using Golem.Core; @@ -118,4 +119,49 @@ namespace Golem.Test } } + + [TestFixture] + public class FinderConfigurationFixture + { + [SetUp] + public void Before_Each_Test() + { + if(File.Exists(Configuration.DefaultFileName)) + File.Delete(Configuration.DefaultFileName); + } + + + + [Test] + public void Finder_Caches_Assemblies_Containing_Recipes() + { + var finder = new RecipeFinder(); + finder.FindRecipesInFiles(); + Assert.AreEqual(1, finder.AssembliesContainingRecipes.Count); + } + + [Test] + public void Can_Automatically_Generate_First_Config_File() + { + Assert.IsFalse(File.Exists("\\" + Configuration.DefaultFileName)); + var config = new Configuration(); + Assert.IsTrue(config.IsNew); + Assert.IsFalse(File.Exists("\\" + Configuration.DefaultFileName)); + + var finder = new RecipeFinder(); + finder.FindRecipesInFiles(); + + if(config.IsNew) + config.RecipeSearchHints.AddRange(finder.FilesContainingRecipes.Select(s=>s.FullName)); + + config.Save(); + + var config2 = new Configuration(); + Assert.IsFalse(config2.IsNew); + Assert.AreEqual(1, config2.RecipeSearchHints.Count); + + + } + + } } Golem.Test/RecipeDiscoveryFixture.cs @@ -9,11 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Golem.Runner", "Golem.Runne EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Golem.Build", "Golem.Build\Golem.Build.csproj", "{9F3F3B09-AB90-42E0-B099-81E8BB505954}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2CFC9ECF-8ED3-4B98-8C5B-7FA5580F34C3}" - ProjectSection(SolutionItems) = preProject - Welcome.htm = Welcome.htm - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Golem.sln 978f2065b9601bb4d85273587a9234c41fe9b7f4 Tobin tobin@tobinharris.com http://github.com/tobinharris/golem/commit/add1d4fa06cd01c2a8ac5e95d72dacc79290e686 add1d4fa06cd01c2a8ac5e95d72dacc79290e686 2008-09-21T11:51:06-07:00 2008-09-21T11:51:06-07:00 working on cofig da012be9bd00b52e77ece79b91e8ae30e6aef8fb Tobin tobin@tobinharris.com