sidekiq-unique-jobs 5.0.11 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c40a03b7114fd7c5b1c56ceaaf8f4d96b19939bd06f0b76e0c3ce088e34ee1
-  data.tar.gz: 7b41fc69c8cd77117a56beb1d15a17b523f4bff7a742317735cfcc28cda121de
+  metadata.gz: 2df5975505fc4b3764d2cdd9dd64ecc9f3be6c553d88c3a15c7c5393acc6c4a0
+  data.tar.gz: ad888ea1fc3c717c91975b79f5105d186384b21b534e96ce2a13b474e0b5201b
 SHA512:
-  metadata.gz: 78dbf85901350c5b9e9e10889b25de771ef1c9757ac1e9a3565bc7b447501d0505770a3e9befda2242f855319c373777fee01e9c92c37bf1facdbeac87cb052e
-  data.tar.gz: ae243b12f6a0b4db056f474584e53017076226a93e87cc9fd45f7525f7e4a0e44da076a5725895405a3f6db6588578664cd0bc3fba746f139bb0ff65aba8f565
+  metadata.gz: a7161efd989f5c27e95a9a3f0b7943b245ed4448e7584f568210ed81fc0ef2f816750c34336e38e612c73486d6749935907c3ff3931c2530f871e0b406339e36
+  data.tar.gz: 17d7880b7856baee9e474b68c57edab8966e7f16599b0c08250949996d46ef5f22e665a32e625f3b69be03687beb1f63f30ee24662e9f26b9e43904e7a6e23fd

data/.codeclimate.yml

@@ -1,22 +1,30 @@
 ---
-engines:
+version: '2'
+plugins:
   bundler-audit:
     enabled: false
-  fixme:
-    enabled: true
   duplication:
     enabled: true
     config:
       languages:
         - ruby
+  # editorconfig:
+  #   enabled: true
+  #   channel: beta
+  #   config:
+  #     editorconfig: .editorconfig
+  flog:
+    enabled: true
+  fixme:
+    enabled: true
+  markdownlint:
+      enabled: true
+  reek:
+    enabled: true
   rubocop:
     enabled: true
-ratings:
-  paths:
-    - lib/**
-    - bin/**
-    - "**.rb"
-exclude_paths:
+    channel: rubocop-0-54
+exclude_patterns:
   - Gemfile
   - "*.gemspec"
   - Appraisals

data/.gitignore

@@ -17,8 +17,6 @@ rails_example/spec/examples.txt
 
 /sidekiq/
 
-/spec/examples.txt
+.rspec_status
 
 /gemfiles/.bundle/
-
-/.rspec_status

data/.reek

@@ -0,0 +1,105 @@
+---
+exclude_paths:
+  - rails_example
+  - redis
+  - spec
+  - tmp
+  - gemfiles
+  - examples
+DuplicateMethodCall:
+  exclude:
+  - Sidekiq#self.use_options
+IrresponsibleModule:
+  exclude:
+  - Sidekiq::Simulator
+  - SidekiqUniqueJobs::Cli
+  - SidekiqUniqueJobs::Client::Middleware
+  - SidekiqUniqueJobs
+  - Array
+  - Hash
+  - SidekiqUniqueJobs::JidMissing
+  - SidekiqUniqueJobs::LockTimeout
+  - SidekiqUniqueJobs::MaxLockTimeMissing
+  - SidekiqUniqueJobs::RunLockFailed
+  - SidekiqUniqueJobs::ScriptError
+  - SidekiqUniqueJobs::UnexpectedValue
+  - SidekiqUniqueJobs::UniqueKeyMissing
+  - SidekiqUniqueJobs::UnknownLock
+  - SidekiqUniqueJobs::Lock::BaseLock
+  - SidekiqUniqueJobs::Lock::UntilAndWhileExecuting
+  - SidekiqUniqueJobs::Lock::UntilExecuted
+  - SidekiqUniqueJobs::Lock::UntilExecuting
+  - SidekiqUniqueJobs::Lock::UntilExpired
+  - SidekiqUniqueJobs::Lock::WhileExecuting
+  - SidekiqUniqueJobs::Lock::WhileExecutingReject
+  - SidekiqUniqueJobs::Lock::WhileExecutingRequeue
+  - SidekiqUniqueJobs::Locksmith
+  - SidekiqUniqueJobs::Middleware
+  - SidekiqUniqueJobs::Normalizer
+  - SidekiqUniqueJobs::Scripts
+  - SidekiqUniqueJobs::Server::Middleware
+  - Sidekiq::Job
+  - Sidekiq::Job::UniqueExtension
+  - Sidekiq::JobSet
+  - Sidekiq::JobSet::UniqueExtension
+  - Sidekiq::Queue
+  - Sidekiq::Queue::UniqueExtension
+  - Sidekiq::ScheduledSet
+  - Sidekiq::ScheduledSet::UniqueExtension
+  - Sidekiq::SortedEntry
+  - Sidekiq::SortedEntry::UniqueExtension
+  - Sidekiq
+  - Sidekiq::Worker
+  - Sidekiq::Worker::ClassMethods
+  - Sidekiq::Worker::Overrides
+  - Sidekiq::Worker::Overrides::Testing
+  - SidekiqUniqueJobs::Timeout::Calculator
+  - SidekiqUniqueJobs::Timeout
+  - SidekiqUniqueJobs::Unlockable
+  - SidekiqUniqueJobs::Util
+TooManyStatements:
+  exclude:
+  - initialize
+  - Hash#slice!
+  - SidekiqUniqueJobs::Middleware#configure_server_middleware
+  - SidekiqUniqueJobs::Server::Middleware#call
+  - SidekiqUniqueJobs::UniqueArgs#filtered_args
+  - SidekiqUniqueJobs::Util#del
+UncommunicativeVariableName:
+  exclude:
+  - Hash#slice
+BooleanParameter:
+  exclude:
+  - SidekiqUniqueJobs::Cli#self.banner
+UtilityFunction:
+  enabled: false
+TooManyConstants:
+  exclude:
+  - SidekiqUniqueJobs
+ManualDispatch:
+  enabled: true
+  exclude:
+  - Hash#slice
+  - Hash#slice!
+  - SidekiqUniqueJobs::Lock::WhileExecutingReject#deadset_kill?
+  - SidekiqUniqueJobs::SidekiqWorkerMethods#worker_method_defined?
+PrimaDonnaMethod:
+  exclude:
+  - Array
+NilCheck:
+  enabled: false
+FeatureEnvy:
+  exclude:
+  - SidekiqUniqueJobs::Lock::WhileExecutingReject#push_to_deadset
+  - SidekiqUniqueJobs::Util#batch_delete
+NestedIterators:
+  exclude:
+  - SidekiqUniqueJobs::Middleware#configure_client_middleware
+  - SidekiqUniqueJobs::Middleware#configure_server_middleware
+  - SidekiqUniqueJobs::Util#batch_delete
+TooManyInstanceVariables:
+  exclude:
+  - SidekiqUniqueJobs::Locksmith
+TooManyMethods:
+  exclude:
+  - SidekiqUniqueJobs::Locksmith

data/.rubocop.yml

@@ -1,9 +1,11 @@
+require: rubocop-rspec
 AllCops:
   Include:
     - '**/Rakefile'
     - 'lib/**/*.rb'
     - 'bin/**/*.rb'
     - 'spec/**/*.rb'
+    - 'examples/**/*.rb'
   Exclude:
     - 'Gemfile.lock'
     - 'gemfiles/**/*'
@@ -30,7 +32,7 @@ Metrics/MethodLength:
 Metrics/BlockLength:
   Enabled: true
   Exclude:
-    - '**/spec/**/*_spec.rb'
+    - '**/spec/**/*.rb'
 
 Metrics/PerceivedComplexity:
   Max: 8
@@ -49,12 +51,45 @@ Naming/FileName:
     - '**/Appraisals'
     - '**/*.gemspec'
 
+Naming/UncommunicativeMethodParamName:
+  AllowedNames:
+    - ex
+
+RSpec/DescribeClass:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/ExpectActual:
+  Enabled: false
+
+RSpec/ExpectInHook:
+  Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Max: 4
+  Enabled: true
+
+RSpec/RepeatedExample:
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: true
 
 Style/Documentation:
   Enabled: false
 
+Style/SignalException:
+  EnforcedStyle: only_fail
+  Enabled: false
+
 Style/GlobalVars:
   Enabled: true
 

data/.simplecov

@@ -1,7 +1,6 @@
 require 'simplecov-json'
-require 'codeclimate-test-reporter'
 
-SimpleCov.command_name 'rspec'
+SimpleCov.command_name 'RSpec'
 # SimpleCov.refuse_coverage_drop
 SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
@@ -12,4 +11,10 @@ SimpleCov.start do
   add_filter '/spec/'
   add_filter '/bin/'
   add_filter '/gemfiles/'
+  add_filter '/examples/'
+
+  add_group 'Client', 'lib/sidekiq_unique_jobs/client'
+  add_group 'Locks', 'lib/sidekiq_unique_jobs/lock'
+  add_group 'Server', 'lib/sidekiq_unique_jobs/server'
+  add_group 'Timeout', 'lib/sidekiq_unique_jobs/timeout'
 end

data/.travis.yml

@@ -8,29 +8,31 @@ dist: trusty
 sudo: required
 language: ruby
 cache: bundler
-services:
-  - redis-server
 
 before_install:
+  - sudo rm -rf /etc/apt/sources.list.d/rwky-redis.list
+  - sudo add-apt-repository ppa:chris-lea/redis-server -y
+  - sudo apt-get update -qy
+  - sudo apt-get install redis-server
+  - sudo service redis-server start
+before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
-before_script:
   - ./cc-test-reporter before-build
 script:
   - if [[ "${COV}" = "true" ]]; then bundle exec rubocop -P; fi;
-  - bundle exec rspec
-after_script:
+  - bundle exec rspec spec
   - if [[ "${COV}" = "true" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi;
+
 rvm:
-  - 2.5.3
+  - 2.5.1
   - 2.4.2
   - 2.3.2
-  - 2.2.7
-  - jruby-9.2.0.0
+  - jruby-9.1.15.0
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.5.3
+    - rvm: 2.5.1
       gemfile: gemfiles/sidekiq_develop.gemfile
       env: COV=true
 gemfile:
@@ -40,7 +42,6 @@ gemfile:
   - gemfiles/sidekiq_4.2.gemfile
   - gemfiles/sidekiq_5.0.gemfile
   - gemfiles/sidekiq_5.1.gemfile
-  - gemfiles/sidekiq_5.2.gemfile
 
 notifications:
   email:

data/Appraisals

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 appraise 'sidekiq-develop' do
-  gem 'sidekiq', github: 'mperham/sidekiq'
+  gem 'sidekiq', git: 'https://github.com/mperham/sidekiq.git'
 end
 
 appraise 'sidekiq-4.0' do
@@ -17,13 +17,9 @@ appraise 'sidekiq-4.2' do
 end
 
 appraise 'sidekiq-5.0' do
-  gem 'sidekiq', '>= 5.0.0', '< 5.1'
+  gem 'sidekiq', '~> 5.0.0'
 end
 
 appraise 'sidekiq-5.1' do
-  gem 'sidekiq', '>= 5.1.0', '< 5.2'
-end
-
-appraise 'sidekiq-5.2' do
-  gem 'sidekiq', '>= 5.2.0', '< 6'
+  gem 'sidekiq', '~> 5.1.0'
 end

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## v6.0.0
+
+- Complete rewrite of the locking mechanism
+- Improved README
+- Improved reliability
+- Improved coverage
+- Removed a ton of default configuration
+- Removed support for ActiveJob
+- Added WhileExecutingReject `unique: :while_executing_reject`
+- Renamed `UntilTimeout` to `UntilExpired`
+- Removed concurrency for now (a0cff5bc42edbe7190d6ede7e7f845074d2d7af6)
+- Improved integration testing for locks
+
+## v5.1.0
+
+- Refactoring the runtime locks (WhileExecuting)
+
 ## v5.0.10
 
 - Cleans up test setup and make tests more readable

data/Gemfile

@@ -3,19 +3,22 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'appraisal', '>= 2.0.0'
-gem 'rspec-its',  require: false
-gem 'rspec-wait', require: false
+gem 'appraisal',        '~> 2.2.0'
+gem 'rspec-its',        require: false
+gem 'rspec-retry',      require: false
+gem 'rspec-eventually', require: false
 
 platforms :mri_25 do
-  gem 'benchmark-ips',                         require: false
-  gem 'codeclimate-test-reporter', '>= 1.0.8', require: false
-  gem 'fasterer',                              require: false
-  gem 'memory_profiler',                       require: false
-  gem 'mock_redis',                            require: false
-  gem 'pry-byebug',                            require: false
-  gem 'rubocop',                               require: false
-  gem 'simplecov', '>= 0.13',                  require: false
-  gem 'simplecov-json',                        require: false
-  gem 'travis',                                require: false
+  gem 'benchmark-ips',   require: false
+  gem 'fasterer',        require: false
+  gem 'guard',           require: false
+  gem 'guard-reek',      require: false
+  gem 'guard-rspec',     require: false
+  gem 'guard-rubocop',   require: false
+  gem 'memory_profiler', require: false
+  gem 'pry-byebug',      require: false
+  gem 'rubocop',         require: false
+  gem 'rubocop-rspec',   require: false
+  gem 'simplecov-json',  require: false
+  gem 'travis',          require: false
 end

data/Guardfile

@@ -0,0 +1,55 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "env COV=false bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/integration/#{m[1]}_spec.rb" }
+  watch(%r{^examples/(.+)\.rb$}) { |m| "spec/examples/#{m[1]}_spec.rb" }
+  watch(rspec.spec_helper)  { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end
+
+guard :rubocop do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard 'reek' do
+  watch(%r{.+\.rb$})
+  watch('.reek')
+end