job-iteration 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1833eae2c053130cb1cb6729a33e0414683427d
-  data.tar.gz: 7fd2d0bb197fca5453de89efbc8881d8da9abcb3
+  metadata.gz: b5dbb0dadbd0368e6b75a7725118d82cd49ed38d
+  data.tar.gz: 7a601058a648e433b30c409c76244c8ad1b71edd
 SHA512:
-  metadata.gz: 1793c72cc520206290d7d92be1970608d51afa0fab4f74d36c7c178d0523db5c1a282029481f08250635a8f1944c66d1fc37b6984e5128a1ca0d0bc7ae6e237e
-  data.tar.gz: f954ef4d69c5c7178dc97db6cc0e01b0ea9888d33757614e1c37f0b8f077457343470f977a95f6e17c41a01b96f5d66553255538e10a303f2661908e0a69cc0f
+  metadata.gz: 4a3952c608d5f087e680c31973a7617caeca9afbfb4eae80645ea3e9d9b3e11131b0c7659ef5a77086e8e0d00221620ca0015c47874d6f09b62a81ba12d26f2f
+  data.tar.gz: fe5fca4a552996a268d2f2b386a4cea11e4e0eaa933d00fa79fc0d2a8a967168b7e8b2f584e3c5756d9260614f87181524cdb79ee1e28227c908bfbf17898d12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    job-iteration (0.9.4)
+    job-iteration (0.9.5)
       activejob (~> 5.2)
 
 GEM

data/lib/job-iteration/iteration.rb

@@ -102,14 +102,16 @@ module JobIteration
         ActiveSupport::Notifications.instrument("resumed.iteration", iteration_instrumentation_tags)
       end
 
-      catch(:abort) do
-        return unless iterate_with_enumerator(enumerator, arguments)
+      completed = catch(:abort) do
+        iterate_with_enumerator(enumerator, arguments)
       end
 
       run_callbacks :shutdown
-      run_callbacks :complete
 
-      output_interrupt_summary
+      if completed
+        run_callbacks :complete
+        output_interrupt_summary
+      end
     end
 
     def iterate_with_enumerator(enumerator, arguments)
@@ -122,7 +124,7 @@ module JobIteration
 
         next unless job_should_exit?
         self.executions -= 1 if executions > 1
-        shutdown_and_reenqueue
+        reenqueue_iteration_job
         return false
       end
 
@@ -135,7 +137,7 @@ module JobIteration
       end
     end
 
-    def shutdown_and_reenqueue
+    def reenqueue_iteration_job
       ActiveSupport::Notifications.instrument("interrupted.iteration", iteration_instrumentation_tags)
       logger.info "[JobIteration::Iteration] Interrupting and re-enqueueing the job cursor_position=#{cursor_position}"
 
@@ -143,14 +145,11 @@ module JobIteration
       self.times_interrupted += 1
 
       self.already_in_queue = true if respond_to?(:already_in_queue=)
-      run_callbacks :shutdown
-      retry_job unless @enqueued
-
-      true
+      retry_job unless @retried
     end
 
     def retry_job(*)
-      @enqueued = true
+      @retried = true
       super
     end
 

data/lib/job-iteration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob