move cache to task

SimonCropp · SimonCropp · commit 012a659c1a65 · 2014-10-04T17:19:19.000+10:00
no need for in memory cache in an exe
diff --git a/GitVersionCore/CachedVersion.cs b/GitVersionCore/CachedVersion.cs
diff --git a/GitVersionCore/DirectoryDateFinder.cs b/GitVersionCore/DirectoryDateFinder.cs
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
@@ -63,8 +63,6 @@
     <Compile Include="BuildServers\GitHelper.cs" />
     <Compile Include="BuildServers\IBuildServer.cs" />
     <Compile Include="BuildServers\TeamCity.cs" />
-    <Compile Include="CachedVersion.cs" />
-    <Compile Include="DirectoryDateFinder.cs" />
     <Compile Include="LastVersionOnMasterFinder.cs" />
     <Compile Include="ShortVersion.cs" />
     <Compile Include="SemanticVersionExtensions.cs" />
@@ -113,7 +111,6 @@
     <Compile Include="SemanticVersionBuildMetaData.cs" />
     <Compile Include="SemanticVersionPreReleaseTag.cs" />
     <Compile Include="ShortVersionParser.cs" />
-    <Compile Include="VersionCache.cs" />
     <Compile Include="GitFlow\BranchFinders\VersionOnMasterFinder.cs" />
     <Compile Include="VersionPoint.cs" />
   </ItemGroup>
diff --git a/GitVersionCore/GitVersionFinder.cs b/GitVersionCore/GitVersionFinder.cs
@@ -19,6 +19,13 @@ public SemanticVersion FindVersion(GitVersionContext context)
             return new GitFlowVersionFinder().FindVersion(context);
         }
 
+        public static SemanticVersion GetSemanticVersion(Repository repository)
+        {
+            var versionForRepositoryFinder = new GitVersionFinder();
+            var gitVersionContext = new GitVersionContext(repository);
+            Logger.WriteInfo("Running against branch: " + gitVersionContext.CurrentBranch.Name);
+            return versionForRepositoryFinder.FindVersion(gitVersionContext);
+        }
         public static bool ShouldGitHubFlowVersioningSchemeApply(IRepository repo)
         {
             return repo.FindBranch("develop") == null;
diff --git a/GitVersionCore/RepositoryLoader.cs b/GitVersionCore/RepositoryLoader.cs
@@ -9,7 +9,14 @@ public static Repository GetRepo(string gitDirectory)
         {
             try
             {
-                return new Repository(gitDirectory);
+                var repository = new Repository(gitDirectory);
+
+                var branch = repository.Head;
+                if (branch.Tip == null)
+                {
+                    throw new WarningException("No Tip found. Has repo been initialized?");
+                }
+                return repository;
             }
             catch (Exception exception)
             {
diff --git a/GitVersionCore/VersionCache.cs b/GitVersionCore/VersionCache.cs
diff --git a/GitVersionExe/Program.cs b/GitVersionExe/Program.cs
@@ -59,8 +59,11 @@ static void Main()
                 {
                     buildServer.PerformPreProcessingSteps(gitDirectory);
                 }
-
-                var semanticVersion = VersionCache.GetVersion(gitDirectory);
+                SemanticVersion semanticVersion;
+                using (var repo = RepositoryLoader.GetRepo(gitDirectory))
+                {
+                    semanticVersion = GitVersionFinder.GetSemanticVersion(repo);
+                }
 
                 if (arguments.Output == OutputType.BuildServer)
                 {
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
@@ -31,7 +31,10 @@ public void VerifyCreatedCode()
         };
         var assemblyInfoBuilder = new AssemblyInfoBuilder
             {
-                SemanticVersion = semanticVersion
+                CachedVersion = new CachedVersion
+                {
+                    SemanticVersion = semanticVersion
+                }
             };
         var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText();
         Approvals.Verify(assemblyInfoText);
@@ -80,7 +83,10 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
         };
         var assemblyInfoBuilder = new AssemblyInfoBuilder
         {
-            SemanticVersion = semanticVersion,
+            CachedVersion = new CachedVersion
+            {
+                SemanticVersion = semanticVersion
+            },
             AssemblyVersioningScheme = avs,
         };
 
diff --git a/GitVersionTask.Tests/VersionAndBranchFinderTests.cs b/GitVersionTask.Tests/VersionAndBranchFinderTests.cs
@@ -1,5 +1,4 @@
-﻿using GitVersion;
-using LibGit2Sharp;
+﻿using LibGit2Sharp;
 using NUnit.Framework;
 
 [TestFixture]
@@ -17,7 +16,7 @@ public void ShouldBeAbleGetVersionFromGitDir()
             AddOneCommitToHead(repo, "code");
 
         }
-        SemanticVersion versionAndBranch;
+        CachedVersion versionAndBranch;
         VersionAndBranchFinder.TryGetVersion(ASBMTestRepoWorkingDirPath, out versionAndBranch);
         Assert.IsNotNull(versionAndBranch);
     }
diff --git a/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs b/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
@@ -4,12 +4,13 @@
 
 public class AssemblyInfoBuilder
 {
-    public SemanticVersion SemanticVersion;
+    public CachedVersion CachedVersion;
     public AssemblyVersioningScheme AssemblyVersioningScheme;
 
     public string GetAssemblyInfoText()
     {
-        var vars = VariableProvider.GetVariablesFor(SemanticVersion);
+        var semanticVersion = CachedVersion.SemanticVersion;
+        var vars = VariableProvider.GetVariablesFor(semanticVersion);
         var assemblyInfo = string.Format(@"
 using System;
 using System.Reflection;
@@ -39,9 +40,9 @@ static class GitVersionInformation
 }}
 
 
-", SemanticVersion.GetAssemblyVersion(AssemblyVersioningScheme), string.Format("{0}.{1}.{2}.0", SemanticVersion.Major, SemanticVersion.Minor, SemanticVersion.Patch), SemanticVersion.ToString("i"),
-            SemanticVersion.BuildMetaData.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
-            SemanticVersion.BuildMetaData.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"),
+", semanticVersion.GetAssemblyVersion(AssemblyVersioningScheme), string.Format("{0}.{1}.{2}.0", semanticVersion.Major, semanticVersion.Minor, semanticVersion.Patch), semanticVersion.ToString("i"),
+            semanticVersion.BuildMetaData.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
+            semanticVersion.BuildMetaData.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"),
             GenerateVariableMembers(vars));
 
         return assemblyInfo;
diff --git a/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs b/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs
@@ -62,7 +62,7 @@ public void InnerExecute()
 
             InvalidFileChecker.CheckForInvalidFiles(CompileFiles, ProjectFile);
 
-            SemanticVersion semanticVersion;
+            CachedVersion semanticVersion;
             if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion))
             {
                 return;
@@ -98,12 +98,12 @@ AssemblyVersioningScheme GetAssemblyVersioningScheme()
             throw new WarningException(string.Format("Unexpected assembly versioning scheme '{0}'.", AssemblyVersioningScheme));
         }
 
-        void CreateTempAssemblyInfo(SemanticVersion semanticVersion)
+        void CreateTempAssemblyInfo(CachedVersion semanticVersion)
         {
             var versioningScheme = GetAssemblyVersioningScheme();
             var assemblyInfoBuilder = new AssemblyInfoBuilder
                                       {
-                                          SemanticVersion = semanticVersion,
+                                          CachedVersion = semanticVersion,
                                           AssemblyVersioningScheme = versioningScheme,
                                       };
             var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText();
diff --git a/GitVersionTask/CachedVersion.cs b/GitVersionTask/CachedVersion.cs
@@ -0,0 +1,7 @@
+﻿using GitVersion;
+
+public class CachedVersion
+{
+    public SemanticVersion SemanticVersion;
+    public long Timestamp;
+}
diff --git a/GitVersionTask/DirectoryDateFinder.cs b/GitVersionTask/DirectoryDateFinder.cs
@@ -0,0 +1,19 @@
+﻿using System;
+using System.IO;
+
+public static class DirectoryDateFinder
+{
+    public static long GetLastDirectoryWrite(string path)
+    {
+        var lastHigh = DateTime.MinValue;
+        foreach (var file in Directory.EnumerateDirectories(path, "*.*", SearchOption.AllDirectories))
+        {
+            var lastWriteTime = File.GetLastWriteTime(file);
+            if (lastWriteTime > lastHigh)
+            {
+                lastHigh = lastWriteTime;
+            }
+        }
+        return lastHigh.Ticks;
+    }
+}
diff --git a/GitVersionTask/GetVersion.cs b/GitVersionTask/GetVersion.cs
@@ -84,11 +84,11 @@ public override bool Execute()
         {
             try
             {
-                SemanticVersion versionAndBranch;
+                CachedVersion versionAndBranch;
                 if (VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionAndBranch))
                 {
                     var thisType = typeof(GetVersion);
-                    var variables = VariableProvider.GetVariablesFor(versionAndBranch);
+                    var variables = VariableProvider.GetVariablesFor(versionAndBranch.SemanticVersion);
                     foreach (var variable in variables)
                     {
                         thisType.GetProperty(variable.Key).SetValue(this, variable.Value, null);
diff --git a/GitVersionTask/GitVersionTask.csproj b/GitVersionTask/GitVersionTask.csproj
@@ -58,8 +58,11 @@
     <Compile Include="AssemblyInfoBuilder\AssemblyVersioningScheme.cs" />
     <Compile Include="AssemblyInfoBuilder\AssemblyVersionsGenerator.cs" />
     <Compile Include="BuildLogger.cs" />
+    <Compile Include="CachedVersion.cs" />
     <Compile Include="Config.cs" />
     <Compile Include="ConfigReader.cs" />
+    <Compile Include="DirectoryDateFinder.cs" />
+    <Compile Include="VersionCache.cs" />
     <Compile Include="WriteVersionInfoToBuildLog.cs" />
     <Compile Include="GetVersion.cs" />
     <Compile Include="InvalidFileChecker.cs" />
diff --git a/GitVersionTask/VersionAndBranchFinder.cs b/GitVersionTask/VersionAndBranchFinder.cs
@@ -4,7 +4,7 @@
 public static class VersionAndBranchFinder
 {
     static List<string> processedDirectories = new List<string>(); 
-    public static bool TryGetVersion(string directory, out SemanticVersion versionAndBranch)
+    public static bool TryGetVersion(string directory, out CachedVersion versionAndBranch)
     {
         var gitDirectory = GitDirFinder.TreeWalkForGitDir(directory);
 
diff --git a/GitVersionTask/VersionCache.cs b/GitVersionTask/VersionCache.cs
@@ -0,0 +1,35 @@
+﻿using System.Collections.Generic;
+using GitVersion;
+
+public static class VersionCache
+{
+    static Dictionary<string, CachedVersion> versionCacheVersions = new Dictionary<string, CachedVersion>();
+
+    public static CachedVersion GetVersion(string gitDirectory)
+    {
+        using (var repo = RepositoryLoader.GetRepo(gitDirectory))
+        {
+            var ticks = DirectoryDateFinder.GetLastDirectoryWrite(gitDirectory);
+            var key = string.Format("{0}:{1}:{2}", repo.Head.CanonicalName, repo.Head.Tip.Sha, ticks);
+            CachedVersion cachedVersion;
+            if (versionCacheVersions.TryGetValue(key, out cachedVersion))
+            {
+                if (cachedVersion.Timestamp != ticks)
+                {
+                    Logger.WriteInfo("Change detected. flushing cache.");
+                    cachedVersion.SemanticVersion = GitVersionFinder.GetSemanticVersion(repo);
+                }
+                return cachedVersion;
+            }
+            Logger.WriteInfo("Version not in cache. Calculating version.");
+
+            return versionCacheVersions[key] = new CachedVersion
+            {
+                SemanticVersion = GitVersionFinder.GetSemanticVersion(repo),
+                Timestamp = ticks
+            };
+
+        }
+    }
+
+}
diff --git a/GitVersionTask/WriteVersionInfoToBuildLog.cs b/GitVersionTask/WriteVersionInfoToBuildLog.cs
@@ -46,7 +46,7 @@ public override bool Execute()
 
         public void InnerExecute()
         {
-            SemanticVersion semanticVersion;
+            CachedVersion semanticVersion;
             if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion))
             {
                 return;
@@ -56,14 +56,14 @@ public void InnerExecute()
             WriteIntegrationParameters(semanticVersion, BuildServerList.GetApplicableBuildServers(authentication));
         }
 
-        public void WriteIntegrationParameters(SemanticVersion semanticVersion, IEnumerable<IBuildServer> applicableBuildServers)
+        public void WriteIntegrationParameters(CachedVersion semanticVersion, IEnumerable<IBuildServer> applicableBuildServers)
         {
             foreach (var buildServer in applicableBuildServers)
             {
                 logger.LogInfo(string.Format("Executing GenerateSetVersionMessage for '{0}'.", buildServer.GetType().Name));
                 logger.LogInfo(buildServer.GenerateSetVersionMessage(semanticVersion.ToString()));
                 logger.LogInfo(string.Format("Executing GenerateBuildLogOutput for '{0}'.", buildServer.GetType().Name));
-                foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(semanticVersion, buildServer))
+                foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(semanticVersion.SemanticVersion, buildServer))
                 {
                     logger.LogInfo(buildParameter);
                 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,13 @@ public SemanticVersion FindVersion(GitVersionContext context)`
`19`	`19`	`return new GitFlowVersionFinder().FindVersion(context);`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ public static SemanticVersion GetSemanticVersion(Repository repository)`
	`23`	`+ {`
	`24`	`+ var versionForRepositoryFinder = new GitVersionFinder();`
	`25`	`+ var gitVersionContext = new GitVersionContext(repository);`
	`26`	`+ Logger.WriteInfo("Running against branch: " + gitVersionContext.CurrentBranch.Name);`
	`27`	`+ return versionForRepositoryFinder.FindVersion(gitVersionContext);`
	`28`	`+ }`
`22`	`29`	`public static bool ShouldGitHubFlowVersioningSchemeApply(IRepository repo)`
`23`	`30`	`{`
`24`	`31`	`return repo.FindBranch("develop") == null;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,14 @@ public static Repository GetRepo(string gitDirectory)`
`9`	`9`	`{`
`10`	`10`	`try`
`11`	`11`	`{`
`12`		`- return new Repository(gitDirectory);`
	`12`	`+ var repository = new Repository(gitDirectory);`
	`13`	`+`
	`14`	`+ var branch = repository.Head;`
	`15`	`+ if (branch.Tip == null)`
	`16`	`+ {`
	`17`	`+ throw new WarningException("No Tip found. Has repo been initialized?");`
	`18`	`+ }`
	`19`	`+ return repository;`
`13`	`20`	`}`
`14`	`21`	`catch (Exception exception)`
`15`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,11 @@ static void Main()`
`59`	`59`	`{`
`60`	`60`	`buildServer.PerformPreProcessingSteps(gitDirectory);`
`61`	`61`	`}`
`62`		`-`
`63`		`- var semanticVersion = VersionCache.GetVersion(gitDirectory);`
	`62`	`+ SemanticVersion semanticVersion;`
	`63`	`+ using (var repo = RepositoryLoader.GetRepo(gitDirectory))`
	`64`	`+ {`
	`65`	`+ semanticVersion = GitVersionFinder.GetSemanticVersion(repo);`
	`66`	`+ }`
`64`	`67`
`65`	`68`	`if (arguments.Output == OutputType.BuildServer)`
`66`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using GitVersion;`
`2`		`-using LibGit2Sharp;`
	`1`	`+using LibGit2Sharp;`
`3`	`2`	`using NUnit.Framework;`
`4`	`3`
`5`	`4`	`[TestFixture]`
`@@ -17,7 +16,7 @@ public void ShouldBeAbleGetVersionFromGitDir()`
`17`	`16`	`AddOneCommitToHead(repo, "code");`
`18`	`17`
`19`	`18`	`}`
`20`		`- SemanticVersion versionAndBranch;`
	`19`	`+ CachedVersion versionAndBranch;`
`21`	`20`	`VersionAndBranchFinder.TryGetVersion(ASBMTestRepoWorkingDirPath, out versionAndBranch);`
`22`	`21`	`Assert.IsNotNull(versionAndBranch);`
`23`	`22`	`}`