Feature/job implementation

src/Nox.Cli.Abstractions/Configuration/IJobConfiguration.cs

@@ -0,0 +1,10 @@
+namespace Nox.Cli.Abstractions.Configuration;
+
+public interface IJobConfiguration
+{
+    string Id { get; set; }
+    string Name { get; set; }
+    string? If { get; set; }
+    NoxJobDisplayMessage? Display { get; set; }
+    List<IActionConfiguration> Steps { get; set; } 
+}

src/Nox.Cli.Abstractions/Configuration/IWorkflowConfiguration.cs

@@ -5,5 +5,5 @@ public interface IWorkflowConfiguration
     string Name { get; set; }
     string Description { get; set; }
     ICliConfiguration Cli { get; set; }
-    Dictionary<string, IStepConfiguration> Jobs { get; set; }
+    List<IJobConfiguration> Jobs { get; set; }
 }

src/Nox.Cli.Abstractions/INoxAction.cs

@@ -5,7 +5,7 @@ public interface INoxAction
     int Sequence { get; set; }
     string Id { get; set; }
     string? If { get; set; }
-    string Job { get; set; }
+    string JobId { get; set; }
     string Name { get; set; }
     string Uses { get; set; }
 

src/Nox.Cli.Abstractions/INoxJob.cs

@@ -0,0 +1,13 @@
+namespace Nox.Cli.Abstractions;
+
+public interface INoxJob
+{
+    int Sequence { get; set; }
+    int FirstStepSequence { get; set; }
+    string Id { get; set; }
+
+    string Name { get; set; }
+    string? If { get; set; }
+    NoxJobDisplayMessage? Display { get; set; }
+    IDictionary<string, INoxAction> Steps { get; set; }
+}

src/Nox.Cli.Abstractions/INoxWorkflow.cs

@@ -0,0 +1,6 @@
+namespace Nox.Cli.Abstractions;
+
+public interface INoxWorkflow
+{
+    public IDictionary<string, INoxJob> Jobs { get; set; }
+}

src/Nox.Cli.Abstractions/INoxWorkflowContext.cs

@@ -1,6 +1,7 @@
 using Nox.Cli.Abstractions.Caching;
 using Nox.Secrets.Abstractions;
 using Nox.Solution;
+using Spectre.Console;
 
 namespace Nox.Cli.Abstractions
 {

src/Nox.Cli.Abstractions/Nox.Cli.Abstractions.csproj

@@ -11,4 +11,10 @@
     <PackageReference Include="Nox.Secrets" Version="7.0.14" />
     <PackageReference Include="Nox.Solution" Version="7.0.15" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Spectre.Console">
+      <HintPath>..\Nox.Cli\bin\Debug\net7.0\Spectre.Console.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>

src/Nox.Cli.Abstractions/NoxJobDisplayMessage.cs

@@ -0,0 +1,7 @@
+namespace Nox.Cli.Abstractions;
+
+public class NoxJobDisplayMessage
+{
+    public string Success { get; set; } = string.Empty;
+    public string IfCondition { get; set; } = string.Empty;
+}

src/Nox.Cli.Caching/NoxCliCacheManager.cs

@@ -395,7 +395,7 @@ private IDeserializer BuildDeserializer()
             .IgnoreUnmatchedProperties()
             .WithTypeMapping<IActionConfiguration, ActionConfiguration>()
             .WithTypeMapping<ICliConfiguration, CliConfiguration>()
-            .WithTypeMapping<IStepConfiguration, StepConfiguration>()
+            .WithTypeMapping<IJobConfiguration, JobConfiguration>()
             .WithTypeMapping<ICliCommandConfiguration, CliCommandConfiguration>()
             .WithTypeMapping<ILocalTaskExecutorConfiguration, LocalTaskExecutorConfiguration>()
             .WithTypeMapping<ISecretsConfiguration, SecretsConfiguration>()

src/Nox.Cli.Configuration/JobConfiguration.cs

@@ -0,0 +1,16 @@
+using Nox.Cli.Abstractions;
+using Nox.Cli.Abstractions.Configuration;
+
+namespace Nox.Cli.Configuration;
+
+public class JobConfiguration: IJobConfiguration
+{
+    public string Id { get; set; } = string.Empty;
+
+    public string Name { get; set; } = string.Empty;
+
+    public string? If { get; set; }
+
+    public NoxJobDisplayMessage? Display { get; set; }
+    public List<IActionConfiguration> Steps { get; set; } = new();
+}

src/Nox.Cli.Configuration/WorkflowConfiguration.cs

@@ -7,6 +7,6 @@ public class WorkflowConfiguration: IWorkflowConfiguration
     public string Name { get; set; } = string.Empty;
     public string Description { get; set; } = string.Empty;
     public ICliConfiguration Cli { get; set; } = null!;
-    public Dictionary<string, IStepConfiguration> Jobs { get; set; } = new();
+    public List<IJobConfiguration> Jobs { get; set; } = new();
 }
 

src/Nox.Cli.Helpers/ConsoleWriter.cs

@@ -4,13 +4,8 @@
 
 public interface IConsoleWriter
 {
-    void WriteInfo(string message);
-    void WriteError(string message);
-    void WriteWarning(string message);
-    void WriteHelpHeader(string message);
-    void WriteHelpText(string message);
-    void WriteLogMessage(string message);
-    void WriteRuler(string message);
+    void WriteInfo(string key, string message);
+    void WriteHelpText(string key, string message);
 }
 
 public class ConsoleWriter : IConsoleWriter
@@ -22,39 +17,14 @@ public ConsoleWriter(IAnsiConsole console)
         _console = console;
     }
 
-    public void WriteInfo(string message)
+    public void WriteInfo(string key, string message)
     {
-        _console.MarkupLine($"[bold mediumpurple3_1]{message.EscapeMarkup()}[/]");
+        _console.MarkupLine($"[bold mediumpurple3_1]{key}: [/]{message.EscapeMarkup()}");
     }
 
-    public void WriteError(string message)
+    public void WriteHelpText(string key, string message)
     {
-        _console.MarkupLine($"[bold indianred1]ERROR: {message.EscapeMarkup()}[/]");
-    }
-
-    public void WriteWarning(string message)
-    {
-        _console.MarkupLine($"[bold olive]WARNING: {message.EscapeMarkup()}[/]");
-    }
-
-    public void WriteHelpHeader(string message)
-    {
-        _console.MarkupLine($"[bold olive]{message.EscapeMarkup()}[/]");
-    }
-
-    public void WriteHelpText(string message)
-    {
-        _console.MarkupLine($"[bold seagreen1]{message.EscapeMarkup()}[/]");
-    }
-
-    public void WriteLogMessage(string message)
-    {
-        _console.MarkupLine($"[grey]{message}.[/]");
-    }
-
-    public void WriteRuler(string message)
-    {
-        _console.Write(new Rule($"[bold mediumpurple3_1]{message.EscapeMarkup()}[/]") { Justification = Justify.Left });
+        _console.MarkupLine($"[bold seagreen1]{key}: [/]{message.EscapeMarkup()}");
     }
 
 }

src/Nox.Cli.Plugins/Nox.Cli.Plugin.Console/ConsolePromptSchema_v1.cs

@@ -4,7 +4,6 @@
 using Nox.Cli.Abstractions;
 using Nox.Cli.Abstractions.Exceptions;
 using Nox.Cli.Abstractions.Extensions;
-using Nox.Cli.Abstractions.Helpers;
 using Nox.Cli.Helpers;
 using Nox.Cli.Plugin.Console.JsonSchema;
 using RestSharp;
@@ -217,8 +216,8 @@ public async Task<IDictionary<string, object>> ProcessAsync(INoxWorkflowContext
                             await File.WriteAllTextAsync(outputFilePath, _yaml.ToString());
                             outputs["file-path"] = outputFilePath;
 
-                            AnsiConsole.WriteLine();
-                            AnsiConsole.MarkupLine($"[bold mediumpurple3_1]Created {_fileOptions["filename"].EscapeMarkup()}[/]");
+                            //AnsiConsole.WriteLine();
+                            //AnsiConsole.MarkupLine($"[bold mediumpurple3_1]Created {_fileOptions["filename"].EscapeMarkup()}[/]");
                         }
 
                         ctx.SetState(ActionState.Success);

src/Nox.Cli.Shared.DTO/Task/Request/ServerAction.cs

@@ -7,7 +7,7 @@ public class ServerAction: INoxAction
     public int Sequence { get; set; }
     public string Id { get; set; } = string.Empty;
     public string? If { get; set; }
-    public string Job { get; set; } = string.Empty;
+    public string JobId { get; set; } = string.Empty;
     public string Name { get; set; } = string.Empty;
     public string Uses { get; set; } = string.Empty;
     public bool? RunAtServer { get; set; }

src/Nox.Cli/Actions/NoxAction.cs

@@ -8,7 +8,7 @@ public class NoxAction: INoxAction
     public int Sequence { get; set; } = 0;
     public string Id { get; set; } = string.Empty;
     public string? If { get; set; } = string.Empty;
-    public string Job { get; set; } = string.Empty;
+    public string JobId { get; set; } = string.Empty;
     public string Name { get; set; } = string.Empty;
     public string Uses { get; set; } = string.Empty;
     public bool? RunAtServer { get; set; } = false;

src/Nox.Cli/Actions/NoxJob.cs

@@ -0,0 +1,16 @@
+using Nox.Cli.Abstractions;
+
+namespace Nox.Cli.Actions;
+
+public class NoxJob: INoxJob
+{
+    public int Sequence { get; set; }
+    public int FirstStepSequence { get; set; } = 0;
+    public string Id { get; set; } = string.Empty;
+
+    public string Name { get; set; } = string.Empty;
+    public string? If { get; set; }
+
+    public NoxJobDisplayMessage? Display { get; set; } = new();
+    public IDictionary<string, INoxAction> Steps { get; set; } = new Dictionary<string, INoxAction>();
+}