Upgrade Rubocop Ruby target version to 3.0

Author: benedikt

.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.0
   NewCops: enable
   Exclude:
     - 'bin/*'

Gemfile

@@ -4,6 +4,11 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
 
+gem 'jwt', '~> 2.2'
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.0'
+gem 'webmock', '~> 3.18'
+
 gem 'guard-rspec', '~> 4.7'
 gem 'guard-rubocop', '~> 1.3'
 gem 'rubocop', '~> 1.45'

lib/userlist/config.rb

@@ -75,12 +75,12 @@ def respond_to_missing?(name, include_private = false)
       key?(name.to_sym) || super
     end
 
-    def method_missing(name, *args, &block)
+    def method_missing(name, ...)
       if respond_to_missing?(name)
         name = name.to_s
         method = name =~ /=$/ ? :[]= : :[]
         name = name.sub(/=$/, '').to_sym
-        send(method, name, *args, &block)
+        send(method, name, ...)
       else
         super
       end

lib/userlist/push/strategies/active_job.rb

@@ -27,7 +27,7 @@ def call(*args)
         def options
           @options ||= begin
             options = config.push_strategy_options || {}
-            options.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+            options.transform_keys(&:to_sym)
           end
         end
 

lib/userlist/push/strategies/sidekiq.rb

@@ -25,7 +25,7 @@ def call(*args)
         def options
           @options ||= begin
             options = config.push_strategy_options || {}
-            options.each_with_object({}) { |(k, v), h| h[k.to_s] = v }
+            options.transform_keys(&:to_s)
           end
         end
 

lib/userlist/push/strategies/threaded/worker.rb

@@ -18,14 +18,12 @@ def run
             logger.info 'Starting worker thread...'
 
             loop do
-              begin
-                method, *args = *queue.pop
-                break if method == :stop
-
-                retryable.attempt { client.public_send(method, *args) }
-              rescue StandardError => e
-                logger.error "Failed to deliver payload: [#{e.class.name}] #{e.message}"
-              end
+              method, *args = *queue.pop
+              break if method == :stop
+
+              retryable.attempt { client.public_send(method, *args) }
+            rescue StandardError => e
+              logger.error "Failed to deliver payload: [#{e.class.name}] #{e.message}"
             end
 
             logger.info "Worker thread exited with #{queue.size} tasks still in the queue..."

lib/userlist/retryable.rb

@@ -33,17 +33,15 @@ def retry?(value)
 
     def attempt
       (0..@retries).each do |attempt|
-        begin
-          if attempt.positive?
-            milliseconds = delay(attempt)
-            logger.debug "Retrying in #{milliseconds}ms, #{@retries - attempt} retries left"
-            sleep(milliseconds / 1000.0)
-          end
-
-          return yield
-        rescue Userlist::Error => e
-          raise e unless retry?(e)
+        if attempt.positive?
+          milliseconds = delay(attempt)
+          logger.debug "Retrying in #{milliseconds}ms, #{@retries - attempt} retries left"
+          sleep(milliseconds / 1000.0)
         end
+
+        return yield
+      rescue Userlist::Error => e
+        raise e unless retry?(e)
       end
 
       logger.debug 'Retries exhausted, giving up'

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 require 'userlist'
 
-Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

spec/userlist/push/event_spec.rb

@@ -113,7 +113,7 @@
 
   context 'when there is a legacy occured_at property' do
     let(:payload) do
-      super().merge(occured_at: timestamp )
+      super().merge(occured_at: timestamp)
     end
 
     let(:timestamp) { Time.parse('2018-01-01T00:00:00Z') }

userlist.gemspec

@@ -19,13 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
-
-  spec.add_development_dependency 'bundler', '>= 1.15'
-  spec.add_development_dependency 'jwt', '~> 2.2'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'webmock', '~> 3.18'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.metadata = { 'rubygems_mfa_required' => 'true' }
 end