job-iteration 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5dbb0dadbd0368e6b75a7725118d82cd49ed38d
-  data.tar.gz: 7a601058a648e433b30c409c76244c8ad1b71edd
+  metadata.gz: 6093efe949b8033cac444ce502bfe4e68057802c
+  data.tar.gz: c191823dcf19c97b304ad00cd09f900fc8768eda
 SHA512:
-  metadata.gz: 4a3952c608d5f087e680c31973a7617caeca9afbfb4eae80645ea3e9d9b3e11131b0c7659ef5a77086e8e0d00221620ca0015c47874d6f09b62a81ba12d26f2f
-  data.tar.gz: fe5fca4a552996a268d2f2b386a4cea11e4e0eaa933d00fa79fc0d2a8a967168b7e8b2f584e3c5756d9260614f87181524cdb79ee1e28227c908bfbf17898d12
+  metadata.gz: 6fbd13a06347fe7d60062f99ecf4d61544e54cf646f6e07f823e6c889cf4c6d98ba3163324d96f142ed7faebe978f8277ff45c8a69d866f9366a3eb8cdd60a06
+  data.tar.gz: 7857493464003d53119e93a5bc29a149bb251524ef9a8a5d4b9dfcc00bf843e5de478ea3c2fda537f91b4884eacaf82a412905e1212ef7df4c0b3d6c58fe3cb0

data/.travis.yml

@@ -3,13 +3,12 @@ services:
   - redis-server
 language: ruby
 rvm:
-  - 2.4.4
-  - 2.5.1
+  - 2.4.5
+  - 2.5.3
 before_install:
-  - gem install bundler -v 1.16.0
+  - gem install bundler
   - mysql -e 'CREATE DATABASE job_iteration_test;'
 script:
   - bundle exec rake test
   - bundle exec rubocop
   - bundle exec yardoc --no-output --no-save --no-stats --fail-on-warning
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    job-iteration (0.9.5)
+    job-iteration (0.9.6)
       activejob (~> 5.2)
 
 GEM
@@ -112,4 +112,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.3
+   1.16.6

data/dev.yml

@@ -0,0 +1,19 @@
+# This file is for Shopify employees development environment.
+# If you are an external contributor you don't have to bother with it.
+name: job-iteration
+
+up:
+  - homebrew:
+    - mysql-client:
+        or:        [mysql@5.7]
+  - ruby:
+      version: 2.5.3
+  - railgun
+  - bundler
+  - custom:
+      name: Create Job Iteration database
+      meet: mysql -uroot -h job-iteration.railgun -e "CREATE DATABASE job_iteration_test"
+      met?: mysql -uroot -h job-iteration.railgun job_iteration_test -e "SELECT 1"
+
+commands:
+  test: bundle exec rake

data/lib/job-iteration/iteration.rb

@@ -72,6 +72,11 @@ module JobIteration
       interruptible_perform(*params)
     end
 
+    def retry_job(*)
+      @retried = true
+      super
+    end
+
     private
 
     def enumerator_builder
@@ -108,7 +113,7 @@ module JobIteration
 
       run_callbacks :shutdown
 
-      if completed
+      if run_complete_callbacks?(completed)
         run_callbacks :complete
         output_interrupt_summary
       end
@@ -148,11 +153,6 @@ module JobIteration
       retry_job unless @retried
     end
 
-    def retry_job(*)
-      @retried = true
-      super
-    end
-
     def adjust_total_time
       self.total_time += (Time.now.utc.to_f - start_time.to_f).round(6)
     end
@@ -204,5 +204,19 @@ module JobIteration
 
       JobIteration.interruption_adapter.call || (defined?(super) && super)
     end
+
+    def run_complete_callbacks?(completed)
+      # nil means that someone aborted the job but want to call the on_complete callback
+      if completed.nil?
+        completed = :finished
+      end
+
+      case completed
+      when :finished, true then true
+      # skip_complete_callbacks is returning from ThrottleEnumeratorand we do not want the on_complete callback to
+      # be executed
+      when false, :skip_complete_callbacks then false
+      end
+    end
   end
 end

data/lib/job-iteration/version.rb

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

data/railgun.yml

@@ -0,0 +1,16 @@
+# https://development.shopify.io/tools/dev/railgun/Railgun-Config
+name: job-iteration
+
+vm:
+  image:      /opt/dev/misc/railgun-images/default
+  ip_address: 192.168.64.142
+  memory:     1G
+  cores:      2
+
+volumes:
+  root:  '500M'
+
+services:
+  - redis
+  - mysql
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -84,6 +84,7 @@ files:
 - README.md
 - Rakefile
 - bin/setup
+- dev.yml
 - guides/best-practices.md
 - guides/custom-enumerator.md
 - guides/iteration-how-it-works.md
@@ -98,6 +99,7 @@ files:
 - lib/job-iteration/iteration.rb
 - lib/job-iteration/test_helper.rb
 - lib/job-iteration/version.rb
+- railgun.yml
 homepage: https://github.com/shopify/job-iteration
 licenses:
 - MIT