sidekiq-unique-jobs 4.0.15 → 4.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae23c1545dd81bcf054b01f5d7aa26cb4585e18
-  data.tar.gz: 13aad39ea7821ec2886992ed873e06545fac4a86
+  metadata.gz: aa74d419e8964813243a427ec860730ac44dfe36
+  data.tar.gz: e4e1850f812e286a59e4de00c9ea2f6b4ff6d392
 SHA512:
-  metadata.gz: adcee484a254153c691743dfd6576b81207ef824acf37c6572afb8229ed9fdb82571f7677b5be6e32f41c8d93c41c5ea6077967b2ff0a0fa16be7b420afa5df4
-  data.tar.gz: e9be8f0c54505d544ad63b3eb85c16ed4f6e69894683db4f70f58138d0b49445e263904479259b5d2a897c4cdc44ef7b2d3d7046b7bba0553255edb042c9e719
+  metadata.gz: f6d6e3e9c95acfc333bb8d697121d53a2a8208fbca08ce9790c5457f08f6680c7469d7493cdc5eeb2bf49046c4094ebf23cb5a1449e63793169a9ad3d5d9bffc
+  data.tar.gz: 810c75a9aafd58ef30cb4a99568ac9a24d49062fe69ef7a11512e9c261d5e2e8af730a109c4213f083024dcc9ae10d0f6d9c56ae41c80a7ed68f41df8b34df40

data/.codeclimate.yml

@@ -0,0 +1,22 @@
+engines:
+  bundler-audit:
+    enabled: true
+  fixme:
+    enabled: true
+  duplication:
+    enabled: true
+  rubocop:
+    enabled: true
+  golint:
+    enabled: true
+ratings:
+  paths:
+    - lib/**
+    - bin/**
+    - "**.rb"
+exclude_paths:
+  - spec/
+  - gemfiles/
+  - rails_example/
+  - redis/
+  - tmp/

data/.travis.yml

@@ -1,6 +1,10 @@
 sudo: false
 language: ruby
 cache: bundler
+before_install:
+  - rvm get head
+  - gem update --system
+  - gem install bundler
 services:
   - redis-server
 script:

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v4.0.16
+
+- Allow run & queue lock timeout (expiration) to be different [#164](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/164)
+- Fix a bug with loading sidekiq test overrides ([#167](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/167)
+
+## v4.0.15
+
+- Close [#156](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/156)
+- Close [#158](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/158)
+- Style fixes and some minor adjustments to the console/cmd line app
+
 ## v4.0.13
 
 - Allow deleting locks by jid
@@ -5,19 +16,19 @@
 ## v4.0.12
 
 - Allow jobs to be pushed to processing
-- Close #150
-- Close #151
-- Close #146
-- Close #136
-- Close #133
+- Close [#150](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/150)
+- Close [#151](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/151)
+- Close [#146](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/146)
+- Close [#136](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/136)
+- Close [#133](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/133)
 
 ## v4.0.11
 
-- Always load forwardable - https://github.com/mhenrixon/sidekiq-unique-jobs/issues/152#issuecomment-164199978
+- Always load forwardable [#152](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/152#issuecomment-164199978)
 
 ## v4.0.10
 
-- Fix https://github.com/mhenrixon/sidekiq-unique-jobs/issues/152
+- Fix [#152](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/152)
 - Minor improvement to internal esthetics
 
 ## v4.0.9
@@ -26,18 +37,18 @@
 
 ## v4.0.8
 
-- Use unique arguments for the `WhileExecuting` lock (#127)
-- Delicensed code (#132)
-- Fix queuing unique jobs (#138)
+- Use unique arguments for the `WhileExecuting` lock ([#127](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/127)
+- Delicensed code ([#132](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/132)
+- Fix queuing unique jobs ([#138](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/138)
 
 ## v4.0.7
 
-- Use unique arguments for the `WhileExecuting` lock (#127)
+- Use unique arguments for the `WhileExecuting` lock ([#127](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/127)
 - See also https://github.com/mhenrixon/sidekiq-unique-jobs/releases/tag/v4.0.7
 
 ## v4.0.6
 
-- Removes enforced uniqueness for all jobs (#127)
+- Removes enforced uniqueness for all jobs ([#127](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/127)
 
 ## v4.0.5
 

data/Gemfile

@@ -5,7 +5,7 @@ gem 'appraisal', '~> 2.0.0'
 gem 'rspec-its',  require: false
 gem 'rspec-wait', require: false
 
-platform :mri_23 do
+platforms :mri_23 do
   gem 'fasterer',                  require: false
   gem 'benchmark-ips',             require: false
   gem 'pry-byebug',                require: false

data/README.md

@@ -101,7 +101,7 @@ For jobs scheduled in the future it is possible to set for how long the job
 should be unique. The job will be unique for the number of seconds configured (default 30 minutes)
 or until the job has been completed. Thus, the job will be unique for the shorter of the two.  Note that Sidekiq versions before 3.0 will remove job keys after an hour, which means jobs can remain unique for at most an hour.
 
-*If you want the unique job to stick around even after it has been successfully
+If you want the unique job to stick around even after it has been successfully
 processed then just set `unique: :until_timeout`.
 
 You can also control the expiration length of the uniqueness check. If you want to enforce uniqueness over a longer period than the default of 30 minutes then you can pass the number of seconds you want to use to the sidekiq options:
@@ -110,6 +110,12 @@ You can also control the expiration length of the uniqueness check. If you want
 sidekiq_options unique: :until_timeout, unique_expiration: 120 * 60 # 2 hours
 ```
 
+For locking modes (`:while_executing` and `:until_and_while_executing`) you can control the expiration length of the runtime uniqueness. If you want to enforce uniqueness over a longer period than the default of 60 seconds, then you can pass the number of seconds you want to use to the sidekiq options:
+
+```ruby
+sidekiq_options unique: :while_executing, run_lock_expiration: 2 * 60 # 2 minutes
+```
+
 Requiring the gem in your gemfile should be sufficient to enable unique jobs.
 
 ### Usage with ActiveJob

data/lib/sidekiq-unique-jobs.rb

@@ -23,7 +23,8 @@ module SidekiqUniqueJobs
   def config
     @config ||= Config.new(
       unique_prefix: 'uniquejobs',
-      default_expiration: 30 * 60,
+      default_queue_lock_expiration: 30 * 60,
+      default_run_lock_expiration: 60,
       default_lock: :while_executing,
       redis_test_mode: :redis # :mock
     )

data/lib/sidekiq_unique_jobs/config.rb

@@ -2,7 +2,8 @@ module SidekiqUniqueJobs
   class Config < OpenStruct
     CONFIG_ACCESSORS = [
       :unique_prefix,
-      :default_expiration,
+      :default_queue_lock_expiration,
+      :default_run_lock_expiration,
       :default_lock,
       :redis_mode
     ].freeze

data/lib/sidekiq_unique_jobs/constants.rb

@@ -5,6 +5,8 @@ module SidekiqUniqueJobs
   JID_KEY ||= 'jid'.freeze
   LOG_DUPLICATE_KEY ||= 'log_duplicate_payload'.freeze
   QUEUE_KEY ||= 'queue'.freeze
+  QUEUE_LOCK_TIMEOUT_KEY ||= 'unique_expiration'.freeze
+  RUN_LOCK_TIMEOUT_KEY ||= 'run_lock_expiration'.freeze
   TESTING_CONSTANT ||= 'Testing'.freeze
   UNIQUE_KEY ||= 'unique'.freeze
   UNIQUE_LOCK_KEY ||= 'unique_lock'.freeze
@@ -12,6 +14,5 @@ module SidekiqUniqueJobs
   UNIQUE_PREFIX_KEY ||= 'unique_prefix'.freeze
   UNIQUE_DIGEST_KEY ||= 'unique_digest'.freeze
   UNIQUE_ON_ALL_QUEUES_KEY ||= 'unique_on_all_queues'.freeze
-  UNIQUE_TIMEOUT_KEY ||= 'unique_expiration'.freeze
   UNIQUE_ARGS_ENABLED_KEY ||= 'unique_args_enabled'.freeze
 end

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -58,7 +58,7 @@ module SidekiqUniqueJobs
       end
 
       def max_lock_time
-        @max_lock_time ||= TimeoutCalculator.for_item(item).seconds
+        @max_lock_time ||= QueueLockTimeoutCalculator.for_item(item).seconds
       end
 
       def after_yield_yield

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -24,7 +24,13 @@ module SidekiqUniqueJobs
       end
 
       def locked?
-        Scripts.call(:synchronize, @redis_pool, keys: [@unique_digest], argv: [Time.now.to_i]) == 1
+        Scripts.call(:synchronize, @redis_pool,
+                     keys: [@unique_digest],
+                     argv: [Time.now.to_i, max_lock_time]) == 1
+      end
+
+      def max_lock_time
+        @max_lock_time ||= RunLockTimeoutCalculator.for_item(@item).seconds
       end
 
       def execute(_callback)

data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb

@@ -54,7 +54,7 @@ module Sidekiq
       end
     end
 
-    module UniqueExtension3_4
+    module UniqueExtension3_5
       def self.included(base)
         base.class_eval do
           include SidekiqUniqueJobs::Unlockable
@@ -75,9 +75,9 @@ module Sidekiq
       end
     end
     sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
-    include UniqueExtension3_4 if sidekiq_version >= Gem::Version.new('3.4')
+    include UniqueExtension3_5 if sidekiq_version >= Gem::Version.new('3.5')
     include UniqueExtension3_0 if sidekiq_version >= Gem::Version.new('3.0') &&
-                                  sidekiq_version < Gem::Version.new('3.4')
+                                  sidekiq_version < Gem::Version.new('3.5')
     # rubocop:enable Style/ClassAndModuleCamelCase
   end
 

data/lib/sidekiq_unique_jobs/timeout_calculator.rb

@@ -8,27 +8,22 @@ module SidekiqUniqueJobs
       @item = item
     end
 
-    def seconds
-      time_until_scheduled + unique_expiration
-    end
-
     def time_until_scheduled
       scheduled = item[AT_KEY]
       return 0 unless scheduled
       (Time.at(scheduled) - Time.now.utc).to_i
     end
 
-    def unique_expiration
-      @unique_expiration ||=
-        (
-          worker_class_unique_expiration ||
-          SidekiqUniqueJobs.config.default_expiration
-        ).to_i
+    def seconds
+      raise NotImplementedError
     end
 
-    def worker_class_unique_expiration
-      return unless worker_class.respond_to?(:get_sidekiq_options)
-      worker_class.get_sidekiq_options[UNIQUE_TIMEOUT_KEY]
+    def worker_class_queue_lock_expiration
+      worker_class_expiration_for QUEUE_LOCK_TIMEOUT_KEY
+    end
+
+    def worker_class_run_lock_expiration
+      worker_class_expiration_for RUN_LOCK_TIMEOUT_KEY
     end
 
     def worker_class
@@ -37,6 +32,34 @@ module SidekiqUniqueJobs
 
     private
 
+    def worker_class_expiration_for(key)
+      return unless worker_class.respond_to?(:get_sidekiq_options)
+      worker_class.get_sidekiq_options[key]
+    end
+
     attr_reader :item
   end
+
+  class RunLockTimeoutCalculator < TimeoutCalculator
+    def seconds
+      @seconds ||= (
+        worker_class_run_lock_expiration ||
+        SidekiqUniqueJobs.config.default_run_lock_expiration
+      ).to_i
+    end
+  end
+
+  class QueueLockTimeoutCalculator < TimeoutCalculator
+    def seconds
+      queue_lock_expiration + time_until_scheduled
+    end
+
+    def queue_lock_expiration
+      @queue_lock_expiration ||=
+        (
+          worker_class_queue_lock_expiration ||
+          SidekiqUniqueJobs.config.default_queue_lock_expiration
+        ).to_i
+    end
+  end
 end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '4.0.15'.freeze
+  VERSION = '4.0.16'.freeze
 end

data/rails_example/app/workers/simple_worker.rb

@@ -3,7 +3,7 @@ class SimpleWorker
   sidekiq_options unique: :until_executed,
                   unique_args: -> (args) { [args.first] },
                   queue: :default,
-                  default_expiration: 3 * 60 * 60
+                  default_queue_lock_expiration: 3 * 60 * 60
 
   def perform(_some_arg)
     sleep 60

data/redis/synchronize.lua

@@ -1,13 +1,14 @@
 local unique_key     = KEYS[1]
 local time           = ARGV[1]
+local expires        = ARGV[2]
 
-if redis.pcall('set', unique_key, time + 60, 'nx', 'ex', 60) then
+if redis.pcall('set', unique_key, time + expires, 'nx', 'ex', expires) then
   return 1
 end
 
 local stored_time = redis.pcall('get', unique_key)
 if stored_time and stored_time < time then
-  if redis.pcall('set', unique_key, time + 60, 'xx', 'ex', 60) then
+  if redis.pcall('set', unique_key, time + expires, 'xx', 'ex', expires) then
     return 1
   end
 end

data/spec/jobs/long_running_job.rb

@@ -0,0 +1,7 @@
+class LongRunningJob
+  include Sidekiq::Worker
+  sidekiq_options queue: :customqueue, retry: true, unique: :until_and_while_executing,
+                  run_lock_expiration: 7_200, retry_count: 10
+  def perform(_one, _two)
+  end
+end

data/spec/jobs/simple_worker.rb

@@ -3,7 +3,7 @@ class SimpleWorker
   sidekiq_options unique: :until_executed,
                   unique_args: ->(args) { [args.first] },
                   queue: :default,
-                  default_expiration: 5 * 60 * 60
+                  default_queue_lock_expiration: 5 * 60 * 60
 
   def perform(_arg)
     sleep 5

data/spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb

@@ -225,7 +225,8 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
     # jobs are set around the same time as the scheduled job itself feel free to improve.
     it 'expires the digest when a scheduled job is scheduled at' do
       expected_expires_at =
-        (Time.at(Time.now.to_i + 15 * 60) - Time.now.utc) + SidekiqUniqueJobs.config.default_expiration
+        (Time.at(Time.now.to_i + 15 * 60) - Time.now.utc) +
+        SidekiqUniqueJobs.config.default_queue_lock_expiration
       jid = MyUniqueJob.perform_in(expected_expires_at, 'mike')
       item = { 'class' => MyUniqueJob,
                'queue' => 'customqueue',

data/spec/lib/sidekiq_unique_jobs/lock/while_executing_spec.rb

@@ -31,6 +31,33 @@ RSpec.describe SidekiqUniqueJobs::Lock::WhileExecuting do
     expect(x).to eq(10)
   end
 
+  it 'expires the lock on the mutex object after run_lock_expiration if specified' do
+    mutexes = (1..10).map do
+      described_class.new(item)
+    end
+
+    worker = SidekiqUniqueJobs.worker_class_constantize(item[SidekiqUniqueJobs::CLASS_KEY])
+    allow(worker).to receive(:get_sidekiq_options)
+      .and_return('retry'               => true,
+                  'queue'               => :dupsallowed,
+                  'run_lock_expiration' => 0,
+                  'unique'              => :until_and_while_executing)
+
+    start_times = []
+    sleep_time = 0.1
+    mutexes.each_with_index.map do |m, i|
+      Thread.new do
+        m.synchronize do
+          start_times[i] = Time.now
+          sleep sleep_time
+        end
+      end
+    end.map(&:join)
+
+    expect(start_times.size).to be 10
+    expect(start_times.sort.last - start_times.sort.first).to be < sleep_time * 10
+  end
+
   it 'handles auto cleanup correctly' do
     m = described_class.new(item)
 

data/spec/lib/sidekiq_unique_jobs/queue_lock_timeout_calculator_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+RSpec.describe SidekiqUniqueJobs::QueueLockTimeoutCalculator do
+  shared_context 'generic unscheduled job' do
+    subject { described_class.new('class' => 'JustAWorker') }
+  end
+
+  describe 'public api' do
+    it_behaves_like 'generic unscheduled job' do
+      it { is_expected.to respond_to(:seconds) }
+      it { is_expected.to respond_to(:queue_lock_expiration) }
+    end
+  end
+
+  describe '.for_item' do
+    it 'initializes a new calculator' do
+      expect(described_class).to receive(:new).with('WAT')
+      described_class.for_item('WAT')
+    end
+  end
+
+  describe '#seconds' do
+    subject { described_class.new(nil) }
+
+    before do
+      allow(subject).to receive(:time_until_scheduled).and_return(10)
+      allow(subject).to receive(:queue_lock_expiration).and_return(9)
+    end
+    its(:seconds) { is_expected.to eq(19) }
+  end
+
+  describe '#queue_lock_expiration' do
+    context 'using default unique_expiration' do
+      subject { described_class.new(nil) }
+      before { allow(subject).to receive(:worker_class_queue_lock_expiration).and_return(nil) }
+
+      its(:queue_lock_expiration) { is_expected.to eq(1_800) }
+    end
+
+    context 'using specified sidekiq option unique_expiration' do
+      subject { described_class.new(nil) }
+      before { allow(subject).to receive(:worker_class_queue_lock_expiration).and_return(9) }
+
+      its(:queue_lock_expiration) { is_expected.to eq(9) }
+    end
+  end
+end

data/spec/lib/sidekiq_unique_jobs/run_lock_timeout_calculator_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe SidekiqUniqueJobs::RunLockTimeoutCalculator do
+  shared_context 'generic unscheduled job' do
+    subject { described_class.new('class' => 'JustAWorker') }
+  end
+
+  describe 'public api' do
+    it_behaves_like 'generic unscheduled job' do
+      it { is_expected.to respond_to(:seconds) }
+    end
+  end
+
+  describe '.for_item' do
+    it 'initializes a new calculator' do
+      expect(described_class).to receive(:new).with('WAT')
+      described_class.for_item('WAT')
+    end
+  end
+
+  describe '#seconds' do
+    context 'using default run_lock_expiration' do
+      subject { described_class.new(nil) }
+      before { allow(subject).to receive(:worker_class_run_lock_expiration).and_return(9) }
+
+      its(:seconds) { is_expected.to eq(9) }
+    end
+
+    context 'using specified sidekiq option run_lock_expiration' do
+      subject { described_class.new(nil) }
+      before { allow(subject).to receive(:worker_class_run_lock_expiration).and_return(nil) }
+
+      its(:seconds) { is_expected.to eq(60) }
+    end
+  end
+end

data/spec/lib/sidekiq_unique_jobs/timeout_calculator_spec.rb

@@ -12,8 +12,8 @@ RSpec.describe SidekiqUniqueJobs::TimeoutCalculator do
   describe 'public api' do
     subject { described_class.new(nil) }
     it { is_expected.to respond_to(:time_until_scheduled) }
-    it { is_expected.to respond_to(:unique_expiration) }
-    it { is_expected.to respond_to(:worker_class_unique_expiration) }
+    it { is_expected.to respond_to(:worker_class_queue_lock_expiration) }
+    it { is_expected.to respond_to(:worker_class_run_lock_expiration) }
     it { is_expected.to respond_to(:worker_class) }
     it { is_expected.to respond_to(:seconds) }
   end
@@ -25,16 +25,6 @@ RSpec.describe SidekiqUniqueJobs::TimeoutCalculator do
     end
   end
 
-  describe '#seconds' do
-    subject { described_class.new(nil) }
-
-    before do
-      allow(subject).to receive(:time_until_scheduled).and_return(10)
-      allow(subject).to receive(:unique_expiration).and_return(9)
-    end
-    its(:seconds) { is_expected.to eq(19) }
-  end
-
   describe '#time_until_scheduled' do
     it_behaves_like 'item not scheduled' do
       its(:time_until_scheduled) { is_expected.to eq(0) }
@@ -51,22 +41,22 @@ RSpec.describe SidekiqUniqueJobs::TimeoutCalculator do
     end
   end
 
-  describe '#unique_expiration' do
+  describe '#worker_class_queue_lock_expiration' do
     it_behaves_like 'undefined worker class' do
-      its(:unique_expiration) { is_expected.to eq(SidekiqUniqueJobs.config.default_expiration) }
+      its(:worker_class_queue_lock_expiration) { is_expected.to eq(nil) }
     end
 
     subject { described_class.new('class' => 'MyUniqueJob') }
-    its(:unique_expiration) { is_expected.to eq(7_200) }
+    its(:worker_class_queue_lock_expiration) { is_expected.to eq(7_200) }
   end
 
-  describe '#worker_class_unique_expiration' do
+  describe '#worker_class_run_lock_expiration' do
     it_behaves_like 'undefined worker class' do
-      its(:worker_class_unique_expiration) { is_expected.to eq(nil) }
+      its(:worker_class_run_lock_expiration) { is_expected.to eq(nil) }
     end
 
-    subject { described_class.new('class' => 'MyUniqueJob') }
-    its(:worker_class_unique_expiration) { is_expected.to eq(7_200) }
+    subject { described_class.new('class' => 'LongRunningJob') }
+    its(:worker_class_run_lock_expiration) { is_expected.to eq(7_200) }
   end
 
   describe '#worker_class' do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.2.3'
+if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.3.0'
   if ENV['CI']
     require 'codeclimate-test-reporter'
     CodeClimate::TestReporter.start
@@ -64,69 +64,3 @@ RSpec.configure do |config|
 end
 
 Dir[File.join(File.dirname(__FILE__), 'jobs', '**', '*.rb')].each { |f| require f }
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.2.3'
-  if ENV['CI']
-    require 'codeclimate-test-reporter'
-    CodeClimate::TestReporter.start
-  else
-    require 'simplecov'
-  end
-
-  begin
-    require 'pry-byebug'
-  rescue LoadError
-    puts 'Pry unavailable'
-  end
-end
-
-require 'rspec'
-require 'rspec/its'
-
-require 'celluloid_with_fallback'
-require 'sidekiq'
-require 'sidekiq/util'
-require 'sidekiq-unique-jobs'
-require 'sidekiq_unique_jobs/testing'
-require 'timecop'
-
-require 'sidekiq/simulator'
-
-Sidekiq::Testing.disable!
-Sidekiq.logger.level = "Logger::#{ENV.fetch('LOGLEVEL') { 'error' }.upcase}".constantize
-
-require 'sidekiq/redis_connection'
-
-begin
-  require 'redis-namespace'
-rescue LoadError
-  puts 'Redis Namespace unavailable'
-end
-
-REDIS_URL ||= ENV['REDIS_URL'] || 'redis://localhost/15'.freeze
-REDIS_NAMESPACE ||= 'unique-test'.freeze
-REDIS_OPTIONS ||= { url: REDIS_URL }.freeze
-REDIS_OPTIONS[:namespace] = REDIS_NAMESPACE if defined?(Redis::Namespace)
-REDIS ||= Sidekiq::RedisConnection.create(REDIS_OPTIONS)
-
-Sidekiq.configure_client do |config|
-  config.redis = REDIS_OPTIONS
-end
-
-Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each { |f| require f }
-RSpec.configure do |config|
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-  config.filter_run :focus unless ENV['CI']
-  config.run_all_when_everything_filtered = true
-  config.disable_monkey_patching!
-  config.warnings = false
-  config.default_formatter = 'doc' if config.files_to_run.one?
-  config.order = :random
-  Kernel.srand config.seed
-end
-
-Dir[File.join(File.dirname(__FILE__), 'jobs', '**', '*.rb')].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.15
+  version: 4.0.16
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -116,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".editorconfig"
 - ".fasterer.yml"
 - ".gitignore"
@@ -241,6 +242,7 @@ files:
 - spec/jobs/expiring_job.rb
 - spec/jobs/inline_worker.rb
 - spec/jobs/just_a_worker.rb
+- spec/jobs/long_running_job.rb
 - spec/jobs/main_job.rb
 - spec/jobs/my_job.rb
 - spec/jobs/my_unique_job.rb
@@ -265,6 +267,8 @@ files:
 - spec/lib/sidekiq_unique_jobs/lock/while_executing_spec.rb
 - spec/lib/sidekiq_unique_jobs/normalizer_spec.rb
 - spec/lib/sidekiq_unique_jobs/options_with_fallback_spec.rb
+- spec/lib/sidekiq_unique_jobs/queue_lock_timeout_calculator_spec.rb
+- spec/lib/sidekiq_unique_jobs/run_lock_timeout_calculator_spec.rb
 - spec/lib/sidekiq_unique_jobs/scripts_spec.rb
 - spec/lib/sidekiq_unique_jobs/server/middleware_spec.rb
 - spec/lib/sidekiq_unique_jobs/sidekiq_testing_enabled_spec.rb
@@ -300,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq