inst-jobs 2.3.3 → 2.4.0

data/spec/delayed/worker_spec.rb

@@ -3,22 +3,27 @@
 require_relative "../spec_helper"
 
 describe Delayed::Worker do
-  let(:worker_config) { {
-      queue: "test", min_priority: 1, max_priority: 2, stuff: "stuff",
-  }.freeze }
-  let(:job_attrs) { {
-    id: 42, name: "testjob", full_name: "testfullname", :last_error= => nil,
-    attempts: 1, reschedule: nil, :expired? => false,
-    payload_object: {}, priority: 25
-  }.freeze }
   subject { described_class.new(worker_config.dup) }
 
-  after { Delayed::Worker.lifecycle.reset! }
+  let(:worker_config) do
+    {
+      queue: "test", min_priority: 1, max_priority: 2, stuff: "stuff"
+    }.freeze
+  end
+  let(:job_attrs) do
+    {
+      id: 42, name: "testjob", full_name: "testfullname", :last_error= => nil,
+      attempts: 1, reschedule: nil, :expired? => false,
+      payload_object: {}, priority: 25
+    }.freeze
+  end
+
+  after { described_class.lifecycle.reset! }
 
   describe "#perform" do
     it "fires off an error callback when a job raises an exception" do
       fired = false
-      Delayed::Worker.lifecycle.before(:error) {|worker, exception| fired = true}
+      described_class.lifecycle.before(:error) { |_worker, _exception| fired = true }
       job = double(job_attrs)
       output_count = subject.perform(job)
       expect(fired).to be_truthy
@@ -27,8 +32,8 @@ describe Delayed::Worker do
 
     it "uses the retry callback for a retriable exception" do
       error_fired = retry_fired = false
-      Delayed::Worker.lifecycle.before(:error) {|worker, exception| error_fired = true }
-      Delayed::Worker.lifecycle.before(:retry) {|worker, exception| retry_fired = true}
+      described_class.lifecycle.before(:error) { |_worker, _exception| error_fired = true }
+      described_class.lifecycle.before(:retry) { |_worker, _exception| retry_fired = true }
       job = Delayed::Job.new(payload_object: {}, priority: 25, strand: "test_jobs", max_attempts: 3)
       expect(job).to receive(:invoke_job) do
         raise Delayed::RetriableError, "that's all this job does"
@@ -40,15 +45,13 @@ describe Delayed::Worker do
     end
 
     it "reloads" do
-      fakeApplication = double('Rails.application',
-          config: double('Rails.application.config',
-          cache_classes: false,
-          reload_classes_only_on_change: false
-        ),
-        reloader: double()
-      )
+      fake_application = double("Rails.application",
+                                config: double("Rails.application.config",
+                                               cache_classes: false,
+                                               reload_classes_only_on_change: false),
+                                reloader: double)
 
-      allow(Rails).to receive(:application).and_return(fakeApplication)
+      allow(Rails).to receive(:application).and_return(fake_application)
       if Rails::VERSION::MAJOR >= 5
         expect(Rails.application.reloader).to receive(:reload!).once
       else
@@ -61,7 +64,7 @@ describe Delayed::Worker do
   end
 
   describe "#log_job" do
-    around(:each) do |block|
+    around do |block|
       prev_logger = Delayed::Settings.job_detailed_log_format
       block.call
       Delayed::Settings.job_detailed_log_format = prev_logger
@@ -73,11 +76,11 @@ describe Delayed::Worker do
       short_log_format = subject.log_job(job, :short)
       expect(short_log_format).to eq("RSpec::Mocks::Double")
       long_format = subject.log_job(job, :long)
-      expect(long_format).to eq("RSpec::Mocks::Double {\"priority\":25,\"attempts\":0,\"created_at\":null,\"tag\":\"RSpec::Mocks::Double#perform\",\"max_attempts\":null,\"strand\":\"test_jobs\",\"source\":null}")
+      expect(long_format).to eq("RSpec::Mocks::Double {\"priority\":25,\"attempts\":0,\"created_at\":null,\"tag\":\"RSpec::Mocks::Double#perform\",\"max_attempts\":null,\"strand\":\"test_jobs\",\"source\":null}") # rubocop:disable Layout/LineLength
     end
 
     it "logging format can be changed with settings" do
-      Delayed::Settings.job_detailed_log_format = ->(job){ "override format #{job.strand}"}
+      Delayed::Settings.job_detailed_log_format = ->(job) { "override format #{job.strand}" }
       payload = double(perform: nil)
       job = Delayed::Job.new(payload_object: payload, priority: 25, strand: "test_jobs")
       short_log_format = subject.log_job(job, :short)
@@ -89,8 +92,8 @@ describe Delayed::Worker do
 
   describe "#run" do
     it "passes extra config options through to the WorkQueue" do
-      expect(subject.work_queue).to receive(:get_and_lock_next_available).
-        with(subject.name, worker_config).and_return(nil)
+      expect(subject.work_queue).to receive(:get_and_lock_next_available)
+        .with(subject.name, worker_config).and_return(nil)
       subject.run
     end
   end

data/spec/gemfiles/52.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-gemspec :path => "../../"
+gemspec path: "../../"
 
 gem "rails", "~> 5.2.0"
-gem 'sinatra', "~> 2.0"
-gem 'sinatra-contrib', "~> 2.0"
+gem "sinatra", "~> 2.0"
+gem "sinatra-contrib", "~> 2.0"

data/spec/gemfiles/52.gemfile.lock

@@ -0,0 +1,240 @@
+PATH
+  remote: ../..
+  specs:
+    inst-jobs (2.3.3)
+      activerecord (>= 5.2)
+      activesupport (>= 5.2)
+      after_transaction_commit (>= 1.0, < 3)
+      debug_inspector (~> 1.0)
+      fugit (~> 1.3)
+      railties (>= 5.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
+      globalid (>= 0.3.6)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    after_transaction_commit (2.2.2)
+      activerecord (>= 5.2)
+    arel (9.0.0)
+    builder (3.2.4)
+    bump (0.10.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    debug_inspector (1.1.0)
+    deep_merge (1.2.1)
+    diff-lcs (1.4.4)
+    diplomat (2.5.1)
+      deep_merge (~> 1.2)
+      faraday (>= 0.9)
+    erubi (1.10.0)
+    et-orbi (1.2.4)
+      tzinfo
+    faraday (1.7.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    fugit (1.5.0)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.4)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    hashdiff (1.0.1)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.12.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.8)
+    nokogiri (1.12.3-x86_64-darwin)
+      racc (~> 1.4)
+    pg (1.2.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    raabro (1.4.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
+      bundler (>= 1.3.0)
+      railties (= 5.2.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.6)
+    redis (4.4.0)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.5)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.1.0)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    timecop (0.9.4)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    wwtd (1.4.1)
+
+PLATFORMS
+  x86_64-darwin-20
+
+DEPENDENCIES
+  bump
+  byebug
+  database_cleaner (~> 2.0)
+  database_cleaner-active_record (~> 2.0)
+  diplomat (~> 2.5.1)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 5.2.0)
+  rake
+  rspec (~> 3.10)
+  sinatra (~> 2.0)
+  sinatra-contrib (~> 2.0)
+  timecop (= 0.9.4)
+  webmock
+  wwtd (~> 1.4.0)
+
+BUNDLED WITH
+   2.2.24

data/spec/gemfiles/60.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-gemspec :path => "../../"
+gemspec path: "../../"
 
 gem "rails", "~> 6.0.0"
-gem 'sinatra', "~> 2.0"
-gem 'sinatra-contrib', "~> 2.0"
+gem "sinatra", "~> 2.0"
+gem "sinatra-contrib", "~> 2.0"

data/spec/gemfiles/60.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (2.3.1)
+    inst-jobs (2.3.3)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
       after_transaction_commit (>= 1.0, < 3)

data/spec/gemfiles/61.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-gemspec :path => "../../"
+gemspec path: "../../"
 
 gem "rails", "~> 6.1.0"
-gem 'sinatra', "~> 2.0"
-gem 'sinatra-contrib', "~> 2.0"
+gem "sinatra", "~> 2.0"
+gem "sinatra-contrib", "~> 2.0"

data/spec/sample_jobs.rb

@@ -1,49 +1,79 @@
 # frozen_string_literal: true
 
 class SimpleJob
-  cattr_accessor :runs; self.runs = 0
-  def perform; @@runs += 1; end
+  class << self
+    attr_accessor :runs
+  end
+
+  self.runs = 0
+
+  def perform
+    self.class.runs += 1
+  end
 end
 
 class ErrorJob
-  cattr_accessor :runs; self.runs = 0
-  def perform; raise 'did not work'; end
+  class << self
+    attr_accessor :runs, :last_error, :failure_runs, :permanent_failure_runs
+  end
 
-  cattr_accessor :last_error; self.last_error = nil
+  self.runs = 0
+  def perform
+    raise "did not work"
+  end
 
-  cattr_accessor :failure_runs; self.failure_runs = 0
-  def on_failure(error); @@last_error = error; @@failure_runs += 1; end
+  self.last_error = nil
+  self.failure_runs = 0
+  def on_failure(error)
+    self.class.last_error = error
+    self.class.failure_runs += 1
+  end
 
-  cattr_accessor :permanent_failure_runs; self.permanent_failure_runs = 0
-  def on_permanent_failure(error); @@last_error = error; @@permanent_failure_runs += 1; end
+  self.permanent_failure_runs = 0
+  def on_permanent_failure(error)
+    self.class.last_error = error
+    self.class.permanent_failure_runs += 1
+  end
 end
 
 class UnlockJob
   attr_accessor :times_to_unlock
+
   def initialize(times_to_unlock)
     @times_to_unlock = times_to_unlock
   end
 
-  def perform; raise SystemExit, 'raising to trigger on_failure'; end
+  def perform
+    raise SystemExit, "raising to trigger on_failure"
+  end
 
-  def on_failure(error)
+  def on_failure(_error)
     times_to_unlock -= 1
     :unlock if times_to_unlock <= 0
   end
 end
 
 class LongRunningJob
-  def perform; sleep 250; end
+  def perform
+    sleep 250
+  end
 end
 
 module M
   class ModuleJob
-    cattr_accessor :runs; self.runs = 0
-    def perform; @@runs += 1; end
+    class << self
+      attr_accessor :runs
+    end
+
+    cattr_accessor :runs
+    self.runs = 0
+    def perform
+      self.class.runs += 1
+    end
   end
 end
 
 class DeserializeErrorJob < SimpleJob; end
-Psych.add_domain_type("ruby/object", "DeserializeErrorJob") do |_type, val|
+Psych.add_domain_type("ruby/object", "DeserializeErrorJob") do |_type, _val|
   raise "error deserializing"
 end