cleanup

GitTools · Mar 25, 2020 · 255afd9 · 255afd9
1 parent 65db5a4
commit 255afd9
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 49 deletions.
diff --git a/src/GitVersionCore/Core/GitVersionTool.cs b/src/GitVersionCore/Core/GitVersionTool.cs
@@ -28,22 +28,25 @@ public class GitVersionTool : IGitVersionTool
 
         private readonly IBuildServer buildServer;
 
-        public GitVersionTool(ILog log, IGitVersionCache gitVersionCache, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
-            IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
+        public GitVersionTool(ILog log, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
+            IGitVersionCache gitVersionCache, IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
             IWixVersionFileUpdater wixVersionFileUpdater, IGitVersionInformationGenerator gitVersionInformationGenerator, IAssemblyInfoFileUpdater assemblyInfoFileUpdater,
             IOptions<Arguments> options, IOptions<GitVersionContext> versionContext)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
+
             this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
             this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
+
             this.cacheKeyFactory = cacheKeyFactory ?? throw new ArgumentNullException(nameof(cacheKeyFactory));
+            this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
 
             this.wixVersionFileUpdater = wixVersionFileUpdater ?? throw new ArgumentNullException(nameof(wixVersionFileUpdater));
             this.gitVersionInformationGenerator = gitVersionInformationGenerator ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
             this.assemblyInfoFileUpdater = assemblyInfoFileUpdater ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
 
+            this.options = options ?? throw new ArgumentNullException(nameof(options));
+
             context = versionContext.Value;
             buildServer = buildServerResolver.Resolve();
         }

diff --git a/...itVersionCore/Extensions/GitVersionInformationResources/GitVersionInformationGenerator.cs b/...itVersionCore/Extensions/GitVersionInformationResources/GitVersionInformationGenerator.cs
@@ -5,11 +5,6 @@
 
 namespace GitVersion.Extensions.GitVersionInformationResources
 {
-    public interface IGitVersionInformationGenerator
-    {
-        void Generate(VersionVariables variables, FileWriteInfo writeInfo);
-    }
-
     public class GitVersionInformationGenerator : IGitVersionInformationGenerator
     {
         private readonly IFileSystem fileSystem;

diff --git a/...tVersionCore/Extensions/GitVersionInformationResources/IGitVersionInformationGenerator.cs b/...tVersionCore/Extensions/GitVersionInformationResources/IGitVersionInformationGenerator.cs
@@ -0,0 +1,9 @@
+using GitVersion.OutputVariables;
+
+namespace GitVersion.Extensions.GitVersionInformationResources
+{
+    public interface IGitVersionInformationGenerator
+    {
+        void Generate(VersionVariables variables, FileWriteInfo writeInfo);
+    }
+}
diff --git a/src/GitVersionCore/Extensions/IWixVersionFileUpdater.cs b/src/GitVersionCore/Extensions/IWixVersionFileUpdater.cs
@@ -0,0 +1,10 @@
+using System;
+using GitVersion.OutputVariables;
+
+namespace GitVersion.Extensions
+{
+    public interface IWixVersionFileUpdater : IDisposable
+    {
+        string Update(VersionVariables variables, string workingDirectory);
+    }
+}
diff --git a/src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs b/src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs
@@ -8,12 +8,6 @@
 
 namespace GitVersion.Extensions.VersionAssemblyInfoResources
 {
-    public interface IAssemblyInfoFileUpdater : IDisposable
-    {
-        void Update(VersionVariables variables, bool ensureAssemblyInfo, string workingDirectory, params string[] assemblyInfo);
-        void CommitChanges();
-    }
-
     public class AssemblyInfoFileUpdater : IAssemblyInfoFileUpdater
     {
         private readonly List<Action> restoreBackupTasks = new List<Action>();

diff --git a/src/GitVersionCore/Extensions/VersionAssemblyInfoResources/IAssemblyInfoFileUpdater.cs b/src/GitVersionCore/Extensions/VersionAssemblyInfoResources/IAssemblyInfoFileUpdater.cs
@@ -0,0 +1,11 @@
+using System;
+using GitVersion.OutputVariables;
+
+namespace GitVersion.Extensions.VersionAssemblyInfoResources
+{
+    public interface IAssemblyInfoFileUpdater : IDisposable
+    {
+        void Update(VersionVariables variables, bool ensureAssemblyInfo, string workingDirectory, params string[] assemblyInfo);
+        void CommitChanges();
+    }
+}
diff --git a/src/GitVersionCore/Extensions/WixVersionFileUpdater.cs b/src/GitVersionCore/Extensions/WixVersionFileUpdater.cs
@@ -7,11 +7,6 @@
 
 namespace GitVersion.Extensions
 {
-    public interface IWixVersionFileUpdater : IDisposable
-    {
-        string Update(VersionVariables variables, string workingDirectory);
-    }
-
     public class WixVersionFileUpdater : IWixVersionFileUpdater
     {
         private readonly IFileSystem fileSystem;

diff --git a/src/GitVersionExe.Tests/ArgumentParserTests.cs b/src/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -2,21 +2,26 @@
 using GitVersion.Logging;
 using GitVersion.Model;
 using GitVersionCore.Tests.Helpers;
+using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Shouldly;
 using Environment = System.Environment;
 
 namespace GitVersionExe.Tests
 {
     [TestFixture]
-    public class ArgumentParserTests
+    public class ArgumentParserTests : TestBase
     {
         private IArgumentParser argumentParser;
 
         [SetUp]
         public void SetUp()
         {
-            argumentParser = new ArgumentParser(new TestEnvironment());
+            var sp = ConfigureServices(services =>
+            {
+                services.AddSingleton<IArgumentParser, ArgumentParser>();
+            });
+            argumentParser = sp.GetService<IArgumentParser>();
         }
 
         [Test]

diff --git a/src/GitVersionExe.Tests/ExecutionResults.cs b/src/GitVersionExe.Tests/ExecutionResults.cs
@@ -14,9 +14,9 @@ public ExecutionResults(int exitCode, string output, string logContents)
             Log = logContents;
         }
 
-        public int ExitCode { get; private set; }
-        public string Output { get; private set; }
-        public string Log { get; private set; }
+        public int ExitCode { get; }
+        public string Output { get; }
+        public string Log { get; }
 
         public virtual VersionVariables OutputVariables
         {

diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -10,6 +10,7 @@
         <PackageReference Include="Mono.Cecil" Version="0.11.2"></PackageReference>
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="..\GitVersionCore.Tests\GitVersionCore.Tests.csproj" />
         <ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
         <ProjectReference Include="..\GitVersionExe\GitVersionExe.csproj" />
     </ItemGroup>

diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -14,10 +14,12 @@ namespace GitVersion
     public class ArgumentParser : IArgumentParser
     {
         private readonly IEnvironment environment;
+        private readonly IBuildServerResolver buildServerResolver;
 
-        public ArgumentParser(IEnvironment environment)
+        public ArgumentParser(IEnvironment environment, IBuildServerResolver buildServerResolver)
         {
             this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
+            this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
         }
 
         public Arguments ParseArguments(string commandLineArguments)
@@ -158,7 +160,6 @@ public Arguments ParseArguments(string[] commandLineArguments)
                     continue;
                 }
 
-
                 if (name.IsSwitch("execargs"))
                 {
                     EnsureArgumentValueCount(values);
@@ -186,7 +187,6 @@ public Arguments ParseArguments(string[] commandLineArguments)
                     continue;
                 }
 
-
                 if (name.IsSwitch("diag"))
                 {
                     if (value == null || value.IsTrue())
@@ -305,18 +305,11 @@ public Arguments ParseArguments(string[] commandLineArguments)
 
                 if (name.IsSwitch("ensureassemblyinfo"))
                 {
-                    if (value.IsTrue())
-                    {
-                        arguments.EnsureAssemblyInfo = true;
-                    }
-                    else if (value.IsFalse())
+                    arguments.EnsureAssemblyInfo = true;
+                    if (value.IsFalse())
                     {
                         arguments.EnsureAssemblyInfo = false;
                     }
-                    else
-                    {
-                        arguments.EnsureAssemblyInfo = true;
-                    }
 
                     if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
                     {
@@ -428,6 +421,9 @@ public Arguments ParseArguments(string[] commandLineArguments)
                     : firstArgument;
             }
 
+            var buildServer = buildServerResolver.Resolve();
+            arguments.NoFetch = arguments.NoFetch || buildServer != null && buildServer.PreventFetch();
+
             return arguments;
         }
 

diff --git a/src/GitVersionExe/ExecCommand.cs b/src/GitVersionExe/ExecCommand.cs
@@ -10,7 +10,6 @@ namespace GitVersion
 {
     public class ExecCommand : IExecCommand
     {
-
         private readonly ILog log;
         private readonly IOptions<Arguments> options;
 

diff --git a/src/GitVersionExe/GitVersionExecutor.cs b/src/GitVersionExe/GitVersionExecutor.cs
@@ -15,19 +15,16 @@ public class GitVersionExecutor : IGitVersionExecutor
         private readonly IHelpWriter helpWriter;
         private readonly IExecCommand execCommand;
         private readonly IConfigProvider configProvider;
-        private readonly IBuildServerResolver buildServerResolver;
         private readonly IGitVersionTool gitVersionTool;
         private readonly IVersionWriter versionWriter;
 
-        public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfigProvider configProvider,
-            IBuildServerResolver buildServerResolver, IGitVersionTool gitVersionTool,
+        public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfigProvider configProvider, IGitVersionTool gitVersionTool,
             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.gitVersionTool = gitVersionTool ?? throw new ArgumentNullException(nameof(gitVersionTool));
 
             this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
@@ -38,7 +35,10 @@ public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfi
 
         public int Execute(Arguments arguments)
         {
-            var exitCode = VerifyArgumentsAndRun(arguments);
+            if (!HandleNonMainCommand(arguments, out var exitCode))
+            {
+                exitCode = RunGitVersionTool(arguments);
+            }
 
             if (exitCode != 0)
             {
@@ -49,12 +49,10 @@ public int Execute(Arguments arguments)
             return exitCode;
         }
 
-        private int VerifyArgumentsAndRun(Arguments arguments)
+        private int RunGitVersionTool(Arguments arguments)
         {
             try
             {
-                if (HandleNonMainCommand(arguments, out var exitCode)) return exitCode;
-
                 var variables = gitVersionTool.CalculateVersionVariables();
 
                 gitVersionTool.OutputVariables(variables, Console.WriteLine);
@@ -132,9 +130,6 @@ private bool HandleNonMainCommand(Arguments arguments, out int exitCode)
                 arguments.Output.Add(OutputType.BuildServer);
             }
 
-            var buildServer = buildServerResolver.Resolve();
-            arguments.NoFetch = arguments.NoFetch || buildServer != null && buildServer.PreventFetch();
-
             ConfigureLogging(arguments, log);
 
             if (arguments.Diag)