dronejob 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c94ba81da81adb2eec9c74286d3ee853ee5afeb
-  data.tar.gz: 33703463749cd88f918d58ecc601fa57beba2c60
+  metadata.gz: 1ae3f67b3ef3b04b19441944585f8444a79e7ca0
+  data.tar.gz: 97a7e9a0d4c8325953f004ae8adcb32a2577ee45
 SHA512:
-  metadata.gz: 6ff736fee739b754e522f48f7b128585eaf46ab6a72b0b48df59431f6530101490ea2a60346a681b69b1ee98a7acf22e1363a32ffa44dba5a37a1a76539f9079
-  data.tar.gz: 5e1e844fdbe97aa49a815ae39e0a10e139f3473cbf4d9a889f7a3cd7d5f7166531357e23705618109c02ae00200c11ad430ee0a7f7152ac6b3163034af2cb666
+  metadata.gz: 4715a179f18ca37b8788154ce745a83bc9004d96a90c75c652b3b406afde985f5d6c3619839748fde9f8321463bbfadb66f79a4a4c5a73861ee0bbce3201368e
+  data.tar.gz: afc37a7dc0183ab36e1ddb1077ed4883ef650efc46c589e9f44b8eb69659959d6634448040e88e86bdb60cfd530735fb8ddbed68967138186b961f3b704ed5a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.1.9)
+    dronejob (1.2.0)
       activejob (~> 4.2)
       bundler (>= 1.3.0, < 2.0)
       git (~> 1.2)
@@ -29,7 +29,7 @@ GEM
     concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
     diff-lcs (1.2.5)
-    ethon (0.9.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
     ffi (1.9.14)
     git (1.3.0)
@@ -40,13 +40,13 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.9.0)
+    minitest (5.9.1)
     open_uri_redirections (0.2.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-protection (1.5.3)
       rack
     redis (3.3.1)
@@ -64,17 +64,13 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     rubyzip (1.2.0)
-    sidekiq (4.1.4)
+    sidekiq (4.2.2)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (~> 1.5)
       redis (~> 3.2, >= 3.2.1)
-      sinatra (>= 1.4.7)
     sidekiq-status (0.6.0)
       sidekiq (>= 2.7)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)

data/lib/dronejob/command.rb

@@ -98,5 +98,19 @@ module Dronejob
       end
     end
     
+    desc :continue, "Continue existing job"
+    jobs_dir = WorkspaceDir.new("tmp/jobs")
+    jobs = jobs_dir.exists? ? jobs_dir.children.map(&:name) : []
+    method_option(:job, type: :string, required: true, enum: jobs)
+    def continue
+      job_dir = WorkspaceDir.new("tmp/jobs").dir(options.job)
+      dronejob_config = job_dir.file("dronejob.yml").read_yaml
+      job_params = dronejob_config[:job_params]
+      job_identifier = dronejob_config[:job_identifier]
+      worker = Dronejob::Loader.workers[job_identifier]
+      job_params.delete("from")
+      Dronejob::Base.queue_adapter = job_params["queue_adapter"]
+      worker.perform_now(job_params)
+    end    
   end
 end

data/lib/dronejob/modules/attr_store.rb

@@ -9,12 +9,12 @@ module Dronejob
 
       class_methods do
         def attr_store(*args)
-          @attr_stores ||= [:dronejob_completed]
+          @attr_stores ||= [:dronejob_completed, :job_params, :job_identifier]
           @attr_stores.push(*args)
         end
 
         def attr_stores
-          @attr_stores ||= [:dronejob_completed]
+          @attr_stores ||= [:dronejob_completed, :job_params, :job_identifier]
         end
       end
       

data/lib/dronejob/modules/core.rb

@@ -8,6 +8,8 @@ module Dronejob
       end
       
       def perform(params)
+        @job_params = params.to_h
+        @job_identifier = Dronejob::Loader.identifier_for(self)
         set_parameters(params)
         validate_parameters!
         run_callbacks :job do

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.1.9"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler