introduced ConfigFileLocatorFactory

Author: arturcic

src/GitVersionCore.Tests/NamedConfigFileLocatorTests.cs

@@ -22,13 +22,16 @@ public class NamedConfigFileLocatorTests : TestBase
         private NamedConfigFileLocator configFileLocator;
         private ILog log;
         private IConfigInitStepFactory stepFactory;
+        private IOptions<Arguments> options;
 
         [SetUp]
         public void Setup()
         {
             fileSystem = new TestFileSystem();
             log = new NullLog();
-            configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
+
+            options = Options.Create(new Arguments { ConfigFile = "my-config.yaml" });
+            configFileLocator = new NamedConfigFileLocator(fileSystem, log, options);
             repoPath = DefaultRepoPath;
             workingPath = DefaultWorkingPath;
             stepFactory = new ConfigInitStepFactory();
@@ -59,7 +62,7 @@ public void NoWarnOnCustomYmlFile()
             var logAppender = new TestLogAppender(Action);
             log = new Log(logAppender);
 
-            configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
+            configFileLocator = new NamedConfigFileLocator(fileSystem, log, options);
 
             var gitPreparer = new GitPreparer(log, Options.Create(new Arguments { TargetPath = repoPath }));
             var configInitWizard = new ConfigInitWizard(new ConsoleAdapter(), stepFactory);
@@ -80,7 +83,7 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
             var logAppender = new TestLogAppender(Action);
             log = new Log(logAppender);
 
-            configFileLocator = new NamedConfigFileLocator("my-config.yaml", fileSystem, log);
+            configFileLocator = new NamedConfigFileLocator(fileSystem, log, options);
             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);

src/GitVersionCore/Configuration/ConfigFileLocatorFactory.cs

@@ -0,0 +1,27 @@
+using System;
+using GitVersion.Logging;
+using Microsoft.Extensions.Options;
+
+namespace GitVersion.Configuration
+{
+    public class ConfigFileLocatorFactory : IConfigFileLocatorFactory
+    {
+        private readonly IFileSystem fileSystem;
+        private readonly ILog log;
+        private readonly IOptions<Arguments> options;
+
+        public ConfigFileLocatorFactory(IFileSystem fileSystem, ILog log, IOptions<Arguments> options)
+        {
+            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+            this.log = log ?? throw new ArgumentNullException(nameof(log));
+            this.options = options ?? throw new ArgumentNullException(nameof(fileSystem));
+        }
+
+        public IConfigFileLocator Create()
+        {
+            return string.IsNullOrWhiteSpace(options.Value.ConfigFile)
+                ? new DefaultConfigFileLocator(fileSystem, log) as IConfigFileLocator
+                : new NamedConfigFileLocator(fileSystem, log, options);
+        }
+    }
+}

src/GitVersionCore/Configuration/IConfigFileLocatorFactory.cs

@@ -0,0 +1,7 @@
+namespace GitVersion.Configuration
+{
+    public interface IConfigFileLocatorFactory
+    {
+        IConfigFileLocator Create();
+    }
+}

src/GitVersionCore/Configuration/NamedConfigFileLocator.cs

@@ -2,13 +2,16 @@
 using System.IO;
 using GitVersion.Exceptions;
 using GitVersion.Logging;
+using Microsoft.Extensions.Options;
 
 namespace GitVersion.Configuration
 {
     public class NamedConfigFileLocator : ConfigFileLocator
     {
-        public NamedConfigFileLocator(string filePath, IFileSystem fileSystem, ILog log) : base(fileSystem, log)
+        public NamedConfigFileLocator(IFileSystem fileSystem, ILog log, IOptions<Arguments> options) : base(fileSystem, log)
         {
+            var arguments = options.Value;
+            var filePath = arguments.ConfigFile;
             if (string.IsNullOrEmpty(filePath)) throw new ArgumentNullException(nameof(filePath), "Empty file path provided!");
             FilePath = filePath;
         }

src/GitVersionCore/GitVersionCoreModule.cs

@@ -1,4 +1,3 @@
-using System;
 using GitVersion.BuildServers;
 using GitVersion.Cache;
 using Microsoft.Extensions.DependencyInjection;
@@ -7,7 +6,6 @@
 using GitVersion.OutputVariables;
 using GitVersion.VersionCalculation;
 using GitVersion.VersionCalculation.BaseVersionCalculators;
-using Microsoft.Extensions.Options;
 using GitVersion.Configuration.Init;
 using GitVersion.Extensions;
 
@@ -35,8 +33,9 @@ public void RegisterTypes(IServiceCollection services)
 
             services.AddSingleton<IBuildServerResolver, BuildServerResolver>();
             services.AddSingleton<IGitPreparer, GitPreparer>();
+            services.AddSingleton<IConfigFileLocatorFactory, ConfigFileLocatorFactory>();
 
-            services.AddSingleton(GetConfigFileLocator);
+            services.AddSingleton(sp => sp.GetService<IConfigFileLocatorFactory>().Create());
 
             RegisterBuildServers(services);
 
@@ -45,21 +44,6 @@ public void RegisterTypes(IServiceCollection services)
             services.AddModule(new GitVersionInitModule());
         }
 
-        private static IConfigFileLocator GetConfigFileLocator(IServiceProvider sp)
-        {
-            var fileSystem = sp.GetService<IFileSystem>();
-            var log = sp.GetService<ILog>();
-            var arguments = sp.GetService<IOptions<Arguments>>();
-
-            var configFile = arguments.Value.ConfigFile;
-
-            var configFileLocator = string.IsNullOrWhiteSpace(configFile)
-                ? new DefaultConfigFileLocator(fileSystem, log) as IConfigFileLocator
-                : new NamedConfigFileLocator(configFile, fileSystem, log);
-
-            return configFileLocator;
-        }
-
         private static void RegisterBuildServers(IServiceCollection services)
         {
             services.AddSingleton<IBuildServer, ContinuaCi>();