Merge branch 'hotfix/0.9.1'

cake-contrib · Jul 11, 2020 · ed3cf9f · ed3cf9f
2 parents e19568e + fafc5c9
commit ed3cf9f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/Source/Cake.Codecov.Tests/CodecovAliasesTests.cs b/Source/Cake.Codecov.Tests/CodecovAliasesTests.cs
@@ -52,7 +52,7 @@ public void Should_Use_Specified_Files()
 
             var result = fixture.Run();
 
-            result.Args.Should().Contain($"--file \"{string.Join(" ", files)}\"");
+            result.Args.Should().Contain($"--file \"{string.Join("\" \"", files)}\"");
         }
 
         [Fact]
@@ -78,7 +78,7 @@ public void Should_Use_Specified_Files_And_Token()
             result.Args.Should()
                 .ContainAll(new[]
                 {
-                    $"--file \"{string.Join(" ", files)}\"",
+                    $"--file \"{string.Join("\" \"", files)}\"",
                     $"--token \"{token}\""
                 });
         }

diff --git a/Source/Cake.Codecov.Tests/CodecovRunnerTests.cs b/Source/Cake.Codecov.Tests/CodecovRunnerTests.cs
@@ -265,7 +265,7 @@ public void Should_Set_Envs()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--env ""env1 env2""");
+            result.Args.Should().Be(@"--env ""env1"" ""env2""");
         }
 
         [Fact]
@@ -291,7 +291,7 @@ public void Should_Set_Files()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--file ""file1.xml file2.xml""");
+            result.Args.Should().Be(@"--file ""file1.xml"" ""file2.xml""");
         }
 
         [Fact]

diff --git a/Source/Cake.Codecov/CodecovRunner.cs b/Source/Cake.Codecov/CodecovRunner.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Cake.Codecov.Internals;
 using Cake.Core;
@@ -57,8 +58,11 @@ protected override IEnumerable<string> GetToolExecutableNames()
 
         private static void AddValue(ProcessArgumentBuilder builder, string key, IEnumerable<string> value)
         {
-            var joinedValue = string.Join(" ", value);
-            AddValue(builder, key, joinedValue);
+            AddValue(builder, key, value.FirstOrDefault());
+            foreach (var subValue in value.Skip(1))
+            {
+                AddValue(builder, key, subValue, true);
+            }
         }
 
         private static void AddValue(ProcessArgumentBuilder builder, string key, Uri value)
@@ -77,15 +81,29 @@ private static void AddValue(ProcessArgumentBuilder builder, KeyValuePair<string
             }
         }
 
-        private static void AddValue(ProcessArgumentBuilder builder, string key, string value)
+        private static void AddValue(ProcessArgumentBuilder builder, string key, string value, bool onlyAppendValue = false)
         {
             if (key.StartsWith("!", StringComparison.OrdinalIgnoreCase))
             {
-                builder.AppendSwitchQuotedSecret(key.TrimStart('!'), " ", value);
+                if (onlyAppendValue)
+                {
+                    builder.AppendQuoted(value);
+                }
+                else
+                {
+                    builder.AppendSwitchQuotedSecret(key.TrimStart('!'), " ", value);
+                }
             }
             else
             {
-                builder.AppendSwitchQuoted(key, " ", value);
+                if (onlyAppendValue)
+                {
+                    builder.AppendQuoted(value);
+                }
+                else
+                {
+                    builder.AppendSwitchQuoted(key, " ", value);
+                }
             }
         }