rocketjob 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abb40a0f5b7abce954efc71891845f43088af58b
-  data.tar.gz: 554a9d1df074fff449db727ce2bba2dcae8867b0
+  metadata.gz: 6c3d286a7897bd81bef71df484490bca1c38ef45
+  data.tar.gz: '09e9db2779c746cd3b96bb72bbe44e9ad1ad6a7f'
 SHA512:
-  metadata.gz: 0ef4cff6fac8bb64b10b8b4be0a2c4b2e009510f964619423c8604ed78710a0712fe2a2cdf3e5a88450d233eaba74d999d6094f344f6ae53841abd223f1c622b
-  data.tar.gz: 7fcb27f62e344fe38ca20fae4178e021baafa955644abf9420d8970a250d7c59a24c41e488201bc47b140d03aad03a8772618ae68df0cc22e8c8757be3ee4afb
+  metadata.gz: c3eba8f0b893631984477714946fa3a89062e6d71d6f122511d36354e5fa2b558d3591ee7716408356084aaebc4e43ff03a8dbeeb74b3dfaa789eb43ae4c8188
+  data.tar.gz: 711e258fc7d726247f3252e3aea9a3f75407c978bb4f378300faf66fff8e3a9098273dc6eb68084591f6035ed5de37e7a3ba7f1c809a40b9be1945cc2c67a2cd

data/lib/rocket_job/plugins/cron.rb

@@ -159,7 +159,7 @@ module RocketJob
         def rocket_job_restart_abort
           return unless cron_schedule
           rocket_job_restart_new_instance
-          self.cron_schedule = nil
+          update_attribute(:cron_schedule, nil)
         end
       end
 

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

data/test/plugins/cron_test.rb

@@ -11,10 +11,19 @@ module Plugins
       end
     end
 
+    class FailOnceCronJob < RocketJob::Job
+      include RocketJob::Plugins::Cron
+
+      def perform
+        raise 'oh no' if failure_count == 0
+      end
+    end
+
     describe RocketJob::Plugins::Cron do
       before do
         # destroy_all could create new instances
         CronJob.delete_all
+        FailOnceCronJob.delete_all
         assert_equal 0, CronJob.count
       end
 
@@ -91,9 +100,12 @@ module Plugins
       describe '#fail' do
         describe 'with cron_schedule' do
           let :job do
-            job = CronJob.create!(cron_schedule: '* 1 * * *')
+            job = FailOnceCronJob.create!(cron_schedule: '* 1 * * *')
             job.start
-            job.fail
+            assert_raises RuntimeError do
+              job.perform_now
+            end
+            job.reload
             job
           end
 
@@ -110,13 +122,21 @@ module Plugins
           end
 
           it 'schedules a new instance' do
-            assert_equal 0, CronJob.count
+            assert_equal 0, FailOnceCronJob.count
             job
-            assert_equal 2, CronJob.count
-            assert scheduled_job = CronJob.last
+            assert_equal 2, FailOnceCronJob.count
+            assert scheduled_job = FailOnceCronJob.last
             assert scheduled_job.queued?
             assert_equal '* 1 * * *', scheduled_job.cron_schedule
           end
+
+          it 'restarts on retry' do
+            job.retry!
+            job.perform_now
+            assert job.completed?
+            assert_equal 1, FailOnceCronJob.count, -> { FailOnceCronJob.all.to_a.collect(&:state).to_s }
+            assert_equal 1, FailOnceCronJob.queued.count
+          end
         end
 
         describe 'without cron_schedule' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby