Add Spectre.Cli to Spectre.Console

* Renames Spectre.Cli to Spectre.Console.Cli.
* Now uses Verify with Spectre.Console.Cli tests.
* Removes some duplicate definitions.

Closes #168

examples/Cli/Delegates/BarSettings.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+using Spectre.Console.Cli;
+
+namespace Delegates
+{
+    public static partial class Program
+    {
+        public sealed class BarSettings : CommandSettings
+        {
+            [CommandOption("--count")]
+            [Description("The number of bars to print")]
+            [DefaultValue(1)]
+            public int Count { get; set; }
+        }
+    }
+}

examples/Cli/Delegates/Delegates.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Delegates</ExampleName>
+    <ExampleDescription>Demonstrates how to specify commands as delegates.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Cli/Delegates/Program.cs

@@ -0,0 +1,39 @@
+using System;
+using Spectre.Console.Cli;
+
+namespace Delegates
+{
+    public static partial class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+            app.Configure(config =>
+            {
+                config.AddDelegate("foo", Foo)
+                    .WithDescription("Foos the bars");
+
+                config.AddDelegate<BarSettings>("bar", Bar)
+                    .WithDescription("Bars the foos"); ;
+            });
+
+            return app.Run(args);
+        }
+
+        private static int Foo(CommandContext context)
+        {
+            Console.WriteLine("Foo");
+            return 0;
+        }
+
+        private static int Bar(CommandContext context, BarSettings settings)
+        {
+            for (var index = 0; index < settings.Count; index++)
+            {
+                Console.WriteLine("Bar");
+            }
+
+            return 0;
+        }
+    }
+}

examples/Cli/Demo/Commands/Add/AddPackageCommand.cs

@@ -0,0 +1,47 @@
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    [Description("Add a NuGet package reference to the project.")]
+    public sealed class AddPackageCommand : Command<AddPackageCommand.Settings>
+    {
+        public sealed class Settings : AddSettings
+        {
+            [CommandArgument(0, "<PACKAGENAME>")]
+            [Description("The package reference to add.")]
+            public string PackageName { get; set; }
+
+            [CommandOption("-v|--version <VERSION>")]
+            [Description("The version of the package to add.")]
+            public string Version { get; set; }
+
+            [CommandOption("-f|--framework <FRAMEWORK>")]
+            [Description("Add the reference only when targeting a specific framework.")]
+            public string Framework { get; set; }
+
+            [CommandOption("--no-restore")]
+            [Description("Add the reference without performing restore preview and compatibility check.")]
+            public bool NoRestore { get; set; }
+
+            [CommandOption("--source <SOURCE>")]
+            [Description("The NuGet package source to use during the restore.")]
+            public string Source { get; set; }
+
+            [CommandOption("--package-directory <PACKAGEDIR>")]
+            [Description("The directory to restore packages to.")]
+            public string PackageDirectory { get; set; }
+
+            [CommandOption("--interactive")]
+            [Description("Allows the command to stop and wait for user input or action (for example to complete authentication).")]
+            public bool Interactive { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}

examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs

@@ -0,0 +1,30 @@
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    public sealed class AddReferenceCommand : Command<AddReferenceCommand.Settings>
+    {
+        public sealed class Settings : AddSettings
+        {
+            [CommandArgument(0, "<PROJECTPATH>")]
+            [Description("The package reference to add.")]
+            public string ProjectPath { get; set; }
+
+            [CommandOption("-f|--framework <FRAMEWORK>")]
+            [Description("Add the reference only when targeting a specific framework.")]
+            public string Framework { get; set; }
+
+            [CommandOption("--interactive")]
+            [Description("Allows the command to stop and wait for user input or action (for example to complete authentication).")]
+            public bool Interactive { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}

examples/Cli/Demo/Commands/Add/AddSettings.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    public abstract class AddSettings : CommandSettings
+    {
+        [CommandArgument(0, "<PROJECT>")]
+        [Description("The project file to operate on. If a file is not specified, the command will search the current directory for one.")]
+        public string Project { get; set; }
+    }
+}

examples/Cli/Demo/Commands/Run/RunCommand.cs

@@ -0,0 +1,70 @@
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    [Description("Build and run a .NET project output.")]
+    public sealed class RunCommand : Command<RunCommand.Settings>
+    {
+        public sealed class Settings : CommandSettings
+        {
+            [CommandOption("-c|--configuration <CONFIGURATION>")]
+            [Description("The configuration to run for. The default for most projects is '[grey]Debug[/]'.")]
+            [DefaultValue("Debug")]
+            public string Configuration { get; set; }
+
+            [CommandOption("-f|--framework <FRAMEWORK>")]
+            [Description("The target framework to run for. The target framework must also be specified in the project file.")]
+            public string Framework { get; set; }
+
+            [CommandOption("-r|--runtime <RUNTIMEIDENTIFIER>")]
+            [Description("The target runtime to run for.")]
+            public string RuntimeIdentifier { get; set; }
+
+            [CommandOption("-p|--project <PROJECTPATH>")]
+            [Description("The path to the project file to run (defaults to the current directory if there is only one project).")]
+            public string ProjectPath { get; set; }
+
+            [CommandOption("--launch-profile <LAUNCHPROFILE>")]
+            [Description("The name of the launch profile (if any) to use when launching the application.")]
+            public string LaunchProfile { get; set; }
+
+            [CommandOption("--no-launch-profile")]
+            [Description("Do not attempt to use [grey]launchSettings.json[/] to configure the application.")]
+            public bool NoLaunchProfile { get; set; }
+
+            [CommandOption("--no-build")]
+            [Description("Do not build the project before running. Implies [grey]--no-restore[/].")]
+            public bool NoBuild { get; set; }
+
+            [CommandOption("--interactive")]
+            [Description("Allows the command to stop and wait for user input or action (for example to complete authentication).")]
+            public string Interactive { get; set; }
+
+            [CommandOption("--no-restore")]
+            [Description("Do not restore the project before building.")]
+            public bool NoRestore { get; set; }
+
+            [CommandOption("--verbosity <VERBOSITY>")]
+            [Description("Set the MSBuild verbosity level. Allowed values are q[grey]uiet[/], m[grey]inimal[/], n[grey]ormal[/], d[grey]etailed[/], and diag[grey]nostic[/].")]
+            [TypeConverter(typeof(VerbosityConverter))]
+            [DefaultValue(Verbosity.Normal)]
+            public Verbosity Verbosity { get; set; }
+
+            [CommandOption("--no-dependencies")]
+            [Description("Do not restore project-to-project references and only restore the specified project.")]
+            public bool NoDependencies { get; set; }
+
+            [CommandOption("--force")]
+            [Description("Force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting [grey]project.assets.json[/].")]
+            public bool Force { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}

examples/Cli/Demo/Commands/Serve/ServeCommand.cs

@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    [Description("Launches a web server in the current working directory and serves all files in it.")]
+    public sealed class ServeCommand : Command<ServeCommand.Settings>
+    {
+        public sealed class Settings : CommandSettings
+        {
+            [CommandOption("-p|--port <PORT>")]
+            [Description("Port to use. Defaults to [grey]8080[/]. Use [grey]0[/] for a dynamic port.")]
+            public int Port { get; set; }
+
+            [CommandOption("-o|--open-browser [BROWSER]")]
+            [Description("Open a web browser when the server starts. You can also specify which browser to use. If none is specified, the default one will be used.")]
+            public FlagValue<string> OpenBrowser { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            if (settings.OpenBrowser.IsSet)
+            {
+                var browser = settings.OpenBrowser.Value;
+                if (browser != null)
+                {
+                    Console.WriteLine($"Open in {browser}");
+                }
+                else
+                {
+                    Console.WriteLine($"Open in default browser.");
+                }
+            }
+
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}

examples/Cli/Demo/Demo.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Demo</ExampleName>
+    <ExampleDescription>Demonstrates the most common use cases of Spectre.Cli.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Cli/Demo/Program.cs

@@ -0,0 +1,37 @@
+using Demo.Commands;
+using Spectre.Console.Cli;
+
+namespace Demo
+{
+    public static class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+            app.Configure(config =>
+            {
+                config.SetApplicationName("fake-dotnet");
+                config.ValidateExamples();
+                config.AddExample(new[] { "run", "--no-build" });
+
+                // Run
+                config.AddCommand<RunCommand>("run");
+
+                // Add
+                config.AddBranch<AddSettings>("add", add =>
+                {
+                    add.SetDescription("Add a package or reference to a .NET project");
+                    add.AddCommand<AddPackageCommand>("package");
+                    add.AddCommand<AddReferenceCommand>("reference");
+                });
+
+                // Serve
+                config.AddCommand<ServeCommand>("serve")
+                    .WithExample(new[] { "serve", "-o", "firefox" })
+                    .WithExample(new[] { "serve", "--port", "80", "-o", "firefox" });
+            });
+
+            return app.Run(args);
+        }
+    }
+}

examples/Cli/Demo/Utilities/SettingsDumper.cs

@@ -0,0 +1,29 @@
+using Spectre.Console;
+using Spectre.Console.Cli;
+
+namespace Demo.Utilities
+{
+    public static class SettingsDumper
+    {
+        public static void Dump(CommandSettings settings)
+        {
+            var table = new Table().RoundedBorder();
+            table.AddColumn("[grey]Name[/]");
+            table.AddColumn("[grey]Value[/]");
+
+            var properties = settings.GetType().GetProperties();
+            foreach (var property in properties)
+            {
+                var value = property.GetValue(settings)
+                    ?.ToString()
+                    ?.Replace("[", "[[");
+
+                table.AddRow(
+                    property.Name,
+                    value ?? "[grey]null[/]");
+            }
+
+            AnsiConsole.Render(table);
+        }
+    }
+}

examples/Cli/Demo/Verbosity.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Demo
+{
+    public enum Verbosity
+    {
+        Quiet,
+        Minimal,
+        Normal,
+        Detailed,
+        Diagnostic
+    }
+
+    public sealed class VerbosityConverter : TypeConverter
+    {
+        private readonly Dictionary<string, Verbosity> _lookup;
+
+        public VerbosityConverter()
+        {
+            _lookup = new Dictionary<string, Verbosity>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "q", Verbosity.Quiet },
+                { "quiet", Verbosity.Quiet },
+                { "m", Verbosity.Minimal },
+                { "minimal", Verbosity.Minimal },
+                { "n", Verbosity.Normal },
+                { "normal", Verbosity.Normal },
+                { "d", Verbosity.Detailed },
+                { "detailed", Verbosity.Detailed },
+                { "diag", Verbosity.Diagnostic },
+                { "diagnostic", Verbosity.Diagnostic }
+            };
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string stringValue)
+            {
+                var result = _lookup.TryGetValue(stringValue, out var verbosity);
+                if (!result)
+                {
+                    const string format = "The value '{0}' is not a valid verbosity.";
+                    var message = string.Format(CultureInfo.InvariantCulture, format, value);
+                    throw new InvalidOperationException(message);
+                }
+                return verbosity;
+            }
+            throw new NotSupportedException("Can't convert value to verbosity.");
+        }
+    }
+}

examples/Cli/Dynamic/Dynamic.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Dynamic</ExampleName>
+    <ExampleDescription>Demonstrates how to define dynamic commands.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Cli/Dynamic/MyCommand.cs

@@ -0,0 +1,20 @@
+using System;
+using Spectre.Console.Cli;
+
+namespace Dynamic
+{
+    public sealed class MyCommand : Command
+    {
+        public override int Execute(CommandContext context)
+        {
+            if (!(context.Data is int data))
+            {
+                throw new InvalidOperationException("Command has no associated data.");
+                
+            }
+
+            Console.WriteLine("Value = {0}", data);
+            return 0;
+        }
+    }
+}

examples/Cli/Dynamic/Program.cs

@@ -0,0 +1,24 @@
+using System.Linq;
+using Spectre.Console.Cli;
+
+namespace Dynamic
+{
+    public static class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+            app.Configure(config =>
+            {
+                foreach(var index in Enumerable.Range(1, 10))
+                {
+                    config.AddCommand<MyCommand>($"c{index}")
+                        .WithDescription($"Prints the number {index}")
+                        .WithData(index);
+                }
+            });
+
+            return app.Run(args);
+        }
+    }
+}

examples/Cli/Injection/Commands/DefaultCommand.cs

@@ -0,0 +1,30 @@
+using System;
+using System.ComponentModel;
+using Spectre.Console.Cli;
+
+namespace Injection.Commands
+{
+    public sealed class DefaultCommand : Command<DefaultCommand.Settings>
+    {
+        private readonly IGreeter _greeter;
+
+        public sealed class Settings : CommandSettings
+        {
+            [CommandOption("-n|--name <NAME>")]
+            [Description("The person or thing to greet.")]
+            [DefaultValue("World")]
+            public string Name { get; set; }
+        }
+
+        public DefaultCommand(IGreeter greeter)
+        {
+            _greeter = greeter ?? throw new ArgumentNullException(nameof(greeter));
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            _greeter.Greet(settings.Name);
+            return 0;
+        }
+    }
+}

examples/Cli/Injection/IGreeter.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace Injection
+{
+    public interface IGreeter
+    {
+        void Greet(string name);
+    }
+
+    public sealed class HelloWorldGreeter : IGreeter
+    {
+        public void Greet(string name)
+        {
+            Console.WriteLine($"Hello {name}!");
+        }
+    }
+}

examples/Cli/Injection/Infrastructure/TypeRegistrar.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Injection
+{
+    public sealed class TypeRegistrar : ITypeRegistrar
+    {
+        private readonly IServiceCollection _builder;
+
+        public TypeRegistrar(IServiceCollection builder)
+        {
+            _builder = builder;
+        }
+
+        public ITypeResolver Build()
+        {
+            return new TypeResolver(_builder.BuildServiceProvider());
+        }
+
+        public void Register(Type service, Type implementation)
+        {
+            _builder.AddSingleton(service, implementation);
+        }
+
+        public void RegisterInstance(Type service, object implementation)
+        {
+            _builder.AddSingleton(service, implementation);
+        }
+    }
+}

examples/Cli/Injection/Infrastructure/TypeResolver.cs

@@ -0,0 +1,21 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Injection
+{
+    public sealed class TypeResolver : ITypeResolver
+    {
+        private readonly IServiceProvider _provider;
+
+        public TypeResolver(IServiceProvider provider)
+        {
+            _provider = provider ?? throw new ArgumentNullException(nameof(provider));
+        }
+
+        public object Resolve(Type type)
+        {
+            return _provider.GetRequiredService(type);
+        }
+    }
+}

examples/Cli/Injection/Injection.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Injection</ExampleName>
+    <ExampleDescription>Demonstrates how to use dependency injection with Spectre.Cli.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Cli/Injection/Program.cs

@@ -0,0 +1,23 @@
+using Injection.Commands;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Injection
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            // Create a type registrar and register any dependencies.
+            // A type registrar is an adapter for a DI framework.
+            var registrations = new ServiceCollection();
+            registrations.AddSingleton<IGreeter, HelloWorldGreeter>();
+            var registrar = new TypeRegistrar(registrations);
+
+            // Create a new command app with the registrar
+            // and run it with the provided arguments.
+            var app = new CommandApp<DefaultCommand>(registrar);
+            return app.Run(args);
+        }
+    }
+}