GH-2127 - allow json and buildserver output at the same time

arturcic · arturcic · commit 37f8829683fc · 2020-02-25T15:31:53.000+02:00
diff --git a/src/GitVersionCore/Arguments.cs b/src/GitVersionCore/Arguments.cs
@@ -8,6 +8,10 @@ namespace GitVersion
 {
     public class Arguments
     {
+        public Arguments()
+        {
+            Output.Add(OutputType.Json);
+        }
         public AuthenticationInfo Authentication;
 
         public Config OverrideConfig;
@@ -44,7 +48,7 @@ public class Arguments
         public bool NoCache;
         public bool NoNormalize;
 
-        public OutputType Output = OutputType.Json;
+        public ISet<OutputType> Output = new HashSet<OutputType>();
         public Verbosity Verbosity = Verbosity.Normal;
 
         public bool UpdateAssemblyInfo;
diff --git a/src/GitVersionExe.Tests/ArgumentParserTests.cs b/src/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -135,28 +135,36 @@ public void UnknownOutputShouldThrow()
         public void OutputDefaultsToJson()
         {
             var arguments = argumentParser.ParseArguments("targetDirectoryPath");
-            arguments.Output.ShouldBe(OutputType.Json);
+            arguments.Output.ShouldContain(OutputType.Json);
         }
 
         [Test]
         public void OutputJsonCanBeParsed()
         {
             var arguments = argumentParser.ParseArguments("targetDirectoryPath -output json");
-            arguments.Output.ShouldBe(OutputType.Json);
+            arguments.Output.ShouldContain(OutputType.Json);
         }
 
         [Test]
         public void OutputBuildserverCanBeParsed()
         {
             var arguments = argumentParser.ParseArguments("targetDirectoryPath -output buildserver");
-            arguments.Output.ShouldBe(OutputType.BuildServer);
+            arguments.Output.ShouldContain(OutputType.BuildServer);
+        }
+
+        [Test]
+        public void OutputBuildserverAndJsonCanBeParsed()
+        {
+            var arguments = argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output json");
+            arguments.Output.ShouldContain(OutputType.BuildServer);
+            arguments.Output.ShouldContain(OutputType.Json);
         }
 
         [Test]
         public void MultipleArgsAndFlag()
         {
             var arguments = argumentParser.ParseArguments("targetDirectoryPath -output buildserver -updateAssemblyInfo");
-            arguments.Output.ShouldBe(OutputType.BuildServer);
+            arguments.Output.ShouldContain(OutputType.BuildServer);
         }
 
         [Test]
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -269,7 +269,7 @@ public Arguments ParseArguments(string[] commandLineArguments)
                         throw new WarningException($"Value '{value}' cannot be parsed as output type, please use 'json' or 'buildserver'");
                     }
 
-                    arguments.Output = outputType;
+                    arguments.Output.Add(outputType);
                     continue;
                 }
 
diff --git a/src/GitVersionExe/ExecCommand.cs b/src/GitVersionExe/ExecCommand.cs
@@ -40,32 +40,32 @@ public void Execute()
 
             var arguments = options.Value;
 
-            switch (arguments.Output)
+            if (arguments.Output.Contains(OutputType.BuildServer))
             {
-                case OutputType.BuildServer:
-                    var buildServer = buildServerResolver.Resolve();
-                    buildServer?.WriteIntegration(Console.WriteLine, variables);
-
-                    break;
-                case OutputType.Json:
-                    switch (arguments.ShowVariable)
-                    {
-                        case null:
-                            Console.WriteLine(variables.ToString());
-                            break;
-
-                        default:
-                            if (!variables.TryGetValue(arguments.ShowVariable, out var part))
-                            {
-                                throw new WarningException($"'{arguments.ShowVariable}' variable does not exist");
-                            }
-                            Console.WriteLine(part);
-                            break;
-                    }
-
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
+                var buildServer = buildServerResolver.Resolve();
+                buildServer?.WriteIntegration(Console.WriteLine, variables);
+            }
+            if (arguments.Output.Contains(OutputType.Json))
+            {
+                switch (arguments.ShowVariable)
+                {
+                    case null:
+                        Console.WriteLine(variables.ToString());
+                        break;
+
+                    default:
+                        if (!variables.TryGetValue(arguments.ShowVariable, out var part))
+                        {
+                            throw new WarningException($"'{arguments.ShowVariable}' variable does not exist");
+                        }
+
+                        Console.WriteLine(part);
+                        break;
+                }
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException();
             }
 
             if (arguments.UpdateWixVersionFile)
diff --git a/src/GitVersionExe/GitVersionExecutor.cs b/src/GitVersionExe/GitVersionExecutor.cs
@@ -73,12 +73,12 @@ private int VerifyArgumentsAndRun(Arguments arguments)
                 if (arguments.Diag)
                 {
                     arguments.NoCache = true;
-                    arguments.Output = OutputType.BuildServer;
+                    arguments.Output.Add(OutputType.BuildServer);
                 }
 
                 if (!string.IsNullOrEmpty(arguments.Proj) || !string.IsNullOrEmpty(arguments.Exec))
                 {
-                    arguments.Output = OutputType.BuildServer;
+                    arguments.Output.Add(OutputType.BuildServer);
                 }
 
                 var buildServer = buildServerResolver.Resolve();
@@ -154,7 +154,7 @@ private void VerifyConfiguration()
 
         private static void ConfigureLogging(Arguments arguments, ILog log)
         {
-            if (arguments.Output == OutputType.BuildServer || arguments.LogFilePath == "console" || arguments.Init)
+            if (arguments.Output.Contains(OutputType.BuildServer) || arguments.LogFilePath == "console" || arguments.Init)
             {
                 log.AddLogAppender(new ConsoleAppender());
             }

Original file line number	Diff line number	Diff line change
`@@ -135,28 +135,36 @@ public void UnknownOutputShouldThrow()`
`135`	`135`	`public void OutputDefaultsToJson()`
`136`	`136`	`{`
`137`	`137`	`var arguments = argumentParser.ParseArguments("targetDirectoryPath");`
`138`		`- arguments.Output.ShouldBe(OutputType.Json);`
	`138`	`+ arguments.Output.ShouldContain(OutputType.Json);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`[Test]`
`142`	`142`	`public void OutputJsonCanBeParsed()`
`143`	`143`	`{`
`144`	`144`	`var arguments = argumentParser.ParseArguments("targetDirectoryPath -output json");`
`145`		`- arguments.Output.ShouldBe(OutputType.Json);`
	`145`	`+ arguments.Output.ShouldContain(OutputType.Json);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`[Test]`
`149`	`149`	`public void OutputBuildserverCanBeParsed()`
`150`	`150`	`{`
`151`	`151`	`var arguments = argumentParser.ParseArguments("targetDirectoryPath -output buildserver");`
`152`		`- arguments.Output.ShouldBe(OutputType.BuildServer);`
	`152`	`+ arguments.Output.ShouldContain(OutputType.BuildServer);`
	`153`	`+ }`
	`154`	`+`
	`155`	`+ [Test]`
	`156`	`+ public void OutputBuildserverAndJsonCanBeParsed()`
	`157`	`+ {`
	`158`	`+ var arguments = argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output json");`
	`159`	`+ arguments.Output.ShouldContain(OutputType.BuildServer);`
	`160`	`+ arguments.Output.ShouldContain(OutputType.Json);`
`153`	`161`	`}`
`154`	`162`
`155`	`163`	`[Test]`
`156`	`164`	`public void MultipleArgsAndFlag()`
`157`	`165`	`{`
`158`	`166`	`var arguments = argumentParser.ParseArguments("targetDirectoryPath -output buildserver -updateAssemblyInfo");`
`159`		`- arguments.Output.ShouldBe(OutputType.BuildServer);`
	`167`	`+ arguments.Output.ShouldContain(OutputType.BuildServer);`
`160`	`168`	`}`
`161`	`169`
`162`	`170`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ public Arguments ParseArguments(string[] commandLineArguments)`
`269`	`269`	`throw new WarningException($"Value '{value}' cannot be parsed as output type, please use 'json' or 'buildserver'");`
`270`	`270`	`}`
`271`	`271`
`272`		`- arguments.Output = outputType;`
	`272`	`+ arguments.Output.Add(outputType);`
`273`	`273`	`continue;`
`274`	`274`	`}`
`275`	`275`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ private int VerifyArgumentsAndRun(Arguments arguments)`
`73`	`73`	`if (arguments.Diag)`
`74`	`74`	`{`
`75`	`75`	`arguments.NoCache = true;`
`76`		`- arguments.Output = OutputType.BuildServer;`
	`76`	`+ arguments.Output.Add(OutputType.BuildServer);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (!string.IsNullOrEmpty(arguments.Proj) \|\| !string.IsNullOrEmpty(arguments.Exec))`
`80`	`80`	`{`
`81`		`- arguments.Output = OutputType.BuildServer;`
	`81`	`+ arguments.Output.Add(OutputType.BuildServer);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`var buildServer = buildServerResolver.Resolve();`
`@@ -154,7 +154,7 @@ private void VerifyConfiguration()`
`154`	`154`
`155`	`155`	`private static void ConfigureLogging(Arguments arguments, ILog log)`
`156`	`156`	`{`
`157`		`- if (arguments.Output == OutputType.BuildServer \|\| arguments.LogFilePath == "console" \|\| arguments.Init)`
	`157`	`+ if (arguments.Output.Contains(OutputType.BuildServer) \|\| arguments.LogFilePath == "console" \|\| arguments.Init)`
`158`	`158`	`{`
`159`	`159`	`log.AddLogAppender(new ConsoleAppender());`
`160`	`160`	`}`