Cleaning up Configure calls

Author: shana

src/GitHub.Api/Git/GitClient.cs

@@ -9,8 +9,7 @@ namespace GitHub.Unity
     interface IGitClient
     {
         Task<NPath> FindGitInstallation();
-
-        ITask<ValidateGitInstallResult> ValidateGitInstall(string path);
+        ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path);
 
         ITask Init(IOutputProcessor<string> processor = null);
 
@@ -171,37 +170,28 @@ private async Task<NPath> LookForSystemGit()
             return path;
         }
 
-        public ITask<ValidateGitInstallResult> ValidateGitInstall(string path)
+        public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
         {
-            if (!path.ToNPath().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);
-            gitVersionTask.Configure(processManager, path, 
-                gitVersionTask.ProcessArguments, environment.RepositoryPath);
-
-            var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken);
-            gitLfsVersionTask.Configure(processManager, path,
-                gitLfsVersionTask.ProcessArguments, environment.RepositoryPath);
+            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(result => {
-                    var b = result 
-                        && gitVersion != null
-                        && gitVersion >= Constants.MinimumGitVersion
-                        && gitLfsVersion != null
-                        && gitLfsVersion >= Constants.MinimumGitLfsVersion;
-
-                    return new ValidateGitInstallResult(b, gitVersion, gitLfsVersion);
-                });
+                .Then(success => new ValidateGitInstallResult(success &&
+                    gitVersion?.CompareTo(Constants.MinimumGitVersion) >= 0 &&
+                    gitLfsVersion?.CompareTo(Constants.MinimumGitLfsVersion) >= 0,
+                    gitVersion, gitLfsVersion)
+                );
         }
 
         public ITask Init(IOutputProcessor<string> processor = null)

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);
         }
     }
 

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; }

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,10 @@ 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 = FindExecutableInPath(executable, startInfo.EnvironmentVariables["PATH"]) ?? executable;
+            startInfo.FileName = executable.FileName;
+            startInfo.Arguments = arguments ?? processTask.ProcessArguments;
             processTask.Configure(startInfo);
             return processTask;
         }