Merge pull request #272 from github-for-unity/enhancements/git-path-view

StanleyGoldman · web-flow · commit c4d410f5aa74 · 2017-09-14T17:29:38.000-04:00
Isolating the git path functionality into GitPathView
diff --git a/src/GitHub.Api/Git/GitClient.cs b/src/GitHub.Api/Git/GitClient.cs
@@ -9,7 +9,7 @@ namespace GitHub.Unity
     interface IGitClient
     {
         Task<NPath> FindGitInstallation();
-        bool ValidateGitInstall(NPath path);
+        ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path);
 
         ITask Init(IOutputProcessor<string> processor = null);
 
@@ -77,6 +77,10 @@ ITask<string> Unlock(string file, bool force,
             IOutputProcessor<string> processor = null);
 
         ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> processor = null);
+
+        ITask<Version> Version(IOutputProcessor<Version> processor = null);
+
+        ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null);
     }
 
     class GitClient : IGitClient
@@ -87,7 +91,6 @@ class GitClient : IGitClient
         private readonly ITaskManager taskManager;
         private readonly CancellationToken cancellationToken;
 
-
         public GitClient(IEnvironment environment, IProcessManager processManager,
             ICredentialManager credentialManager, ITaskManager taskManager)
         {
@@ -167,9 +170,28 @@ private async Task<NPath> LookForSystemGit()
             return path;
         }
 
-        public bool ValidateGitInstall(NPath path)
+        public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
         {
-            return path.FileExists();
+            if (!path.FileExists())
+            {
+                return new FuncTask<ValidateGitInstallResult>(TaskEx.FromResult(new ValidateGitInstallResult(false, null, null)));
+            }
+
+            Version gitVersion = null;
+            Version gitLfsVersion = null;
+
+            var gitVersionTask = new GitVersionTask(cancellationToken).Configure(processManager, path);
+            var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken).Configure(processManager, path);
+
+            return gitVersionTask
+                .Then((result, version) => gitVersion = version)
+                .Then(gitLfsVersionTask)
+                .Then((result, version) => gitLfsVersion = version)
+                .Then(success => new ValidateGitInstallResult(success &&
+                    gitVersion?.CompareTo(Constants.MinimumGitVersion) >= 0 &&
+                    gitLfsVersion?.CompareTo(Constants.MinimumGitLfsVersion) >= 0,
+                    gitVersion, gitLfsVersion)
+                );
         }
 
         public ITask Init(IOutputProcessor<string> processor = null)
@@ -202,6 +224,22 @@ public ITask<List<GitLogEntry>> Log(BaseOutputListProcessor<GitLogEntry> process
                 .Configure(processManager);
         }
 
+        public ITask<Version> Version(IOutputProcessor<Version> processor = null)
+        {
+            Logger.Trace("Version");
+
+            return new GitVersionTask(cancellationToken, processor)
+                .Configure(processManager);
+        }
+
+        public ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null)
+        {
+            Logger.Trace("LfsVersion");
+
+            return new GitLfsVersionTask(cancellationToken, processor)
+                .Configure(processManager);
+        }
+
         public ITask<string> GetConfig(string key, GitConfigSource configSource, IOutputProcessor<string> processor = null)
         {
             Logger.Trace("GetConfig");
diff --git a/src/GitHub.Api/Git/Tasks/GitLfsVersionTask.cs b/src/GitHub.Api/Git/Tasks/GitLfsVersionTask.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Threading;
+
+namespace GitHub.Unity
+{
+    class GitLfsVersionTask : ProcessTask<Version>
+    {
+        private const string TaskName = "git lfs version";
+
+        public GitLfsVersionTask(CancellationToken token, IOutputProcessor<Version> processor = null)
+            : base(token, processor ?? new LfsVersionOutputProcessor())
+        {
+            Name = TaskName;
+        }
+
+        public override string ProcessArguments { get { return "lfs version"; } }
+        public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } }
+    }
+}
diff --git a/src/GitHub.Api/Git/Tasks/GitVersionTask.cs b/src/GitHub.Api/Git/Tasks/GitVersionTask.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Threading;
+
+namespace GitHub.Unity
+{
+    class GitVersionTask : ProcessTask<Version>
+    {
+        private const string TaskName = "git --version";
+
+        public GitVersionTask(CancellationToken token, IOutputProcessor<Version> processor = null)
+            : base(token, processor ?? new VersionOutputProcessor())
+        {
+            Name = TaskName;
+        }
+
+        public override string ProcessArguments { get { return "--version"; } }
+        public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } }
+    }
+}
diff --git a/src/GitHub.Api/Git/ValidateGitInstallResult.cs b/src/GitHub.Api/Git/ValidateGitInstallResult.cs
@@ -0,0 +1,18 @@
+﻿using System;
+
+namespace GitHub.Unity
+{
+    struct ValidateGitInstallResult
+    {
+        public bool IsValid;
+        public Version GitVersion;
+        public Version GitLfsVersion;
+
+        public ValidateGitInstallResult(bool isValid, Version gitVersion, Version gitLfsVersion)
+        {
+            IsValid = isValid;
+            GitVersion = gitVersion;
+            GitLfsVersion = gitLfsVersion;
+        }
+    }
+}
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -100,6 +100,9 @@
     <Compile Include="Application\LoginResult.cs" />
     <Compile Include="Application\AppConfiguration.cs" />
     <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" />
@@ -109,6 +112,8 @@
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Cache\IBranchCache.cs" />
     <Compile Include="Helpers\Validation.cs" />
+    <Compile Include="OutputProcessors\LfsVersionOutputProcessor.cs" />
+    <Compile Include="OutputProcessors\VersionOutputProcessor.cs" />
     <Compile Include="Helpers\TaskHelpers.cs" />
     <Compile Include="Platform\DefaultEnvironment.cs" />
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
diff --git a/src/GitHub.Api/GitHub.Api.csproj.DotSettings b/src/GitHub.Api/GitHub.Api.csproj.DotSettings
@@ -5,6 +5,7 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=git/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=git_005Ctasks/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=helpers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=installer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=io/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=io_005Cwatchers/@EntryIndexedValue">True</s:Boolean>
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
@@ -7,5 +9,8 @@ static class Constants
         public const string UsageFile = "usage.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
+
+        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/NewTaskSystem/ProcessTask.cs b/src/GitHub.Api/NewTaskSystem/ProcessTask.cs
@@ -11,17 +11,19 @@ namespace GitHub.Unity
 {
     static class ProcessTaskExtensions
     {
-        public static T Configure<T>(this T task, IProcessManager processManager, bool withInput = false)
+        public static T Configure<T>(this T task, IProcessManager processManager, bool withInput)
             where T : IProcess
         {
-            return processManager.Configure(task, withInput);
+            return processManager.Configure(task, withInput: withInput);
         }
 
-        public static T Configure<T>(this T task, IProcessManager processManager, string executable, string arguments,
-            NPath workingDirectory = null, bool withInput = false)
+        public static T Configure<T>(this T task, IProcessManager processManager, string executable = null,
+            string arguments = null,
+            NPath workingDirectory = null,
+            bool withInput = false)
             where T : IProcess
         {
-            return processManager.Configure(task, executable, arguments, workingDirectory, withInput);
+            return processManager.Configure(task, executable?.ToNPath(), arguments, workingDirectory, withInput);
         }
     }
 
diff --git a/src/GitHub.Api/OutputProcessors/IProcessManager.cs b/src/GitHub.Api/OutputProcessors/IProcessManager.cs
@@ -4,8 +4,7 @@ namespace GitHub.Unity
 {
     interface IProcessManager
     {
-        T Configure<T>(T processTask, bool withInput = false) where T : IProcess;
-        T Configure<T>(T processTask, string executableFileName, string arguments, NPath workingDirectory = null, bool withInput = false)
+        T Configure<T>(T processTask, NPath executable = null, string arguments = null, NPath workingDirectory = null, bool withInput = false)
             where T : IProcess;
         IProcess Reconnect(IProcess processTask, int i);
         CancellationToken CancellationToken { get; }
diff --git a/src/GitHub.Api/OutputProcessors/LfsVersionOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/LfsVersionOutputProcessor.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace GitHub.Unity
+{
+    class LfsVersionOutputProcessor : BaseOutputProcessor<Version>
+    {
+        public static Regex GitLfsVersionRegex = new Regex(@"git-lfs/([\d]+)\.([\d]+)\.([\d]+)");
+
+        public override void LineReceived(string line)
+        {
+            if (String.IsNullOrEmpty(line))
+                return;
+
+            var match = GitLfsVersionRegex.Match(line);
+
+            if (match.Groups.Count > 0)
+            {
+                var major = Int32.Parse(match.Groups[1].Value);
+                var minor = Int32.Parse(match.Groups[2].Value);
+                var build = Int32.Parse(match.Groups[3].Value);
+                var version = new Version(major, minor, build);
+                RaiseOnEntry(version);
+            }
+        }
+    }
+}
diff --git a/src/GitHub.Api/OutputProcessors/ProcessManager.cs b/src/GitHub.Api/OutputProcessors/ProcessManager.cs
@@ -22,31 +22,13 @@ public ProcessManager(IEnvironment environment, IProcessEnvironment gitEnvironme
             this.cancellationToken = cancellationToken;
         }
 
-        public T Configure<T>(T processTask, bool withInput = false) where T : IProcess
-        {
-            NPath executableFileName;
-            if (processTask.ProcessName != null)
-            {
-                executableFileName = processTask.ProcessName.ToNPath();
-                //logger.Trace("Configuring Task:{0} with Exec:{1}", processTask.GetType().Name, executableFileName);
-            }
-            else
-            {
-                executableFileName = environment.GitExecutablePath;
-                //logger.Trace("Configuring Task:{0} with Git", processTask.GetType().Name);
-            }
-
-            return Configure(processTask,
-                executableFileName,
-                processTask.ProcessArguments,
-                environment.RepositoryPath, withInput);
-        }
-
-        public T Configure<T>(T processTask, string executableFileName, string arguments, NPath workingDirectory = null, bool withInput = false)
+        public T Configure<T>(T processTask, NPath executable = null, string arguments = null, NPath workingDirectory = null, bool withInput = false)
              where T : IProcess
         {
+            executable = executable ?? processTask.ProcessName?.ToNPath() ?? environment.GitExecutablePath;
+
             //If this null check fails, be sure you called Configure() on your task
-            Guard.ArgumentNotNull(executableFileName, nameof(executableFileName));
+            Guard.ArgumentNotNull(executable, nameof(executable));
 
             var startInfo = new ProcessStartInfo
             {
@@ -61,11 +43,13 @@ public T Configure<T>(T processTask, string executableFileName, string arguments
 
             gitEnvironment.Configure(startInfo, workingDirectory ?? environment.RepositoryPath);
 
-            var execPath = executableFileName.ToNPath();
-            if (execPath.IsRelative)
-                executableFileName = FindExecutableInPath(execPath, startInfo.EnvironmentVariables["PATH"]) ?? execPath.FileName;
-            startInfo.FileName = executableFileName;
-            startInfo.Arguments = arguments;
+            if (executable.IsRelative)
+            {
+                executable = executable.FileName.ToNPath();
+                executable = FindExecutableInPath(executable, startInfo.EnvironmentVariables["PATH"]) ?? executable;
+            }
+            startInfo.FileName = executable;
+            startInfo.Arguments = arguments ?? processTask.ProcessArguments;
             processTask.Configure(startInfo);
             return processTask;
         }
diff --git a/src/GitHub.Api/OutputProcessors/VersionOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/VersionOutputProcessor.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace GitHub.Unity
+{
+    class VersionOutputProcessor : BaseOutputProcessor<Version>
+    {
+        public static Regex GitVersionRegex = new Regex(@"git version ([\d]+)\.([\d]+)\.([\d]+)");
+
+        public override void LineReceived(string line)
+        {
+            if (String.IsNullOrEmpty(line))
+                return;
+
+            var match = GitVersionRegex.Match(line);
+
+            if (match.Groups.Count > 0)
+            {
+                var major = Int32.Parse(match.Groups[1].Value);
+                var minor = Int32.Parse(match.Groups[2].Value);
+                var build = Int32.Parse(match.Groups[3].Value);
+                var version = new Version(major, minor, build);
+                RaiseOnEntry(version);
+            }
+        }
+    }
+}
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj
@@ -102,6 +102,7 @@
     <Compile Include="UI\IView.cs" />
     <Compile Include="UI\LoadingView.cs" />
     <Compile Include="UI\PublishView.cs" />
+    <Compile Include="UI\GitPathView.cs" />
     <Compile Include="UI\SettingsView.cs" />
     <Compile Include="UI\Subview.cs" />
     <Compile Include="UI\Window.cs" />
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
@@ -46,7 +46,6 @@ class Styles
 
         public const int HalfSpacing = (int)(BaseSpacing / 2);
 
-        private const string BrowseButton = "...";
         private const string WarningLabel = "<b>Warning:</b> {0}";
 
         private static Color headerGreyColor = new Color(0.878f, 0.878f, 0.878f, 1.0f);
@@ -170,23 +169,6 @@ public static void Warning(string message)
             GUILayout.EndHorizontal();
         }
 
-        public static void PathField(ref string path, Func<string> browseFunction, Func<string, bool> validationFunction)
-        {
-            GUILayout.BeginHorizontal();
-            path = EditorGUILayout.TextField("Path to Git", path);
-            if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
-            {
-                var newValue = browseFunction();
-                if (!string.IsNullOrEmpty(newValue) && validationFunction(newValue))
-                {
-                    path = newValue;
-                    GUIUtility.keyboardControl = GUIUtility.hotControl = 0;
-                    GUI.changed = true;
-                }
-            }
-            GUILayout.EndHorizontal();
-        }
-
         public static GUIStyle HistoryFileTreeBoxStyle
         {
             get
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
diff --git a/src/tests/IntegrationTests/GitClientTests.cs b/src/tests/IntegrationTests/GitClientTests.cs
diff --git a/src/tests/IntegrationTests/IntegrationTests.csproj b/src/tests/IntegrationTests/IntegrationTests.csproj
diff --git a/src/tests/UnitTests/IO/LfsVersionOutputProcessorTests.cs b/src/tests/UnitTests/IO/LfsVersionOutputProcessorTests.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,3 +1,5 @@`
	`1`	`+using System;`
	`2`	`+`
`1`	`3`	`namespace GitHub.Unity`
`2`	`4`	`{`
`3`	`5`	`static class Constants`
`@@ -7,5 +9,8 @@ static class Constants`
`7`	`9`	`public const string UsageFile = "usage.json";`
`8`	`10`	`public const string GitInstallPathKey = "GitInstallPath";`
`9`	`11`	`public const string TraceLoggingKey = "EnableTraceLogging";`
	`12`	`+`
	`13`	`+ public static readonly Version MinimumGitVersion = new Version(2, 11, 0);`
	`14`	`+ public static readonly Version MinimumGitLfsVersion = new Version(2, 2, 0);`
`10`	`15`	`}`
`11`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,19 @@ namespace GitHub.Unity`
`11`	`11`	`{`
`12`	`12`	`static class ProcessTaskExtensions`
`13`	`13`	`{`
`14`		`- public static T Configure<T>(this T task, IProcessManager processManager, bool withInput = false)`
	`14`	`+ public static T Configure<T>(this T task, IProcessManager processManager, bool withInput)`
`15`	`15`	`where T : IProcess`
`16`	`16`	`{`
`17`		`- return processManager.Configure(task, withInput);`
	`17`	`+ return processManager.Configure(task, withInput: withInput);`
`18`	`18`	`}`
`19`	`19`
`20`		`- public static T Configure<T>(this T task, IProcessManager processManager, string executable, string arguments,`
`21`		`- NPath workingDirectory = null, bool withInput = false)`
	`20`	`+ public static T Configure<T>(this T task, IProcessManager processManager, string executable = null,`
	`21`	`+ string arguments = null,`
	`22`	`+ NPath workingDirectory = null,`
	`23`	`+ bool withInput = false)`
`22`	`24`	`where T : IProcess`
`23`	`25`	`{`
`24`		`- return processManager.Configure(task, executable, arguments, workingDirectory, withInput);`
	`26`	`+ return processManager.Configure(task, executable?.ToNPath(), arguments, workingDirectory, withInput);`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@ namespace GitHub.Unity`
`4`	`4`	`{`
`5`	`5`	`interface IProcessManager`
`6`	`6`	`{`
`7`		`- T Configure<T>(T processTask, bool withInput = false) where T : IProcess;`
`8`		`- T Configure<T>(T processTask, string executableFileName, string arguments, NPath workingDirectory = null, bool withInput = false)`
	`7`	`+ T Configure<T>(T processTask, NPath executable = null, string arguments = null, NPath workingDirectory = null, bool withInput = false)`
`9`	`8`	`where T : IProcess;`
`10`	`9`	`IProcess Reconnect(IProcess processTask, int i);`
`11`	`10`	`CancellationToken CancellationToken { get; }`