Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Ruby 3.0, and adopt Rubycritic changes for Ruby 3.1. #492

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
Expand Down Expand Up @@ -59,7 +58,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
Expand Down Expand Up @@ -89,7 +87,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
Expand Down Expand Up @@ -119,7 +116,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
Expand Down
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AllCops:
- 'tmp/**/*'
- 'vendor/**/*'
- 'gemfiles/*'
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1

Metrics/BlockLength:
Enabled: false
Expand All @@ -26,6 +26,9 @@ Layout/LineLength:
Style/Documentation:
Enabled: false

Style/HashSyntax:
EnforcedShorthandSyntax: either

Security/MarshalLoad:
Enabled: false
Include:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# main [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.9.1...main)

* [CHANGE] Drop support for Ruby 3.0.x (by [@faisal][])
* [CHANGE] Bump minitest, mocha, rubocop dependencies (by [@faisal][])
* [CHANGE] Drop support for Ruby 2.7.x (by [@faisal][])

# v4.9.1 / 2024-04-14 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.9.0...v4.9.1)
Expand Down
4 changes: 2 additions & 2 deletions lib/rubycritic/analysers/coverage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ def stored_data

# Ensure only one process is reading or writing the resultset at any
# given time
def synchronize_resultset(&proc)
def synchronize_resultset(&)
# make it reentrant
return yield if defined?(@resultset_locked) && @resultset_locked == true

return yield unless File.exist?(resultset_writelock)

with_lock(&proc)
with_lock(&)
end

def with_lock
Expand Down
4 changes: 2 additions & 2 deletions lib/rubycritic/core/analysed_modules_collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def initialize(paths, modules = nil)
end
end

def each(&block)
@modules.each(&block)
def each(&)
@modules.each(&)
end

def where(module_paths)
Expand Down
30 changes: 15 additions & 15 deletions rubycritic.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.summary = 'RubyCritic is a Ruby code quality reporter'
spec.homepage = 'https://github.com/whitesmith/rubycritic'
spec.license = 'MIT'
spec.required_ruby_version = '>= 3.0.0'
spec.required_ruby_version = '>= 3.1.0'

spec.files = [
'CHANGELOG.md',
Expand All @@ -30,17 +30,17 @@ Gem::Specification.new do |spec|
spec.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
spec.require_path = 'lib'

spec.add_runtime_dependency 'flay', '~> 2.13'
spec.add_runtime_dependency 'flog', '~> 4.7'
spec.add_runtime_dependency 'launchy', '>= 2.5.2'
spec.add_runtime_dependency 'parser', '>= 3.3.0.5'
spec.add_runtime_dependency 'rainbow', '~> 3.1.1'
spec.add_runtime_dependency 'reek', '~> 6.3.0', '< 7.0'
spec.add_runtime_dependency 'rexml'
spec.add_runtime_dependency 'ruby_parser', '~> 3.21'
spec.add_runtime_dependency 'simplecov', '>= 0.22.0'
spec.add_runtime_dependency 'tty-which', '~> 0.5.0'
spec.add_runtime_dependency 'virtus', '~> 2.0'
spec.add_dependency 'flay', '~> 2.13'
spec.add_dependency 'flog', '~> 4.7'
spec.add_dependency 'launchy', '>= 2.5.2'
spec.add_dependency 'parser', '>= 3.3.0.5'
spec.add_dependency 'rainbow', '~> 3.1.1'
spec.add_dependency 'reek', '~> 6.3.0', '< 7.0'
spec.add_dependency 'rexml'
spec.add_dependency 'ruby_parser', '~> 3.21'
spec.add_dependency 'simplecov', '>= 0.22.0'
spec.add_dependency 'tty-which', '~> 0.5.0'
spec.add_dependency 'virtus', '~> 2.0'

spec.add_development_dependency 'aruba', '~> 2.2.0'
spec.add_development_dependency 'bundler', '>= 2.0.0'
Expand All @@ -53,12 +53,12 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'diff-lcs', '~> 1.3'
spec.add_development_dependency 'fakefs', '~> 2.5.0'
spec.add_development_dependency 'mdl', '~> 0.13.0', '>= 0.12.0'
spec.add_development_dependency 'minitest', '~> 5.22.2', '>= 5.3.0'
spec.add_development_dependency 'minitest', '~> 5.25.2', '>= 5.3.0'
spec.add_development_dependency 'minitest-around', '~> 0.5.0', '>= 0.4.0'
spec.add_development_dependency 'mocha', '~> 2.2.0'
spec.add_development_dependency 'mocha', '~> 2.6.1'
spec.add_development_dependency 'rake', '~> 13.2.0', '>= 11.0.0'
spec.add_development_dependency 'rexml', '>= 3.2.0'
spec.add_development_dependency 'rubocop', '~> 1.63.0', '>= 1.54.0'
spec.add_development_dependency 'rubocop', '~> 1.69.0', '>= 1.54.0'
spec.add_development_dependency 'rubocop-minitest'
spec.add_development_dependency 'rubocop-performance'
spec.add_development_dependency 'rubocop-rake'
Expand Down
Loading