Adds ExecuteOnlyWhen to group of tasks in target.

Author: mzorec

src/FlubuCore/Context/FluentInterface/Interfaces/ITarget.cs

@@ -253,8 +253,10 @@ public interface ITarget : ITargetBaseFluentInterfaceOfT<ITarget>
         /// <param name="targetAction">specify tasks to add in target action.</param>
         /// <param name="onFinally">action that will be taken when all task finish or when error occures.</param>
         /// <param name="onError">action that will be taken on any task actions.</param>
-        /// <param name="when">Tasks will be added only if specified condition is meet.</param>
+        /// <param name="when">Tasks in group will be added to target only if specified condition is meet. When condition is executed when target is configured</param>
+        /// <param name="executeOnlyWhen">Tasks in group will be executed. When condition is executed when target is executed. </param>
+        /// <param name="cleanupOnCancel">onFinally is executed even if script execution is cancelled with ctrl+c etc.</param>
         /// <returns></returns>
-        ITarget Group(Action<ITargetBaseFluentInterfaceOfT<ITarget>> targetAction, Action<ITaskContext> onFinally = null, Action<ITaskContext, Exception> onError = null, Func<ITaskContext, bool> when = null, bool cleanupOnCancel = false);
+        ITarget Group(Action<ITargetBaseFluentInterfaceOfT<ITarget>> targetAction, Action<ITaskContext> onFinally = null, Action<ITaskContext, Exception> onError = null, Func<ITaskContext, bool> when = null,  Func<ITaskContext, bool> executeOnlyWhen = null, bool cleanupOnCancel = false);
     }
 }

src/FlubuCore/Context/FluentInterface/TargetFluentInterface.cs

@@ -11,56 +11,6 @@ namespace FlubuCore.Context.FluentInterface
 {
     public class TargetFluentInterface : TargetBaseFluentInterface<ITarget>, ITarget
     {
-        public ITarget DependsOn(params string[] targetNames)
-        {
-            LastTargetAction = TargetAction.AddDependency;
-            ActionCount = targetNames.Length;
-            Target.DependsOn(targetNames);
-            return this;
-        }
-
-        public ITarget DependsOn(params ITargetInternal[] targets)
-        {
-            LastTargetAction = TargetAction.AddDependency;
-            ActionCount = targets.Length;
-            Target.DependsOn(targets);
-            return this;
-        }
-
-        public ITarget DependsOn(params ITarget[] targets)
-        {
-            LastTargetAction = TargetAction.AddDependency;
-            ActionCount = targets.Length;
-            foreach (var t in targets)
-            {
-                var target = (TargetFluentInterface)t;
-                Target.DependsOn(target.Target);
-            }
-
-            return this;
-        }
-
-        public ITarget DependsOnAsync(params ITargetInternal[] targets)
-        {
-            LastTargetAction = TargetAction.AddDependency;
-            ActionCount = targets.Length;
-            Target.DependsOnAsync(targets);
-            return this;
-        }
-
-        public ITarget DependsOnAsync(params ITarget[] targets)
-        {
-            LastTargetAction = TargetAction.AddDependency;
-            ActionCount = targets.Length;
-            foreach (var t in targets)
-            {
-                var target = (TargetFluentInterface)t;
-                Target.DependsOnAsync(target.Target);
-            }
-
-            return this;
-        }
-
         public ITarget SetAsDefault()
         {
             LastTargetAction = TargetAction.Other;
@@ -85,7 +35,7 @@ public ITarget SetAsHidden()
             return this;
         }
 
-        public ITarget Group(Action<ITargetBaseFluentInterfaceOfT<ITarget>> targetAction, Action<ITaskContext> onFinally = null, Action<ITaskContext, Exception> onError = null, Func<ITaskContext, bool> when = null, bool cleanupOnCancel = false)
+        public ITarget Group(Action<ITargetBaseFluentInterfaceOfT<ITarget>> targetAction, Action<ITaskContext> onFinally = null, Action<ITaskContext, Exception> onError = null, Func<ITaskContext, bool> when = null, Func<ITaskContext, bool> executeOnlyWhen = null,  bool cleanupOnCancel = false)
         {
             LastTargetAction = TargetAction.Other;
             ActionCount = 0;
@@ -94,7 +44,8 @@ public ITarget Group(Action<ITargetBaseFluentInterfaceOfT<ITarget>> targetAction
                 GroupId = Guid.NewGuid().ToString(),
                 OnErrorAction = onError,
                 FinallyAction = onFinally,
-                CleanupOnCancel = cleanupOnCancel
+                ExecuteOnlyWhen = executeOnlyWhen,
+                CleanupOnCancel = cleanupOnCancel,
             };
 
             var conditionMeet = when?.Invoke(Context);

src/FlubuCore/Targeting/Target.cs

@@ -528,6 +528,18 @@ protected override int DoExecute(ITaskContextInternal context)
             for (int i = 0; i < taskGroupsCount; i++)
             {
                 int tasksCount = _taskGroups[i].Tasks.Count;
+
+                bool shouldExecute = true;
+                if (_taskGroups[i].ExecuteOnlyWhen != null)
+                {
+                    shouldExecute = _taskGroups[i].ExecuteOnlyWhen.Invoke(context);
+                }
+
+                if (!shouldExecute)
+                {
+                    continue;
+                }
+
                 if (_taskGroups[i].CleanupOnCancel)
                 {
                     CleanUpStore.AddCleanupAction(_taskGroups[i].FinallyAction);

src/FlubuCore/Targeting/TaskGroup.cs

@@ -22,5 +22,7 @@ public TaskGroup()
         public bool CleanupOnCancel { get; set; }
 
         public Action<ITaskContext, Exception> OnErrorAction { get; set; }
+
+        public Func<ITaskContext, bool> ExecuteOnlyWhen { get; set; }
     }
 }