fix GitPrepare injection

arturcic · arturcic · commit 9437513c5ec9 · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.cs b/src/GitVersionCore.Tests/ConfigProviderTests.cs
@@ -13,6 +13,7 @@
 using GitVersion;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
+using Microsoft.Extensions.Options;
 
 namespace GitVersionCore.Tests
 {
@@ -37,7 +38,7 @@ public void Setup()
             configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
             repoPath = DefaultRepoPath;
 
-            var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
+            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
             configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
@@ -292,7 +293,7 @@ public void NoWarnOnGitVersionYmlFile()
             var log = new Log(logAppender);
 
             var defaultConfigFileLocator = new DefaultConfigFileLocator(fileSystem, log);
-            var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
+            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
 
             configurationProvider = new ConfigurationProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer, configInitWizard);
 
diff --git a/src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs b/src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs
@@ -7,6 +7,7 @@
 using GitVersion;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
+using Microsoft.Extensions.Options;
 
 namespace GitVersionCore.Tests
 {
@@ -91,8 +92,8 @@ public void NoWarnOnGitVersionYmlFile()
             {
                 var log = new NullLog();
                 var defaultConfigFileLocator = new DefaultConfigFileLocator(fileSystem, log);
-                var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
-            var stepFactory = new ConfigInitStepFactory();
+                var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
+                var stepFactory = new ConfigInitStepFactory();
                 var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
 
                 var configurationProvider = new ConfigurationProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer, configInitWizard);
diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs
@@ -94,7 +94,7 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             var nextVersionCalculator = new NextVersionCalculator(log, metadataCalculator, baseVersionCalculator, mainlineVersionCalculator);
             var gitVersionFinder = new GitVersionFinder(log, nextVersionCalculator);
 
-            var gitPreparer = new GitPreparer(log, arguments);
+            var gitPreparer = new GitPreparer(log, options);
             var stepFactory = new ConfigInitStepFactory();
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
 
diff --git a/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
@@ -10,6 +10,7 @@
 using GitVersion.SemanticVersioning;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.VersionCalculation;
+using Microsoft.Extensions.Options;
 
 namespace GitVersionCore.Tests
 {
@@ -99,7 +100,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
                 Authentication = new Authentication(),
                 TargetPath = fixture.LocalRepositoryFixture.RepositoryPath
             };
-            new GitPreparer(log, arguments).Prepare(true, null);
+            new GitPreparer(log, Options.Create(arguments)).Prepare(true, null);
         }
     }
 }
diff --git a/src/GitVersionCore.Tests/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/GitVersionExecutorTests.cs
@@ -63,7 +63,7 @@ public void CacheKeySameAfterReNormalizing()
                     TargetUrl = targetUrl,
                     TargetPath = fixture.RepositoryPath
                 };
-                var gitPreparer = new GitPreparer(log, arguments);
+                var gitPreparer = new GitPreparer(log, Options.Create(arguments));
                 configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
 
                 gitPreparer.Prepare(true, targetBranch);
@@ -97,7 +97,7 @@ public void CacheKeyForWorktree()
                         TargetPath = worktreePath
                     };
 
-                    var gitPreparer = new GitPreparer(log, arguments);
+                    var gitPreparer = new GitPreparer(log, Options.Create(arguments));
                     configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
                     var cacheKey = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, configFileLocator, null);
                     cacheKey.Value.ShouldNotBeEmpty();
@@ -212,7 +212,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
                     TargetPath = fixture.RepositoryPath
                 };
 
-                var gitPreparer = new GitPreparer(log, arguments);
+                var gitPreparer = new GitPreparer(log, Options.Create(arguments));
 
                 gitVersionCache = new GitVersionCache(fileSystem, log);
                 var cacheDirectory = gitVersionCache.GetCacheDirectory(gitPreparer);
@@ -390,7 +390,7 @@ public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
                         TargetPath = worktreePath
                     };
 
-                    var gitPreparer = new GitPreparer(log, arguments);
+                    var gitPreparer = new GitPreparer(log, Options.Create(arguments));
 
                     gitPreparer.GetProjectRootDirectory().TrimEnd('/', '\\').ShouldBe(worktreePath);
                 }
@@ -414,7 +414,7 @@ public void GetProjectRootDirectory_NoWorktree()
                     TargetPath = fixture.RepositoryPath
                 };
 
-                var gitPreparer = new GitPreparer(log, arguments);
+                var gitPreparer = new GitPreparer(log, Options.Create(arguments));
                 var expectedPath = fixture.RepositoryPath.TrimEnd('/', '\\');
                 gitPreparer.GetProjectRootDirectory().TrimEnd('/', '\\').ShouldBe(expectedPath);
             });
@@ -451,7 +451,7 @@ public void GetDotGitDirectory_NoWorktree()
                     TargetPath = fixture.RepositoryPath
                 };
 
-                var gitPreparer = new GitPreparer(log, arguments);
+                var gitPreparer = new GitPreparer(log, Options.Create(arguments));
                 var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
                 gitPreparer.GetDotGitDirectory().ShouldBe(expectedPath);
             });
@@ -479,7 +479,7 @@ public void GetDotGitDirectory_Worktree()
                         TargetPath = worktreePath
                     };
 
-                    var gitPreparer = new GitPreparer(log, arguments);
+                    var gitPreparer = new GitPreparer(log, Options.Create(arguments));
                     var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
                     gitPreparer.GetDotGitDirectory().ShouldBe(expectedPath);
                 }
@@ -524,7 +524,7 @@ private void RepositoryScope(ILog _log, Action<EmptyRepositoryFixture, VersionVa
             var arguments = new Arguments { TargetPath = fixture.RepositoryPath };
             var options = Options.Create(arguments);
 
-            var gitPreparer = new GitPreparer(_log, arguments);
+            var gitPreparer = new GitPreparer(_log, options);
             var stepFactory = new ConfigInitStepFactory();
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
             var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer, configInitWizard);
@@ -547,7 +547,7 @@ private GitVersionCalculator GetGitVersionCalculator(Arguments arguments)
         {
             var options = Options.Create(arguments);
 
-            var gitPreparer = new GitPreparer(log, arguments);
+            var gitPreparer = new GitPreparer(log, options);
             var stepFactory = new ConfigInitStepFactory();
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
             var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
diff --git a/src/GitVersionCore.Tests/Init/InitScenarios.cs b/src/GitVersionCore.Tests/Init/InitScenarios.cs
@@ -7,6 +7,7 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Shouldly;
 
@@ -44,7 +45,7 @@ public void CanSetNextVersion()
             var configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
             var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
 
-            var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = workingDirectory });
+            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = workingDirectory }));
             var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
             configurationProvider.Init(workingDirectory);
diff --git a/src/GitVersionCore.Tests/NamedConfigFileLocatorTests.cs b/src/GitVersionCore.Tests/NamedConfigFileLocatorTests.cs
@@ -6,6 +6,7 @@
 using GitVersion;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
+using Microsoft.Extensions.Options;
 
 namespace GitVersionCore.Tests
 {
@@ -60,7 +61,7 @@ public void NoWarnOnCustomYmlFile()
 
             configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
 
-            var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
+            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
             var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
@@ -80,7 +81,7 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
             log = new Log(logAppender);
 
             configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
-            var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
+            var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
             var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
diff --git a/src/GitVersionCore/GitPreparer.cs b/src/GitVersionCore/GitPreparer.cs
@@ -4,6 +4,7 @@
 using GitVersion.Helpers;
 using GitVersion.Logging;
 using LibGit2Sharp;
+using Microsoft.Extensions.Options;
 
 namespace GitVersion
 {
@@ -17,9 +18,10 @@ public class GitPreparer : IGitPreparer
         private const string defaultRemoteName = "origin";
         private string dynamicGitRepositoryPath;
 
-        public GitPreparer(ILog log, Arguments arguments)
+        public GitPreparer(ILog log, IOptions<Arguments> options)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
+            var arguments = options.Value;
 
             TargetUrl = arguments.TargetUrl;
             WorkingDirectory = arguments.TargetPath.TrimEnd('/', '\\');
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -13,7 +13,7 @@ namespace GitVersion
     /// </summary>
     public class GitVersionContext
     {
-        public ILog Log { get; set; }
+        public ILog Log { get; }
 
         public GitVersionContext(IRepository repository, ILog log, string targetBranch, Config configuration, bool onlyEvaluateTrackedBranches = true, string commitId = null)
              : this(repository, log, GetTargetBranch(repository, targetBranch), configuration, onlyEvaluateTrackedBranches, commitId)
diff --git a/src/GitVersionCore/GitVersionCoreModule.cs b/src/GitVersionCore/GitVersionCoreModule.cs
@@ -32,8 +32,8 @@ public void RegisterTypes(IServiceCollection services)
             services.AddSingleton<IGitVersionCalculator, GitVersionCalculator>();
 
             services.AddSingleton<IBuildServerResolver, BuildServerResolver>();
+            services.AddSingleton<IGitPreparer, GitPreparer>();
 
-            services.AddSingleton(GetGitPreparer);
             services.AddSingleton(GetConfigFileLocator);
 
             RegisterBuildServers(services);
@@ -56,14 +56,6 @@ private static IConfigFileLocator GetConfigFileLocator(IServiceProvider sp)
             return configFileLocator;
         }
 
-        private static IGitPreparer GetGitPreparer(IServiceProvider sp)
-        {
-            var log = sp.GetService<ILog>();
-            var arguments = sp.GetService<IOptions<Arguments>>();
-
-            return new GitPreparer(log, arguments.Value);
-        }
-
         private static void RegisterBuildServers(IServiceCollection services)
         {
             services.AddSingleton<IBuildServer, ContinuaCi>();
diff --git a/src/GitVersionExe/GitVersionExecutor.cs b/src/GitVersionExe/GitVersionExecutor.cs
@@ -17,10 +17,11 @@ public class GitVersionExecutor : IGitVersionExecutor
         private readonly IExecCommand execCommand;
         private readonly IConfigurationProvider configurationProvider;
         private readonly IBuildServerResolver buildServerResolver;
+        private readonly IGitPreparer gitPreparer;
         private readonly IVersionWriter versionWriter;
 
         public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IVersionWriter versionWriter, IHelpWriter helpWriter,
-            IExecCommand execCommand, IConfigurationProvider configurationProvider, IBuildServerResolver buildServerResolver)
+            IExecCommand execCommand, IConfigurationProvider configurationProvider, IBuildServerResolver buildServerResolver, IGitPreparer gitPreparer)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
@@ -29,6 +30,7 @@ public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IVersi
             this.execCommand = execCommand ?? throw new ArgumentNullException(nameof(execCommand));
             this.configurationProvider = configurationProvider ?? throw new ArgumentNullException(nameof(configFileLocator));
             this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
+            this.gitPreparer = gitPreparer;
         }
 
         public int Execute(Arguments arguments)
@@ -98,7 +100,7 @@ private int VerifyArgumentsAndRun(Arguments arguments)
                     log.Info("Working directory: " + targetPath);
                 }
 
-                VerifyConfiguration(arguments);
+                VerifyConfiguration();
 
                 if (arguments.Init)
                 {
@@ -144,9 +146,8 @@ private int VerifyArgumentsAndRun(Arguments arguments)
             return 0;
         }
 
-        private void VerifyConfiguration(Arguments arguments)
+        private void VerifyConfiguration()
         {
-            var gitPreparer = new GitPreparer(log, arguments);
             configFileLocator.Verify(gitPreparer);
         }
 
diff --git a/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs b/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs
@@ -68,7 +68,7 @@ public void Finds_GitDirectory()
                 var arguments = new Arguments { TargetPath = workDirectory, NoFetch = true };
                 var options = Options.Create(arguments);
 
-                var gitPreparer = new GitPreparer(log, arguments);
+                var gitPreparer = new GitPreparer(log, options);
                 var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
                 var baseVersionCalculator = new BaseVersionCalculator(log, null);
@@ -100,7 +100,7 @@ public void Finds_GitDirectory_In_Parent()
                 var arguments = new Arguments { TargetPath = childDir, NoFetch = true };
                 var options = Options.Create(arguments);
 
-                var gitPreparer = new GitPreparer(log, arguments);
+                var gitPreparer = new GitPreparer(log, options);
                 var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer, configInitWizard);
                 var baseVersionCalculator = new BaseVersionCalculator(log, null);
                 var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using GitVersion.SemanticVersioning;`
`11`	`11`	`using GitVersion.VersionCalculation;`
`12`	`12`	`using GitVersionCore.Tests.VersionCalculation;`
	`13`	`+using Microsoft.Extensions.Options;`
`13`	`14`
`14`	`15`	`namespace GitVersionCore.Tests`
`15`	`16`	`{`
`@@ -99,7 +100,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)`
`99`	`100`	`Authentication = new Authentication(),`
`100`	`101`	`TargetPath = fixture.LocalRepositoryFixture.RepositoryPath`
`101`	`102`	`};`
`102`		`- new GitPreparer(log, arguments).Prepare(true, null);`
	`103`	`+ new GitPreparer(log, Options.Create(arguments)).Prepare(true, null);`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace GitVersion`
`13`	`13`	`/// </summary>`
`14`	`14`	`public class GitVersionContext`
`15`	`15`	`{`
`16`		`- public ILog Log { get; set; }`
	`16`	`+ public ILog Log { get; }`
`17`	`17`
`18`	`18`	`public GitVersionContext(IRepository repository, ILog log, string targetBranch, Config configuration, bool onlyEvaluateTrackedBranches = true, string commitId = null)`
`19`	`19`	`: this(repository, log, GetTargetBranch(repository, targetBranch), configuration, onlyEvaluateTrackedBranches, commitId)`