removed ConfigFileLocator from Arguments class

arturcic · arturcic · commit cab0c76d948a · 2019-10-17T11:48:45.000+03:00
diff --git a/src/GitVersionCore/Arguments.cs b/src/GitVersionCore/Arguments.cs
@@ -20,9 +20,9 @@ public Arguments()
 
         public Config OverrideConfig;
         public bool HasOverrideConfig { get; set; }
-        public IConfigFileLocator ConfigFileLocator { get; set; }
 
         public string TargetPath;
+        public string ConfigFile;
 
         public string TargetUrl;
         public string TargetBranch;
diff --git a/src/GitVersionExe.Tests/ArgumentParserTests.cs b/src/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -6,7 +6,6 @@
 using GitVersion.Exceptions;
 using GitVersion.Logging;
 using GitVersion.OutputFormatters;
-using GitVersionExe.Tests.Helpers;
 
 namespace GitVersionExe.Tests
 {
@@ -18,7 +17,7 @@ public class ArgumentParserTests
         [SetUp]
         public void SetUp()
         {
-            argumentParser = new ArgumentParser(new TestFileSystem(), new NullLog());
+            argumentParser = new ArgumentParser();
         }
 
         [Test]
diff --git a/src/GitVersionExe.Tests/HelpWriterTests.cs b/src/GitVersionExe.Tests/HelpWriterTests.cs
@@ -28,7 +28,8 @@ public void AllArgsAreInHelp()
                 { "DynamicRepositoryLocation" , "/dynamicRepoLocation" },
                 { "IsHelp", "/?" },
                 { "IsVersion", "/version" },
-                { "UpdateWixVersionFile", "/updatewixversionfile" }
+                { "UpdateWixVersionFile", "/updatewixversionfile" },
+                { "ConfigFile", "/config" },
             };
             string helpText = null;
 
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -3,8 +3,6 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
-using GitVersion.Common;
-using GitVersion.Configuration;
 using GitVersion.Exceptions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -15,15 +13,6 @@ namespace GitVersion
 {
     public class ArgumentParser : IArgumentParser
     {
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-
-        public ArgumentParser(IFileSystem fileSystem, ILog log)
-        {
-            this.fileSystem = fileSystem;
-            this.log = log;
-        }
-
         public Arguments ParseArguments()
         {
             var argumentsWithoutExeName = GetArgumentsWithoutExeName();
@@ -38,7 +27,7 @@ public Arguments ParseArguments()
                 Console.WriteLine("Failed to parse arguments: {0}", string.Join(" ", argumentsWithoutExeName));
                 if (!string.IsNullOrWhiteSpace(exception.Message))
                 {
-                    log.Error(exception.Message);
+                    Console.WriteLine(exception.Message);
                 }
 
                 return arguments;
@@ -58,13 +47,11 @@ public Arguments ParseArguments(string commandLineArguments)
 
         public Arguments ParseArguments(List<string> commandLineArguments)
         {
-            var configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
             if (commandLineArguments.Count == 0)
             {
                 return new Arguments
                 {
                     TargetPath = Environment.CurrentDirectory,
-                    ConfigFileLocator = configFileLocator
                 };
             }
 
@@ -75,7 +62,6 @@ public Arguments ParseArguments(List<string> commandLineArguments)
                 return new Arguments
                 {
                     IsHelp = true,
-                    ConfigFileLocator = configFileLocator
                 };
             }
 
@@ -85,14 +71,10 @@ public Arguments ParseArguments(List<string> commandLineArguments)
                 {
                     TargetPath = Environment.CurrentDirectory,
                     Init = true,
-                    ConfigFileLocator = configFileLocator
                 };
             }
 
-            var arguments = new Arguments
-            {
-                ConfigFileLocator = configFileLocator
-            };
+            var arguments = new Arguments();
             var switchesAndValues = CollectSwitchesAndValuesFromArguments(commandLineArguments, out var firstArgumentIsSwitch);
 
             for (var i = 0; i < switchesAndValues.AllKeys.Length; i++)
@@ -118,7 +100,7 @@ public Arguments ParseArguments(List<string> commandLineArguments)
                 if (name.IsSwitch("config"))
                 {
                     EnsureArgumentValueCount(values);
-                    arguments.ConfigFileLocator = new NamedConfigFileLocator(value, fileSystem, log);
+                    arguments.ConfigFile = value;
                     continue;
                 }
 
diff --git a/src/GitVersionExe/ExecCommand.cs b/src/GitVersionExe/ExecCommand.cs
@@ -10,6 +10,7 @@
 using GitVersion.Extensions;
 using GitVersion.Extensions.VersionAssemblyInfoResources;
 using GitVersion.Common;
+using GitVersion.Configuration;
 using GitVersion.Logging;
 
 namespace GitVersion
@@ -19,7 +20,7 @@ public class ExecCommand
         private static readonly bool runningOnUnix = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
         public static readonly string BuildTool = GetMsBuildToolPath();
 
-        public void Execute(Arguments arguments, IFileSystem fileSystem, IEnvironment environment, ILog log)
+        public void Execute(Arguments arguments, IFileSystem fileSystem, IEnvironment environment, ILog log, IConfigFileLocator configFileLocator)
         {
             log.Info($"Running on {(runningOnUnix ? "Unix" : "Windows")}.");
 
@@ -34,7 +35,7 @@ public void Execute(Arguments arguments, IFileSystem fileSystem, IEnvironment en
             var noCache = arguments.NoCache;
             var noNormalize = arguments.NoNormalize;
 
-            var executeCore = new ExecuteCore(fileSystem, environment, log, arguments.ConfigFileLocator);
+            var executeCore = new ExecuteCore(fileSystem, environment, log, configFileLocator);
             var variables = executeCore.ExecuteGitVersion(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, targetPath, commitId, overrideConfig, noCache, noNormalize);
 
             switch (arguments.Output)
diff --git a/src/GitVersionExe/GitVersionApplication.cs b/src/GitVersionExe/GitVersionApplication.cs
@@ -15,14 +15,16 @@ public class GitVersionApplication : IGitVersionApplication
         private readonly IFileSystem fileSystem;
         private readonly IEnvironment environment;
         private readonly ILog log;
+        private readonly IConfigFileLocator configFileLocator;
         private readonly IHelpWriter helpWriter;
         private readonly IVersionWriter versionWriter;
 
-        public GitVersionApplication(IFileSystem fileSystem, IEnvironment environment, ILog log)
+        public GitVersionApplication(IFileSystem fileSystem, IEnvironment environment, ILog log, IConfigFileLocator configFileLocator)
         {
             this.fileSystem = fileSystem;
             this.environment = environment;
             this.log = log;
+            this.configFileLocator = configFileLocator;
 
             versionWriter = new VersionWriter();
             helpWriter = new HelpWriter(versionWriter);
@@ -91,24 +93,24 @@ private int VerifyArgumentsAndRun(Arguments arguments)
                     log.Info("Working directory: " + arguments.TargetPath);
                 }
 
-                VerifyConfiguration(arguments, log);
+                VerifyConfiguration(arguments);
 
                 if (arguments.Init)
                 {
-                    ConfigurationProvider.Init(arguments.TargetPath, fileSystem, new ConsoleAdapter(), log, arguments.ConfigFileLocator);
+                    ConfigurationProvider.Init(arguments.TargetPath, fileSystem, new ConsoleAdapter(), log, configFileLocator);
                     return 0;
                 }
                 if (arguments.ShowConfig)
                 {
-                    Console.WriteLine(ConfigurationProvider.GetEffectiveConfigAsString(arguments.TargetPath, arguments.ConfigFileLocator));
+                    Console.WriteLine(ConfigurationProvider.GetEffectiveConfigAsString(arguments.TargetPath, configFileLocator));
                     return 0;
                 }
 
                 
 
                 var execCommand = new ExecCommand();
 
-                execCommand.Execute(arguments, fileSystem, environment, log);
+                execCommand.Execute(arguments, fileSystem, environment, log, configFileLocator);
             }
             catch (WarningException exception)
             {
@@ -141,10 +143,10 @@ private int VerifyArgumentsAndRun(Arguments arguments)
             return 0;
         }
 
-        private static void VerifyConfiguration(Arguments arguments, ILog log)
+        private void VerifyConfiguration(Arguments arguments)
         {
             var gitPreparer = new GitPreparer(log, arguments);
-            arguments.ConfigFileLocator.Verify(gitPreparer);
+            configFileLocator.Verify(gitPreparer);
         }
 
         private static void ConfigureLogging(Arguments arguments, ILog log)
diff --git a/src/GitVersionExe/Program.cs b/src/GitVersionExe/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using GitVersion.Common;
+using GitVersion.Configuration;
 using GitVersion.Logging;
 using Environment = GitVersion.Common.Environment;
 
@@ -10,16 +11,31 @@ class Program
     {
         static void Main()
         {
-            var log = new Log();
             var fileSystem = new FileSystem();
             var environment = new Environment();
-            var argumentParser = new ArgumentParser(fileSystem, log);
+            var argumentParser = new ArgumentParser();
             var arguments = argumentParser.ParseArguments();
-            log.Verbosity = arguments?.Verbosity ?? Verbosity.Normal;
 
-            var app = new GitVersionApplication(fileSystem, environment, log);
+            int exitCode;
+            if (arguments != null)
+            {
+                var log = new Log
+                {
+                    Verbosity = arguments.Verbosity
+                };
+
+                var configFileLocator = string.IsNullOrWhiteSpace(arguments.ConfigFile)
+                    ? (IConfigFileLocator) new DefaultConfigFileLocator(fileSystem, log)
+                    : new NamedConfigFileLocator(arguments.ConfigFile, fileSystem, log);
+
+                var app = new GitVersionApplication(fileSystem, environment, log, configFileLocator);
 
-            var exitCode = app.Run(arguments);
+                exitCode = app.Run(arguments);
+            }
+            else
+            {
+                exitCode = 1;
+            }
 
             if (Debugger.IsAttached)
             {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using GitVersion.Exceptions;`
`7`	`7`	`using GitVersion.Logging;`
`8`	`8`	`using GitVersion.OutputFormatters;`
`9`		`-using GitVersionExe.Tests.Helpers;`
`10`	`9`
`11`	`10`	`namespace GitVersionExe.Tests`
`12`	`11`	`{`
`@@ -18,7 +17,7 @@ public class ArgumentParserTests`
`18`	`17`	`[SetUp]`
`19`	`18`	`public void SetUp()`
`20`	`19`	`{`
`21`		`- argumentParser = new ArgumentParser(new TestFileSystem(), new NullLog());`
	`20`	`+ argumentParser = new ArgumentParser();`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`using System.Collections.Specialized;`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.Linq;`
`6`		`-using GitVersion.Common;`
`7`		`-using GitVersion.Configuration;`
`8`	`6`	`using GitVersion.Exceptions;`
`9`	`7`	`using GitVersion.Logging;`
`10`	`8`	`using GitVersion.OutputVariables;`
`@@ -15,15 +13,6 @@ namespace GitVersion`
`15`	`13`	`{`
`16`	`14`	`public class ArgumentParser : IArgumentParser`
`17`	`15`	`{`
`18`		`- private readonly IFileSystem fileSystem;`
`19`		`- private readonly ILog log;`
`20`		`-`
`21`		`- public ArgumentParser(IFileSystem fileSystem, ILog log)`
`22`		`- {`
`23`		`- this.fileSystem = fileSystem;`
`24`		`- this.log = log;`
`25`		`- }`
`26`		`-`
`27`	`16`	`public Arguments ParseArguments()`
`28`	`17`	`{`
`29`	`18`	`var argumentsWithoutExeName = GetArgumentsWithoutExeName();`
`@@ -38,7 +27,7 @@ public Arguments ParseArguments()`
`38`	`27`	`Console.WriteLine("Failed to parse arguments: {0}", string.Join(" ", argumentsWithoutExeName));`
`39`	`28`	`if (!string.IsNullOrWhiteSpace(exception.Message))`
`40`	`29`	`{`
`41`		`- log.Error(exception.Message);`
	`30`	`+ Console.WriteLine(exception.Message);`
`42`	`31`	`}`
`43`	`32`
`44`	`33`	`return arguments;`
`@@ -58,13 +47,11 @@ public Arguments ParseArguments(string commandLineArguments)`
`58`	`47`
`59`	`48`	`public Arguments ParseArguments(List<string> commandLineArguments)`
`60`	`49`	`{`
`61`		`- var configFileLocator = new DefaultConfigFileLocator(fileSystem, log);`
`62`	`50`	`if (commandLineArguments.Count == 0)`
`63`	`51`	`{`
`64`	`52`	`return new Arguments`
`65`	`53`	`{`
`66`	`54`	`TargetPath = Environment.CurrentDirectory,`
`67`		`- ConfigFileLocator = configFileLocator`
`68`	`55`	`};`
`69`	`56`	`}`
`70`	`57`
`@@ -75,7 +62,6 @@ public Arguments ParseArguments(List<string> commandLineArguments)`
`75`	`62`	`return new Arguments`
`76`	`63`	`{`
`77`	`64`	`IsHelp = true,`
`78`		`- ConfigFileLocator = configFileLocator`
`79`	`65`	`};`
`80`	`66`	`}`
`81`	`67`
`@@ -85,14 +71,10 @@ public Arguments ParseArguments(List<string> commandLineArguments)`
`85`	`71`	`{`
`86`	`72`	`TargetPath = Environment.CurrentDirectory,`
`87`	`73`	`Init = true,`
`88`		`- ConfigFileLocator = configFileLocator`
`89`	`74`	`};`
`90`	`75`	`}`
`91`	`76`
`92`		`- var arguments = new Arguments`
`93`		`- {`
`94`		`- ConfigFileLocator = configFileLocator`
`95`		`- };`
	`77`	`+ var arguments = new Arguments();`
`96`	`78`	`var switchesAndValues = CollectSwitchesAndValuesFromArguments(commandLineArguments, out var firstArgumentIsSwitch);`
`97`	`79`
`98`	`80`	`for (var i = 0; i < switchesAndValues.AllKeys.Length; i++)`
`@@ -118,7 +100,7 @@ public Arguments ParseArguments(List<string> commandLineArguments)`
`118`	`100`	`if (name.IsSwitch("config"))`
`119`	`101`	`{`
`120`	`102`	`EnsureArgumentValueCount(values);`
`121`		`- arguments.ConfigFileLocator = new NamedConfigFileLocator(value, fileSystem, log);`
	`103`	`+ arguments.ConfigFile = value;`
`122`	`104`	`continue;`
`123`	`105`	`}`
`124`	`106`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,16 @@ public class GitVersionApplication : IGitVersionApplication`
`15`	`15`	`private readonly IFileSystem fileSystem;`
`16`	`16`	`private readonly IEnvironment environment;`
`17`	`17`	`private readonly ILog log;`
	`18`	`+ private readonly IConfigFileLocator configFileLocator;`
`18`	`19`	`private readonly IHelpWriter helpWriter;`
`19`	`20`	`private readonly IVersionWriter versionWriter;`
`20`	`21`
`21`		`- public GitVersionApplication(IFileSystem fileSystem, IEnvironment environment, ILog log)`
	`22`	`+ public GitVersionApplication(IFileSystem fileSystem, IEnvironment environment, ILog log, IConfigFileLocator configFileLocator)`
`22`	`23`	`{`
`23`	`24`	`this.fileSystem = fileSystem;`
`24`	`25`	`this.environment = environment;`
`25`	`26`	`this.log = log;`
	`27`	`+ this.configFileLocator = configFileLocator;`
`26`	`28`
`27`	`29`	`versionWriter = new VersionWriter();`
`28`	`30`	`helpWriter = new HelpWriter(versionWriter);`
`@@ -91,24 +93,24 @@ private int VerifyArgumentsAndRun(Arguments arguments)`
`91`	`93`	`log.Info("Working directory: " + arguments.TargetPath);`
`92`	`94`	`}`
`93`	`95`
`94`		`- VerifyConfiguration(arguments, log);`
	`96`	`+ VerifyConfiguration(arguments);`
`95`	`97`
`96`	`98`	`if (arguments.Init)`
`97`	`99`	`{`
`98`		`- ConfigurationProvider.Init(arguments.TargetPath, fileSystem, new ConsoleAdapter(), log, arguments.ConfigFileLocator);`
	`100`	`+ ConfigurationProvider.Init(arguments.TargetPath, fileSystem, new ConsoleAdapter(), log, configFileLocator);`
`99`	`101`	`return 0;`
`100`	`102`	`}`
`101`	`103`	`if (arguments.ShowConfig)`
`102`	`104`	`{`
`103`		`- Console.WriteLine(ConfigurationProvider.GetEffectiveConfigAsString(arguments.TargetPath, arguments.ConfigFileLocator));`
	`105`	`+ Console.WriteLine(ConfigurationProvider.GetEffectiveConfigAsString(arguments.TargetPath, configFileLocator));`
`104`	`106`	`return 0;`
`105`	`107`	`}`
`106`	`108`
`107`	`109`
`108`	`110`
`109`	`111`	`var execCommand = new ExecCommand();`
`110`	`112`
`111`		`- execCommand.Execute(arguments, fileSystem, environment, log);`
	`113`	`+ execCommand.Execute(arguments, fileSystem, environment, log, configFileLocator);`
`112`	`114`	`}`
`113`	`115`	`catch (WarningException exception)`
`114`	`116`	`{`
`@@ -141,10 +143,10 @@ private int VerifyArgumentsAndRun(Arguments arguments)`
`141`	`143`	`return 0;`
`142`	`144`	`}`
`143`	`145`
`144`		`- private static void VerifyConfiguration(Arguments arguments, ILog log)`
	`146`	`+ private void VerifyConfiguration(Arguments arguments)`
`145`	`147`	`{`
`146`	`148`	`var gitPreparer = new GitPreparer(log, arguments);`
`147`		`- arguments.ConfigFileLocator.Verify(gitPreparer);`
	`149`	`+ configFileLocator.Verify(gitPreparer);`
`148`	`150`	`}`
`149`	`151`
`150`	`152`	`private static void ConfigureLogging(Arguments arguments, ILog log)`