Adding an object to summarize the result; Adding an undefined state

Author: StanleyGoldman

src/GitHub.Api/Git/GitClient.cs

@@ -10,7 +10,7 @@ interface IGitClient
     {
         Task<NPath> FindGitInstallation();
 
-        ITask<bool> ValidateGitInstall(string path);
+        ITask<ValidateGitInstallResult> ValidateGitInstall(string path);
 
         ITask Init(IOutputProcessor<string> processor = null);
 
@@ -92,7 +92,6 @@ class GitClient : IGitClient
         private readonly ITaskManager taskManager;
         private readonly CancellationToken cancellationToken;
 
-
         public GitClient(IEnvironment environment, IProcessManager processManager,
             ICredentialManager credentialManager, ITaskManager taskManager)
         {
@@ -153,15 +152,16 @@ private async Task<NPath> LookForSystemGit()
             return path;
         }
 
-        public ITask<bool> ValidateGitInstall(string path)
+        public ITask<ValidateGitInstallResult> ValidateGitInstall(string path)
         {
             if (!path.ToNPath().FileExists())
             {
-                return new FuncTask<bool>(cancellationToken, () => false);
+                return new FuncTask<ValidateGitInstallResult>(cancellationToken, 
+                    () => new ValidateGitInstallResult(false, SoftwareVersion.Undefined, SoftwareVersion.Undefined));
             }
 
-            SoftwareVersion? gitVersion = null;
-            SoftwareVersion? gitLfsVersion = null;
+            var gitVersion = SoftwareVersion.Undefined;
+            var gitLfsVersion = SoftwareVersion.Undefined;
 
             var gitVersionTask = new GitVersionTask(cancellationToken);
             gitVersionTask.Configure(processManager, path, 
@@ -176,11 +176,15 @@ public ITask<bool> ValidateGitInstall(string path)
                 .Then(gitLfsVersionTask)
                 .Then((result, version) => {
                     gitLfsVersion = version;
-                }).Then(result => result &&
-                    gitVersion.HasValue &&
-                    gitVersion.Value >= new SoftwareVersion(2, 1, 0) &&
-                    gitLfsVersion.HasValue &&
-                    gitLfsVersion.Value >= new SoftwareVersion(2, 1, 0));
+                }).Then(result => {
+                    var b = result 
+                        && gitVersion != SoftwareVersion.Undefined
+                        && gitVersion >= Constants.MinimumGitVersion
+                        && gitLfsVersion != SoftwareVersion.Undefined
+                        && gitLfsVersion >= Constants.MinimumGitLfsVersion;
+
+                    return new ValidateGitInstallResult(b, gitVersion, gitLfsVersion);
+                });
         }
 
         public ITask Init(IOutputProcessor<string> processor = null)

src/GitHub.Api/Git/ValidateGitInstallResult.cs

@@ -0,0 +1,16 @@
+namespace GitHub.Unity
+{
+    struct ValidateGitInstallResult
+    {
+        public bool IsValid;
+        public SoftwareVersion GitVersionTask;
+        public SoftwareVersion GitLfsVersionTask;
+
+        public ValidateGitInstallResult(bool isValid, SoftwareVersion gitVersionTask, SoftwareVersion gitLfsVersionTask)
+        {
+            IsValid = isValid;
+            GitVersionTask = gitVersionTask;
+            GitLfsVersionTask = gitLfsVersionTask;
+        }
+    }
+}

src/GitHub.Api/GitHub.Api.csproj

@@ -102,6 +102,7 @@
     <Compile Include="Extensions\ListExtensions.cs" />
     <Compile Include="Git\Tasks\GitLfsVersionTask.cs" />
     <Compile Include="Git\Tasks\GitVersionTask.cs" />
+    <Compile Include="Git\ValidateGitInstallResult.cs" />
     <Compile Include="Helpers\AssemblyResources.cs" />
     <Compile Include="Authentication\IKeychain.cs" />
     <Compile Include="Authentication\Keychain.cs" />

src/GitHub.Api/Helpers/Constants.cs

@@ -7,5 +7,8 @@ static class Constants
         public const string UsageFile = "usage.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
+
+        public static readonly SoftwareVersion MinimumGitVersion = new SoftwareVersion(2, 1, 0);
+        public static readonly SoftwareVersion MinimumGitLfsVersion = new SoftwareVersion(2, 1, 0);
     }
 }

src/GitHub.Api/OutputProcessors/SoftwareVersion.cs

@@ -2,9 +2,11 @@ namespace GitHub.Unity
 {
     public struct SoftwareVersion
     {
-        public int Major;
-        public int Minor;
-        public int Build;
+        public static SoftwareVersion Undefined = new SoftwareVersion(-1, -1, -1);
+
+        public readonly int Major;
+        public readonly int Minor;
+        public readonly int Build;
 
         public SoftwareVersion(int major, int minor, int build)
         {
@@ -19,6 +21,18 @@ public SoftwareVersion(string major, string minor, string build) :
 
         }
 
+        public static bool operator ==(SoftwareVersion lhs, SoftwareVersion rhs)
+        {
+            return lhs.Major == rhs.Major
+                && lhs.Minor == rhs.Minor
+                && lhs.Build == rhs.Build;
+        }
+
+        public static bool operator !=(SoftwareVersion lhs, SoftwareVersion rhs)
+        {
+            return !(lhs == rhs);
+        }
+
         public static bool operator <(SoftwareVersion lhs, SoftwareVersion rhs)
         {
             if (lhs.Major < rhs.Major)