Merge pull request #22 from zendesk/jury.razumau/ruby_4.0

razumau · web-flow · commit 36479cd28090 · 2026-01-14T14:11:18.000+01:00
Drop support for Ruby below 3.2, add tests with Ruby 4.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,17 +18,15 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '2.7'
-          - '3.0'
-          - '3.1'
           - '3.2'
           - '3.3'
           - '3.4'
+          - '4.0'
         gemfile:
           - 'resque_1'
           - 'resque_2'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
@@ -39,7 +37,7 @@ jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Drop support for Ruby below 3.2.
+
 ## [0.3.0] - 2023-07-18
 - Adds support for Resque 2.x.
 - Ruby versions from 2.7 to 3.2 are now tested against and supported.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,12 +10,14 @@ GEM
     ast (2.4.2)
     coderay (1.1.3)
     docile (1.4.0)
-    json (2.6.3)
+    json (2.18.0)
     language_server-protocol (3.17.0.3)
+    logger (1.7.0)
     method_source (1.0.0)
-    minitest (5.25.4)
-    minitest-rg (5.2.0)
-      minitest (~> 5.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    minitest-rg (5.4.0)
+      minitest (>= 5.0, < 7)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     mono_logger (1.1.2)
@@ -26,6 +28,7 @@ GEM
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
+    prism (1.7.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -34,7 +37,7 @@ GEM
     rack-protection (3.0.6)
       rack
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.3.1)
     redis (4.8.1)
     redis-namespace (1.11.0)
       redis (>= 4)
@@ -81,6 +84,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  logger
   minitest
   minitest-rg
   mocha
@@ -93,4 +97,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.12
+  4.0.3
diff --git a/gemfiles/common.rb b/gemfiles/common.rb
@@ -4,6 +4,7 @@
 
 gemspec path: '../'
 
+gem 'logger'
 gem 'minitest'
 gem 'minitest-rg'
 gem 'mocha'
diff --git a/gemfiles/resque_1.gemfile.lock b/gemfiles/resque_1.gemfile.lock
@@ -10,12 +10,14 @@ GEM
     ast (2.4.2)
     coderay (1.1.3)
     docile (1.4.0)
-    json (2.6.3)
+    json (2.18.0)
     language_server-protocol (3.17.0.3)
+    logger (1.7.0)
     method_source (1.0.0)
-    minitest (5.25.4)
-    minitest-rg (5.2.0)
-      minitest (~> 5.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    minitest-rg (5.4.0)
+      minitest (>= 5.0, < 7)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     mono_logger (1.1.2)
@@ -26,6 +28,7 @@ GEM
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
+    prism (1.7.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -34,7 +37,7 @@ GEM
     rack-protection (3.0.6)
       rack
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.3.1)
     redis (4.8.1)
     redis-namespace (1.11.0)
       redis (>= 4)
@@ -81,6 +84,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  logger
   minitest
   minitest-rg
   mocha
@@ -93,4 +97,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.12
+  4.0.3
diff --git a/gemfiles/resque_2.gemfile.lock b/gemfiles/resque_2.gemfile.lock
@@ -11,12 +11,14 @@ GEM
     coderay (1.1.3)
     connection_pool (2.4.1)
     docile (1.4.0)
-    json (2.6.3)
+    json (2.18.0)
     language_server-protocol (3.17.0.3)
+    logger (1.7.0)
     method_source (1.0.0)
-    minitest (5.25.4)
-    minitest-rg (5.2.0)
-      minitest (~> 5.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    minitest-rg (5.4.0)
+      minitest (>= 5.0, < 7)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     mono_logger (1.1.2)
@@ -27,6 +29,7 @@ GEM
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
+    prism (1.7.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -35,7 +38,7 @@ GEM
     rack-protection (3.0.6)
       rack
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.3.1)
     redis (5.0.6)
       redis-client (>= 0.9.0)
     redis-client (0.14.1)
@@ -82,6 +85,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  logger
   minitest
   minitest-rg
   mocha
@@ -93,4 +97,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.12
+  4.0.3
diff --git a/lib/resque/plugins/disable_job.rb b/lib/resque/plugins/disable_job.rb
@@ -26,11 +26,11 @@ def disable_job_handler(message, *_args)
       end
 
       def disable(specific_args = [], timeout = DEFAULT_TIMEOUT)
-        Job.disable_job(name, specific_args: specific_args, timeout: timeout)
+        Job.disable_job(name, specific_args:, timeout:)
       end
 
       def enable(specific_args = [])
-        Job.enable_job(name, specific_args: specific_args)
+        Job.enable_job(name, specific_args:)
       end
 
       def enable_all
diff --git a/resque-disable-job.gemspec b/resque-disable-job.gemspec
@@ -22,7 +22,7 @@ It uses some Redis data structures to keep a record of what jobs need to be disa
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_dependency 'resque'
 end
diff --git a/spec/resque/disable_job/version_spec.rb b/spec/resque/disable_job/version_spec.rb
@@ -3,6 +3,6 @@
 require_relative '../../spec_helper'
 describe Resque::DisableJob do
   it 'has a version number' do
-    expect(Resque::DisableJob::VERSION).wont_be_nil
+    refute_nil(Resque::DisableJob::VERSION)
   end
 end
diff --git a/spec/resque/plugins/disable_job/job_spec.rb b/spec/resque/plugins/disable_job/job_spec.rb
@@ -22,74 +22,74 @@ class SimpleJob
         Job.disable_job('TestJob', specific_args: [654])
         rule = Rule.new('TestJob', [654])
         Resque.redis.expects(:incr).with(rule.rule_key).once
-        Job.disabled?('TestJob', [654]).must_equal true
-        Job.disabled?('TestJob', []).must_equal false
+        assert_equal(true, Job.disabled?('TestJob', [654]))
+        assert_equal(false, Job.disabled?('TestJob', []))
       end
 
       it 'should return false if the rule is expired' do
         Job.disable_job('TestJob', specific_args: [654])
-        Job.disabled?('TestJob', [654]).must_equal true
+        assert_equal(true, Job.disabled?('TestJob', [654]))
         rule = Rule.new('TestJob', [654])
         Resque.redis.expire(rule.rule_key, -1)
         Job.expects(:remove_specific_rule).once
-        Job.disabled?('TestJob', [654]).must_equal false
+        assert_equal(false, Job.disabled?('TestJob', [654]))
       end
 
       it 'should return false if there is and error with the JSON parsing' do
         Job.disable_job('TestJob', specific_args: [654])
-        Job.disabled?('TestJob', [654]).must_equal true
+        assert_equal(true, Job.disabled?('TestJob', [654]))
         JSON.expects(:parse).raises(StandardError).once
-        Job.disabled?('TestJob', [654]).must_equal false
+        assert_equal(false, Job.disabled?('TestJob', [654]))
       end
     end
 
     describe '#disable_job' do
       it 'should save data in Redis' do
-        Resque.redis.keys.must_be_empty
+        assert_empty(Resque.redis.keys)
         Job.disable_job('TestJob', specific_args: [654])
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 3
+        assert_equal(3, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
       end
 
       it 'should set the specified TTL in Redis' do
-        Resque.redis.keys.must_be_empty
+        assert_empty(Resque.redis.keys)
         Job.disable_job('TestJob', specific_args: [654], timeout: 2 * SimpleJob::DEFAULT_TIMEOUT)
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 3
+        assert_equal(3, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
         rule = Rule.new('TestJob', [654])
-        (Resque.redis.ttl(rule.rule_key) > SimpleJob::DEFAULT_TIMEOUT).must_equal true
+        assert_equal(true, Resque.redis.ttl(rule.rule_key) > SimpleJob::DEFAULT_TIMEOUT)
       end
     end
 
     describe '#enable_job' do
       it 'should remove the rule' do
-        Resque.redis.keys.must_be_empty
+        assert_empty(Resque.redis.keys)
         Job.disable_job('TestJob', specific_args: [654])
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 3
+        assert_equal(3, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
         Job.enable_job('TestJob', specific_args: [654])
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 0
+        assert_equal(0, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
       end
     end
 
     describe '#enable_all' do
       it 'should remove all the job\'s rules' do
-        Resque.redis.keys.must_be_empty
+        assert_empty(Resque.redis.keys)
         Job.disable_job('TestJob')
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 3
+        assert_equal(3, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
         Job.disable_job('TestJob', specific_args: [654])
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 4
+        assert_equal(4, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
         Job.enable_all('TestJob')
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 0
+        assert_equal(0, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
       end
     end
 
     describe '#enable_all!' do
       it 'should remove all the rules in the system' do
-        Resque.redis.keys.must_be_empty
+        assert_empty(Resque.redis.keys)
         Job.disable_job('TestJob')
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 3
+        assert_equal(3, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
         Job.disable_job('SampleJob', specific_args: [654])
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 5
+        assert_equal(5, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
         Job.enable_all!
-        Resque.redis.keys("#{Rule::JOBS_SET}*").size.must_equal 0
+        assert_equal(0, Resque.redis.keys("#{Rule::JOBS_SET}*").size)
       end
     end
   end
diff --git a/spec/resque/plugins/disable_job/rule_spec.rb b/spec/resque/plugins/disable_job/rule_spec.rb
@@ -10,13 +10,13 @@ module Resque::Plugins::DisableJob
         args = [765]
         rule = Rule.new(name, args)
 
-        rule.main_set.must_equal Rule::JOBS_SET
-        rule.job_name.must_equal name
-        rule.arguments.must_equal args
-        rule.all_rules_key.must_equal "#{rule.main_set}:#{name}"
-        rule.rule_key.must_equal "#{rule.all_rules_key}:#{rule.digest}"
-        rule.serialized_arguments.must_equal args.to_json
-        rule.digest.must_equal Digest::SHA1.hexdigest(rule.serialized_arguments)
+        assert_equal(Rule::JOBS_SET, rule.main_set)
+        assert_equal(name, rule.job_name)
+        assert_equal(args, rule.arguments)
+        assert_equal("#{rule.main_set}:#{name}", rule.all_rules_key)
+        assert_equal("#{rule.all_rules_key}:#{rule.digest}", rule.rule_key)
+        assert_equal(args.to_json, rule.serialized_arguments)
+        assert_equal(Digest::SHA1.hexdigest(rule.serialized_arguments), rule.digest)
       end
 
       it 'should initialize with name and digest' do
@@ -25,21 +25,21 @@ module Resque::Plugins::DisableJob
         digest = Digest::SHA1.hexdigest(args_data)
         rule = Rule.new(name, args_data, digest)
 
-        rule.main_set.must_equal Rule::JOBS_SET
-        rule.job_name.must_equal name
-        rule.all_rules_key.must_equal "#{rule.main_set}:#{name}"
-        rule.rule_key.must_equal "#{rule.all_rules_key}:#{digest}"
-        rule.serialized_arguments.must_equal args_data
-        rule.digest.must_equal digest
+        assert_equal(Rule::JOBS_SET, rule.main_set)
+        assert_equal(name, rule.job_name)
+        assert_equal("#{rule.main_set}:#{name}", rule.all_rules_key)
+        assert_equal("#{rule.all_rules_key}:#{digest}", rule.rule_key)
+        assert_equal(args_data, rule.serialized_arguments)
+        assert_equal(digest, rule.digest)
       end
 
       it 'should initialize with just a name' do
         name = 'TestJob'
         rule = Rule.new(name)
 
-        rule.main_set.must_equal Rule::JOBS_SET
-        rule.job_name.must_equal name
-        rule.all_rules_key.must_equal "#{rule.main_set}:#{name}"
+        assert_equal(Rule::JOBS_SET, rule.main_set)
+        assert_equal(name, rule.job_name)
+        assert_equal("#{rule.main_set}:#{name}", rule.all_rules_key)
       end
     end
 
@@ -74,7 +74,7 @@ module Resque::Plugins::DisableJob
         [[{ 'key_1' => 1, 'key_2' => 4, 'time' => 3 }],   { 'key_1' => 2 }, false]
       ].each do |args, set_args, match|
         it "#{match ? 'should' : "shouldn't"} match #{set_args} set with received #{args}" do
-          Rule.new('test', set_args).match?(args).must_equal match
+          assert_equal(match, Rule.new('test', set_args).match?(args))
         end
       end
     end
diff --git a/spec/resque/plugins/disable_job/stats_spec.rb b/spec/resque/plugins/disable_job/stats_spec.rb
diff --git a/spec/resque/plugins/disable_job_spec.rb b/spec/resque/plugins/disable_job_spec.rb
