From 6dd076c13fdefdcec3c6faef7a6a0b10f2e41ddc Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Thu, 25 Dec 2025 20:53:16 -0500 Subject: [PATCH 1/7] Changes needed for Ruby 4.0.0 --- lib/rubycritic/analysers/smells/reek.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/rubycritic/analysers/smells/reek.rb b/lib/rubycritic/analysers/smells/reek.rb index db5cf0cf..cfe8ee5e 100644 --- a/lib/rubycritic/analysers/smells/reek.rb +++ b/lib/rubycritic/analysers/smells/reek.rb @@ -10,7 +10,10 @@ class ReekSmells include Colorize def initialize(analysed_modules) - @analysed_modules = analysed_modules.reject { Reek.configuration.path_excluded?(_1.pathname) } + @analysed_modules = analysed_modules.reject do |mod| + path_string = mod.pathname.to_s + Reek.configuration.path_excluded?(Pathname.new(path_string)) + end end def run From c9025ac523f0a4fc2f508e78603f34c78d976cc6 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Thu, 25 Dec 2025 21:04:20 -0500 Subject: [PATCH 2/7] Test with Ruby 4.0 too --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a913540f..2a23608c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,7 @@ jobs: - '3.2' - '3.3' - '3.4' + - '4.0' experimental: [false] include: - ruby-version: 'ruby-head' @@ -61,6 +62,7 @@ jobs: - '3.2' - '3.3' - '3.4' + - '4.0' experimental: [false] include: - ruby-version: 'ruby-head' @@ -91,6 +93,7 @@ jobs: - '3.2' - '3.3' - '3.4' + - '4.0' experimental: [false] include: - ruby-version: 'ruby-head' @@ -121,6 +124,7 @@ jobs: - '3.2' - '3.3' - '3.4' + - '4.0' experimental: [false] include: - ruby-version: 'ruby-head' From d1008f9ef7dc6ed332d90df2909a26cf1ead0faa Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 27 Dec 2025 10:08:20 -0500 Subject: [PATCH 3/7] Patch FakeFS --- test/fakefs_helper.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/fakefs_helper.rb b/test/fakefs_helper.rb index a63f7abc..282c3b88 100644 --- a/test/fakefs_helper.rb +++ b/test/fakefs_helper.rb @@ -24,3 +24,14 @@ def home(user = Etc.getlogin) end end FakeFS::Dir.singleton_class.prepend(FakeFSPatch) + +# Patch FakeFS::Pathname to include the path method for Ruby 4.0.0 compatibility +# This is needed because Reek's configuration internally calls Pathname#== which +# requires the path method to be present +module FakeFS + class Pathname + def path + to_s + end + end +end From 04461804af86027012f8d2ab342292e953e0482d Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 27 Dec 2025 10:23:47 -0500 Subject: [PATCH 4/7] Add a note about Ruby 4.0 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2c953a8..a65d21e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * [CHORE] Updated README with last supported Ruby versions for the older as well as the latest releases of Rubycritic/Ruby (by [@faisal][]) * [CHANGE] Drop support for Ruby 3.1.x and JRuby 9.4 (by [@faisal][]) * [CHANGE] Add CI support for JRuby 10.0 (by [@faisal][]) +* [CHORE] Start testing library with Ruby 4.0 (by [@etagwerker][]) * [CHANGE] Bump cucumber dependency (by [@faisal][]) * [BUGFIX] Fixed regression in compatibility with Flog 4.9.0 (by [@faisal][]) * [CHANGE] Bump mocha dependency (by [@faisal][]) From 4a7ddcb7f22381f0cf20fe3aec345fd9e3130b4c Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Tue, 30 Dec 2025 13:15:37 -0500 Subject: [PATCH 5/7] Apply patch by @faisal --- lib/rubycritic/generators/html/line.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rubycritic/generators/html/line.rb b/lib/rubycritic/generators/html/line.rb index c5e3cd15..51fc5e6a 100644 --- a/lib/rubycritic/generators/html/line.rb +++ b/lib/rubycritic/generators/html/line.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'cgi' +require 'cgi/escape' require 'rubycritic/generators/html/base' module RubyCritic From 2b90b80b081709b585ab4b1e1d1c230743d376e7 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Tue, 30 Dec 2025 13:21:46 -0500 Subject: [PATCH 6/7] Remove irb and bump dependency on fakefs --- rubycritic.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rubycritic.gemspec b/rubycritic.gemspec index ff4adb93..afadd7a3 100644 --- a/rubycritic.gemspec +++ b/rubycritic.gemspec @@ -54,8 +54,7 @@ Gem::Specification.new do |spec| end spec.add_development_dependency 'cucumber', '~> 10.2.0', '>= 10.1.0' spec.add_development_dependency 'diff-lcs', '~> 1.3' - spec.add_development_dependency 'fakefs', '~> 3.0.0' - spec.add_development_dependency 'irb' + spec.add_development_dependency 'fakefs', '~> 3.2.0' spec.add_development_dependency 'mdl', '~> 0.15.0', '>= 0.12.0' spec.add_development_dependency 'minitest', '~> 6.0.0' spec.add_development_dependency 'minitest-around', '~> 0.6.0' From 76a7bbab4cfde6590ca34fa985dda3e04c4e59d0 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Tue, 30 Dec 2025 13:22:08 -0500 Subject: [PATCH 7/7] undef :path --- test/fakefs_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/fakefs_helper.rb b/test/fakefs_helper.rb index 282c3b88..29d05131 100644 --- a/test/fakefs_helper.rb +++ b/test/fakefs_helper.rb @@ -30,6 +30,8 @@ def home(user = Etc.getlogin) # requires the path method to be present module FakeFS class Pathname + undef :path + def path to_s end