Merge pull request #4123 from juwens/develop

augustoproiete · web-flow · commit 7ad0f4865484 · 2023-04-02T18:24:36.000-04:00
GH-4122: Make multiple arguments available in Frosting
diff --git a/src/Cake.Frosting.Tests/CakeHostTests.cs b/src/Cake.Frosting.Tests/CakeHostTests.cs
@@ -10,6 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Xunit;
+using Xunit.Sdk;
 
 namespace Cake.Frosting.Tests
 {
@@ -330,5 +331,33 @@ public void Should_pass_target_within_cakeContext_arguments()
                 .Received(1)
                 .ExecuteAsync(Arg.Any<CakeTask>(), Arg.Is<ICakeContext>(cc => cc.Arguments.HasArgument("target") && cc.Arguments.GetArgument("target").Equals(nameof(DummyTask))));
         }
+
+        [Theory]
+        [InlineData(nameof(DummyTask), nameof(DummyTask2), nameof(DummyTask3))]
+        [InlineData(nameof(DummyTask), nameof(DummyTask3), nameof(DummyTask2))]
+        [InlineData(nameof(DummyTask2), nameof(DummyTask3), nameof(DummyTask))]
+        [InlineData(nameof(DummyTask2), nameof(DummyTask), nameof(DummyTask3))]
+        [InlineData(nameof(DummyTask3), nameof(DummyTask2), nameof(DummyTask))]
+        [InlineData(nameof(DummyTask3), nameof(DummyTask), nameof(DummyTask2))]
+        public void Should_Execute_Multiple_Targets_In_Correct_Order(string task0, string task1, string task2)
+        {
+            // Given
+            var fixture = new CakeHostFixture();
+            fixture.RegisterTask<DummyTask>();
+            fixture.RegisterTask<DummyTask2>();
+            fixture.RegisterTask<DummyTask3>();
+            fixture.Strategy = Substitute.For<IExecutionStrategy>();
+
+            // When
+            fixture.Run("--target", task0, "--target", task1, "--target", task2);
+
+            // Then
+            Received.InOrder(() =>
+            {
+                fixture.Strategy.ExecuteAsync(Arg.Is<CakeTask>(t => t.Name == task0), Arg.Any<ICakeContext>());
+                fixture.Strategy.ExecuteAsync(Arg.Is<CakeTask>(t => t.Name == task1), Arg.Any<ICakeContext>());
+                fixture.Strategy.ExecuteAsync(Arg.Is<CakeTask>(t => t.Name == task2), Arg.Any<ICakeContext>());
+            });
+        }
     }
 }
diff --git a/src/Cake.Frosting.Tests/Tasks/DummyTask2.cs b/src/Cake.Frosting.Tests/Tasks/DummyTask2.cs
@@ -0,0 +1,15 @@
+﻿// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Cake.Core;
+
+namespace Cake.Frosting.Tests
+{
+    public sealed class DummyTask2 : FrostingTask<ICakeContext>
+    {
+        public override void Run(ICakeContext context)
+        {
+        }
+    }
+}
diff --git a/src/Cake.Frosting.Tests/Tasks/DummyTask3.cs b/src/Cake.Frosting.Tests/Tasks/DummyTask3.cs
@@ -0,0 +1,15 @@
+﻿// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Cake.Core;
+
+namespace Cake.Frosting.Tests
+{
+    public sealed class DummyTask3 : FrostingTask<ICakeContext>
+    {
+        public override void Run(ICakeContext context)
+        {
+        }
+    }
+}
diff --git a/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs b/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs
@@ -68,7 +68,7 @@ public override int Execute(CommandContext context, DefaultCommandSettings setti
                     runner.Settings.UseExclusiveTarget();
                 }
 
-                runner.Run(settings.Target);
+                runner.Run(settings.Targets);
             }
             catch (Exception ex)
             {
@@ -98,7 +98,11 @@ private static CakeArguments CreateCakeArguments(IRemainingArguments remainingAr
             {
                 arguments[targetArgumentName] = new List<string>();
             }
-            arguments[targetArgumentName].Add(settings.Target);
+
+            foreach (var target in settings.Targets)
+            {
+                arguments[targetArgumentName].Add(target);
+            }
 
             var argumentLookUp = arguments.SelectMany(a => a.Value, Tuple.Create).ToLookup(a => a.Item1.Key, a => a.Item2);
             return new CakeArguments(argumentLookUp);
diff --git a/src/Cake.Frosting/Internal/Commands/DefaultCommandSettings.cs b/src/Cake.Frosting/Internal/Commands/DefaultCommandSettings.cs
@@ -15,7 +15,7 @@ internal sealed class DefaultCommandSettings : CommandSettings
         [CommandOption("--target|-t <TARGET>")]
         [DefaultValue("Default")]
         [Description("Target task to invoke.")]
-        public string Target { get; set; }
+        public string[] Targets { get; set; }
 
         [CommandOption("--working|-w <PATH>")]
         [TypeConverter(typeof(Cli.DirectoryPathConverter))]
diff --git a/src/Cake.Frosting/Internal/FrostingEngine.cs b/src/Cake.Frosting/Internal/FrostingEngine.cs
@@ -13,7 +13,7 @@ namespace Cake.Frosting.Internal
     internal interface IFrostingEngine
     {
         ExecutionSettings Settings { get; }
-        CakeReport Run(string target);
+        CakeReport Run(IEnumerable<string> targets);
     }
 
     internal abstract class FrostingEngine<THost> : IFrostingEngine
@@ -51,13 +51,13 @@ protected FrostingEngine(
             _tasks = new List<IFrostingTask>(tasks ?? Array.Empty<IFrostingTask>());
         }
 
-        public CakeReport Run(string target)
+        public CakeReport Run(IEnumerable<string> targets)
         {
             ConfigureTasks();
             ConfigureLifetime();
             ConfigureTaskLifetime();
 
-            return _host.RunTarget(target);
+            return _host.RunTargets(targets);
         }
 
         private void ConfigureTaskLifetime()

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public override int Execute(CommandContext context, DefaultCommandSettings setti`
`68`	`68`	`runner.Settings.UseExclusiveTarget();`
`69`	`69`	`}`
`70`	`70`
`71`		`- runner.Run(settings.Target);`
	`71`	`+ runner.Run(settings.Targets);`
`72`	`72`	`}`
`73`	`73`	`catch (Exception ex)`
`74`	`74`	`{`
`@@ -98,7 +98,11 @@ private static CakeArguments CreateCakeArguments(IRemainingArguments remainingAr`
`98`	`98`	`{`
`99`	`99`	`arguments[targetArgumentName] = new List<string>();`
`100`	`100`	`}`
`101`		`- arguments[targetArgumentName].Add(settings.Target);`
	`101`	`+`
	`102`	`+ foreach (var target in settings.Targets)`
	`103`	`+ {`
	`104`	`+ arguments[targetArgumentName].Add(target);`
	`105`	`+ }`
`102`	`106`
`103`	`107`	`var argumentLookUp = arguments.SelectMany(a => a.Value, Tuple.Create).ToLookup(a => a.Item1.Key, a => a.Item2);`
`104`	`108`	`return new CakeArguments(argumentLookUp);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Cake.Frosting.Internal`
`13`	`13`	`internal interface IFrostingEngine`
`14`	`14`	`{`
`15`	`15`	`ExecutionSettings Settings { get; }`
`16`		`- CakeReport Run(string target);`
	`16`	`+ CakeReport Run(IEnumerable<string> targets);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`internal abstract class FrostingEngine<THost> : IFrostingEngine`
`@@ -51,13 +51,13 @@ protected FrostingEngine(`
`51`	`51`	`_tasks = new List<IFrostingTask>(tasks ?? Array.Empty<IFrostingTask>());`
`52`	`52`	`}`
`53`	`53`
`54`		`- public CakeReport Run(string target)`
	`54`	`+ public CakeReport Run(IEnumerable<string> targets)`
`55`	`55`	`{`
`56`	`56`	`ConfigureTasks();`
`57`	`57`	`ConfigureLifetime();`
`58`	`58`	`ConfigureTaskLifetime();`
`59`	`59`
`60`		`- return _host.RunTarget(target);`
	`60`	`+ return _host.RunTargets(targets);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private void ConfigureTaskLifetime()`