Another small restructuring and removing busted test

Author: JakeGinnivan

src/GitVersionCore/ExecuteCore.cs

@@ -21,14 +21,24 @@ public ExecuteCore(IFileSystem fileSystem)
 
         public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId)
         {
-            var gitDir = Repository.Discover(workingDirectory);
-            using (var repo = GetRepository(gitDir))
+            // Normalise if we are running on build server
+            var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, noFetch, workingDirectory);
+            var dotGitDirectory = gitPreparer.GetDotGitDirectory();
+            var projectRoot = gitPreparer.GetProjectRootDirectory();
+            Logger.WriteInfo(string.Format("Project root is: " + projectRoot));
+            if (string.IsNullOrEmpty(dotGitDirectory) || string.IsNullOrEmpty(projectRoot))
+            {
+                // TODO Link to wiki article
+                throw new Exception(string.Format("Failed to prepare or find the .git directory in path '{0}'.", workingDirectory));
+            }
+            
+            using (var repo = GetRepository(dotGitDirectory))
             {
-                var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(repo, gitDir);
+                var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(repo, dotGitDirectory);
                 if (versionVariables == null)
                 {
-                    versionVariables = ExecuteInternal(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, workingDirectory, commitId, repo);
-                    gitVersionCache.WriteVariablesToDiskCache(repo, gitDir, versionVariables);
+                    versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot);
+                    gitVersionCache.WriteVariablesToDiskCache(repo, dotGitDirectory, versionVariables);
                 }
 
                 return versionVariables;
@@ -63,23 +73,13 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch
             return currentBranch;
         }
 
-        VersionVariables ExecuteInternal(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId, IRepository repo)
+        VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot)
         {
-            // Normalise if we are running on build server
-            var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, noFetch, workingDirectory);
             var applicableBuildServers = BuildServerList.GetApplicableBuildServers();
             var buildServer = applicableBuildServers.FirstOrDefault();
 
             gitPreparer.Initialise(buildServer != null, ResolveCurrentBranch(buildServer, targetBranch));
 
-            var dotGitDirectory = gitPreparer.GetDotGitDirectory();
-            var projectRoot = gitPreparer.GetProjectRootDirectory();
-            Logger.WriteInfo(string.Format("Project root is: " + projectRoot));
-            if (string.IsNullOrEmpty(dotGitDirectory) || string.IsNullOrEmpty(projectRoot))
-            {
-                // TODO Link to wiki article
-                throw new Exception(string.Format("Failed to prepare or find the .git directory in path '{0}'.", workingDirectory));
-            }
             var versionFinder = new GitVersionFinder();
             var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem);
 

src/GitVersionCore/GitPreparer.cs

@@ -93,17 +93,17 @@ public string GetDotGitDirectory()
                 return DynamicGitRepositoryPath;
             }
 
-            return Repository.Discover(this.targetPath);
+            return Repository.Discover(targetPath);
         }
 
         public string GetProjectRootDirectory()
         {
             if (IsDynamicGitRepository)
-                return this.targetPath;
+                return targetPath;
 
-            var gitDir = Repository.Discover(this.targetPath);
+            var gitDir = Repository.Discover(targetPath);
 
-            if (String.IsNullOrEmpty(gitDir))
+            if (string.IsNullOrEmpty(gitDir))
                 throw new DirectoryNotFoundException("Can't find the .git directory in " + targetPath);
 
             return Directory.GetParent(gitDir).FullName;

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -1,7 +1,6 @@
 using System.IO;
 
 using GitVersion;
-
 using NUnit.Framework;
 
 using Shouldly;
@@ -61,35 +60,6 @@ public void InvalidArgumentsExitCodeShouldNotBeZero()
         }
     }
 
-
-    [Test]
-    public void UsesGitVersionConfigWhenCreatingDynamicRepository()
-    {
-        var localRepoPath = PathHelper.GetTempPath();
-        var repoBasePath = Path.GetDirectoryName(PathHelper.GetTempPath());
-        Directory.CreateDirectory(localRepoPath);
-
-        try
-        {
-            using (var remote = new EmptyRepositoryFixture(new Config()))
-            {
-                remote.Repository.MakeACommit();
-                var configFile = Path.Combine(localRepoPath, "GitVersionConfig.yaml");
-                File.WriteAllText(configFile, "next-version: 1.0.0");
-
-                var arguments = string.Format(" /url {0} /dynamicRepoLocation {1} /b master", remote.RepositoryPath, repoBasePath);
-                var results = GitVersionHelper.ExecuteIn(localRepoPath, arguments, false);
-                results.OutputVariables.SemVer.ShouldBe("1.0.0");
-            }
-        }
-        finally
-        {
-            DeleteHelper.DeleteGitRepository(localRepoPath);
-            DeleteHelper.DeleteGitRepository(repoBasePath);
-        }
-    }
-
-
     [Test]
     public void InvalidWorkingDirectoryCrashesWithInformativeMessage()
     {