inst-jobs 1.0.1 → 2.1.0

data/spec/delayed/worker/health_check_spec.rb

@@ -107,6 +107,15 @@ RSpec.describe Delayed::Worker::HealthCheck do
       @dead_job.reload
       expect(@dead_job.locked_by).to eq 'prefetch:some_node'
     end
+
+    it "bails immediately if advisory lock already taken" do
+      allow(Delayed::Worker::HealthCheck).to receive(:attempt_advisory_lock).and_return(false)
+      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+      @dead_job.reload
+      expect(@dead_job.run_at.to_i).to eq(initial_run_at.to_i)
+      expect(@dead_job.locked_at).to_not be_nil
+      expect(@dead_job.locked_by).to_not be_nil
+    end
   end
 
   describe '#initialize' do

data/spec/delayed/worker_spec.rb

@@ -19,6 +19,19 @@ describe Delayed::Worker do
       expect(fired).to be_truthy
     end
 
+    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}
+      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"
+      end
+      subject.perform(job)
+      expect(error_fired).to be_falsey
+      expect(retry_fired).to be_truthy
+    end
+
     it "reloads" do
       fakeApplication = double('Rails.application',
           config: double('Rails.application.config',

data/spec/shared/delayed_method.rb

@@ -82,11 +82,11 @@ shared_examples_for 'random ruby objects' do
         obj = klass.new
         method = double()
 
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method, args: [1,2,3], kwargs: {synchronous: true}, on_failure: nil, on_permanent_failure: nil).and_return(method)
+        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method, args: [1,2,3], kwargs: {synchronous: true}, on_failure: nil, on_permanent_failure: nil, sender: obj).and_return(method)
         expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_1 => :thing)
         obj.test_method(1,2,3)
 
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method, args: [4], kwargs: {:synchronous=>true}, on_failure: nil, on_permanent_failure: nil).and_return(method)
+        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method, args: [4], kwargs: {:synchronous=>true}, on_failure: nil, on_permanent_failure: nil, sender: obj).and_return(method)
         expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_1 => :thing)
         obj.test_method(4)
 

data/spec/shared/performable_method.rb

@@ -65,4 +65,10 @@ shared_examples_for 'Delayed::PerformableMethod' do
     p.send(:on_permanent_failure, 'fail_frd')
     story.text.should == 'fail_frd'
   end
+
+  it "can still generate a name with no kwargs" do
+    story = Story.create :text => 'wat'
+    p = Delayed::PerformableMethod.new(story, :tell, kwargs: nil)
+    expect(p.full_name).to eq("Story.find(#{story.id}).tell()")
+  end
 end

data/spec/spec_helper.rb

@@ -35,6 +35,15 @@ RSpec.configure do |config|
   end
 end
 
+module NoYamlDump
+  def encode_with(coder)
+  end
+end
+# example groups are often the sender, and if we try to serialize them,
+# the resultant object is then encoded in the sender, and then we serialize
+# again, and it just keeps getting bigger and bigger and bigger...
+RSpec::Core::ExampleGroup.include(NoYamlDump)
+
 ENV['TEST_ENV_NUMBER'] ||= '1'
 ENV['TEST_DB_HOST'] ||= 'localhost'
 ENV['TEST_DB_DATABASE'] ||= "inst-jobs-test-#{ENV['TEST_ENV_NUMBER']}"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tobias Luetke
 - Brian Palmer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -325,7 +325,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description:
+description: 
 email:
 - brianp@instructure.com
 executables:
@@ -412,6 +412,7 @@ files:
 - spec/delayed/cli_spec.rb
 - spec/delayed/daemon_spec.rb
 - spec/delayed/message_sending_spec.rb
+- spec/delayed/periodic_spec.rb
 - spec/delayed/server_spec.rb
 - spec/delayed/settings_spec.rb
 - spec/delayed/work_queue/in_process_spec.rb
@@ -422,15 +423,10 @@ files:
 - spec/delayed/worker/health_check_spec.rb
 - spec/delayed/worker_spec.rb
 - spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/gemfiles/50.gemfile
-- spec/gemfiles/50.gemfile.lock
 - spec/gemfiles/51.gemfile
-- spec/gemfiles/51.gemfile.lock
 - spec/gemfiles/52.gemfile
-- spec/gemfiles/52.gemfile.lock
 - spec/gemfiles/60.gemfile
-- spec/gemfiles/60.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -445,7 +441,7 @@ files:
 homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -453,30 +449,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files:
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
 - spec/redis_job_spec.rb
-- spec/gemfiles/51.gemfile.lock
-- spec/gemfiles/60.gemfile.lock
-- spec/gemfiles/42.gemfile.lock
-- spec/gemfiles/50.gemfile.lock
 - spec/gemfiles/60.gemfile
 - spec/gemfiles/42.gemfile
 - spec/gemfiles/52.gemfile
 - spec/gemfiles/50.gemfile
-- spec/gemfiles/52.gemfile.lock
 - spec/gemfiles/51.gemfile
 - spec/shared_jobs_specs.rb
 - spec/shared/performable_method.rb
@@ -490,6 +481,7 @@ test_files:
 - spec/delayed/cli_spec.rb
 - spec/delayed/daemon_spec.rb
 - spec/delayed/worker_spec.rb
+- spec/delayed/periodic_spec.rb
 - spec/delayed/message_sending_spec.rb
 - spec/delayed/settings_spec.rb
 - spec/delayed/work_queue/in_process_spec.rb

data/spec/gemfiles/42.gemfile.lock

@@ -1,192 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    inst-jobs (0.15.12)
-      activerecord (>= 4.2)
-      activesupport (>= 4.2)
-      after_transaction_commit (>= 1.0, < 3)
-      railties (>= 4.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.4, < 3.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    after_transaction_commit (1.1.2)
-      activerecord (>= 4.0)
-    arel (6.0.4)
-    backports (3.8.0)
-    builder (3.2.3)
-    bump (0.5.4)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    et-orbi (1.2.1)
-      tzinfo
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    httpclient (2.8.3)
-    i18n (0.8.6)
-    imperium (0.3.0)
-      addressable (~> 2.5.0)
-      httpclient (~> 2.8)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.4.0)
-    minitest (5.10.3)
-    multi_json (1.12.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    pg (0.21.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.0.2)
-    rack (1.6.8)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    redis (4.1.2)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rufus-scheduler (3.4.2)
-      et-orbi (~> 1.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    timecop (0.7.1)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  after_transaction_commit (< 2)
-  bump
-  byebug
-  database_cleaner (= 1.6.1)
-  imperium (>= 0.2.3)
-  inst-jobs!
-  pg (< 1.0)
-  pry
-  rack-test
-  rails (~> 4.2.5)
-  rake
-  rspec (~> 3.8.0)
-  sinatra
-  sinatra-contrib
-  test_after_commit (= 0.4.1)
-  timecop (= 0.7.1)
-  wwtd (~> 1.3.0)
-
-BUNDLED WITH
-   1.17.2

data/spec/gemfiles/50.gemfile.lock

@@ -1,197 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    inst-jobs (0.15.12)
-      activerecord (>= 4.2)
-      activesupport (>= 4.2)
-      after_transaction_commit (>= 1.0, < 3)
-      railties (>= 4.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.4, < 3.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.5)
-      actionpack (= 5.0.5)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
-      actionview (= 5.0.5)
-      activesupport (= 5.0.5)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
-      activesupport (= 5.0.5)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.5)
-      activesupport (= 5.0.5)
-      globalid (>= 0.3.6)
-    activemodel (5.0.5)
-      activesupport (= 5.0.5)
-    activerecord (5.0.5)
-      activemodel (= 5.0.5)
-      activesupport (= 5.0.5)
-      arel (~> 7.0)
-    activesupport (5.0.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    after_transaction_commit (2.0.0)
-      activerecord (>= 5.0)
-    arel (7.1.4)
-    backports (3.8.0)
-    builder (3.2.3)
-    bump (0.5.4)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    et-orbi (1.2.1)
-      tzinfo
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    httpclient (2.8.3)
-    i18n (0.8.6)
-    imperium (0.5.1)
-      addressable (~> 2.5)
-      httpclient (~> 2.8)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.4.0)
-    minitest (5.10.3)
-    multi_json (1.12.1)
-    mustermann (1.0.0.beta2)
-    nio4r (2.1.0)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    pg (0.21.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.1.1)
-    rack (2.0.3)
-    rack-protection (2.0.0.beta2)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.5)
-      actioncable (= 5.0.5)
-      actionmailer (= 5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      activemodel (= 5.0.5)
-      activerecord (= 5.0.5)
-      activesupport (= 5.0.5)
-      bundler (>= 1.3.0)
-      railties (= 5.0.5)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.5)
-      actionpack (= 5.0.5)
-      activesupport (= 5.0.5)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    redis (4.1.2)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rufus-scheduler (3.4.2)
-      et-orbi (~> 1.0)
-    sinatra (2.0.0.beta2)
-      mustermann (= 1.0.0.beta2)
-      rack (~> 2.0)
-      rack-protection (= 2.0.0.beta2)
-      tilt (~> 2.0)
-    sinatra-contrib (2.0.0.beta2)
-      backports (>= 2.0)
-      multi_json
-      mustermann (= 1.0.0.beta2)
-      rack-protection (= 2.0.0.beta2)
-      rack-test
-      sinatra (= 2.0.0.beta2)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    timecop (0.7.1)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  byebug
-  database_cleaner (= 1.6.1)
-  imperium (>= 0.2.3)
-  inst-jobs!
-  pg (< 1.0)
-  pry
-  rack-test
-  rails (~> 5.0.0)
-  rake
-  rspec (~> 3.8.0)
-  sinatra (= 2.0.0.beta2)
-  sinatra-contrib (= 2.0.0.beta2)
-  timecop (= 0.7.1)
-  wwtd (~> 1.3.0)
-
-BUNDLED WITH
-   1.17.2