refactored ExecCommand, moved the prepare and calculate version out of ExeCommand

Author: arturcic

src/GitVersionCore/GitVersionCalculator.cs

@@ -20,8 +20,8 @@ public class GitVersionCalculator : IGitVersionCalculator
         private readonly IOptions<Arguments> options;
         private readonly IGitVersionCacheKeyFactory cacheKeyFactory;
 
-        public GitVersionCalculator(ILog log, IConfigProvider configProvider, IBuildServerResolver buildServerResolver,
-            IGitVersionCache gitVersionCache, INextVersionCalculator nextVersionCalculator, IGitPreparer gitPreparer, IVariableProvider variableProvider,
+        public GitVersionCalculator(ILog log, IConfigProvider configProvider,
+            IGitVersionCache gitVersionCache, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
             IOptions<Arguments> options, IGitVersionCacheKeyFactory cacheKeyFactory)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));

src/GitVersionExe/ExecCommand.cs

@@ -20,27 +20,20 @@ public class ExecCommand : IExecCommand
         private readonly IFileSystem fileSystem;
         private readonly IBuildServerResolver buildServerResolver;
         private readonly ILog log;
-        private readonly IGitPreparer gitPreparer;
-        private readonly IGitVersionCalculator gitVersionCalculator;
         private readonly IOptions<Arguments> options;
 
-        public ExecCommand(IFileSystem fileSystem, IBuildServerResolver buildServerResolver, ILog log, IGitPreparer gitPreparer, IGitVersionCalculator gitVersionCalculator, IOptions<Arguments> options)
+        public ExecCommand(IFileSystem fileSystem, IBuildServerResolver buildServerResolver, ILog log, IOptions<Arguments> options)
         {
             this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
             this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
             this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
-            this.gitVersionCalculator = gitVersionCalculator ?? throw new ArgumentNullException(nameof(gitVersionCalculator));
             this.options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
-        public void Execute()
+        public void Execute(VersionVariables variables)
         {
             log.Info($"Running on {(RunningOnUnix ? "Unix" : "Windows")}.");
 
-            gitPreparer.Prepare();
-            var variables = gitVersionCalculator.CalculateVersionVariables();
-
             var arguments = options.Value;
 
             if (arguments.Output.Contains(OutputType.BuildServer))

src/GitVersionExe/GitVersionExecutor.cs

@@ -17,18 +17,25 @@ public class GitVersionExecutor : IGitVersionExecutor
         private readonly IExecCommand execCommand;
         private readonly IConfigProvider configProvider;
         private readonly IBuildServerResolver buildServerResolver;
+        private readonly IGitPreparer gitPreparer;
+        private readonly IGitVersionCalculator gitVersionCalculator;
         private readonly IVersionWriter versionWriter;
 
-        public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IVersionWriter versionWriter, IHelpWriter helpWriter,
-            IExecCommand execCommand, IConfigProvider configProvider, IBuildServerResolver buildServerResolver, IGitPreparer gitPreparer)
+        public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfigProvider configProvider,
+            IBuildServerResolver buildServerResolver, IGitPreparer gitPreparer, IGitVersionCalculator gitVersionCalculator,
+            IVersionWriter versionWriter, IHelpWriter helpWriter, IExecCommand execCommand)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
+            this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configFileLocator));
+
+            this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
+            this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
+            this.gitVersionCalculator = gitVersionCalculator ?? throw new ArgumentNullException(nameof(gitVersionCalculator));
+
             this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
             this.helpWriter = helpWriter ?? throw new ArgumentNullException(nameof(helpWriter));
             this.execCommand = execCommand ?? throw new ArgumentNullException(nameof(execCommand));
-            this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configFileLocator));
-            this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
         }
 
         public int Execute(Arguments arguments)
@@ -50,7 +57,9 @@ private int VerifyArgumentsAndRun(Arguments arguments)
             {
                 if (HandleNonMainCommand(arguments, out var exitCode)) return exitCode;
 
-                execCommand.Execute();
+                gitPreparer.Prepare();
+                var variables = gitVersionCalculator.CalculateVersionVariables();
+                execCommand.Execute(variables);
             }
             catch (WarningException exception)
             {

src/GitVersionExe/IExecCommand.cs

@@ -1,7 +1,9 @@
+using GitVersion.OutputVariables;
+
 namespace GitVersion
 {
     public interface IExecCommand
     {
-        void Execute();
+        void Execute(VersionVariables variables);
     }
 }

src/GitVersionTask/GitVersionTaskExecutor.cs

@@ -5,6 +5,7 @@
 using GitVersion.Logging;
 using GitVersion.MSBuildTask.Tasks;
 using GitVersion.OutputFormatters;
+using GitVersion.OutputVariables;
 
 namespace GitVersion.MSBuildTask
 {
@@ -13,19 +14,19 @@ public class GitVersionTaskExecutor : IGitVersionTaskExecutor
         private readonly IFileSystem fileSystem;
         private readonly ILog log;
         private readonly IBuildServerResolver buildServerResolver;
-        private readonly IGitVersionCalculator gitVersionCalculator;
+        private VersionVariables versionVariables;
 
-        public GitVersionTaskExecutor(IFileSystem fileSystem, ILog log, IBuildServerResolver buildServerResolver, IGitVersionCalculator gitVersionCalculator)
+        public GitVersionTaskExecutor(IFileSystem fileSystem, ILog log, IBuildServerResolver buildServerResolver, IGitVersionCalculator gitVersionCalculator, IGitPreparer preparer)
         {
             this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
-            this.gitVersionCalculator = gitVersionCalculator ?? throw new ArgumentNullException(nameof(gitVersionCalculator));
+            preparer.Prepare();
+            versionVariables = gitVersionCalculator.CalculateVersionVariables();
         }
 
         public void GetVersion(GetVersion task)
         {
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var outputType = typeof(GetVersion);
             foreach (var variable in versionVariables)
             {
@@ -38,7 +39,6 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
             FileHelper.DeleteTempFiles();
             FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
 
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo");
 
             task.AssemblyInfoTempFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
@@ -50,7 +50,6 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
 
         public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
         {
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");
 
             task.GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
@@ -62,17 +61,15 @@ public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
         {
             var logger = task.Log;
 
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var buildServer = buildServerResolver.Resolve();
-            if (buildServer != null)
+            if (buildServer == null) return;
+
+            logger.LogMessage($"Executing GenerateSetVersionMessage for '{buildServer.GetType().Name}'.");
+            logger.LogMessage(buildServer.GenerateSetVersionMessage(versionVariables));
+            logger.LogMessage($"Executing GenerateBuildLogOutput for '{buildServer.GetType().Name}'.");
+            foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(buildServer, versionVariables))
             {
-                logger.LogMessage($"Executing GenerateSetVersionMessage for '{buildServer.GetType().Name}'.");
-                logger.LogMessage(buildServer.GenerateSetVersionMessage(versionVariables));
-                logger.LogMessage($"Executing GenerateBuildLogOutput for '{buildServer.GetType().Name}'.");
-                foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(buildServer, versionVariables))
-                {
-                    logger.LogMessage(buildParameter);
-                }
+                logger.LogMessage(buildParameter);
             }
         }
     }