rubocop cleanup ruby 3.0

.github/workflows/rubocop.yml

@@ -6,16 +6,22 @@ on:
   pull_request:
     branches: [master]
 
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
   rubocop:
     name: Rubocop
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        ruby: [
-            2.7
-        ]
+        ruby:
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
 
     steps:
       - uses: actions/checkout@v4

.rubocop.yml

@@ -1,18 +1,20 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
+  TargetRubyVersion: 3.0
+  NewCops: enable
   Include:
   - Gemfile
   - '**/Rakefile'
   - resque-scheduler.gemspec
   - bin/resque-scheduler
 
-Documentation:
-  Enabled: false
-
 Style/DoubleNegation:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
 Metrics/ClassLength:
   Max: 110
+Bundler/DuplicatedGem:
+  Exclude:
+    - 'Gemfile'
+Style/FrozenStringLiteralComment:
+  Enabled: false

Gemfile

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 source 'https://rubygems.org'
 
 case resque_version = ENV.fetch('RESQUE', 'latest')

Rakefile

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'yard'

bin/migrate_to_timestamps_set.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'redis'
 require 'resque'
 

examples/Rakefile

@@ -1,2 +1 @@
-# vim:fileencoding=utf-8
 require 'resque/scheduler/tasks'

examples/config/initializers/resque-web.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'json'
 require 'yaml'
 require 'resque'

examples/dynamic-scheduling/app/jobs/fix_schedules_job.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 #
 # Background job to fix the schedule for email sending. Any missing
 # schedule will be added to resque-schedule.

examples/dynamic-scheduling/app/jobs/send_email_job.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 class SendEmailJob
   @queue = :send_emails
 

examples/dynamic-scheduling/app/models/user.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 class User < ActiveRecord::Base
   after_create :schedule_send_email
 

examples/dynamic-scheduling/lib/tasks/resque.rake

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'resque/tasks'
 require 'resque/scheduler/tasks'
 require 'yaml'

exe/resque-scheduler

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# vim:fileencoding=utf-8
 
 require 'resque-scheduler'
 Resque::Scheduler::Cli.run!

lib/resque-scheduler.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require_relative 'resque/scheduler'
 
 Resque.extend Resque::Scheduler::Extension

lib/resque/scheduler.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'redis/errors'
 require 'rufus/scheduler'
 require_relative 'scheduler/configuration'

lib/resque/scheduler/cli.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'optparse'
 
 module Resque

lib/resque/scheduler/configuration.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     module Configuration

lib/resque/scheduler/delaying_extensions.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require 'resque'
 require_relative 'plugin'
 require_relative '../scheduler'

lib/resque/scheduler/env.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'English' # $PROCESS_ID
 
 module Resque

lib/resque/scheduler/extension.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require_relative 'scheduling_extensions'
 require_relative 'delaying_extensions'
 

lib/resque/scheduler/lock.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 %w(base basic resilient).each do |file|
   require "resque/scheduler/lock/#{file}"
 end

lib/resque/scheduler/lock/base.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     module Lock

lib/resque/scheduler/lock/basic.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require_relative 'base'
 
 module Resque

lib/resque/scheduler/lock/resilient.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require_relative 'base'
 
 module Resque

lib/resque/scheduler/locking.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 # ### Locking the scheduler process
 #
 # There are two places in resque-scheduler that need to be synchronized in order

lib/resque/scheduler/logger_builder.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'mono_logger'
 
 module Resque

lib/resque/scheduler/plugin.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     module Plugin

lib/resque/scheduler/scheduling_extensions.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     module SchedulingExtensions

lib/resque/scheduler/server.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require 'resque-scheduler'
 require 'resque/server'
 require 'tilt/erb'

lib/resque/scheduler/signal_handling.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     module SignalHandling

lib/resque/scheduler/tasks.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 require 'resque/tasks'
 require 'resque-scheduler'
 

lib/resque/scheduler/util.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     class Util

lib/resque/scheduler/version.rb

@@ -1,5 +1,3 @@
-# vim:fileencoding=utf-8
-
 module Resque
   module Scheduler
     VERSION = '4.10.2'.freeze

resque-scheduler.gemspec

@@ -1,27 +1,26 @@
-# vim:fileencoding=utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'resque/scheduler/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'resque-scheduler'
   spec.version = Resque::Scheduler::VERSION
-  spec.authors = <<-EOF.split(/\n/).map(&:strip)
+  spec.authors = <<-AUTHORS.split(/\n/).map(&:strip)
     Ben VandenBos
     Simon Eskildsen
     Ryan Biesemeyer
     Dan Buch
     Michael Bianco
     Patrick Tulskie
-  EOF
-  spec.email = %w(
+  AUTHORS
+  spec.email = %w[
     [email protected]
     [email protected]
     [email protected]
     [email protected]
     [email protected]
     [email protected]
-  )
+  ]
   spec.summary = 'Light weight job scheduling on top of Resque'
   spec.description = <<-DESCRIPTION
     Light weight job scheduling on top of Resque.
@@ -32,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.files = `git ls-files -z`.split("\0").reject do |f|
     f.match(%r{^(test|spec|features|examples|bin|tasks)/}) ||
@@ -41,7 +40,7 @@ Gem::Specification.new do |spec|
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = %w(lib)
+  spec.require_paths = %w[lib]
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'json'
@@ -52,12 +51,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'test-unit'
-  spec.add_development_dependency 'yard'
   spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'yard'
 
   # We pin rubocop because new cops have a tendency to result in false-y
   # positives for new contributors, which is not a nice experience.
-  spec.add_development_dependency 'rubocop', '~> 0.40.0'
+  spec.add_development_dependency 'ostruct'
+  spec.add_development_dependency 'racc'
+  spec.add_development_dependency 'rubocop', '~> 0.93.1'
 
   spec.add_runtime_dependency 'mono_logger', '~> 1.0'
   spec.add_runtime_dependency 'redis', '>= 3.3'

test/cli_test.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require_relative 'test_helper'
 
 context 'Cli' do

test/configuration_test.rb

@@ -1,4 +1,3 @@
-# vim:fileencoding=utf-8
 require_relative 'test_helper'
 
 context 'Configuration' do