Support multiple option files in a single assembly

Author: ethanhann

src/InEngine.Commands/InEngine.Commands.csproj

@@ -38,6 +38,7 @@
     <Compile Include="Sample\ShowProgress.cs" />
     <Compile Include="Sample\SayHello.cs" />
     <Compile Include="Options.cs" />
+    <Compile Include="MoreOptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Sample\" />

src/InEngine.Commands/MoreOptions.cs

@@ -0,0 +1,22 @@
+using CommandLine;
+using CommandLine.Text;
+using InEngine.Commands.Sample;
+using InEngine.Core;
+
+namespace InEngine.Commands
+{
+    public class MoreOptions : IOptions
+    {
+        [VerbOption("sample:show-progress")]
+        public ShowProgress ShowProgress { get; set; }
+
+        [VerbOption("sample:say-hello")]
+        public SayHello SayHello { get; set; }
+
+        [HelpVerbOption]
+        public string GetUsage(string verb)
+        {
+            return HelpText.AutoBuild(this, verb);
+        }
+    }
+}

src/InEngine.Commands/Options.cs

@@ -10,12 +10,6 @@ public class Options : IOptions
         [VerbOption("sample:minimal")]
         public Minimal Minimal { get; set; }
 
-        [VerbOption("sample:show-progress")]
-        public ShowProgress ShowProgress { get; set; }
-
-        [VerbOption("sample:say-hello")]
-        public SayHello SayHello { get; set; }
-
         [HelpVerbOption]
         public string GetUsage(string verb)
         {

src/InEngine.Core/Plugin.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -14,12 +15,13 @@ public Plugin(Assembly assembly)
             Assembly = assembly;
         }
 
-        public IOptions MakeOptions()
+        public List<IOptions> MakeOptions()
         {
-            var optionType = Assembly.GetTypes().FirstOrDefault(x => x.IsClass && typeof(IOptions).IsAssignableFrom(x));
-            if (optionType == null)
-                Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
-            return Assembly.CreateInstance(optionType.FullName) as IOptions;
+            return Assembly
+                .GetTypes()
+                .Where(x => x.IsClass && typeof(IOptions).IsAssignableFrom(x))
+                .Select(x => Assembly.CreateInstance(x.FullName) as IOptions)
+                .ToList();
         }
     }
 }

src/InEngine.Net.userprefs

@@ -1,21 +1,18 @@
 <Properties StartupConfiguration="{DF1A45FD-4887-4D65-8BAD-EE17B70FE79D}|Default">
   <MonoDevelop.Ide.ItemProperties.InEngineScheduler PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="InEngine.Commands/Options.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="InEngineCli/ArgumentInterpreter.cs">
     <Files>
-      <File FileName="InEngineCli/ArgumentInterpreter.cs" Line="46" Column="39" />
-      <File FileName="InEngine.Core/Plugin.cs" Line="15" Column="10" />
-      <File FileName="InEngine.Commands/Options.cs" Line="10" Column="22" />
+      <File FileName="InEngineCli/ArgumentInterpreter.cs" Line="57" Column="52" />
+      <File FileName="InEngine.Core/Plugin.cs" Line="17" Column="1" />
+      <File FileName="InEngine.Commands/MoreOptions.cs" Line="10" Column="20" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="InEngine.Net" expanded="True">
-            <Node name="InEngine.Commands" expanded="True">
-              <Node name="Options.cs" selected="True" />
-            </Node>
+            <Node name="InEngine.Commands" expanded="True" />
             <Node name="InEngine.Core" expanded="True" />
-            <Node name="InEngineCli" expanded="True" />
-            <Node name="InEngineScheduler" expanded="True" />
+            <Node name="InEngineCli" expanded="True" selected="True" />
           </Node>
         </State>
       </Pad>

src/InEngineCli/ArgumentInterpreter.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using CommandLine;
 using InEngine.Core;
 using InEngine.Core.Exceptions;
 using NLog;
@@ -35,17 +36,29 @@ public void Interpret(string[] args)
             {
                 if (options == null)
                     Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
+
+                var plugin = plugins.FirstOrDefault(x => x.Name == options.PlugInName);
+                if (plugin == null)
+                    ExitWithFailure("Plugin does not exist: " + options.PlugInName);
 
-                var pluginOptions = plugins.FirstOrDefault(x => x.Name == options.PlugInName).MakeOptions();
+                var pluginOptionList = plugin.MakeOptions();
+
                 var pluginArgs = args.Skip(1).ToArray();
                 if (!pluginArgs.ToList().Any()) {
                     // If the plugin's args are empty, print the plugin's help screen and exit.
-                    CommandLine.Parser.Default.ParseArguments(pluginArgs, pluginOptions);
-                    Console.WriteLine(pluginOptions.GetUsage(""));
+                    foreach(var pluginOptions in pluginOptionList) {
+                        CommandLine.Parser.Default.ParseArguments(pluginArgs, pluginOptions);
+                        Console.WriteLine(pluginOptions.GetUsage(""));
+                    }
                     ExitWithSuccess();
                 }
 
-                InterpretPluginArguments(pluginArgs, pluginOptions);
+                var commandVerbName = pluginArgs.First();
+                foreach (var ops in pluginOptionList)
+                    foreach (var prop in ops.GetType().GetProperties())
+                        foreach (object attr in prop.GetCustomAttributes(true))
+                            if (attr is VerbOptionAttribute commandVerb && (commandVerb.LongName == commandVerbName || commandVerb.ShortName.ToString() == commandVerbName))
+                                    InterpretPluginArguments(pluginArgs, ops);
             }
         }
 
@@ -57,6 +70,14 @@ public void ExitWithSuccess(string message = null)
             Environment.Exit(0);
         }
 
+        public void ExitWithFailure(string message = null)
+        {
+            if (string.IsNullOrWhiteSpace(message))
+                message = "fail";
+            Logger.Error($"✘ {message}");
+            Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
+        }
+
         public void ExitWithFailure(Exception exception = null)
         {
             Logger.Error(exception ?? new CommandFailedException(), "✘ fail");
@@ -104,7 +125,7 @@ public void InterpretPluginArguments(string[] pluginArgs, IOptions pluginOptions
                 });
 
             if (!isSuccessful)
-                ExitWithFailure();
+                ExitWithFailure("Could not parse plugin arguments");
         }
     }
 }