Improve DI registration (#121)

* DefaultResolver should not throw NotImplementedException

* Should use interface for extension methods instead of concrete type fixed #120

* DefaultResolver should not throw NotImplementedExceptions

* Mark implementation as obsolete and introduce new method that uses factory method to register

* Make AddCommandLineParser extension method work

* Add new constructor for #120

* Create new instance when options are null

* Create new instance when options are null

* Add ICommandLineParser interface

* Make both generic and normal AddCommandLineParser DI extensions work #120

* Replace new keyword with dependency injected CommandLineParsers

* Update tests to use new DI method

Author: Matthiee

CommandLineParser.Tests/BasicDITests.cs

@@ -23,7 +23,9 @@ public void CommandLineParserUsesInjectedServiceCorrectly()
 
             Services.AddSingleton(mockedService.Object);
 
-            var parser = new CommandLineParser(Services);
+            Services.AddCommandLineParser();
+
+            var parser = ResolveParser();
 
             parser.RegisterCommand<MyCommandThatUsesService>();
 
@@ -41,7 +43,9 @@ public void CommandLineParserServiceResolvesCorrectly()
 
             Services.AddSingleton(mockedService);
 
-            var parser = new CommandLineParser(Services);
+            Services.AddCommandLineParser();
+
+            var parser = ResolveParser();
 
             var resolved = parser.Services.GetRequiredService<MySerice>();
 

CommandLineParser.Tests/Command/CommandDiscoveryTests.cs

@@ -41,7 +41,9 @@ public void DiscoverCommandFromAssemblyContainsCorrectTypes()
         [Fact]
         public void DiscoveredCommandsAreRegisteredCorrectly()
         {
-            var parser = new CommandLineParser<SomeBaseType>(Services);
+            Services.AddCommandLineParser<SomeBaseType>();
+
+            var parser = ResolveParser<SomeBaseType>();
 
             parser.DiscoverCommands(Assembly.GetExecutingAssembly());
 
@@ -64,7 +66,8 @@ public async Task CommandDiscoveryWithInjectedServices()
             Services.AddSingleton(envMock.Object);
             Services.AddSingleton(myServiceMock.Object);
 
-            var parser = new CommandLineParser<MyCommandWithInjectionsOptions>(Services);
+            Services.AddCommandLineParser<MyCommandWithInjectionsOptions>();
+            var parser = ResolveParser<MyCommandWithInjectionsOptions>();
 
             parser.DiscoverCommands(Assembly.GetExecutingAssembly());
 
@@ -83,7 +86,8 @@ public async Task NonGenericCommandCanBeDiscovered()
 
             Services.AddSingleton(argResolverMock.Object);
 
-            var parser = new CommandLineParser(Services);
+            Services.AddCommandLineParser();
+            var parser = ResolveParser();
 
             parser.DiscoverCommands(typeof(NonGenericDiscoverableCommand).Assembly);
 
@@ -110,7 +114,7 @@ public class ValidCommand2 : Command<SomeBaseType, object>
         {
         }
 
-        public class MyCommandWithInjectionsOptions 
+        public class MyCommandWithInjectionsOptions
         {
         }
 

CommandLineParser.Tests/Command/CommandInModelTests.cs

@@ -2,6 +2,7 @@
 using MatthiWare.CommandLine.Core.Attributes;
 using Xunit;
 using Xunit.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace MatthiWare.CommandLine.Tests.Command
 {
@@ -13,10 +14,13 @@ public CommandInModelTests(ITestOutputHelper testOutputHelper) : base(testOutput
 
         #region FindCommandsInModel
 
-        [Fact]
+        [Fact(Timeout = 1000)]
         public void FindCommandsInModel()
         {
-            var parser = new CommandLineParser<ModelWithCommands>(Services);
+            Services.AddLogging();
+            Services.AddCommandLineParser<ModelWithCommands>();
+
+            var parser = ResolveParser<ModelWithCommands>();
 
             Assert.Equal(3, parser.Commands.Count);
         }
@@ -65,7 +69,9 @@ public override void OnConfigure(ICommandConfigurationBuilder builder)
         [Fact]
         public void FindCommandsInCommandModel()
         {
-            var parser = new CommandLineParser(Services);
+            Services.AddCommandLineParser();
+
+            var parser = ResolveParser();
 
             parser.RegisterCommand<GenericSubCommandWithOwnOptions, SubCommandModelWithCommands>();
 

CommandLineParser.Tests/Command/MultipleCommandTests.cs

@@ -16,7 +16,9 @@ public MultipleCommandTests(ITestOutputHelper testOutputHelper) : base(testOutpu
         [InlineData(new string[] { }, false)]
         public void NonRequiredCommandShouldNotSetResultInErrorStateWhenRequiredOptionsAreMissing(string[] args, bool _)
         {
-            var parser = new CommandLineParser(Services);
+            Services.AddCommandLineParser();
+
+            var parser = ResolveParser();
 
             parser.AddCommand<MultipleCommandTestsOptions>()
                 .Name("cmd1")

CommandLineParser.Tests/Command/SubCommandTests.cs

@@ -27,7 +27,8 @@ public async Task TestSubCommandWorksCorrectlyInModelAsync(bool autoExecute, str
             Services.AddSingleton(new MainCommand(lock1, autoExecute, bla, i, n));
             Services.AddSingleton(new SubCommand(lock2, autoExecute, bla, i, n));
 
-            var parser = new CommandLineParser<MainModel>(Services);
+            Services.AddCommandLineParser<MainModel>();
+            var parser = ResolveParser<MainModel>();
 
             var result = await parser.ParseAsync(new[] { "main", "-b", bla, "sub", "-i", i.ToString(), "-n", n.ToString() });
 

CommandLineParser.Tests/CommandLineModelTests.cs

@@ -14,7 +14,8 @@ public CommandLineModelTests(ITestOutputHelper testOutputHelper) : base(testOutp
         [Fact]
         public void TestBasicModel()
         {
-            var parser = new CommandLineParser<Model>(Services);
+            Services.AddCommandLineParser<Model>();
+            var parser = ResolveParser<Model>();
 
             Assert.Equal(1, parser.Options.Count);
 
@@ -36,7 +37,8 @@ public void TestBasicModel()
         [Fact]
         public void TestBasicModelWithOverwritingUsingFluentApi()
         {
-            var parser = new CommandLineParser<Model>(Services);
+            Services.AddCommandLineParser<Model>();
+            var parser = ResolveParser<Model>();
 
             parser.Configure(_ => _.Message)
                 .Required(false)