sidekiq-unique-jobs 4.0.13 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a667c02accea5b2f80e5ba1b193386a416d15453
-  data.tar.gz: c8e813d81b96efc50d1870d32e7c9b3e257ffb63
+  metadata.gz: fae23c1545dd81bcf054b01f5d7aa26cb4585e18
+  data.tar.gz: 13aad39ea7821ec2886992ed873e06545fac4a86
 SHA512:
-  metadata.gz: 30cf3f31dee1a248da9541e8fa7fc4f775f7082919b7baba93c89d013a62fef10450dd882ed726ed1c4af98962ee9995a2df58e8549f5270464b48b51dcb9545
-  data.tar.gz: d18f162f26b71b9a1ab2b8e865ad8da609ea43e993306f46714e7bd289aaea883724a2a2e72e65611fd22aaab4e5ad3d01673b4b412439339cfa9cda53c9221d
+  metadata.gz: adcee484a254153c691743dfd6576b81207ef824acf37c6572afb8229ed9fdb82571f7677b5be6e32f41c8d93c41c5ea6077967b2ff0a0fa16be7b420afa5df4
+  data.tar.gz: e9be8f0c54505d544ad63b3eb85c16ed4f6e69894683db4f70f58138d0b49445e263904479259b5d2a897c4cdc44ef7b2d3d7046b7bba0553255edb042c9e719

data/.travis.yml

@@ -8,10 +8,11 @@ script:
   - bundle exec rspec spec
 rvm:
   - jruby-19mode
-  - jruby-9.0.0.0
+  - jruby-9.0.4.0
   - rbx-2
-  - 2.1.7
-  - 2.2.3
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 env: STYLE=false
 gemfile:
   - gemfiles/sidekiq_develop.gemfile
@@ -21,6 +22,7 @@ gemfile:
   - gemfiles/sidekiq_3.2.gemfile
   - gemfiles/sidekiq_3.3.gemfile
   - gemfiles/sidekiq_4.0.gemfile
+  - gemfiles/sidekiq_4.1.gemfile
 
 notifications:
   email:
@@ -29,7 +31,7 @@ notifications:
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: gemfiles/sidekiq_develop.gemfile
       env: STYLE=true
 addons:

data/Appraisals

@@ -25,3 +25,7 @@ end
 appraise 'sidekiq-4.0' do
   gem 'sidekiq', '~> 4.0.0'
 end
+
+appraise 'sidekiq-4.1' do
+  gem 'sidekiq', '~> 4.1.0'
+end

data/Gemfile

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

data/README.md

@@ -1,4 +1,5 @@
-# SidekiqUniqueJobs [![Build Status](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs.png?branch=master)](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs) [![Code Climate](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs.png)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs) [![Test Coverage](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/badges/coverage.svg)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/coverage)
+# SidekiqUniqueJobs [![Join the chat at https://gitter.im/mhenrixon/sidekiq-unique-jobs](https://badges.gitter.im/mhenrixon/sidekiq-unique-jobs.svg)](https://gitter.im/mhenri
+xon/sidekiq-unique-jobs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs.png?branch=master)](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs) [![Code Climate](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs.png)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs) [![Test Coverage](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/badges/coverage.svg)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs/coverage)
 
 The missing unique jobs for sidekiq
 
@@ -203,6 +204,11 @@ Start the console with the following command `bundle exec jobs console`.
 
 `bundle exec jobs` displays help on how to use the unique jobs command line.
 
+## Communication
+
+There is a [![Join the chat at https://gitter.im/mhenrixon/sidekiq-unique-jobs](https://badges.gitter.im/mhenrixon/sidekiq-unique-jobs.svg)](https://gitter.im/mhenri
+xon/sidekiq-unique-jobs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) for praise or scorn. This would be a good place to have lengthy discuss or brilliant suggestions or simply just nudge me if I forget about anything.
+
 ## Testing
 
 To enable the testing for `sidekiq-unique-jobs`, add `require 'sidekiq_unique_jobs/testing'` to your testing helper.
@@ -217,6 +223,8 @@ To enable the testing for `sidekiq-unique-jobs`, add `require 'sidekiq_unique_jo
 
 ## Contributors
 
+In no particular order:
+
 - https://github.com/salrepe
 - https://github.com/rickenharp
 - https://github.com/sax

data/gemfiles/sidekiq_2.17.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", "~> 2.17.4"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/gemfiles/sidekiq_3.0.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", "~> 3.0.0"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/gemfiles/sidekiq_3.1.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", "~> 3.1.0"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/gemfiles/sidekiq_3.2.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", "~> 3.2.0"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/gemfiles/sidekiq_3.3.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", "~> 3.3.0"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/gemfiles/sidekiq_4.0.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", "~> 4.0.0"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/gemfiles/sidekiq_4.1.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 2.0.0"
+gem "rspec-its", :require => false
+gem "rspec-wait", :require => false
+gem "sidekiq", "~> 4.1.0"
+
+platforms :mri_23 do
+  gem "fasterer", :require => false
+  gem "benchmark-ips", :require => false
+  gem "pry-byebug", :require => false
+  gem "simplecov-json", :require => false
+  gem "memory_profiler", :require => false
+  gem "codeclimate-test-reporter", :require => false
+end
+
+gemspec :path => "../"

data/gemfiles/sidekiq_develop.gemfile

@@ -7,7 +7,7 @@ gem "rspec-its", :require => false
 gem "rspec-wait", :require => false
 gem "sidekiq", :github => "mperham/sidekiq"
 
-platforms :mri_22 do
+platforms :mri_23 do
   gem "fasterer", :require => false
   gem "benchmark-ips", :require => false
   gem "pry-byebug", :require => false

data/lib/sidekiq/simulator.rb

@@ -46,7 +46,7 @@ module Sidekiq
       if launcher.respond_to?(:alive?)
         launcher.alive?
       else
-        launcher.manager.workers.size > 0
+        launcher.manager.workers.any?
       end
     end
 

data/lib/sidekiq_unique_jobs/core_ext.rb

@@ -37,11 +37,11 @@ class String
 
   def camelize(uppercase_first_letter = true)
     string = self
-    if uppercase_first_letter
-      string = string.sub(/^[a-z\d]*/) { $&.capitalize }
-    else
-      string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
-    end
+    string = if uppercase_first_letter
+               string.sub(/^[a-z\d]*/) { $&.capitalize }
+             else
+               string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
+             end
     string.gsub!(%r{(?:_|(\/))([a-z\d]*)}i) do
       "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}"
     end

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -25,7 +25,7 @@ module SidekiqUniqueJobs
 
       def unlock(scope)
         unless [:server, :api, :test].include?(scope)
-          fail ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
+          raise ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
         end
 
         unlock_by_key(unique_key, item[JID_KEY], redis_pool)
@@ -34,7 +34,7 @@ module SidekiqUniqueJobs
       # rubocop:disable MethodLength
       def lock(scope)
         if scope.to_sym != :client
-          fail ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
+          raise ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
         end
 
         result = Scripts.call(:aquire_lock, redis_pool,
@@ -48,7 +48,7 @@ module SidekiqUniqueJobs
           logger.debug { "failed to aquire lock for #{unique_key}" }
           false
         else
-          fail "#{__method__} returned an unexpected value (#{result})"
+          raise "#{__method__} returned an unexpected value (#{result})"
         end
       end
       # rubocop:enable MethodLength

data/lib/sidekiq_unique_jobs/lock/until_timeout.rb

@@ -2,11 +2,9 @@ module SidekiqUniqueJobs
   module Lock
     class UntilTimeout < UntilExecuted
       def unlock(scope)
-        if scope.to_sym == :server
-          return true
-        else
-          fail ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
-        end
+        return true if scope.to_sym == :server
+
+        raise ArgumentError, "#{scope} middleware can't #{__method__} #{unique_key}"
       end
 
       def execute(_callback)

data/lib/sidekiq_unique_jobs/scripts.rb

@@ -7,7 +7,7 @@ module SidekiqUniqueJobs
   module Scripts
     LUA_PATHNAME ||= Pathname.new(__FILE__).dirname.join('../../redis').freeze
     SOURCE_FILES ||= Dir[LUA_PATHNAME.join('**/*.lua')].compact.freeze
-    DEFINED_METHODS ||= []
+    DEFINED_METHODS ||= [].freeze
 
     module_function
 
@@ -30,9 +30,9 @@ module SidekiqUniqueJobs
     rescue Redis::CommandError => ex
       raise ScriptError,
             "#{file_name}.lua\n\n" +
-              ex.message + "\n\n" +
-              script_source(file_name) +
-              ex.backtrace.join("\n")
+            ex.message + "\n\n" +
+            script_source(file_name) +
+            ex.backtrace.join("\n")
     end
 
     def script_source(file_name)

data/lib/sidekiq_unique_jobs/server/middleware.rb

@@ -18,7 +18,7 @@ module SidekiqUniqueJobs
 
       private
 
-      attr_reader :redis_pool, :worker, :item, :worker_class
+      attr_reader :redis_pool, :worker, :item
 
       protected
 

data/lib/sidekiq_unique_jobs/testing.rb

@@ -3,7 +3,7 @@ require 'sidekiq_unique_jobs/testing/sidekiq_overrides'
 module SidekiqUniqueJobs
   module Client
     class Middleware
-      alias_method :call_real, :call
+      alias call_real call
       def call(worker_class, item, queue, redis_pool = nil)
         worker_class = SidekiqUniqueJobs.worker_class_constantize(worker_class)
 

data/lib/sidekiq_unique_jobs/testing/sidekiq_overrides.rb

@@ -3,8 +3,6 @@ require 'sidekiq/testing'
 module Sidekiq
   module Worker
     module ClassMethods
-      include SidekiqUniqueJobs::Unlockable
-
       # Drain and run all jobs for this worker
       def drain
         while (job = jobs.shift)
@@ -18,7 +16,7 @@ module Sidekiq
 
       # Pop out a single job and perform it
       def perform_one
-        fail(EmptyQueueError, 'perform_one called with empty job queue') if jobs.empty?
+        raise(EmptyQueueError, 'perform_one called with empty job queue') if jobs.empty?
         job = jobs.shift
         worker = new
         worker.jid = job['jid']
@@ -42,6 +40,10 @@ module Sidekiq
       def execute_job(worker, args)
         worker.perform(*args)
       end unless respond_to?(:execute_job)
+
+      def unlock(job)
+        SidekiqUniqueJobs::Unlockable.unlock(job)
+      end
     end
 
     module Overrides

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -36,7 +36,7 @@ module SidekiqUniqueJobs
         logger.debug { "#{unique_key} is not a known key" }
         false
       else
-        fail "#{calling_method} returned an unexpected value (#{result})"
+        raise "#{calling_method} returned an unexpected value (#{result})"
       end
     end
 

data/lib/sidekiq_unique_jobs/util.rb

@@ -51,9 +51,9 @@ module SidekiqUniqueJobs
       keys.select { |k| regex.match k }
     end
 
-    def timed(&block)
+    def timed(&_block)
       start = Time.now
-      result = block.call
+      result = yield
       elapsed = (Time.now - start).round(2)
       [result, elapsed]
     end

data/lib/sidekiq_unique_jobs/version.rb

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

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

@@ -41,9 +41,9 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
 
       it 'rejects nested subsequent jobs with the same arguments', sidekiq_ver: '>= 3.5.3' do
         Sidekiq::Testing.disable! do
-          expect(SimpleWorker.perform_async 1).not_to eq(nil)
-          expect(SimpleWorker.perform_async 1).to eq(nil)
-          expect(SpawnSimpleWorker.perform_async 1).not_to eq(nil)
+          expect(SimpleWorker.perform_async(1)).not_to eq(nil)
+          expect(SimpleWorker.perform_async(1)).to eq(nil)
+          expect(SpawnSimpleWorker.perform_async(1)).not_to eq(nil)
 
           Sidekiq.redis do |c|
             expect(c.llen('queue:default')).to eq(1)

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

@@ -14,7 +14,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::UntilExecuted do
 
     context 'when yield fails with Sidekiq::Shutdown' do
       before do
-        allow(subject).to receive(:after_yield_yield) { fail Sidekiq::Shutdown }
+        allow(subject).to receive(:after_yield_yield) { raise Sidekiq::Shutdown }
       end
 
       it 'raises Sidekiq::Shutdown' do
@@ -27,7 +27,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::UntilExecuted do
 
     context 'when yield fails with other errors' do
       before do
-        allow(subject).to receive(:after_yield_yield) { fail 'Hell' }
+        allow(subject).to receive(:after_yield_yield) { raise 'Hell' }
       end
 
       it 'raises Sidekiq::Shutdown' do

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

@@ -5,7 +5,7 @@ require 'sidekiq/worker'
 require 'sidekiq_unique_jobs/server/middleware'
 
 RSpec.describe SidekiqUniqueJobs::Server::Middleware do
-  QUEUE ||= 'working'
+  QUEUE ||= 'working'.freeze
 
   def digest_for(item)
     SidekiqUniqueJobs::UniqueArgs.digest(item)

data/spec/lib/sidekiq_unique_jobs/unlockable_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+RSpec.describe SidekiqUniqueJobs::Unlockable do
+end

data/spec/spec_helper.rb

@@ -38,8 +38,74 @@ end
 
 REDIS_URL ||= ENV['REDIS_URL'] || 'redis://localhost/15'.freeze
 REDIS_NAMESPACE ||= 'unique-test'.freeze
-REDIS_OPTIONS ||= { url: REDIS_URL }
-REDIS_OPTIONS.merge!(namespace: REDIS_NAMESPACE) if defined?(Redis::Namespace)
+REDIS_OPTIONS ||= { url: REDIS_URL } # rubocop:disable MutableConstant
+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 }
+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|

data/spec/support/sidekiq_meta.rb

@@ -1,5 +1,5 @@
 RSpec.configure do |config|
-  VERSION_REGEX = /(?<operator>[<>=]+)?\s?(?<version>(\d+.?)+)/m.freeze
+  VERSION_REGEX = /(?<operator>[<>=]+)?\s?(?<version>(\d+.?)+)/m
   config.before(:each) do |example|
     Sidekiq.redis(&:flushdb)
     Sidekiq::Worker.clear_all
@@ -10,7 +10,7 @@ RSpec.configure do |config|
 
     sidekiq_ver = example.metadata[:sidekiq_ver]
     version, operator = VERSION_REGEX.match(sidekiq_ver.to_s) do |m|
-      fail 'Please specify how to compare the version with >= or < or =' unless m[:operator]
+      raise 'Please specify how to compare the version with >= or < or =' unless m[:operator]
       [m[:version], m[:operator]]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.15
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -140,6 +140,7 @@ files:
 - gemfiles/sidekiq_3.2.gemfile
 - gemfiles/sidekiq_3.3.gemfile
 - gemfiles/sidekiq_4.0.gemfile
+- gemfiles/sidekiq_4.1.gemfile
 - gemfiles/sidekiq_develop.gemfile
 - lib/sidekiq-unique-jobs.rb
 - lib/sidekiq/simulator.rb
@@ -271,6 +272,7 @@ files:
 - spec/lib/sidekiq_unique_jobs/sidekiq_unique_jobs_spec.rb
 - spec/lib/sidekiq_unique_jobs/timeout_calculator_spec.rb
 - spec/lib/sidekiq_unique_jobs/unique_args_spec.rb
+- spec/lib/sidekiq_unique_jobs/unlockable_spec.rb
 - spec/lib/sidekiq_unique_jobs/util_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/redis_matchers.rb
@@ -298,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq