added test for applying /overrideconfig option from command line

Ensures that overriden config will be applied whenever there cached
version exists and willn't save results in cache

Author: sergiorykov

src/GitVersionCore.Tests/ExecuteCoreTests.cs

@@ -1,11 +1,11 @@
-using System;
-using System.IO;
-using System.Text;
-using GitTools.Testing;
+using GitTools.Testing;
 using GitVersion;
 using GitVersion.Helpers;
 using NUnit.Framework;
 using Shouldly;
+using System;
+using System.IO;
+using System.Text;
 
 [TestFixture]
 public class ExecuteCoreTests
@@ -60,6 +60,59 @@ public void CacheFileExistsOnDisk()
         info.ShouldContain("Deserializing version variables from cache file", () => info);
     }
 
+
+    [Test]
+    public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDynamicallyCalculatedWithoutSavingInCache()
+    {
+        const string versionCacheFileContent = @"
+Major: 4
+Minor: 10
+Patch: 3
+PreReleaseTag: test.19
+PreReleaseTagWithDash: -test.19
+PreReleaseLabel: test
+PreReleaseNumber: 19
+BuildMetaData: 
+BuildMetaDataPadded: 
+FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+MajorMinorPatch: 4.10.3
+SemVer: 4.10.3-test.19
+LegacySemVer: 4.10.3-test19
+LegacySemVerPadded: 4.10.3-test0019
+AssemblySemVer: 4.10.3.0
+FullSemVer: 4.10.3-test.19
+InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+BranchName: feature/test
+Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+NuGetVersionV2: 4.10.3-test0019
+NuGetVersion: 4.10.3-test0019
+CommitsSinceVersionSource: 19
+CommitsSinceVersionSourcePadded: 0019
+CommitDate: 2015-11-10
+";
+
+        var versionAndBranchFinder = new ExecuteCore(fileSystem);
+
+        var info = RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
+        {
+            fileSystem.WriteAllText(vv.FileName, versionCacheFileContent);
+
+            var gitPreparer = new GitPreparer(null, null, null, false, fixture.RepositoryPath);
+            var cacheDirectory = GitVersionCache.GetCacheDirectory(gitPreparer);
+
+            var cacheDirectoryTimestamp = fileSystem.GetLastDirectoryWrite(cacheDirectory);
+
+            vv = versionAndBranchFinder.ExecuteGitVersion(null, null, null, null, false, fixture.RepositoryPath, null, new Config() { TagPrefix = "prefix" });
+
+            vv.AssemblySemVer.ShouldBe("0.1.0.0");
+
+            var cachedDirectoryTimestampAfter = fileSystem.GetLastDirectoryWrite(cacheDirectory);
+            cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, () => "Cache was updated when override config was set");
+        });
+
+        info.ShouldContain("Override config from command line", () => info);
+    }
+
     [Test]
     public void CacheFileIsMissing()
     {

src/GitVersionCore/ExecuteCore.cs

@@ -50,8 +50,11 @@ public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicReposi
 
             if (overrideConfig != null)
             {
-                var overridenVersionVariables = ExecuteInternal(targetBranch, commitId, gitPreparer, buildServer, overrideConfig: overrideConfig);
-                return overridenVersionVariables;
+                using (Logger.IndentLog("Override config from command line"))
+                {
+                    var overridenVersionVariables = ExecuteInternal(targetBranch, commitId, gitPreparer, buildServer, overrideConfig: overrideConfig);
+                    return overridenVersionVariables;
+                }
             }
 
             var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(gitPreparer);

src/GitVersionCore/GitVersionCache.cs

@@ -43,12 +43,18 @@ public void WriteVariablesToDiskCache(GitPreparer gitPreparer, VersionVariables
             }
         }
 
-        private string PrepareCacheDirectory(GitPreparer gitPreparer)
+        public static string GetCacheDirectory(GitPreparer gitPreparer)
         {
             var gitDir = gitPreparer.GetDotGitDirectory();
+            var cacheDir = Path.Combine(gitDir, "gitversion_cache");
+            return cacheDir;
+        }
+
+        private string PrepareCacheDirectory(GitPreparer gitPreparer)
+        {
+            var cacheDir = GetCacheDirectory(gitPreparer);
 
             // If the cacheDir already exists, CreateDirectory just won't do anything (it won't fail). @asbjornu
-            var cacheDir = GetCacheDir(gitDir);
             fileSystem.CreateDirectory(cacheDir);
 
             return cacheDir;
@@ -115,11 +121,6 @@ static string GetCacheFileName(string key, string cacheDir)
             return string.Concat(Path.Combine(cacheDir, cacheKey), ".yml");
         }
 
-        static string GetCacheDir(string gitDir)
-        {
-            return Path.Combine(gitDir, "gitversion_cache");
-        }
-
         static string GetHash(string textToHash)
         {
             using (var sha1 = SHA1.Create())