Skip to content

Commit b2f6f24

Browse files
committed
rubocop to latest
1 parent e911f4a commit b2f6f24

5 files changed

Lines changed: 40 additions & 103 deletions

File tree

.github/workflows/rubocop.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,26 @@ on:
66
pull_request:
77
branches: [master]
88

9+
# This allows a subsequently queued workflow run to interrupt previous runs
10+
concurrency:
11+
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
12+
cancel-in-progress: true
13+
914
jobs:
1015
rubocop:
1116
name: Rubocop
12-
runs-on: ${{ matrix.os }}
17+
runs-on: ubuntu-latest
1318
strategy:
19+
fail-fast: false
1420
matrix:
15-
os: [ubuntu-latest]
16-
ruby: [
17-
2.7
18-
]
21+
ruby-version:
22+
- "3.3"
1923

2024
steps:
2125
- uses: actions/checkout@v4
2226
- uses: ruby/setup-ruby@v1
2327
with:
24-
ruby-version: ${{ matrix.ruby }}
28+
ruby-version: ${{ matrix.ruby-version }}
2529
bundler-cache: true
2630
- name: Ruby linter
2731
run: bundle exec rubocop

.github/workflows/ruby.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
- "3.2"
3636
- "3.3"
3737
resque-version:
38-
# - "master"
39-
- "~> 2.6"
38+
- "master"
39+
- "~> 2.4"
4040
- "~> 1.27"
4141
rufus-scheduler:
42-
# - "~> 3.6.0"
43-
# - "~> 3.7.0"
44-
# - "~> 3.8.0"
42+
- "~> 3.6.0"
43+
- "~> 3.7.0"
44+
- "~> 3.8.0"
4545
- "~> 3.9"
4646
redis-version:
4747
- "~> 3.3"

.rubocop.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1-
inherit_from: .rubocop_todo.yml
2-
31
AllCops:
2+
SuggestExtensions: false
3+
TargetRubyVersion: 3.0
4+
NewCops: enable
45
Include:
56
- Gemfile
67
- '**/Rakefile'
78
- resque-scheduler.gemspec
89
- bin/resque-scheduler
910

10-
Documentation:
11+
Gemspec/DevelopmentDependencies:
12+
Enabled: false
13+
Metrics/ClassLength:
14+
Max: 110
15+
Metrics/PerceivedComplexity:
16+
Enabled: false
17+
Naming/HeredocDelimiterNaming:
1118
Enabled: false
12-
1319
Style/DoubleNegation:
1420
Enabled: false
15-
Metrics/PerceivedComplexity:
21+
Style/FrozenStringLiteralComment:
1622
Enabled: false
17-
Metrics/ClassLength:
18-
Max: 110

.rubocop_todo.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

resque-scheduler.gemspec

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
# vim:fileencoding=utf-8
2-
lib = File.expand_path('../lib', __FILE__)
2+
lib = File.expand_path('lib', __dir__)
33
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
44
require 'resque/scheduler/version'
55

66
Gem::Specification.new do |spec|
77
spec.name = 'resque-scheduler'
88
spec.version = Resque::Scheduler::VERSION
9-
spec.authors = <<-EOF.split(/\n/).map(&:strip)
9+
spec.authors = <<-EOF.split("\n").map(&:strip)
1010
Ben VandenBos
1111
Simon Eskildsen
1212
Ryan Biesemeyer
1313
Dan Buch
1414
Michael Bianco
1515
Patrick Tulskie
1616
EOF
17-
spec.email = %w(
17+
spec.email = %w[
1818
bvandenbos@gmail.com
1919
sirup@sirupsen.com
2020
ryan@yaauie.com
2121
dan@meatballhat.com
2222
mike@mikebian.co
2323
patricktulskie@gmail.com
24-
)
24+
]
2525
spec.summary = 'Light weight job scheduling on top of Resque'
2626
spec.description = <<-DESCRIPTION
2727
Light weight job scheduling on top of Resque.
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
3232
spec.license = 'MIT'
3333
spec.metadata['rubygems_mfa_required'] = 'true'
3434

35-
spec.required_ruby_version = '>= 2.3.0'
35+
spec.required_ruby_version = '>= 3.0'
3636

3737
spec.files = `git ls-files -z`.split("\0").reject do |f|
3838
f.match(%r{^(test|spec|features|examples|bin|tasks)/}) ||
@@ -41,28 +41,28 @@ Gem::Specification.new do |spec|
4141
end
4242
spec.bindir = 'exe'
4343
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
44-
spec.require_paths = %w(lib)
44+
spec.require_paths = %w[lib]
4545

4646
spec.add_development_dependency 'bundler'
4747
spec.add_development_dependency 'json'
4848
spec.add_development_dependency 'minitest'
4949
spec.add_development_dependency 'mocha'
50+
spec.add_development_dependency 'ostruct'
5051
spec.add_development_dependency 'pry'
52+
spec.add_development_dependency 'racc'
5153
spec.add_development_dependency 'rack-test'
5254
spec.add_development_dependency 'rake'
5355
spec.add_development_dependency 'simplecov'
5456
spec.add_development_dependency 'test-unit'
55-
spec.add_development_dependency 'yard'
5657
spec.add_development_dependency 'timecop'
58+
spec.add_development_dependency 'yard'
5759

58-
# We pin rubocop because new cops have a tendency to result in false-y
59-
# positives for new contributors, which is not a nice experience.
60-
spec.add_development_dependency 'rubocop', '~> 0.40.0'
60+
spec.add_development_dependency 'rubocop', '~> 1.4'
6161

62-
spec.add_runtime_dependency 'mono_logger', '~> 1.0'
63-
spec.add_runtime_dependency 'redis', '>= 3.3'
64-
spec.add_runtime_dependency 'resque', '>= 1.27'
62+
spec.add_dependency 'mono_logger', '~> 1.0'
63+
spec.add_dependency 'redis', '>= 3.3'
64+
spec.add_dependency 'resque', '>= 1.27'
6565
# rufus-scheduler v3.7 causes a failure in test/multi_process_test.rb
6666
# rufus-scheduler v3.3 is missing a to_local method which fails tests
67-
spec.add_runtime_dependency 'rufus-scheduler', '~> 3.2', '!= 3.3'
67+
spec.add_dependency 'rufus-scheduler', '~> 3.2', '!= 3.3'
6868
end

0 commit comments

Comments
 (0)