Merge pull request #829 from labmonkey42/master

Implemented configuration override for #826

Author: JakeGinnivan

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -11,11 +11,13 @@ public class ConfigurationProvider
     {
         internal const string DefaultTagPrefix = "[vV]";
 
-        public static Config Provide(string workingDirectory, IFileSystem fileSystem, bool applyDefaults = true)
+        public static Config Provide(string workingDirectory, IFileSystem fileSystem, bool applyDefaults = true, Config overrideConfig = null)
         {
             var readConfig = ReadConfig(workingDirectory, fileSystem);
             if (applyDefaults)
                 ApplyDefaultsTo(readConfig);
+            if (null != overrideConfig)
+                ApplyOverridesTo(readConfig, overrideConfig);
             return readConfig;
         }
 
@@ -61,6 +63,11 @@ public static void ApplyDefaultsTo(Config config)
             }
         }
 
+        public static void ApplyOverridesTo(Config config, Config overrideConfig)
+        {
+            config.TagPrefix = string.IsNullOrWhiteSpace(overrideConfig.TagPrefix) ? config.TagPrefix : overrideConfig.TagPrefix;
+        }
+
         static void MigrateBranches(Config config)
         {
             // Map of current names and previous names

src/GitVersionCore/ExecuteCore.cs

@@ -20,7 +20,7 @@ public ExecuteCore(IFileSystem fileSystem)
             gitVersionCache = new GitVersionCache(fileSystem);
         }
 
-        public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId)
+        public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId, Config overrideConfig = null)
         {
             // Normalise if we are running on build server
             var applicableBuildServers = BuildServerList.GetApplicableBuildServers();
@@ -54,7 +54,7 @@ public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicReposi
                 var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(repo, dotGitDirectory);
                 if (versionVariables == null)
                 {
-                    versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot, buildServer);
+                    versionVariables = ExecuteInternal(targetBranch, commitId, repo, gitPreparer, projectRoot, buildServer, overrideConfig: overrideConfig);
                     gitVersionCache.WriteVariablesToDiskCache(repo, dotGitDirectory, versionVariables);
                 }
 
@@ -90,12 +90,12 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch
             return currentBranch;
         }
 
-        VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot, IBuildServer buildServer)
+        VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot, IBuildServer buildServer, Config overrideConfig = null)
         {
             gitPreparer.Initialise(buildServer != null, ResolveCurrentBranch(buildServer, targetBranch, gitPreparer.IsDynamicGitRepository));
 
             var versionFinder = new GitVersionFinder();
-            var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem);
+            var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem, overrideConfig: overrideConfig);
 
             var gitVersionContext = new GitVersionContext(repo, configuration, commitId : commitId);
             var semanticVersion = versionFinder.FindVersion(gitVersionContext);

src/GitVersionExe/ArgumentParser.cs

@@ -285,6 +285,28 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     continue;
                 }
 
+                if (IsSwitch("overrideconfig", name))
+                {
+                    foreach (var item in value.Split(';'))
+                    {
+                        var configOverride = item.Split('=');
+                        
+                        switch (configOverride[0])
+                        {
+                            case "tag-prefix":
+                                if (1 < configOverride.Length)
+                                {
+                                    arguments.OverrideConfig.TagPrefix = configOverride[1];
+                                }
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    continue;
+                }
+
                 throw new WarningException(string.Format("Could not parse command line parameter '{0}'.", name));
             }
 

src/GitVersionExe/Arguments.cs

@@ -7,12 +7,15 @@ public class Arguments
         public Arguments()
         {
             Authentication = new Authentication();
+            OverrideConfig = new Config();
             Output = OutputType.Json;
             UpdateAssemblyInfoFileName = new HashSet<string>();
         }
 
         public Authentication Authentication;
 
+        public Config OverrideConfig;
+
         public string TargetPath;
 
         public string TargetUrl;

src/GitVersionExe/HelpWriter.cs

@@ -25,6 +25,8 @@ path            The directory containing .git. If not defined current directory
                     eg /output json /showvariable SemVer - will output `1.2.3+beta.4`
     /l              Path to logfile.
     /showconfig     Outputs the effective GitVersion config (defaults + custom from GitVersion.yaml) in yaml format
+    /overrideconfig Overrides GitVersion config values inline (semicolon-separated key value pairs e.g. /overrideconfig:tag-prefix=Foo)
+                    Currently supported config overrides: tag-prefix
 
     # AssemblyInfo updating
     /updateassemblyinfo

src/GitVersionExe/SpecifiedArgumentRunner.cs

@@ -20,9 +20,10 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
             var dynamicRepositoryLocation = arguments.DynamicRepositoryLocation;
             var targetBranch = arguments.TargetBranch;
             var commitId = arguments.CommitId;
+            var overrideConfig = arguments.OverrideConfig;
 
             var executeCore = new ExecuteCore(fileSystem);
-            var variables = executeCore.ExecuteGitVersion(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, targetPath, commitId);
+            var variables = executeCore.ExecuteGitVersion(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, targetPath, commitId, overrideConfig: overrideConfig);
 
             if (arguments.Output == OutputType.BuildServer)
             {