Feature/fix on conflict handling

.github/workflows/lint.yml

@@ -2,7 +2,7 @@ name: Lint
 on:
   pull_request:
   push:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   rubocop:
     runs-on: ubuntu-latest

.github/workflows/rspec.yml

@@ -2,7 +2,7 @@ name: RSpec
 on:
   pull_request:
   push:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   coverage:
     services:

Appraisals

@@ -23,3 +23,7 @@ end
 appraise "sidekiq-6.1" do
   gem "sidekiq", "~> 6.1.0"
 end
+
+appraise "sidekiq-6.2" do
+  gem "sidekiq", "~> 6.2.2"
+end

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v7.1.6](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.1.6) (2021-09-21)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.5...v7.1.6)
+
+**Closed issues:**
+
+- until\_and\_while\_executing is not running the job at all in sidekiq-unique-jobs 7.1.4 [\#626](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/626)
+
+**Merged pull requests:**
+
+- Necessary upgrades for Sidekiq v6.2.2 [\#639](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/639) ([mhenrixon](https://github.com/mhenrixon))
+- Tese to these in README.md [\#633](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/633) ([carrickr](https://github.com/carrickr))
+
 ## [v7.1.5](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.1.5) (2021-07-28)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.4...v7.1.5)

Gemfile

@@ -13,39 +13,33 @@ gem "gem-release"
 gem "github-markup"
 gem "rack-test"
 gem "rake", "13.0.3"
+gem "reek", ">= 5.3"
 gem "rspec"
+gem "rspec-benchmark"
 gem "rspec-html-matchers"
 gem "rspec-its"
+gem "rubocop-mhenrixon"
+gem "simplecov-sublime", ">= 0.21.2", require: false
 gem "sinatra"
 gem "timecop"
 gem "yard"
 
 platforms :mri do
   gem "concurrent-ruby-ext"
-  gem "fasterer"
-  gem "github_changelog_generator"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-reek"
-  gem "guard-rspec"
-  gem "guard-rubocop"
   gem "hiredis"
-  gem "redcarpet", "~> 3.4"
-  gem "reek", ">= 5.3"
-  gem "rspec-benchmark"
-  gem "rubocop-mhenrixon"
-  gem "ruby-prof", ">= 0.17.0", require: false
-  gem "simplecov-sublime", ">= 0.21.2", require: false
-  gem "stackprof", ">= 0.2.9", require: false
-  gem "test-prof"
-  gem "travis"
 end
 
 if respond_to?(:install_if)
   install_if -> { RUBY_PLATFORM.include?("darwin") } do
+    gem "fasterer"
     gem "fuubar"
+    gem "github_changelog_generator"
     gem "pry"
+    gem "redcarpet", "~> 3.4"
     gem "rspec-nc"
+    gem "ruby-prof", ">= 0.17.0", require: false
+    gem "stackprof", ">= 0.2.9", require: false
+    gem "test-prof"
   end
 end
 

README.md

@@ -92,10 +92,11 @@ This gem adds unique constraints to sidekiq jobs. The uniqueness is achieved by
 
 By default, only one lock for a given hash can be acquired. What happens when a lock can't be acquired is governed by a chosen [Conflict Strategy](#conflict-strategy) strategy. Unless a conflict strategy is chosen
 
-This is the documentation for the master branch. You can find the documentation for each release by navigating to its tag.
+This is the documentation for the `main` branch. You can find the documentation for each release by navigating to its tag.
 
 Here are links to some of the old versions
 
+- [v7.0.12](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.12)
 - [v6.0.25](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.25)
 - [v5.0.10](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v5.0.10)
 - [v4.0.18](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v4.0.18)

gemfiles/sidekiq_5.0.gemfile

@@ -8,33 +8,21 @@ gem "gem-release"
 gem "github-markup"
 gem "rack-test"
 gem "rake", "13.0.3"
+gem "reek", ">= 5.3"
 gem "rspec"
+gem "rspec-benchmark"
 gem "rspec-html-matchers"
 gem "rspec-its"
+gem "rubocop-mhenrixon"
+gem "simplecov-sublime", ">= 0.21.2", require: false
 gem "sinatra"
 gem "timecop"
 gem "yard"
 gem "sidekiq", "~> 5.0.0"
 
 platforms :mri do
   gem "concurrent-ruby-ext"
-  gem "fasterer"
-  gem "github_changelog_generator"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-reek"
-  gem "guard-rspec"
-  gem "guard-rubocop"
   gem "hiredis"
-  gem "redcarpet", "~> 3.4"
-  gem "reek", ">= 5.3"
-  gem "rspec-benchmark"
-  gem "rubocop-mhenrixon"
-  gem "ruby-prof", ">= 0.17.0", require: false
-  gem "simplecov-sublime", ">= 0.21.2", require: false
-  gem "stackprof", ">= 0.2.9", require: false
-  gem "test-prof"
-  gem "travis"
 end
 
 gemspec path: "../"

gemfiles/sidekiq_5.1.gemfile

@@ -8,33 +8,21 @@ gem "gem-release"
 gem "github-markup"
 gem "rack-test"
 gem "rake", "13.0.3"
+gem "reek", ">= 5.3"
 gem "rspec"
+gem "rspec-benchmark"
 gem "rspec-html-matchers"
 gem "rspec-its"
+gem "rubocop-mhenrixon"
+gem "simplecov-sublime", ">= 0.21.2", require: false
 gem "sinatra"
 gem "timecop"
 gem "yard"
 gem "sidekiq", "~> 5.1.0"
 
 platforms :mri do
   gem "concurrent-ruby-ext"
-  gem "fasterer"
-  gem "github_changelog_generator"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-reek"
-  gem "guard-rspec"
-  gem "guard-rubocop"
   gem "hiredis"
-  gem "redcarpet", "~> 3.4"
-  gem "reek", ">= 5.3"
-  gem "rspec-benchmark"
-  gem "rubocop-mhenrixon"
-  gem "ruby-prof", ">= 0.17.0", require: false
-  gem "simplecov-sublime", ">= 0.21.2", require: false
-  gem "stackprof", ">= 0.2.9", require: false
-  gem "test-prof"
-  gem "travis"
 end
 
 gemspec path: "../"

gemfiles/sidekiq_5.2.gemfile

@@ -8,33 +8,21 @@ gem "gem-release"
 gem "github-markup"
 gem "rack-test"
 gem "rake", "13.0.3"
+gem "reek", ">= 5.3"
 gem "rspec"
+gem "rspec-benchmark"
 gem "rspec-html-matchers"
 gem "rspec-its"
+gem "rubocop-mhenrixon"
+gem "simplecov-sublime", ">= 0.21.2", require: false
 gem "sinatra"
 gem "timecop"
 gem "yard"
 gem "sidekiq", "~> 5.2.0"
 
 platforms :mri do
   gem "concurrent-ruby-ext"
-  gem "fasterer"
-  gem "github_changelog_generator"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-reek"
-  gem "guard-rspec"
-  gem "guard-rubocop"
   gem "hiredis"
-  gem "redcarpet", "~> 3.4"
-  gem "reek", ">= 5.3"
-  gem "rspec-benchmark"
-  gem "rubocop-mhenrixon"
-  gem "ruby-prof", ">= 0.17.0", require: false
-  gem "simplecov-sublime", ">= 0.21.2", require: false
-  gem "stackprof", ">= 0.2.9", require: false
-  gem "test-prof"
-  gem "travis"
 end
 
 gemspec path: "../"

gemfiles/sidekiq_6.0.gemfile

@@ -8,33 +8,21 @@ gem "gem-release"
 gem "github-markup"
 gem "rack-test"
 gem "rake", "13.0.3"
+gem "reek", ">= 5.3"
 gem "rspec"
+gem "rspec-benchmark"
 gem "rspec-html-matchers"
 gem "rspec-its"
+gem "rubocop-mhenrixon"
+gem "simplecov-sublime", ">= 0.21.2", require: false
 gem "sinatra"
 gem "timecop"
 gem "yard"
 gem "sidekiq", "~> 6.0.0"
 
 platforms :mri do
   gem "concurrent-ruby-ext"
-  gem "fasterer"
-  gem "github_changelog_generator"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-reek"
-  gem "guard-rspec"
-  gem "guard-rubocop"
   gem "hiredis"
-  gem "redcarpet", "~> 3.4"
-  gem "reek", ">= 5.3"
-  gem "rspec-benchmark"
-  gem "rubocop-mhenrixon"
-  gem "ruby-prof", ">= 0.17.0", require: false
-  gem "simplecov-sublime", ">= 0.21.2", require: false
-  gem "stackprof", ">= 0.2.9", require: false
-  gem "test-prof"
-  gem "travis"
 end
 
 gemspec path: "../"

gemfiles/sidekiq_6.1.gemfile

@@ -8,33 +8,21 @@ gem "gem-release"
 gem "github-markup"
 gem "rack-test"
 gem "rake", "13.0.3"
+gem "reek", ">= 5.3"
 gem "rspec"
+gem "rspec-benchmark"
 gem "rspec-html-matchers"
 gem "rspec-its"
+gem "rubocop-mhenrixon"
+gem "simplecov-sublime", ">= 0.21.2", require: false
 gem "sinatra"
 gem "timecop"
 gem "yard"
 gem "sidekiq", "~> 6.1.0"
 
 platforms :mri do
   gem "concurrent-ruby-ext"
-  gem "fasterer"
-  gem "github_changelog_generator"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-reek"
-  gem "guard-rspec"
-  gem "guard-rubocop"
   gem "hiredis"
-  gem "redcarpet", "~> 3.4"
-  gem "reek", ">= 5.3"
-  gem "rspec-benchmark"
-  gem "rubocop-mhenrixon"
-  gem "ruby-prof", ">= 0.17.0", require: false
-  gem "simplecov-sublime", ">= 0.21.2", require: false
-  gem "stackprof", ">= 0.2.9", require: false
-  gem "test-prof"
-  gem "travis"
 end
 
 gemspec path: "../"