WiP

scottt732 · Oct 30, 2023 · 2aa8633 · 2aa8633
1 parent 288a8f1
commit 2aa8633
Show file tree

Hide file tree

Showing 49 changed files with 1,219 additions and 1,189 deletions.
diff --git a/Source/Sholo.CommandLine/AppBuilder/BaseCommandLineAppBuilder.cs b/Source/Sholo.CommandLine/AppBuilder/BaseCommandLineAppBuilder.cs
diff --git a/Source/Sholo.CommandLine/Command/ICommand.cs b/Source/Sholo.CommandLine/Command/ICommand.cs
diff --git a/Source/Sholo.CommandLine/CommandLineApp.cs b/Source/Sholo.CommandLine/CommandLineApp.cs
@@ -5,94 +5,93 @@
 using System.Threading.Tasks;
 using McMaster.Extensions.CommandLineUtils;
 
-namespace Sholo.CommandLine
+namespace Sholo.CommandLine;
+
+internal class CommandLineApp : ICommandLineApp
 {
-    internal class CommandLineApp : ICommandLineApp
+    // https://github.com/natemcmaster/CommandLineUtils/issues/111#issuecomment-401276354
+    private static readonly int ExitCodeOperationCanceled;
+    private static readonly int ExitCodeUnhandledException;
+
+    static CommandLineApp()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            // values from http://www.febooti.com/products/automation-workshop/online-help/events/run-dos-cmd-command/exit-codes/
+            ExitCodeOperationCanceled = unchecked((int)0xC000013A);
+            ExitCodeUnhandledException = unchecked((int)0xE0434F4D);
+        }
+        else
+        {
+            // Match Process.ExitCode (cfr bash) which uses 128 + signo.
+            ExitCodeOperationCanceled = 130; // SIGINT
+            ExitCodeUnhandledException = 134; // SIGABRT
+        }
+    }
+
+    private CommandLineApplication Application { get; }
+
+    public CommandLineApp(CommandLineApplication application)
     {
-        // https://github.com/natemcmaster/CommandLineUtils/issues/111#issuecomment-401276354
-        private static readonly int ExitCodeOperationCanceled;
-        private static readonly int ExitCodeUnhandledException;
+        Application = application;
+    }
+
+    public async Task<int> ExecuteAsync(string[] args, CancellationToken cancellationToken)
+    {
+        var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
 
-        static CommandLineApp()
+        void CancelHandler(object o, ConsoleCancelEventArgs e)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            // ReSharper disable AccessToDisposedClosure
+
+            if (!cts.IsCancellationRequested)
             {
-                // values from http://www.febooti.com/products/automation-workshop/online-help/events/run-dos-cmd-command/exit-codes/
-                ExitCodeOperationCanceled = unchecked((int)0xC000013A);
-                ExitCodeUnhandledException = unchecked((int)0xE0434F4D);
+                cts.Cancel();
+                e.Cancel = true;
             }
             else
             {
-                // Match Process.ExitCode (cfr bash) which uses 128 + signo.
-                ExitCodeOperationCanceled = 130; // SIGINT
-                ExitCodeUnhandledException = 134; // SIGABRT
+                e.Cancel = false;
             }
-        }
 
-        private CommandLineApplication Application { get; }
-
-        public CommandLineApp(CommandLineApplication application)
-        {
-            Application = application;
+            // ReSharper restore AccessToDisposedClosure
         }
 
-        public async Task<int> ExecuteAsync(string[] args, CancellationToken cancellationToken)
+        void UnloadingHandler(AssemblyLoadContext ctx)
         {
-            var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+            // ReSharper disable AccessToDisposedClosure
 
-            void CancelHandler(object o, ConsoleCancelEventArgs e)
+            if (!cts.IsCancellationRequested)
             {
-                // ReSharper disable AccessToDisposedClosure
-
-                if (!cts.IsCancellationRequested)
-                {
-                    cts.Cancel();
-                    e.Cancel = true;
-                }
-                else
-                {
-                    e.Cancel = false;
-                }
-
-                // ReSharper restore AccessToDisposedClosure
+                cts.Cancel();
             }
 
-            void UnloadingHandler(AssemblyLoadContext ctx)
-            {
-                // ReSharper disable AccessToDisposedClosure
-
-                if (!cts.IsCancellationRequested)
-                {
-                    cts.Cancel();
-                }
-
-                // ReSharper restore AccessToDisposedClosure
-            }
+            // ReSharper restore AccessToDisposedClosure
+        }
 
-            try
-            {
-                Console.CancelKeyPress += CancelHandler;
-                AssemblyLoadContext.Default.Unloading += UnloadingHandler;
+        try
+        {
+            Console.CancelKeyPress += CancelHandler;
+            AssemblyLoadContext.Default.Unloading += UnloadingHandler;
 
-                var result = await Application.ExecuteAsync(args, cts.Token);
+            var result = await Application.ExecuteAsync(args, cts.Token);
 
-                return result;
-            }
-            catch (OperationCanceledException)
-            {
-                return ExitCodeOperationCanceled;
-            }
-            catch (Exception e)
-            {
-                await Console.Error.WriteLineAsync($"Unhandled exception: {e}");
-                return ExitCodeUnhandledException;
-            }
-            finally
-            {
-                AssemblyLoadContext.Default.Unloading -= UnloadingHandler;
-                Console.CancelKeyPress -= CancelHandler;
-                cts.Dispose();
-            }
+            return result;
+        }
+        catch (OperationCanceledException)
+        {
+            return ExitCodeOperationCanceled;
+        }
+        catch (Exception e)
+        {
+            await Console.Error.WriteLineAsync($"Unhandled exception: {e}");
+            return ExitCodeUnhandledException;
+        }
+        finally
+        {
+            AssemblyLoadContext.Default.Unloading -= UnloadingHandler;
+            Console.CancelKeyPress -= CancelHandler;
+            cts.Dispose();
         }
     }
 }
diff --git a/Source/Sholo.CommandLine/CommandLineAppBuilder.cs b/Source/Sholo.CommandLine/CommandLineAppBuilder.cs
@@ -1,9 +1,8 @@
 using Sholo.CommandLine.AppBuilder;
 
-namespace Sholo.CommandLine
+namespace Sholo.CommandLine;
+
+// Inherit from the base class.
+public sealed class CommandLineAppBuilder : BaseCommandLineAppBuilder<CommandLineAppBuilder>
 {
-    // Inherit from the base class.
-    public sealed class CommandLineAppBuilder : BaseCommandLineAppBuilder<CommandLineAppBuilder>
-    {
-    }
 }
diff --git a/Source/Sholo.CommandLine/CommandLineAppBuilderExtensions.cs b/Source/Sholo.CommandLine/CommandLineAppBuilderExtensions.cs
@@ -0,0 +1,13 @@
+using Sholo.Utils.Logging;
+
+namespace Sholo.CommandLine;
+
+public static class CommandLineAppBuilderExtensions
+{
+    public static ICommandLineAppBuilder<TSelf> UseSerilogConsole<TSelf>(this ICommandLineAppBuilder<TSelf> builder)
+        where TSelf : ICommandLineAppBuilder<TSelf>
+    {
+        builder.ConfigureLogging((ctx, lb) => lb.AddSerilogConsole(ctx.HostConfiguration));
+        return builder;
+    }
+}
diff --git a/Source/Sholo.CommandLine/CommandPlugin/BaseCommandPlugin.cs b/Source/Sholo.CommandLine/CommandPlugin/BaseCommandPlugin.cs
diff --git a/Source/Sholo.CommandLine/CommandPlugin/BaseLambdaCommandPlugin.cs b/Source/Sholo.CommandLine/CommandPlugin/BaseLambdaCommandPlugin.cs