moving to DI ConfigInit

arturcic · arturcic · commit fa2f7a4e81c3 · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.cs b/src/GitVersionCore.Tests/ConfigProviderTests.cs
@@ -11,6 +11,7 @@
 using GitVersion.VersioningModes;
 using GitVersion.Extensions;
 using GitVersion;
+using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests
@@ -24,17 +25,19 @@ public class ConfigProviderTests : TestBase
         private IFileSystem fileSystem;
         private IConfigFileLocator configFileLocator;
         private IConfigurationProvider configurationProvider;
+        private IConfigInitWizard configInitWizard;
 
         [SetUp]
         public void Setup()
         {
             fileSystem = new TestFileSystem();
             var log = new NullLog();
+            configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), fileSystem, log);
             configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
             repoPath = DefaultRepoPath;
 
             var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
-            configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
+            configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
         }
@@ -290,7 +293,7 @@ public void NoWarnOnGitVersionYmlFile()
             var defaultConfigFileLocator = new DefaultConfigFileLocator(fileSystem, log);
             var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
 
-            configurationProvider = new ConfigurationProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer);
+            configurationProvider = new ConfigurationProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer, configInitWizard);
 
             configurationProvider.Provide(repoPath);
 
diff --git a/src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs b/src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs
@@ -5,6 +5,7 @@
 using GitVersion.Configuration;
 using GitVersion.Exceptions;
 using GitVersion;
+using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests
@@ -91,7 +92,9 @@ public void NoWarnOnGitVersionYmlFile()
                 var log = new NullLog();
                 var defaultConfigFileLocator = new DefaultConfigFileLocator(fileSystem, log);
                 var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
-                var configurationProvider = new ConfigurationProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer);
+                var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), fileSystem, log);
+
+                var configurationProvider = new ConfigurationProvider(fileSystem, log, defaultConfigFileLocator, gitPreparer, configInitWizard);
 
                 configurationProvider.Provide(repoPath); 
             });
diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs
@@ -2,6 +2,7 @@
 using GitVersion;
 using GitVersion.Cache;
 using GitVersion.Configuration;
+using GitVersion.Configuration.Init.Wizard;
 using NUnit.Framework;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -94,7 +95,9 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             var gitVersionFinder = new GitVersionFinder(log, nextVersionCalculator);
 
             var gitPreparer = new GitPreparer(log, arguments);
-            var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer);
+            var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), testFileSystem, log);
+
+            var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer, configInitWizard);
             
             var variableProvider = new VariableProvider(nextVersionCalculator);
             var gitVersionCalculator = new GitVersionCalculator(testFileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider, options);
diff --git a/src/GitVersionCore.Tests/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/GitVersionExecutorTests.cs
@@ -9,6 +9,7 @@
 using GitVersion.Configuration;
 using GitVersion.OutputVariables;
 using GitVersion.Cache;
+using GitVersion.Configuration.Init.Wizard;
 using LibGit2Sharp;
 using GitVersionCore.Tests.Helpers;
 using GitVersion.Logging;
@@ -524,7 +525,8 @@ private void RepositoryScope(ILog _log, Action<EmptyRepositoryFixture, VersionVa
             var options = Options.Create(arguments);
 
             var gitPreparer = new GitPreparer(_log, arguments);
-            var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer);
+            var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), fileSystem, log);
+            var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer, configInitWizard);
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
@@ -545,7 +547,8 @@ private GitVersionCalculator GetGitVersionCalculator(Arguments arguments)
             var options = Options.Create(arguments);
 
             var gitPreparer = new GitPreparer(log, arguments);
-            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
+            var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), fileSystem, log);
+            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
             var baseVersionCalculator = new BaseVersionCalculator(log, null);
             var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
             var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
diff --git a/src/GitVersionCore.Tests/Init/InitScenarios.cs b/src/GitVersionCore.Tests/Init/InitScenarios.cs
@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using GitVersion;
 using GitVersion.Configuration;
+using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using NUnit.Framework;
 using Shouldly;
@@ -25,13 +26,14 @@ public void CanSetNextVersion()
             var log = new NullLog();
             var fileSystem = new TestFileSystem();
             var testConsole = new TestConsole("3", "2.0.0", "0");
+            var configInitWizard = new ConfigInitWizard(testConsole, fileSystem, log);
             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 configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
+            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
-            configurationProvider.Init(workingDirectory, testConsole);
+            configurationProvider.Init(workingDirectory);
 
             fileSystem.ReadAllText(Path.Combine(workingDirectory, "GitVersion.yml")).ShouldMatchApproved();
         }
diff --git a/src/GitVersionCore.Tests/NamedConfigFileLocatorTests.cs b/src/GitVersionCore.Tests/NamedConfigFileLocatorTests.cs
@@ -4,6 +4,7 @@
 using GitVersion.Configuration;
 using GitVersion.Exceptions;
 using GitVersion;
+using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests
@@ -58,7 +59,8 @@ public void NoWarnOnCustomYmlFile()
             configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
 
             var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
-            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
+            var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), fileSystem, log);
+            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
             configurationProvider.Provide(repoPath);
             stringLogger.Length.ShouldBe(0);
@@ -77,7 +79,8 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
 
             configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
             var gitPreparer = new GitPreparer(log, new Arguments { TargetPath = repoPath });
-            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
+            var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), fileSystem, log);
+            var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer, configInitWizard);
 
             configurationProvider.Provide(repoPath);
             stringLogger.Length.ShouldBe(0);
diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -11,16 +11,17 @@ public class ConfigurationProvider : IConfigurationProvider
         private readonly ILog log;
         private readonly IConfigFileLocator configFileLocator;
         private readonly IGitPreparer gitPreparer;
+        private readonly IConfigInitWizard configInitWizard;
 
-        public ConfigurationProvider(IFileSystem fileSystem, ILog log, IConfigFileLocator configFileLocator, IGitPreparer gitPreparer)
+        public ConfigurationProvider(IFileSystem fileSystem, ILog log, IConfigFileLocator configFileLocator, IGitPreparer gitPreparer, IConfigInitWizard configInitWizard)
         {
             this.fileSystem = fileSystem;
             this.log = log;
             this.configFileLocator = configFileLocator;
             this.gitPreparer = gitPreparer;
+            this.configInitWizard = configInitWizard;
         }
 
-
         public Config Provide(bool applyDefaults = true, Config overrideConfig = null)
         {
             var workingDirectory = gitPreparer.WorkingDirectory;
@@ -56,11 +57,12 @@ public string GetEffectiveConfigAsString(string workingDirectory)
             return stringBuilder.ToString();
         }
 
-        public void Init(string workingDirectory, IConsole console)
+        public void Init(string workingDirectory)
         {
             var configFilePath = configFileLocator.GetConfigFilePath(workingDirectory);
             var currentConfiguration = Provide(workingDirectory, false);
-            var config = new ConfigInitWizard(console, fileSystem, log).Run(currentConfiguration, workingDirectory);
+
+            var config = configInitWizard.Run(currentConfiguration, workingDirectory);
             if (config == null) return;
 
             using var stream = fileSystem.OpenWrite(configFilePath);
diff --git a/src/GitVersionCore/Configuration/IConfigurationProvider.cs b/src/GitVersionCore/Configuration/IConfigurationProvider.cs
@@ -5,6 +5,6 @@ public interface IConfigurationProvider
         Config Provide(bool applyDefaults = true, Config overrideConfig = null);
         Config Provide(string workingDirectory, bool applyDefaults = true, Config overrideConfig = null);
         string GetEffectiveConfigAsString(string workingDirectory);
-        void Init(string workingDirectory, IConsole console);
+        void Init(string workingDirectory);
     }
 }
diff --git a/src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs b/src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs
@@ -15,12 +15,10 @@ internal enum ProjectVisibility
 
     internal class AppVeyorSetup : ConfigInitWizardStep
     {
-        private readonly ILog log;
         private readonly ProjectVisibility _projectVisibility;
 
-        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log,  ProjectVisibility visibility) : base(console, fileSystem, log)
+        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, ProjectVisibility visibility) : base(console, fileSystem, log)
         {
-            this.log = log;
             _projectVisibility = visibility;
         }
 
@@ -91,7 +89,7 @@ private void WriteConfig(string workingDirectory, IFileSystem fileSystem, string
         {
             var outputFilename = GetOutputFilename(workingDirectory, fileSystem);
             fileSystem.WriteAllText(outputFilename, configContents);
-            log.Info($"AppVeyor sample config file written to {outputFilename}");
+            Log.Info($"AppVeyor sample config file written to {outputFilename}");
         }
 
         protected override string GetPrompt(Config config, string workingDirectory)
diff --git a/src/GitVersionCore/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs b/src/GitVersionCore/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
@@ -6,7 +6,6 @@ namespace GitVersion.Configuration.Init.BuildServer
 {
     internal class AppveyorPublicPrivate : ConfigInitWizardStep
     {
-
         public AppveyorPublicPrivate(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
         }
diff --git a/src/GitVersionCore/Configuration/Init/GitVersionInitModule.cs b/src/GitVersionCore/Configuration/Init/GitVersionInitModule.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using GitVersion.Configuration.Init.Wizard;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GitVersion.Configuration.Init
+{
+    public class GitVersionInitModule : IGitVersionModule
+    {
+        public void RegisterTypes(IServiceCollection services)
+        {
+            services.AddTransient<IConfigInitWizard, ConfigInitWizard>();
+
+            var steps = FindAllDerivedTypes<ConfigInitWizardStep>(Assembly.GetExecutingAssembly());
+
+            foreach (var step in steps)
+            {
+                services.AddTransient(step);
+            }
+        }
+
+        private static IEnumerable<Type> FindAllDerivedTypes<T>(Assembly assembly)
+        {
+            var derivedType = typeof(T);
+            return assembly.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t));
+        } 
+    }
+}
diff --git a/src/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizard.cs b/src/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizard.cs
@@ -3,7 +3,7 @@
 
 namespace GitVersion.Configuration.Init.Wizard
 {
-    public class ConfigInitWizard
+    public class ConfigInitWizard : IConfigInitWizard
     {
         private readonly IConsole console;
         private readonly IFileSystem fileSystem;
diff --git a/src/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizardStep.cs b/src/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizardStep.cs
@@ -6,6 +6,9 @@ namespace GitVersion.Configuration.Init.Wizard
 {
     public abstract class ConfigInitWizardStep
     {
+        protected readonly IConsole Console;
+        protected readonly IFileSystem FileSystem;
+        protected readonly ILog Log;
 
         protected ConfigInitWizardStep(IConsole console, IFileSystem fileSystem, ILog log)
         {
@@ -14,11 +17,6 @@ protected ConfigInitWizardStep(IConsole console, IFileSystem fileSystem, ILog lo
             Log = log;
         }
 
-        protected IConsole Console { get; private set; }
-
-        protected IFileSystem FileSystem { get; private set; }
-        protected ILog Log { get; private set; }
-
         public bool Apply(Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
         {
             Console.WriteLine();
diff --git a/src/GitVersionCore/Configuration/Init/Wizard/IConfigInitWizard.cs b/src/GitVersionCore/Configuration/Init/Wizard/IConfigInitWizard.cs
@@ -0,0 +1,7 @@
+namespace GitVersion.Configuration.Init.Wizard
+{
+    public interface IConfigInitWizard
+    {
+        Config Run(Config config, string workingDirectory);
+    }
+}
diff --git a/src/GitVersionExe/GitVersionExecutor.cs b/src/GitVersionExe/GitVersionExecutor.cs
@@ -17,11 +17,10 @@ public class GitVersionExecutor : IGitVersionExecutor
         private readonly IExecCommand execCommand;
         private readonly IConfigurationProvider configurationProvider;
         private readonly IBuildServerResolver buildServerResolver;
-        private readonly IConsole console;
         private readonly IVersionWriter versionWriter;
 
         public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IVersionWriter versionWriter, IHelpWriter helpWriter,
-            IExecCommand execCommand, IConfigurationProvider configurationProvider, IBuildServerResolver buildServerResolver, IConsole console)
+            IExecCommand execCommand, IConfigurationProvider configurationProvider, IBuildServerResolver buildServerResolver)
         {
             this.log = log;
             this.configFileLocator = configFileLocator;
@@ -30,7 +29,6 @@ public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IVersi
             this.execCommand = execCommand;
             this.configurationProvider = configurationProvider;
             this.buildServerResolver = buildServerResolver;
-            this.console = console;
         }
 
         public int Execute(Arguments arguments)
@@ -55,6 +53,7 @@ private int VerifyArgumentsAndRun(Arguments arguments)
                     helpWriter.Write();
                     return 1;
                 }
+                var targetPath = arguments.TargetPath;
 
                 if (arguments.IsVersion)
                 {
@@ -88,27 +87,27 @@ private int VerifyArgumentsAndRun(Arguments arguments)
                 if (arguments.Diag)
                 {
                     log.Info("Dumping commit graph: ");
-                    LibGitExtensions.DumpGraph(arguments.TargetPath, mess => log.Info(mess), 100);
+                    LibGitExtensions.DumpGraph(targetPath, mess => log.Info(mess), 100);
                 }
-                if (!Directory.Exists(arguments.TargetPath))
+                if (!Directory.Exists(targetPath))
                 {
-                    log.Warning($"The working directory '{arguments.TargetPath}' does not exist.");
+                    log.Warning($"The working directory '{targetPath}' does not exist.");
                 }
                 else
                 {
-                    log.Info("Working directory: " + arguments.TargetPath);
+                    log.Info("Working directory: " + targetPath);
                 }
 
                 VerifyConfiguration(arguments);
 
                 if (arguments.Init)
                 {
-                    configurationProvider.Init(arguments.TargetPath, console);
+                    configurationProvider.Init(targetPath);
                     return 0;
                 }
                 if (arguments.ShowConfig)
                 {
-                    Console.WriteLine(configurationProvider.GetEffectiveConfigAsString(arguments.TargetPath));
+                    Console.WriteLine(configurationProvider.GetEffectiveConfigAsString(targetPath));
                     return 0;
                 }
 
diff --git a/src/GitVersionExe/Program.cs b/src/GitVersionExe/Program.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using GitVersion.Configuration.Init;
 using GitVersion.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,6 +23,7 @@ private static IHostBuilder CreateHostBuilder(string[] args) =>
                 })
                 .ConfigureServices((hostContext, services) =>
                 {
+                    services.AddModule(new GitVersionInitModule());
                     services.AddModule(new GitVersionCoreModule());
                     services.AddModule(new GitVersionExeModule());
 
diff --git a/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs b/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ public interface IConfigurationProvider`
`5`	`5`	`Config Provide(bool applyDefaults = true, Config overrideConfig = null);`
`6`	`6`	`Config Provide(string workingDirectory, bool applyDefaults = true, Config overrideConfig = null);`
`7`	`7`	`string GetEffectiveConfigAsString(string workingDirectory);`
`8`		`- void Init(string workingDirectory, IConsole console);`
	`8`	`+ void Init(string workingDirectory);`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,10 @@ internal enum ProjectVisibility`
`15`	`15`
`16`	`16`	`internal class AppVeyorSetup : ConfigInitWizardStep`
`17`	`17`	`{`
`18`		`- private readonly ILog log;`
`19`	`18`	`private readonly ProjectVisibility _projectVisibility;`
`20`	`19`
`21`		`- public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, ProjectVisibility visibility) : base(console, fileSystem, log)`
	`20`	`+ public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, ProjectVisibility visibility) : base(console, fileSystem, log)`
`22`	`21`	`{`
`23`		`- this.log = log;`
`24`	`22`	`_projectVisibility = visibility;`
`25`	`23`	`}`
`26`	`24`
`@@ -91,7 +89,7 @@ private void WriteConfig(string workingDirectory, IFileSystem fileSystem, string`
`91`	`89`	`{`
`92`	`90`	`var outputFilename = GetOutputFilename(workingDirectory, fileSystem);`
`93`	`91`	`fileSystem.WriteAllText(outputFilename, configContents);`
`94`		`- log.Info($"AppVeyor sample config file written to {outputFilename}");`
	`92`	`+ Log.Info($"AppVeyor sample config file written to {outputFilename}");`
`95`	`93`	`}`
`96`	`94`
`97`	`95`	`protected override string GetPrompt(Config config, string workingDirectory)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace GitVersion.Configuration.Init.BuildServer`
`6`	`6`	`{`
`7`	`7`	`internal class AppveyorPublicPrivate : ConfigInitWizardStep`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`public AppveyorPublicPrivate(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)`
`11`	`10`	`{`
`12`	`11`	`}`