Require that plugins are specified instead of autodiscovered.

Author: ethanhann

src/InEngine.Core.Test/appsettings.json

@@ -1,6 +1,12 @@
 {
   "InEngine": {
+    "Plugins": [
+      "InEngine.Commands"
+    ],
     "Queue": {
+      "UseCompression": false,
+      "PrimaryQueueConsumers": 16,
+      "SecondaryQueueConsumers": 4,
       "QueueName": "InEngine:Queue",
       "RedisHost": "localhost",
       "RedisPort": 6379,

src/InEngine.Core/Commands/Options.cs

@@ -8,8 +8,8 @@ public class Options : IOptions
         [VerbOption("echo", HelpText= "Echo some text to the console. Useful for end-to-end testing.")]
         public Echo Echo { get; set; }
 
-        [VerbOption("process", HelpText = "Launch an arbitrary process.")]
-        public RuntimeProcess Process { get; set; }
+        [VerbOption("proc", HelpText = "Launch an arbitrary process.")]
+        public SystemProcess SystemProcess { get; set; }
 
         [HelpVerbOption]
         public string GetUsage(string verb)

…InEngine.Core/Commands/RuntimeProcess.cs …/InEngine.Core/Commands/SystemProcess.cssrc/InEngine.Core/Commands/RuntimeProcess.cs renamed to src/InEngine.Core/Commands/SystemProcess.cs src/InEngine.Core/Commands/RuntimeProcess.cs renamed to src/InEngine.Core/Commands/SystemProcess.cs

@@ -6,7 +6,7 @@
 
 namespace InEngine.Core.Commands
 {
-    public class RuntimeProcess : AbstractCommand
+    public class SystemProcess : AbstractCommand
     {
         [Option('c', "command", Required = true, HelpText = "The name of the CLI program/command to run.")]
         public string Command { get; set; }

src/InEngine.Core/InEngineSettings.cs

@@ -9,7 +9,7 @@ public class InEngineSettings
     {
         public static string BasePath { get; set; } = Directory.GetCurrentDirectory();
         public static string ConfigurationFile { get; set; } = "appsettings.json";
-        public List<string> PluginDirectories { get; set; }
+        public List<string> Plugins { get; set; } = new List<string>();
         public QueueSettings Queue { get; set; }
 
         public static InEngineSettings Make()

src/InEngine.Core/Plugin.cs

@@ -42,18 +42,26 @@ public List<T> Make<T>() where T : class, IPluginType
                 .ToList();
         }
 
-        public static List<Plugin> Discover<T>() where T : IPluginType
+        public static List<Plugin> Load<T>() where T : IPluginType
         {
-            var logger = LogManager.GetCurrentClassLogger();
-            var discoveredAssemblies = InEngineSettings.Make().PluginDirectories.SelectMany(x => {
-                if (!Directory.Exists(x)) {
-                    logger.Warn("Plugin directory does not exist: " + x);
-                    return new List<Assembly>();
-                }
-                return Directory.GetFiles(x, "*.dll").Select(y => Assembly.LoadFrom(y));                
-            });
             var pluginList = new List<Plugin>();
-            foreach (var assembly in discoveredAssemblies)
+            var logger = LogManager.GetCurrentClassLogger();
+
+            logger.Debug("Loading core plugin...");
+            try
+            {
+                pluginList.Add(new Plugin(Assembly.GetExecutingAssembly()));    
+            } 
+            catch (Exception exception)
+            {
+                logger.Error(exception, "Error loading InEngine.Core plugin.");
+            }
+                    
+            var assemblies = InEngineSettings
+                .Make()
+                .Plugins
+                .Select(x => Assembly.LoadFrom($"{x}.dll"));
+            foreach (var assembly in assemblies)
             {
                 try
                 {
@@ -62,9 +70,11 @@ public static List<Plugin> Discover<T>() where T : IPluginType
                 }
                 catch (Exception exception)
                 {
-                    logger.Error(exception, "Error discovering plugins");
+                    logger.Error(exception, "Error loading plugins.");
                 }
             }
+            if (!pluginList.Any())
+                throw new PluginNotFoundException("There are no plugins available.");
             return pluginList.OrderBy(x => x.Name).ToList();
         }
 

src/InEngine/ArgumentInterpreter.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Linq;
 using CommandLine;
-using CommandLine.Text;
 using InEngine.Core;
 using InEngine.Core.Exceptions;
 using NLog;
 using InEngine.Core.IO;
-using System.ServiceProcess;
-using System.IO;
 using System.Collections.Generic;
 
 namespace InEngine
@@ -33,7 +30,7 @@ ___       _____             _              _   _ _____ _____
 
         public void Interpret(string[] args)
         {
-            var plugins = Plugin.Discover<IOptions>();
+            var plugins = Plugin.Load<IOptions>();
             var parser = new Parser(with => {
                 with.IgnoreUnknownArguments = true;
                 with.MutuallyExclusive = true;
@@ -159,9 +156,9 @@ public void PrintPluginHelpTextAndExit(Plugin plugin, List<IOptions> pluginOptio
                     .ToList()
                     .ForEach(x => {
                         var optionAttribute = (x as BaseOptionAttribute);
-                        Console.WriteLine($"  {optionAttribute.LongName}\t{optionAttribute.HelpText}");
+                        Write.Text($"  {optionAttribute.LongName}".PadRight(20));
+                        Write.Line(optionAttribute.HelpText);
                     });
-
             }
             ExitWithSuccess();
         }

src/InEngine/Jobs.cs

@@ -11,7 +11,7 @@ public static class Jobs
         public static void Schedule(IScheduler scheduler)
         {
             var logger = LogManager.GetCurrentClassLogger();
-            Plugin.Discover<IJobs>().ForEach(x => {
+            Plugin.Load<IJobs>().ForEach(x => {
                 logger.Info($"Registering jobs from plugin: {x.Name}");
                 x.Make<IJobs>().ForEach(y => y.Schedule(scheduler));
             });

src/InEngine/appsettings.json

@@ -1,6 +1,7 @@
 {
   "InEngine": {
-    "PluginDirectories": [ ".", "Plugins" ],
+    "Plugins": [
+    ],
     "Queue": {
       "UseCompression": false,
       "PrimaryQueueConsumers":  16,