Cleanup

Author: ethanhann

src/InEngine.Core/Queue/Commands/Publish.cs

@@ -15,7 +15,7 @@ public override CommandResult Run()
         {
             var command = Assembly.LoadFrom(CommandAssembly).CreateInstance(CommandClass) as ICommand;
             if (command == null)
-                return new CommandResult(false, "Did not publish message. Could not load command from assembly.");
+                return new CommandResult(false, "Did not publish message. Could not load command from plugin.");
             Broker.MakeBroker(this).Publish(command);
             return new CommandResult(true, "Published");
         }

src/InEngineCli/ArgumentInterpreter.cs

@@ -29,25 +29,25 @@ public void Interpret(string[] args)
                 ExitWithSuccess();
             }
 
-            var parser = new CommandLine.Parser(with => with.IgnoreUnknownArguments = true);
+            var parser = new Parser(with => with.IgnoreUnknownArguments = true);
             var options = new Options();
 
             if (parser.ParseArguments(args, options))
             {
                 if (options == null)
-                    Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
+                    Environment.Exit(Parser.DefaultExitCodeFail);
 
-                var plugin = plugins.FirstOrDefault(x => x.Name == options.PlugInName);
+                var plugin = plugins.FirstOrDefault(x => x.Name == options.PluginName);
                 if (plugin == null)
-                    ExitWithFailure("Plugin does not exist: " + options.PlugInName);
+                    ExitWithFailure("Plugin does not exist: " + options.PluginName);
 
                 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.
                     foreach(var pluginOptions in pluginOptionList) {
-                        CommandLine.Parser.Default.ParseArguments(pluginArgs, pluginOptions);
+                        Parser.Default.ParseArguments(pluginArgs, pluginOptions);
                         Console.WriteLine(pluginOptions.GetUsage(""));
                     }
                     ExitWithSuccess();
@@ -72,16 +72,22 @@ public void ExitWithSuccess(string message = null)
 
         public void ExitWithFailure(string message = null)
         {
-            if (string.IsNullOrWhiteSpace(message))
-                message = "fail";
-            Logger.Error($"✘ {message}");
-            Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
+            Logger.Error(MakeErrorMessage(message));
+            Environment.Exit(Parser.DefaultExitCodeFail);
         }
 
         public void ExitWithFailure(Exception exception = null)
         {
-            Logger.Error(exception ?? new CommandFailedException(), "✘ fail");
-            Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
+            var ex = exception ?? new Exception("Unspecified failure");
+            Logger.Error(ex, MakeErrorMessage(ex.Message));
+            Environment.Exit(Parser.DefaultExitCodeFail);
+        }
+
+        protected string MakeErrorMessage(string message = null)
+        {
+            if (string.IsNullOrWhiteSpace(message))
+                message = "fail";
+            return $"✘ {message}";
         }
 
         public List<Plugin> FindPlugins()
@@ -96,8 +102,7 @@ public List<Plugin> FindPlugins()
 
         public void InterpretPluginArguments(string[] pluginArgs, IOptions pluginOptions)
         {
-            var isSuccessful = CommandLine
-                .Parser
+            var isSuccessful = Parser
                 .Default
                 .ParseArguments(pluginArgs, pluginOptions, (verb, subOptions) =>
                 {

src/InEngineCli/NLog.config

@@ -11,6 +11,6 @@
   </targets>
 
   <rules>
-	<logger name="*" minlevel="Debug" writeTo="c" />
+	<logger name="*" minlevel="Trace" writeTo="c" />
   </rules>
 </nlog>

src/InEngineCli/Options.cs

@@ -8,7 +8,7 @@ namespace InEngineCli
     public class Options
     {
         [Option('p', "plugin", Required = true, HelpText = "Plug-In to activate.", DefaultValue = "InEngine.Core")]
-        public string PlugInName { get; set; }
+        public string PluginName { get; set; }
 
         [HelpVerbOption]
         public string GetUsage(string verb)