Merge remote-tracking branch 'remotes/origin/enhancements/git-install-validation' into enhancements/git-path-view

StanleyGoldman · StanleyGoldman · commit 52271d9bf89c · 2017-09-08T13:54:40.000-04:00
diff --git a/src/GitHub.Api/Git/GitClient.cs b/src/GitHub.Api/Git/GitClient.cs
@@ -79,9 +79,9 @@ ITask<string> Unlock(string file, bool force,
 
         ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> processor = null);
 
-        ITask<SoftwareVersion> Version(IOutputProcessor<SoftwareVersion> processor = null);
+        ITask<Version> Version(IOutputProcessor<Version> processor = null);
 
-        ITask<SoftwareVersion> LfsVersion(IOutputProcessor<SoftwareVersion> processor = null);
+        ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null);
     }
 
     class GitClient : IGitClient
@@ -157,11 +157,11 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(string path)
             if (!path.ToNPath().FileExists())
             {
                 return new FuncTask<ValidateGitInstallResult>(cancellationToken, 
-                    () => new ValidateGitInstallResult(false, SoftwareVersion.Undefined, SoftwareVersion.Undefined));
+                    () => new ValidateGitInstallResult(false, null, null));
             }
 
-            var gitVersion = SoftwareVersion.Undefined;
-            var gitLfsVersion = SoftwareVersion.Undefined;
+            Version gitVersion = null;
+            Version gitLfsVersion = null;
 
             var gitVersionTask = new GitVersionTask(cancellationToken);
             gitVersionTask.Configure(processManager, path, 
@@ -178,9 +178,9 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(string path)
                     gitLfsVersion = version;
                 }).Then(result => {
                     var b = result 
-                        && gitVersion != SoftwareVersion.Undefined
+                        && gitVersion != null
                         && gitVersion >= Constants.MinimumGitVersion
-                        && gitLfsVersion != SoftwareVersion.Undefined
+                        && gitLfsVersion != null
                         && gitLfsVersion >= Constants.MinimumGitLfsVersion;
 
                     return new ValidateGitInstallResult(b, gitVersion, gitLfsVersion);
@@ -217,15 +217,15 @@ public ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> process
                 .Configure(processManager);
         }
 
-        public ITask<SoftwareVersion> Version(IOutputProcessor<SoftwareVersion> processor = null)
+        public ITask<Version> Version(IOutputProcessor<Version> processor = null)
         {
             Logger.Trace("Version");
 
             return new GitVersionTask(cancellationToken, processor)
                 .Configure(processManager);
         }
 
-        public ITask<SoftwareVersion> LfsVersion(IOutputProcessor<SoftwareVersion> processor = null)
+        public ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null)
         {
             Logger.Trace("LfsVersion");
 
diff --git a/src/GitHub.Api/Git/Tasks/GitLfsVersionTask.cs b/src/GitHub.Api/Git/Tasks/GitLfsVersionTask.cs
@@ -1,12 +1,13 @@
+using System;
 using System.Threading;
 
 namespace GitHub.Unity
 {
-    class GitLfsVersionTask : ProcessTask<SoftwareVersion>
+    class GitLfsVersionTask : ProcessTask<Version>
     {
         private const string TaskName = "git lfs version";
 
-        public GitLfsVersionTask(CancellationToken token, IOutputProcessor<SoftwareVersion> processor = null)
+        public GitLfsVersionTask(CancellationToken token, IOutputProcessor<Version> processor = null)
             : base(token, processor ?? new LfsVersionOutputProcessor())
         {
             Name = TaskName;
diff --git a/src/GitHub.Api/Git/Tasks/GitVersionTask.cs b/src/GitHub.Api/Git/Tasks/GitVersionTask.cs
@@ -1,12 +1,13 @@
+using System;
 using System.Threading;
 
 namespace GitHub.Unity
 {
-    class GitVersionTask : ProcessTask<SoftwareVersion>
+    class GitVersionTask : ProcessTask<Version>
     {
         private const string TaskName = "git --version";
 
-        public GitVersionTask(CancellationToken token, IOutputProcessor<SoftwareVersion> processor = null)
+        public GitVersionTask(CancellationToken token, IOutputProcessor<Version> processor = null)
             : base(token, processor ?? new VersionOutputProcessor())
         {
             Name = TaskName;
diff --git a/src/GitHub.Api/Git/ValidateGitInstallResult.cs b/src/GitHub.Api/Git/ValidateGitInstallResult.cs
@@ -1,12 +1,14 @@
-﻿namespace GitHub.Unity
+﻿using System;
+
+namespace GitHub.Unity
 {
     struct ValidateGitInstallResult
     {
         public bool IsValid;
-        public SoftwareVersion GitVersion;
-        public SoftwareVersion GitLfsVersion;
+        public Version GitVersion;
+        public Version GitLfsVersion;
 
-        public ValidateGitInstallResult(bool isValid, SoftwareVersion gitVersion, SoftwareVersion gitLfsVersion)
+        public ValidateGitInstallResult(bool isValid, Version gitVersion, Version gitLfsVersion)
         {
             IsValid = isValid;
             GitVersion = gitVersion;
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -113,7 +113,6 @@
     <Compile Include="Cache\IBranchCache.cs" />
     <Compile Include="Helpers\Validation.cs" />
     <Compile Include="OutputProcessors\LfsVersionOutputProcessor.cs" />
-    <Compile Include="OutputProcessors\SoftwareVersion.cs" />
     <Compile Include="OutputProcessors\VersionOutputProcessor.cs" />
     <Compile Include="Helpers\TaskHelpers.cs" />
     <Compile Include="Platform\DefaultEnvironment.cs" />
diff --git a/src/GitHub.Api/Helpers/Constants.cs b/src/GitHub.Api/Helpers/Constants.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace GitHub.Unity
 {
     static class Constants
@@ -8,7 +10,7 @@ static class Constants
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
 
-        public static readonly SoftwareVersion MinimumGitVersion = new SoftwareVersion(2, 11, 0);
-        public static readonly SoftwareVersion MinimumGitLfsVersion = new SoftwareVersion(2, 2, 0);
+        public static readonly Version MinimumGitVersion = new Version(2, 11, 0);
+        public static readonly Version MinimumGitLfsVersion = new Version(2, 2, 0);
     }
 }
diff --git a/src/GitHub.Api/OutputProcessors/LfsVersionOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/LfsVersionOutputProcessor.cs
@@ -2,7 +2,7 @@
 
 namespace GitHub.Unity
 {
-    class LfsVersionOutputProcessor : BaseOutputProcessor<SoftwareVersion>
+    class LfsVersionOutputProcessor : BaseOutputProcessor<Version>
     {
         public override void LineReceived(string line)
         {
@@ -15,7 +15,7 @@ public override void LineReceived(string line)
                 line = line.Substring(gitVersion.Length, line.IndexOf(" ", StringComparison.InvariantCultureIgnoreCase) - gitVersion.Length);
                 var strings = line.Split(new[] { "." }, StringSplitOptions.None);
 
-                RaiseOnEntry(new SoftwareVersion(strings[0], strings[1], strings[2]));
+                RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));
             }
         }
     }
diff --git a/src/GitHub.Api/OutputProcessors/SoftwareVersion.cs b/src/GitHub.Api/OutputProcessors/SoftwareVersion.cs
diff --git a/src/GitHub.Api/OutputProcessors/VersionOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/VersionOutputProcessor.cs
@@ -3,7 +3,7 @@
 
 namespace GitHub.Unity
 {
-    class VersionOutputProcessor : BaseOutputProcessor<SoftwareVersion>
+    class VersionOutputProcessor : BaseOutputProcessor<Version>
     {
         public override void LineReceived(string line)
         {
@@ -16,7 +16,7 @@ public override void LineReceived(string line)
                 line = line.Substring(gitVersion.Length);
                 var strings = line.Split(new[] { "." }, StringSplitOptions.None);
 
-                RaiseOnEntry(new SoftwareVersion(strings[0], strings[1], strings[2]));
+                RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));
             }
         }
     }
diff --git a/src/tests/IntegrationTests/GitClientTests.cs b/src/tests/IntegrationTests/GitClientTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using FluentAssertions;
 using GitHub.Unity;
@@ -19,11 +20,11 @@ public async Task ShouldGetGitVersion()
             var versionResult = version.Result;
             if (Environment.IsWindows)
             {
-                versionResult.Should().Be($"2.11.1");
+                versionResult.Should().Be(new Version(2,11,1));
             }
             else
             {
-                versionResult.Should().NotBe(string.Empty);
+                versionResult.Should().NotBeNull();
             }
         }
 
@@ -38,11 +39,11 @@ public async Task ShouldGetGitLfsVersion()
             var versionResult = version.Result;
             if (Environment.IsWindows)
             {
-                versionResult.Should().Be("2.2.0");
+                versionResult.Should().Be(new Version(2, 2, 0));
             }
             else
             {
-                versionResult.Should().NotBe(string.Empty);
+                versionResult.Should().NotBeNull();
             }
         }
     }
diff --git a/src/tests/UnitTests/IO/LfsVersionOutputProcessorTests.cs b/src/tests/UnitTests/IO/LfsVersionOutputProcessorTests.cs
@@ -15,23 +15,22 @@ public static IEnumerable<TestCaseData> ShouldParseVersionOutputs_TestCases()
 
             testCase = new TestCaseData(
                 $"git-lfs/2.2.0 (GitHub; windows amd64; go 1.8.3; git a99f4b21){Environment.NewLine}", 
-                new SoftwareVersion(2, 2, 0));
+                new Version(2, 2, 0));
 
             testCase.SetName("Windows GitLFS 2.2.0");
             yield return testCase;
         }
 
         [TestCaseSource(nameof(ShouldParseVersionOutputs_TestCases))]
-        public void ShouldParseVersionOutputs(string line, SoftwareVersion expected)
+        public void ShouldParseVersionOutputs(string line, Version expected)
         {
-            SoftwareVersion? version = null;
+            Version version = null;
 
             var outputProcessor = new LfsVersionOutputProcessor();
             outputProcessor.OnEntry += output => { version = output; };
             outputProcessor.LineReceived(line);
 
-            version.HasValue.Should().BeTrue();
-            version.Value.Should().Be(expected);
+            version.Should().Be(expected);
         }
     }
 }
diff --git a/src/tests/UnitTests/IO/SoftwareVersionTests.cs b/src/tests/UnitTests/IO/SoftwareVersionTests.cs
diff --git a/src/tests/UnitTests/IO/VersionOutputProcessorTests.cs b/src/tests/UnitTests/IO/VersionOutputProcessorTests.cs
diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Threading;`
`2`	`3`
`3`	`4`	`namespace GitHub.Unity`
`4`	`5`	`{`
`5`		`- class GitLfsVersionTask : ProcessTask<SoftwareVersion>`
	`6`	`+ class GitLfsVersionTask : ProcessTask<Version>`
`6`	`7`	`{`
`7`	`8`	`private const string TaskName = "git lfs version";`
`8`	`9`
`9`		`- public GitLfsVersionTask(CancellationToken token, IOutputProcessor<SoftwareVersion> processor = null)`
	`10`	`+ public GitLfsVersionTask(CancellationToken token, IOutputProcessor<Version> processor = null)`
`10`	`11`	`: base(token, processor ?? new LfsVersionOutputProcessor())`
`11`	`12`	`{`
`12`	`13`	`Name = TaskName;`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`		`-namespace GitHub.Unity`
	`1`	`+using System;`
	`2`	`+`
	`3`	`+namespace GitHub.Unity`
`2`	`4`	`{`
`3`	`5`	`struct ValidateGitInstallResult`
`4`	`6`	`{`
`5`	`7`	`public bool IsValid;`
`6`		`- public SoftwareVersion GitVersion;`
`7`		`- public SoftwareVersion GitLfsVersion;`
	`8`	`+ public Version GitVersion;`
	`9`	`+ public Version GitLfsVersion;`
`8`	`10`
`9`		`- public ValidateGitInstallResult(bool isValid, SoftwareVersion gitVersion, SoftwareVersion gitLfsVersion)`
	`11`	`+ public ValidateGitInstallResult(bool isValid, Version gitVersion, Version gitLfsVersion)`
`10`	`12`	`{`
`11`	`13`	`IsValid = isValid;`
`12`	`14`	`GitVersion = gitVersion;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System;`
	`2`	`+`
`1`	`3`	`namespace GitHub.Unity`
`2`	`4`	`{`
`3`	`5`	`static class Constants`
`@@ -8,7 +10,7 @@ static class Constants`
`8`	`10`	`public const string GitInstallPathKey = "GitInstallPath";`
`9`	`11`	`public const string TraceLoggingKey = "EnableTraceLogging";`
`10`	`12`
`11`		`- public static readonly SoftwareVersion MinimumGitVersion = new SoftwareVersion(2, 11, 0);`
`12`		`- public static readonly SoftwareVersion MinimumGitLfsVersion = new SoftwareVersion(2, 2, 0);`
	`13`	`+ public static readonly Version MinimumGitVersion = new Version(2, 11, 0);`
	`14`	`+ public static readonly Version MinimumGitLfsVersion = new Version(2, 2, 0);`
`13`	`15`	`}`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GitHub.Unity`
`4`	`4`	`{`
`5`		`- class LfsVersionOutputProcessor : BaseOutputProcessor<SoftwareVersion>`
	`5`	`+ class LfsVersionOutputProcessor : BaseOutputProcessor<Version>`
`6`	`6`	`{`
`7`	`7`	`public override void LineReceived(string line)`
`8`	`8`	`{`
`@@ -15,7 +15,7 @@ public override void LineReceived(string line)`
`15`	`15`	`line = line.Substring(gitVersion.Length, line.IndexOf(" ", StringComparison.InvariantCultureIgnoreCase) - gitVersion.Length);`
`16`	`16`	`var strings = line.Split(new[] { "." }, StringSplitOptions.None);`
`17`	`17`
`18`		`- RaiseOnEntry(new SoftwareVersion(strings[0], strings[1], strings[2]));`
	`18`	`+ RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace GitHub.Unity`
`5`	`5`	`{`
`6`		`- class VersionOutputProcessor : BaseOutputProcessor<SoftwareVersion>`
	`6`	`+ class VersionOutputProcessor : BaseOutputProcessor<Version>`
`7`	`7`	`{`
`8`	`8`	`public override void LineReceived(string line)`
`9`	`9`	`{`
`@@ -16,7 +16,7 @@ public override void LineReceived(string line)`
`16`	`16`	`line = line.Substring(gitVersion.Length);`
`17`	`17`	`var strings = line.Split(new[] { "." }, StringSplitOptions.None);`
`18`	`18`
`19`		`- RaiseOnEntry(new SoftwareVersion(strings[0], strings[1], strings[2]));`
	`19`	`+ RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Threading.Tasks;`
`2`	`3`	`using FluentAssertions;`
`3`	`4`	`using GitHub.Unity;`
`@@ -19,11 +20,11 @@ public async Task ShouldGetGitVersion()`
`19`	`20`	`var versionResult = version.Result;`
`20`	`21`	`if (Environment.IsWindows)`
`21`	`22`	`{`
`22`		`- versionResult.Should().Be($"2.11.1");`
	`23`	`+ versionResult.Should().Be(new Version(2,11,1));`
`23`	`24`	`}`
`24`	`25`	`else`
`25`	`26`	`{`
`26`		`- versionResult.Should().NotBe(string.Empty);`
	`27`	`+ versionResult.Should().NotBeNull();`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`@@ -38,11 +39,11 @@ public async Task ShouldGetGitLfsVersion()`
`38`	`39`	`var versionResult = version.Result;`
`39`	`40`	`if (Environment.IsWindows)`
`40`	`41`	`{`
`41`		`- versionResult.Should().Be("2.2.0");`
	`42`	`+ versionResult.Should().Be(new Version(2, 2, 0));`
`42`	`43`	`}`
`43`	`44`	`else`
`44`	`45`	`{`
`45`		`- versionResult.Should().NotBe(string.Empty);`
	`46`	`+ versionResult.Should().NotBeNull();`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`	`}`