Merge pull request #712 from okb/feature/invalid-directory-crash

More informative crash on invalid working directory

Author: JakeGinnivan

src/GitVersionCore/GitPreparer.cs

@@ -97,9 +97,14 @@ public string GetDotGitDirectory()
         public string GetProjectRootDirectory()
         {
             if (IsDynamicGitRepository)
-                return targetPath;
+                return this.targetPath;
 
-            return Directory.GetParent(GitDirFinder.TreeWalkForDotGitDir(targetPath)).FullName;
+            var gitDir = GitDirFinder.TreeWalkForDotGitDir(this.targetPath);
+
+            if (String.IsNullOrEmpty(gitDir))
+                throw new DirectoryNotFoundException("Can't find the .git directory in " + targetPath);
+
+            return Directory.GetParent(gitDir).FullName;
         }
 
         static string CreateDynamicRepository(string targetPath, Authentication authentication, string repositoryUrl, string targetBranch, bool noFetch)

src/GitVersionCore/Helpers/ProcessHelper.cs

@@ -50,11 +50,18 @@ public static int Run(Action<string> output, Action<string> errorOutput, TextRea
         {
             if (String.IsNullOrEmpty(exe))
                 throw new ArgumentNullException("exe");
+            
             if (output == null)
                 throw new ArgumentNullException("output");
 
             workingDirectory = workingDirectory ?? Environment.CurrentDirectory;
 
+            if (!Directory.Exists(workingDirectory))
+            {
+                errorOutput(string.Format("The directory {0} doesn't exist.", workingDirectory));
+                return 1;
+            }
+
             var psi = new ProcessStartInfo
             {
                 UseShellExecute = false,

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -1,13 +1,17 @@
 using System.IO;
+
 using GitVersion;
+
 using NUnit.Framework;
+
 using Shouldly;
 
 [TestFixture]
 public class ExecCmdLineArgumentTest
 {
     const string MsBuild = @"c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe";
 
+
     [Test]
     public void RunExecViaCommandLine()
     {
@@ -32,6 +36,7 @@ public void RunExecViaCommandLine()
         }
     }
 
+
     [Test]
     public void InvalidArgumentsExitCodeShouldNotBeZero()
     {
@@ -49,13 +54,14 @@ public void InvalidArgumentsExitCodeShouldNotBeZero()
   </Target>
 </Project>";
             File.WriteAllText(buildFile, buildFileContent);
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /invalid-argument");
+            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments : " /invalid-argument");
 
             result.ExitCode.ShouldBe(1);
             result.Output.ShouldContain("Failed to parse arguments");
         }
     }
 
+
     [Test]
     public void UsesGitVersionConfigWhenCreatingDynamicRepository()
     {
@@ -82,4 +88,12 @@ public void UsesGitVersionConfigWhenCreatingDynamicRepository()
             DeleteHelper.DeleteGitRepository(repoBasePath);
         }
     }
+
+
+    [Test]
+    public void InvalidWorkingDirectoryCrashesWithInformativeMessage()
+    {
+        var results = GitVersionHelper.ExecuteIn("InvalidDirectory", null, isTeamCity : false, logToFile : false);
+        results.Output.ShouldContain("InvalidDirectory");
+    }
 }

src/GitVersionExe.Tests/GitVersionHelper.cs

@@ -2,26 +2,33 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+
 using GitVersion.Helpers;
 
 public static class GitVersionHelper
 {
     public static ExecutionResults ExecuteIn(string workingDirectory,
-        string exec = null, string execArgs = null, string projectFile = null, string projectArgs = null,
-        bool isTeamCity = false)
+                                             string exec = null,
+                                             string execArgs = null,
+                                             string projectFile = null,
+                                             string projectArgs = null,
+                                             bool isTeamCity = false,
+                                             bool logToFile = true)
     {
-        var logFile = Path.Combine(workingDirectory, "log.txt");
+        var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
         var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile, isTeamCity);
         return ExecuteIn(args);
     }
 
-    public static ExecutionResults ExecuteIn(string workingDirectory, string arguments, bool isTeamCity = false)
+
+    public static ExecutionResults ExecuteIn(string workingDirectory, string arguments, bool isTeamCity = false, bool logToFile = true)
     {
-        var logFile = Path.Combine(workingDirectory, "log.txt");
+        var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
         var args = new ArgumentBuilder(workingDirectory, arguments, isTeamCity, logFile);
         return ExecuteIn(args);
     }
 
+
     static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
     {
         var gitHubFlowVersion = Path.Combine(PathHelper.GetCurrentDirectory(), "GitVersion.exe");