inst-jobs 2.2.0 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c062c222e731bd490efe572108a508bf78faabee4479f7fe6927a89688d9ef0b
-  data.tar.gz: 3b1678fc017230e990bc7e8d4e652c23ab59413953ce72a312b13adfa7626193
+  metadata.gz: cbfecef485b9884f4504d62b6e4d51345b1c729ae109e5dc619eeb5091dd9d22
+  data.tar.gz: e6bd8e6efe0f4a15d77645fe0f4f6b2bd5c2d13be723fba7a42ae72768c834ae
 SHA512:
-  metadata.gz: 8c1a722c17c9abc8f5c8a44cb28f6584dc9fb16c1edcccc8df566ad21a5f81af7a54fb70282e2689aee11947dcd96f44ca01dfe542d71c8d3d6b7f145a572ce7
-  data.tar.gz: 9a7a65c71820d4b04f1e1ac2bf498cf030490a597d075d87d4399a392a7da1bbf50cfb3d5eeb1dea9c357d11e00aabf5e469f062c1fe9cc4b02cc8ed08e1a192
+  metadata.gz: 8931e016e05ac54872c3053990402cb85818b53f031eeb0c0118f581a2f3cca73dda2613b99316b1b3bb37fa840b1401b73f02bf307700042f4dc451d2b14067
+  data.tar.gz: f301f6495d9854c0e8a53dfd22dd0e8db44994dda66aa22cbf920a7a18adf52170d523578ccd0f5a83971521a556074c270d531d626e216f1cf8af7e7bb0cae5

data/db/migrate/20210809145804_add_n_strand_index.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddNStrandIndex < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :delayed_jobs, [:strand, :next_in_strand, :id],
+              name: 'n_strand_index',
+              where: 'strand IS NOT NULL',
+              algorithm: :concurrently
+  end
+end

data/lib/delayed/backend/active_record.rb

@@ -13,9 +13,13 @@ end
 module Delayed
   module Backend
     module ActiveRecord
+      class AbstractJob < ::ActiveRecord::Base
+        self.abstract_class = true
+      end
+
       # A job object that is persisted to the database.
       # Contains the work object as a YAML field.
-      class Job < ::ActiveRecord::Base
+      class Job < AbstractJob
         include Delayed::Backend::Base
         self.table_name = :delayed_jobs
 
@@ -27,7 +31,7 @@ module Delayed
 
         class << self
           def create(attributes, &block)
-            return super if connection.prepared_statements || Rails.version < '5.2'
+            return super if connection.prepared_statements
 
             # modified from ActiveRecord::Persistence.create and ActiveRecord::Persistence#_insert_record
             job = new(attributes, &block)
@@ -37,7 +41,7 @@ module Delayed
 
         def single_step_create
           connection = self.class.connection
-          return save if connection.prepared_statements || Rails.version < '5.2'
+          return save if connection.prepared_statements
 
           # a before_save callback that we're skipping
           initialize_defaults
@@ -66,7 +70,8 @@ module Delayed
           # > Multiple queries sent in a single PQexec call are processed in a single transaction,
           # unless there are explicit BEGIN/COMMIT commands included in the query string to divide
           # it into multiple transactions.
-          sql = "SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(#{connection.quote(values['strand'])})); #{sql}" if values["strand"]
+          # but we don't need to lock when inserting into Delayed::Failed
+          sql = "SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(#{connection.quote(values['strand'])})); #{sql}" if values["strand"] && self.class == Job
           result = connection.execute(sql, "#{self} Create")
           self.id = result.values.first.first
           result.clear
@@ -98,7 +103,7 @@ module Delayed
         # to raise the lock level
         before_create :lock_strand_on_create
         def lock_strand_on_create
-          if strand.present?
+          if strand.present? && self.class == Job
             self.class.connection.execute("SELECT pg_advisory_xact_lock(#{self.class.connection.quote_table_name('half_md5_as_bigint')}(#{self.class.connection.quote(strand)}))")
           end
         end
@@ -513,17 +518,6 @@ module Delayed
         class Failed < Job
           include Delayed::Backend::Base
           self.table_name = :failed_jobs
-          # Rails hasn't completely loaded yet, and setting the table name will cache some stuff
-          # so reset that cache so that it will load correctly after Rails is all loaded
-          # It's fixed in Rails 5 to not cache anything when you set the table_name
-          if Rails.version < '5' && Rails.version >= '4.2'
-            @arel_engine = nil
-            @arel_table = nil
-          end
-        end
-        if Rails.version < '5' && Rails.version >= '4.2'
-          @arel_engine = nil
-          @arel_table = nil
         end
       end
 

data/lib/delayed/backend/base.rb

@@ -56,6 +56,12 @@ module Delayed
           kwargs[:expires_at] = expires_at
           kwargs[:queue] = queue
 
+          strand_args = 0
+          strand_args += 1 if strand
+          strand_args += 1 if n_strand
+          strand_args += 1 if singleton
+          raise ArgumentError, "Only one of strand, n_strand, or singleton can be used" if strand_args > 1
+
           # If two parameters are given to n_strand, the first param is used
           # as the strand name for looking up the Setting, while the second
           # param is appended to make a unique set of strands.

data/lib/delayed/backend/redis/job.rb

@@ -395,13 +395,6 @@ class Job
     result
   end
 
-  if Rails.version < "4.1"
-    def changes_applied
-      @previously_changed = changes
-      @changed_attributes.clear
-    end
-  end
-
   def save!(*a)
     save(*a) || raise(RecordNotSaved)
   end

data/lib/delayed/cli.rb

@@ -80,7 +80,7 @@ class CLI
 
       opts.separator "\n<options>"
       opts.on("-c", "--config [CONFIG_PATH]", "Use alternate config file (default #{@options[:config_file]})") { |c| @options[:config_file] = c }
-      opts.on("-p", "--pid", "Use alternate folder for PID files (default #{@options[:pid_folder]})") { |p| @options[:pid_folder] = p }
+      opts.on("-p", "--pid [PID_PATH]", "Use alternate folder for PID files (default #{@options[:pid_folder]})") { |p| @options[:pid_folder] = p }
       opts.on("--no-tail", "Don't tail the logs (only affects non-daemon mode)") { @options[:tail_logs] = false }
       opts.on("--with-prejudice", "When stopping, interrupt jobs in progress, instead of letting them drain") { @options[:kill] ||= true }
       opts.on("--with-extreme-prejudice", "When stopping, immediately kill jobs in progress, instead of letting them drain") { @options[:kill] = 9 }

data/lib/delayed/pool.rb

@@ -106,6 +106,7 @@ class Pool
   # db connections with the parent
   def fork_with_reconnects
     fork do
+      @self_pipe.each(&:close) # sub-processes don't need to wake us up; keep their FDs clean
       Pool.on_fork.()
       Delayed::Job.reconnect!
       yield

data/lib/delayed/settings.rb

@@ -84,7 +84,7 @@ module Delayed
     def self.worker_config(config_filename = nil)
       config_filename ||= default_worker_config_name
       config = YAML.load(ERB.new(File.read(config_filename)).result)
-      env = defined?(RAILS_ENV) ? RAILS_ENV : ENV['RAILS_ENV'] || 'development'
+      env = Rails.env || 'development'
       config = config[env] || config['default']
       # Backwards compatibility from when the config was just an array of queues
       config = { :workers => config } if config.is_a?(Array)

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "2.2.0"
+  VERSION = "2.3.3"
 end

data/lib/delayed/work_queue/in_process.rb

@@ -16,6 +16,7 @@ class InProcess
   end
 
   # intentional nops for compatibility w/ parent process
+  def init; end
   def close; end
   def wake_up; end
 end

data/lib/delayed/work_queue/parent_process/client.rb

@@ -11,7 +11,10 @@ class ParentProcess
     def initialize(addrinfo, config: Settings.parent_process)
       @addrinfo = addrinfo
       @connect_timeout = config['client_connect_timeout'] || 2
-      @self_pipe = IO.pipe
+    end
+
+    def init
+      @self_pipe ||= IO.pipe
     end
 
     def close

data/lib/delayed/worker.rb

@@ -69,7 +69,6 @@ class Worker
     @config = options
     @job_count = 0
 
-    @self_pipe = IO.pipe
     @signal_queue = []
 
     app = Rails.application
@@ -120,6 +119,8 @@ class Worker
   def start
     logger.info "Starting worker"
     set_process_name("start:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}")
+    @self_pipe = IO.pipe
+    work_queue.init
 
     work_thread = Thread.current
     SIGNALS.each do |sig|
@@ -162,6 +163,9 @@ class Worker
       signal_processor.kill
       signal_processor.join
     end
+
+    @self_pipe&.each(&:close)
+    @self_pipe = nil
   end
 
   def cleanup!

data/lib/delayed/worker/consul_health_check.rb

@@ -9,52 +9,49 @@ module Delayed
     class ConsulHealthCheck < HealthCheck
       self.type_name = :consul
 
-      CONSUL_CONFIG_KEYS = %w{url host port ssl token connect_timeout receive_timeout send_timeout}.map(&:freeze).freeze
+      CONSUL_CONFIG_KEYS = %w{url acl_token}.map(&:freeze).freeze
       DEFAULT_SERVICE_NAME = 'inst-jobs_worker'.freeze
-      attr_reader :agent_client, :catalog_client
+      attr_reader :service_client, :health_client
 
       def initialize(*, **)
         super
         # Because we don't want the consul client to be a hard dependency we're
         # only requiring it once it's absolutely needed
-        require 'imperium'
+        require 'diplomat'
 
         if config.keys.any? { |k| CONSUL_CONFIG_KEYS.include?(k) }
-          consul_config = Imperium::Configuration.new.tap do |conf|
+          consul_config = Diplomat::Configuration.new.tap do |conf|
             CONSUL_CONFIG_KEYS.each do |key|
               conf.send("#{key}=", config[key]) if config[key]
             end
           end
-          @agent_client = Imperium::Agent.new(consul_config)
-          @catalog_client = Imperium::Catalog.new(consul_config)
+          @service_client = Diplomat::Service.new(configuration: consul_config)
+          @health_client = Diplomat::Health.new(configuration: consul_config)
         else
-          @agent_client = Imperium::Agent.default_client
-          @catalog_client = Imperium::Catalog.default_client
+          @service_client = Diplomat::Service.new
+          @health_client = Diplomat::Health.new
         end
       end
 
       def start
-        service = Imperium::Service.new({
+        @service_client.register({
           id: worker_name,
           name: service_name,
+          check: check_attributes
         })
-        service.add_check(check_attributes)
-        response = @agent_client.register_service(service)
-        response.ok?
       end
 
       def stop
-        response = @agent_client.deregister_service(worker_name)
-        response.ok? || response.not_found?
+        @service_client.deregister(worker_name)
       end
 
       def live_workers
-        live_nodes = @catalog_client.list_nodes_for_service(service_name)
-        if live_nodes.ok?
-          live_nodes.map(&:service_id)
-        else
-          raise "Unable to read from Consul catalog: #{live_nodes.content}"
-        end
+        # Filter out critical workers (probably nodes failing their serf health check)
+        live_nodes = @health_client.service(service_name, {
+          filter: 'not Checks.Status == critical'
+        })
+
+        live_nodes.map { |n| n.Service['ID']}
       end
 
       private

data/lib/delayed_job.rb

@@ -18,6 +18,7 @@ require 'rails'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_record'
 require 'after_transaction_commit'
+require 'debug_inspector'
 
 require 'delayed/core_ext/kernel'
 

data/spec/active_record_job_spec.rb

@@ -262,8 +262,6 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
 
   context "non-transactional", non_transactional: true do
     it "creates a stranded job in a single statement" do
-      skip "Requires Rails 5.2 or greater" unless Rails.version >= '5.2'
-
       allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
       allow(Delayed::Job.connection).to receive(:execute).with(be_include("pg_advisory_xact_lock"), anything).and_call_original.once
       allow(Delayed::Job.connection).to receive(:insert).never
@@ -273,8 +271,6 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     end
 
     it "creates a non-stranded job in a single statement" do
-      skip "Requires Rails 5.2 or greater" unless Rails.version >= '5.2'
-
       allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
       call_count = 0
       allow(Delayed::Job.connection).to receive(:execute).and_wrap_original do |m, (arg1, arg2)|
@@ -286,5 +282,20 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
       expect(call_count).to eq 1
       expect(Delayed::Job.find(j.id)).to eq j
     end
+
+    it "does not lock a stranded failed job creation" do
+      j = create_job(strand: "test1")
+      # query for metadata to ensure it's loaded before we start mucking with the connection
+      Delayed::Backend::ActiveRecord::Job::Failed.new
+
+      allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
+      allow(Delayed::Job.connection).to receive(:execute).and_wrap_original do |original, *args|
+        expect(args.first).not_to include("pg_advisory_xact_lock")
+        original.call(*args)
+      end
+      allow(Delayed::Job.connection).to receive(:insert).never
+      j.fail!
+      allow(Delayed::Job.connection).to receive(:execute).and_call_original
+    end
   end
 end

data/spec/delayed/work_queue/parent_process/client_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
-  let(:subject) { described_class.new(addrinfo) }
+  let(:subject) { described_class.new(addrinfo).tap(&:init) }
   let(:addrinfo) { double('Addrinfo') }
   let(:connection) { double('Socket') }
   let(:job) { Delayed::Job.new(locked_by: "worker_name") }

data/spec/delayed/worker/consul_health_check_spec.rb

@@ -1,76 +1,63 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'imperium'
 
 RSpec.describe Delayed::Worker::ConsulHealthCheck do
   let(:health_check) { Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar') }
 
-  # can't use a verifying double for the response because the methods we're
-  # tryig to stub are actually on HTTP::Message
-  let(:response) { double('Imperium::Response') }
-  let(:agent_client) { instance_double(Imperium::Agent) }
-
-  before do
-    allow(Imperium::Agent).to receive(:default_client).and_return(agent_client)
-  end
-
   describe '#initialize' do
-    it 'must use the default agent client when the config is mostly empty' do
+    it 'must use a default service client when the config is mostly empty' do
       check = Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar')
-      expect(check.agent_client).to eq Imperium::Agent.default_client
+      expect(check.service_client.configuration.url.to_s).to eq 'http://localhost:8500'
     end
 
-    it 'must create a new agent API client when the config has relevant keys set' do
+    it 'must create a new service API client when the config has relevant keys set' do
       check = Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar', config: {url: 'http://consul.example.com:8500'})
-      agent_client = check.agent_client
-      expect(agent_client).to_not eq Imperium::Agent.default_client
-      expect(agent_client.config.url.to_s).to eq 'http://consul.example.com:8500'
+      service_client = check.service_client
+      expect(service_client.configuration.url.to_s).to eq 'http://consul.example.com:8500'
     end
   end
 
   describe '#start' do
     it 'must register this process as a service with consul' do
-      expect(response).to receive(:ok?).and_return(true)
-      expect(agent_client).to receive(:register_service)
-        .with(an_instance_of(Imperium::Service))
-        .and_return(response)
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
+        .with(body: hash_including({id: 'foobar' }))
+
       health_check.start
+
+      expect(stub).to have_been_requested
     end
 
 
     it 'must supply a args style check' do
-      allow(response).to receive(:ok?).and_return(true)
-      allow(agent_client).to receive(:register_service) { |service|
-        check = service.checks.first
-        expect(check.args).to_not be_nil
-        response
-      }
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
+        .with(body: hash_including({check:  WebMock::API.hash_including({args: anything})}))
+
       health_check.start
+
+      expect(stub).to have_been_requested
     end
 
     it 'must include the docker container id when the docker option is set to true' do
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
+        .with(body: hash_including({check:  WebMock::API.hash_including({docker_container_id: anything})}))
+
       local_health_check = Delayed::Worker::ConsulHealthCheck.new(
         worker_name: 'foobar',
         config: {docker: true}
       )
-      allow(response).to receive(:ok?).and_return(true)
-      allow(agent_client).to receive(:register_service) { |service|
-        check = service.checks.first
-        expect(check.docker_container_id).to_not be_nil
-        response
-      }
       local_health_check.start
+
+      expect(stub).to have_been_requested
     end
   end
 
   describe '#stop' do
     it 'must deregister the service from consul' do
-      allow(response).to receive(:ok?).and_return(true)
-      expect(agent_client).to receive(:deregister_service)
-        .with(health_check.worker_name)
-        .and_return(response)
+      stub = stub_request(:put, "localhost:8500/v1/agent/service/deregister/foobar")
+
       health_check.stop
+      expect(stub).to have_been_requested
     end
   end
 end

data/spec/gemfiles/52.gemfile

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

data/spec/gemfiles/60.gemfile

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

data/spec/gemfiles/60.gemfile.lock

@@ -0,0 +1,246 @@
+PATH
+  remote: ../..
+  specs:
+    inst-jobs (2.3.1)
+      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 (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      actionview (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3.7)
+      actionview (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.7)
+      activesupport (= 6.0.3.7)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.7)
+      activesupport (= 6.0.3.7)
+      globalid (>= 0.3.6)
+    activemodel (6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activerecord (6.0.3.7)
+      activemodel (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activestorage (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    after_transaction_commit (2.2.2)
+      activerecord (>= 5.2)
+    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.0)
+      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.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    fugit (1.4.5)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.4)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    hashdiff (1.0.1)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.10.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.7)
+    nokogiri (1.11.7-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 (6.0.3.7)
+      actioncable (= 6.0.3.7)
+      actionmailbox (= 6.0.3.7)
+      actionmailer (= 6.0.3.7)
+      actionpack (= 6.0.3.7)
+      actiontext (= 6.0.3.7)
+      actionview (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activemodel (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.7)
+      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 (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.3)
+    redis (4.2.5)
+    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.4)
+    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.13.0)
+      addressable (>= 2.3.6)
+      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)
+    zeitwerk (2.4.2)
+
+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 (~> 6.0.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.17

data/spec/gemfiles/61.gemfile

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

data/spec/shared/shared_backend.rb

@@ -313,6 +313,13 @@ shared_examples_for 'a backend' do
       expect(second).to eq nil
     end
 
+    it "complains if you pass more than one strand-based option" do
+      expect { create_job(strand: 'a', n_strand: 'b') }.to raise_error(ArgumentError)
+      expect { create_job(strand: 'a', singleton: 'b') }.to raise_error(ArgumentError)
+      expect { create_job(n_strand: 'a', singleton: 'b') }.to raise_error(ArgumentError)
+      expect { create_job(strand: 'a', n_strand: 'b', singleton: 'c') }.to raise_error(ArgumentError)
+    end
+
     context 'singleton' do
       it "should create if there's no jobs on the strand" do
         @job = create_job(:singleton => 'myjobs')

data/spec/shared/worker.rb

@@ -21,7 +21,7 @@ shared_examples_for 'Delayed::Worker' do
 
   describe "running a job" do
     it "should not fail when running a job with a % in the name" do
-      @job = "Some % Name here".delay(ignore_transaction: true).starts_with?("Some % Name")
+      @job = "Some % Name here".delay(ignore_transaction: true).start_with?("Some % Name")
       @worker.perform(@job)
     end
   end

data/spec/spec_helper.rb

@@ -5,8 +5,9 @@ require 'delayed/testing'
 
 require 'database_cleaner'
 require 'rack/test'
-require 'test_after_commit' if ::Rails.version < '5'
 require 'timecop'
+require 'webmock/rspec'
+
 require 'pry'
 require 'byebug'
 
@@ -19,6 +20,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
+    WebMock.disable_net_connect!
   end
 
   config.before(:each) do |example|
@@ -60,18 +62,8 @@ connection_config = {
   database: ENV['TEST_DB_DATABASE'],
 }
 
-if ::Rails.version < '5'
-  class ActiveRecord::Migration
-    class << self
-      def [](_version); self; end
-    end
-  end
-end
-
 def migrate(file)
-  if ::Rails.version < '5.2'
-    ActiveRecord::Migrator.migrate(file)
-  elsif ::Rails.version >= '6'
+  if ::Rails.version >= '6'
     ActiveRecord::MigrationContext.new(file, ActiveRecord::SchemaMigration).migrate
   else
     ActiveRecord::MigrationContext.new(file).migrate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.3
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -161,44 +161,58 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: imperium
+  name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: diplomat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -261,14 +275,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -303,14 +317,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +387,7 @@ files:
 - db/migrate/20200330230722_add_id_to_get_delayed_jobs_index.rb
 - db/migrate/20200824222232_speed_up_max_concurrent_delete_trigger.rb
 - db/migrate/20200825011002_add_strand_order_override.rb
+- db/migrate/20210809145804_add_n_strand_index.rb
 - exe/inst_jobs
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
@@ -422,11 +451,10 @@ files:
 - spec/delayed/worker/consul_health_check_spec.rb
 - spec/delayed/worker/health_check_spec.rb
 - spec/delayed/worker_spec.rb
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/50.gemfile
-- spec/gemfiles/51.gemfile
 - spec/gemfiles/52.gemfile
 - spec/gemfiles/60.gemfile
+- spec/gemfiles/60.gemfile.lock
+- spec/gemfiles/61.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -464,11 +492,10 @@ test_files:
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
 - spec/redis_job_spec.rb
+- spec/gemfiles/60.gemfile.lock
+- spec/gemfiles/61.gemfile
 - spec/gemfiles/60.gemfile
-- spec/gemfiles/42.gemfile
 - spec/gemfiles/52.gemfile
-- spec/gemfiles/50.gemfile
-- spec/gemfiles/51.gemfile
 - spec/shared_jobs_specs.rb
 - spec/shared/performable_method.rb
 - spec/shared/testing.rb

data/spec/gemfiles/42.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 4.2.5"
-gem "after_transaction_commit", "<2"
-gem 'test_after_commit', '0.4.1'

data/spec/gemfiles/50.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 5.0.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"

data/spec/gemfiles/51.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 5.1.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"