Merge branch '3.4-dev'

Author: ethanhann

src/InEngine.Core/Commands/AlwaysFail.cs src/InEngine.Commands/AlwaysFail.cssrc/InEngine.Core/Commands/AlwaysFail.cs renamed to src/InEngine.Commands/AlwaysFail.cs

@@ -1,7 +1,8 @@
 using System;
+using InEngine.Core;
 using InEngine.Core.Exceptions;
 
-namespace InEngine.Core.Commands
+namespace InEngine.Commands
 {
     /// <summary>
     /// Dummy command for testing and sample code.

…/InEngine.Core/Commands/AlwaysSucceed.cs src/InEngine.Commands/AlwaysSucceed.cssrc/InEngine.Core/Commands/AlwaysSucceed.cs renamed to src/InEngine.Commands/AlwaysSucceed.cs src/InEngine.Core/Commands/AlwaysSucceed.cs renamed to src/InEngine.Commands/AlwaysSucceed.cs

@@ -1,4 +1,6 @@
-namespace InEngine.Core.Commands
+using InEngine.Core;
+
+namespace InEngine.Commands
 {
     /// <summary>
     /// Dummy command for testing and sample code.

src/InEngine.Commands/Options.cs

@@ -1,17 +1,21 @@
 using CommandLine;
-using InEngine.Commands.Sample;
+using CommandLine.Text;
 using InEngine.Core;
 
 namespace InEngine.Commands
 {
     public class Options : IOptions
     {
-        [VerbOption("sample:minimal")]
-        public Minimal Minimal { get; set; }
+        [VerbOption("fail", HelpText = "Always fail. Useful for end-to-end testing.")]
+        public AlwaysFail AlwaysFail { get; set; }
 
+        [VerbOption("succeed", HelpText = "A null operation command. Literally does nothing.")]
+        public AlwaysSucceed Null { get; set; }
+
+        [HelpVerbOption]
         public string GetUsage(string verb)
         {
-            return "\tsample:minimal \t\tA minimal implementation of a command.";
+            return HelpText.AutoBuild(this, verb);
         }
     }
 }

src/InEngine.Commands/MoreOptions.cs src/InEngine.Commands/Sample/Options.cssrc/InEngine.Commands/MoreOptions.cs renamed to src/InEngine.Commands/Sample/Options.cs

@@ -13,6 +13,10 @@ public class MoreOptions : IOptions
         [VerbOption("sample:say-hello", HelpText = "A sample command to say \"hello\".")]
         public SayHello SayHello { get; set; }
 
+        [VerbOption("sample:minimal")]
+        public Minimal Minimal { get; set; }
+
+        [HelpVerbOption]
         public string GetUsage(string verb)
         {
             return HelpText.AutoBuild(this, verb);

src/InEngine.Core.Test/Queue/Commands/ConsumeTest.cs

@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using BeekmanLabs.UnitTesting;
-using InEngine.Core.Commands;
-using InEngine.Core.Exceptions;
-using InEngine.Core.Queue.Commands;
+using BeekmanLabs.UnitTesting;
+using InEngine.Commands;
+using InEngine.Core.Queuing.Commands;
 using Moq;
 using NUnit.Framework;
 using Quartz;
@@ -52,7 +49,6 @@ public void ShouldConsumeSecondaryQueueBasedOnJobContextData()
             var jobExecutionConext = new Mock<IJobExecutionContext>();
             var jobDataMap = new JobDataMap { { "useSecondaryQueue", true } };
             jobExecutionConext.SetupGet(p => p.JobDetail.JobDataMap).Returns(jobDataMap);
-            Subject.JobExecutionContext = jobExecutionConext.Object;
 
             Subject.Run();
         }

src/InEngine.Core.Test/Queue/Commands/PublishTest.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using BeekmanLabs.UnitTesting;
+using InEngine.Commands;
 using InEngine.Core.Commands;
 using InEngine.Core.Exceptions;
-using InEngine.Core.Queue.Commands;
+using InEngine.Core.Queuing.Commands;
 using NUnit.Framework;
 
 namespace InEngine.Core.Test.Queue.Commands

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/AbstractCommand.cs

@@ -1,29 +1,19 @@
 using System;
+using System.Linq;
 using InEngine.Core.IO;
+using InEngine.Core.Scheduling;
 using Konsole;
-using NLog;
 using Quartz;
 
 namespace InEngine.Core
 {
     abstract public class AbstractCommand : ICommand, IFailed, IJob, IWrite
     {
-        public IJobExecutionContext JobExecutionContext { get; set; }
-        public ILogger Logger { get; internal set; }
+        public Write Write { get; set; }
         public ProgressBar ProgressBar { get; internal set; }
-        string _name;
-        public string Name
-        {
-            get { return _name; }
-            set
-            {
-                _name = value;
-                Logger = LogManager.GetLogger(_name);
-            }
-        }
+        public string Name { get; set; }
         public string SchedulerGroup { get; set; }
         public string ScheduleId { get; set; }
-        public Write Write { get; set; }
 
         protected AbstractCommand()
         {
@@ -56,7 +46,13 @@ public void UpdateProgress(int tick)
         #region Scheduling
         public void Execute(IJobExecutionContext context)
         {
-            JobExecutionContext = context;
+            var properties = GetType().GetProperties();
+            context.MergedJobDataMap.ToList().ForEach(x => {
+                var property = properties.FirstOrDefault(y => y.Name == x.Key);
+                if (property != null)
+                    property.SetValue(this, x.Value);                
+            });
+
             try
             {
                 Run();
@@ -67,33 +63,6 @@ public void Execute(IJobExecutionContext context)
             }
         }
 
-        public JobBuilder MakeJobBuilder()
-        {
-            return JobBuilder
-                .Create(GetType())
-                .WithIdentity($"{Name}:job:{ScheduleId}", SchedulerGroup);
-        }
-
-        public TriggerBuilder MakeTriggerBuilder()
-        {
-            return TriggerBuilder
-                .Create()
-                .WithIdentity($"{Name}:trigger:{ScheduleId}", SchedulerGroup);
-        }
-
-        public T GetJobContextData<T>(string key)
-        {
-            if (JobExecutionContext == null || JobExecutionContext.MergedJobDataMap == null)
-                return default(T);
-            var objectVal = JobExecutionContext.MergedJobDataMap.Get(key);
-            return objectVal == null ? default(T) : (T)objectVal;
-        }
-
-        public void AddJobContextData<T>(string key, T val)
-        {
-            JobExecutionContext.MergedJobDataMap.Add(key, val);
-        }
-
         #endregion
 
         #region Console output

src/InEngine.Core/Commands/Echo.cs

@@ -1,5 +1,4 @@
-using System;
-using CommandLine;
+using CommandLine;
 
 namespace InEngine.Core.Commands
 {

src/InEngine.Core/Commands/Options.cs

@@ -5,18 +5,16 @@ namespace InEngine.Core.Commands
 {
     public class Options : IOptions
     {
-        [VerbOption("fail", HelpText = "Always fail. Useful for end-to-end testing.")]
-        public AlwaysFail AlwaysFail { get; set; }
-
         [VerbOption("echo", HelpText= "Echo some text to the console. Useful for end-to-end testing.")]
         public Echo Echo { get; set; }
 
-        [VerbOption("succeed", HelpText = "A null operation command. Literally does nothing.")]
-        public AlwaysSucceed Null { get; set; }
+        [VerbOption("proc", HelpText = "Launch an arbitrary process.")]
+        public SystemProcess SystemProcess { get; set; }
 
+        [HelpVerbOption]
         public string GetUsage(string verb)
         {
-            return null;
+            return HelpText.AutoBuild(this, verb);
         }
     }
 }