job-iteration 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6093efe949b8033cac444ce502bfe4e68057802c
-  data.tar.gz: c191823dcf19c97b304ad00cd09f900fc8768eda
+SHA256:
+  metadata.gz: ffc9f695ffad79aa7c097581241e0da79c0e7da09e0ab45094135720ac751b84
+  data.tar.gz: 1804b93cec0989965f43bb6dcefd62a46873878605ad6e6918c0d6305f69e016
 SHA512:
-  metadata.gz: 6fbd13a06347fe7d60062f99ecf4d61544e54cf646f6e07f823e6c889cf4c6d98ba3163324d96f142ed7faebe978f8277ff45c8a69d866f9366a3eb8cdd60a06
-  data.tar.gz: 7857493464003d53119e93a5bc29a149bb251524ef9a8a5d4b9dfcc00bf843e5de478ea3c2fda537f91b4884eacaf82a412905e1212ef7df4c0b3d6c58fe3cb0
+  metadata.gz: 0a58d74621a3f94bdcb22c2cbc097c4700f8ade5cf4b20b7b3307ae802c43f888276b63b85b633cf8e40116432a1f9c8d1c9adee363c355abf86142a8385d3ba
+  data.tar.gz: ef8e11855bdafba6ec0c35da341775fd14c4caeb2a708f35f5c2f7f04d14ed4f93d5595e07b65d5e47ef08a492f4ffaa30145f5f5968e1ae8feab3bd609ff4ab

data/.rubocop.yml

@@ -11,3 +11,10 @@ Lint/HandleExceptions:
 Style/GlobalVars:
   Exclude:
     - lib/job-iteration/integrations/resque.rb
+Naming/FileName:
+  Exclude:
+    - lib/job-iteration.rb
+Style/MethodCallWithArgsParentheses:
+  Exclude:
+    - 'gemfiles/*'
+    - Gemfile

data/.travis.yml

@@ -12,3 +12,7 @@ script:
   - bundle exec rake test
   - bundle exec rubocop
   - bundle exec yardoc --no-output --no-save --no-stats --fail-on-warning
+
+gemfile:
+  - 'gemfiles/activejob_5_2.gemfile'
+  - 'gemfiles/activejob_edge.gemfile'

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+### Master (unreleased)
+
+#### New feature
+
+#### Bug fix
+
+### v0.9.7 (November 30, 2018)
+
+#### New feature
+
+- [23](https://github.com/shopify/job-iteration/pull/23) - Remove upperbound constraint on ActiveJob

data/Gemfile

@@ -11,7 +11,6 @@ gemspec
 gem 'sidekiq'
 gem 'resque'
 
-gem 'activerecord'
 gem 'mysql2', '~> 0.4.4'
 gem 'globalid'
 gem 'i18n'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    job-iteration (0.9.6)
-      activejob (~> 5.2)
+    job-iteration (0.9.7)
+      activejob (>= 5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -112,4 +112,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/Rakefile

@@ -9,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task default: :test
+task(default: :test)

data/gemfiles/activejob_5_2.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile '../Gemfile'
+
+gem 'activejob', '~> 5.2.0'

data/gemfiles/activejob_edge.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+eval_gemfile '../Gemfile'
+
+gem 'activejob', github: 'rails/rails'
+gem 'activerecord', github: 'rails/rails'

data/job-iteration.gemspec

@@ -15,16 +15,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shopify/job-iteration"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files         = %x(git ls-files -z).split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w(lib)
 
-  spec.add_dependency "activejob", "~> 5.2"
+  spec.metadata["changelog_uri"] = "https://github.com/Shopify/job-iteration/blob/master/CHANGELOG.md"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_dependency("activejob", ">= 5.2")
+
+  spec.add_development_dependency("bundler", "~> 1.16")
+  spec.add_development_dependency("rake", "~> 10.0")
+  spec.add_development_dependency("minitest", "~> 5.0")
+  spec.add_development_dependency("activerecord")
 end

data/lib/job-iteration/csv_enumerator.rb

@@ -55,7 +55,7 @@ module JobIteration
         return
       end
 
-      count = `wc -l < #{filepath}`.strip.to_i
+      count = %x(wc -l < #{filepath}).strip.to_i
       count -= 1 if @csv.headers
       count
     end

data/lib/job-iteration/iteration.rb

@@ -94,15 +94,15 @@ module JobIteration
       end
 
       unless enumerator
-        logger.info "[JobIteration::Iteration] `build_enumerator` returned nil. " \
-          "Skipping the job."
+        logger.info("[JobIteration::Iteration] `build_enumerator` returned nil. " \
+          "Skipping the job.")
         return
       end
 
       assert_enumerator!(enumerator)
 
       if executions == 1 && times_interrupted == 0
-        run_callbacks :start
+        run_callbacks(:start)
       else
         ActiveSupport::Notifications.instrument("resumed.iteration", iteration_instrumentation_tags)
       end
@@ -111,10 +111,10 @@ module JobIteration
         iterate_with_enumerator(enumerator, arguments)
       end
 
-      run_callbacks :shutdown
+      run_callbacks(:shutdown)
 
       if run_complete_callbacks?(completed)
-        run_callbacks :complete
+        run_callbacks(:complete)
         output_interrupt_summary
       end
     end
@@ -144,7 +144,7 @@ module JobIteration
 
     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}"
+      logger.info("[JobIteration::Iteration] Interrupting and re-enqueueing the job cursor_position=#{cursor_position}")
 
       adjust_total_time
       self.times_interrupted += 1
@@ -194,7 +194,7 @@ module JobIteration
       adjust_total_time
 
       message = "[JobIteration::Iteration] Completed iterating. times_interrupted=%d total_time=%.3f"
-      logger.info Kernel.format(message, times_interrupted, total_time)
+      logger.info(Kernel.format(message, times_interrupted, total_time))
     end
 
     def job_should_exit?

data/lib/job-iteration/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Makes your background jobs interruptible and resumable.
 email:
 - ops-accounts+shipit@shopify.com
@@ -77,6 +91,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -85,6 +100,8 @@ files:
 - Rakefile
 - bin/setup
 - dev.yml
+- gemfiles/activejob_5_2.gemfile
+- gemfiles/activejob_edge.gemfile
 - guides/best-practices.md
 - guides/custom-enumerator.md
 - guides/iteration-how-it-works.md
@@ -103,7 +120,8 @@ files:
 homepage: https://github.com/shopify/job-iteration
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/Shopify/job-iteration/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -120,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Makes your background jobs interruptible and resumable.