ArgumentParser cleanup

Author: arturcic

src/GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using LibGit2Sharp;
 
+using Index = LibGit2Sharp.Index;
 namespace GitVersionCore.Tests.Mocks
 {
     public class MockRepository : IRepository
@@ -196,7 +197,7 @@ public void RevParse(string revision, out Reference reference, out GitObject obj
 
         public Branch Head { get; set; }
         public LibGit2Sharp.Configuration Config { get; set; }
-        public LibGit2Sharp.Index Index { get; set; }
+        public Index Index { get; set; }
         public ReferenceCollection Refs { get; set; }
 
         public IQueryableCommitLog Commits

src/GitVersionCore/Arguments.cs

@@ -19,7 +19,7 @@ public Arguments()
         public Authentication Authentication;
 
         public Config OverrideConfig;
-        public bool HasOverrideConfig { get; set; }
+        public bool HasOverrideConfig;
 
         public string TargetPath;
         public string ConfigFile;

src/GitVersionExe.Tests/HelpWriterTests.cs

@@ -38,7 +38,7 @@ public void AllArgsAreInHelp()
             typeof(Arguments).GetFields()
                 .Select(p => p.Name)
                 .Where(p => IsNotInHelp(lookup, p, helpText))
-                .Except(new[] { "Authentication", "CommitId" })
+                .Except(new[] { "Authentication", "CommitId", "HasOverrideConfig" })
                 .ShouldBeEmpty();
         }
 

src/GitVersionExe/GitVersionApplication.cs

@@ -106,8 +106,6 @@ private int VerifyArgumentsAndRun(Arguments arguments)
                     return 0;
                 }
 
-                
-
                 var execCommand = new ExecCommand();
 
                 execCommand.Execute(arguments, fileSystem, environment, log, configFileLocator);

src/GitVersionExe/Program.cs

@@ -8,35 +8,34 @@
 
 namespace GitVersion
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
-            var fileSystem = new FileSystem();
-            var environment = new Environment();
-            var argumentParser = new ArgumentParser();
+            var arguments = ParseArguments(args);
 
-            int exitCode;
-            try
+            var exitCode = 1;
+            if (arguments != null)
             {
-                var arguments = argumentParser.ParseArguments(args);
-                var log = new Log
+                var fileSystem = new FileSystem();
+                var environment = new Environment();
+
+                try
                 {
-                    Verbosity = arguments.Verbosity
-                };
+                    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 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 app = new GitVersionApplication(fileSystem, environment, log, configFileLocator);
 
-                exitCode = app.Run(arguments);
-            }
-            catch (Exception exception)
-            {
-                Console.Error.WriteLine(exception.Message);
-                exitCode = 1;
+                    exitCode = app.Run(arguments);
+                }
+                catch (Exception exception)
+                {
+                    Console.Error.WriteLine(exception.Message);
+                }
             }
 
             if (Debugger.IsAttached)
@@ -46,5 +45,20 @@ static void Main(string[] args)
 
             System.Environment.Exit(exitCode);
         }
+
+        private static Arguments ParseArguments(string[] args)
+        {
+            var argumentParser = new ArgumentParser();
+            Arguments arguments = null;
+            try
+            {
+                arguments = argumentParser.ParseArguments(args);
+            }
+            catch (Exception exception)
+            {
+                Console.Error.WriteLine(exception.Message);
+            }
+            return arguments;
+        }
     }
 }