Remove need for specifying plugin name

Author: ethanhann

src/InEngine.Core/AbstractCommand.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using CommandLine;
+using CommandLine.Text;
 using InEngine.Core.Exceptions;
 using InEngine.Core.IO;
 using InEngine.Core.LifeCycle;

src/InEngine.Core/AbstractPlugin.cs

@@ -11,9 +11,18 @@ public virtual void Schedule(ISchedule schedule)
         {}
 
         [HelpVerbOption]
-        public virtual string GetUsage(string verb)
+        public string GetUsage(string verb)
         {
-            return HelpText.AutoBuild(this, verb);
+            var helpText = HelpText.AutoBuild(this, verb);
+            helpText.Heading = $"{GetType().Assembly.GetName().Name} v{GetType().Assembly.GetName().Version.ToString()}";
+            return helpText;
+        }
+
+        public virtual string GetUsageWithoutHeader()
+        {
+            var helpText = new HelpText();
+            helpText.AddOptions(this);
+            return helpText;
         }
     }
 }

src/InEngine.Core/PluginAssembly.cs

@@ -13,10 +13,11 @@ public class PluginAssembly
         public Assembly Assembly { get; set; }
         public string Name { get { return Assembly.GetName().Name; } }
         public string Version { get { return Assembly.GetName().Version.ToString(); } }
-
+        public List<AbstractPlugin> Plugins { get; set; }
         public PluginAssembly(Assembly assembly)
         {
             Assembly = assembly;
+            Plugins = Make<AbstractPlugin>();
         }
 
         public static PluginAssembly LoadFrom(string assemblyPath)

src/InEngine.Core/Queuing/QueuingPlugin.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using CommandLine;
+using CommandLine.Text;
 using InEngine.Core.Queuing.Commands;
 using InEngine.Core.Scheduling;
 

src/InEngine/ArgumentInterpreter.cs

@@ -55,30 +55,24 @@ public void Interpret(string[] args)
                     ExitWithSuccess();
                 }
 
+                var pluginArgs = args.ToArray();
+                var firstPluginArg = pluginArgs.FirstOrDefault();
+                var firstArgIsConf = firstPluginArg.StartsWith("-c", StringComparison.OrdinalIgnoreCase) ||
+                                     firstPluginArg.StartsWith("--configuration", StringComparison.OrdinalIgnoreCase);
 
-                var plugin = pluginAssemblies.FirstOrDefault(x => x.Name == options.PluginName);
-
-                if (plugin == null)
-                    ExitWithFailure("Plugin does not exist: " + options.PluginName);
-                
-                var pluginOptionList = plugin.Make<AbstractPlugin>();
+                if (firstArgIsConf)
+                    pluginArgs = pluginArgs.Skip(1).ToArray();
 
-                var pluginArgs = args.Skip(1).ToArray();
+                var commandVerbName = pluginArgs.FirstOrDefault();
 
-                if (!pluginArgs.ToList().Any()) {
-                    PrintPluginHelpTextAndExit(plugin, pluginOptionList, pluginArgs);
-                }
+                foreach(var assembly in pluginAssemblies)
+                    foreach (var ops in assembly.Plugins)
+                        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);
 
-                if (new[] { "-p", "--plugin-name", "-c", "--configuration" }.Any(c => pluginArgs.First().StartsWith("-p", StringComparison.OrdinalIgnoreCase)))
-                    pluginArgs = pluginArgs.Skip(1).ToArray();
-
-                // Need to remove plugin options    
-                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);
+                PrintInEngineHelpTextAndExit(pluginAssemblies, options);
             }
         }
 
@@ -169,11 +163,14 @@ public void PrintInEngineHelpTextAndExit(List<PluginAssembly> plugins, Options o
         {
             Write.Info(CliLogo);
             Write.Text(options.GetUsage(""));
-            Write.Newline();
-            Write.Warning("Plugins:");
-            plugins.ForEach(x => Write.Line($"  {x.Name}"));
-            Write.Newline(2);
-            ExitWithSuccess();   
+            plugins.ForEach(x => {
+                Write.Warning(x.Name);
+                x.Plugins.ForEach(y => {
+                    Write.Line(string.Join(Environment.NewLine, y.GetUsageWithoutHeader().Split('\n').Where(s => !string.IsNullOrWhiteSpace(s))))
+                         .Newline();
+                });
+            });
+            ExitWithSuccess();
         }
     }
 }

src/InEngine/Options.cs

@@ -5,9 +5,6 @@ namespace InEngine
 {
     public class Options
     {
-        [Option('p', "plugin", HelpText = "Plug-In to activate.")]
-        public string PluginName { get; set; }
-
         [Option('s', "scheduler", HelpText = "Run the scheduler.")]
         public bool ShouldRunScheduler { get; set; }