Support Ruby 4.0 and Rails 8

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7']
+        ruby: ['2.7', '4.0']
 
     steps:
       - name: Checkout
@@ -30,4 +30,5 @@ jobs:
         run: bundle exec rspec
 
       - name: Rubocop
+        if: matrix.ruby == '2.7'
         run: bundle exec rubocop

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '>= 2.4.0'
 
-gem 'activerecord', '>= 4.2.5', '< 6', require: false
+gem 'activerecord', '>= 4.2.5', '< 9', require: false
 gem 'rake', require: false
 
 group :development do
@@ -29,7 +29,6 @@ group :development, :test do
   gem 'coveralls'
 
   gem 'overcommit'
-  gem 'ruby_dep', '1.5.0'
 
   platforms :mri, :mingw do
     gem 'pry', require: false

annotate.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4 if s.respond_to? :specification_version
   s.add_runtime_dependency(%q<rake>, '>= 10.4', '< 14.0')
-  s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 8.0'])
+  s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 9.0'])
 
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",

spec/lib/annotate/annotate_models_spec.rb

@@ -3083,12 +3083,12 @@ class User < ActiveRecord::Base
 
       it 'displays just the error message with trace disabled (default)' do
         expect { AnnotateModels.remove_annotations model_dir: @model_dir, is_rake: true }.to output(a_string_including("Unable to deannotate #{@model_dir}/user.rb: oops")).to_stderr
-        expect { AnnotateModels.remove_annotations model_dir: @model_dir, is_rake: true }.not_to output(a_string_including("/user.rb:2:in `<class:User>'")).to_stderr
+        expect { AnnotateModels.remove_annotations model_dir: @model_dir, is_rake: true }.not_to output(%r{/user\.rb:2:in [`']<class:User>'}).to_stderr
       end
 
       it 'displays the error message and stacktrace with trace enabled' do
         expect { AnnotateModels.remove_annotations model_dir: @model_dir, is_rake: true, trace: true }.to output(a_string_including("Unable to deannotate #{@model_dir}/user.rb: oops")).to_stderr
-        expect { AnnotateModels.remove_annotations model_dir: @model_dir, is_rake: true, trace: true }.to output(a_string_including("/user.rb:2:in `<class:User>'")).to_stderr
+        expect { AnnotateModels.remove_annotations model_dir: @model_dir, is_rake: true, trace: true }.to output(%r{/user\.rb:2:in [`']<class:User>'}).to_stderr
       end
     end
 

spec/spec_helper.rb

@@ -34,6 +34,16 @@
 require 'annotate/constants'
 require 'byebug'
 
+# The `files` gem (test-only) still calls the `File.exists?` alias, which was
+# removed in Ruby 3.2+. Restore it for the test run only.
+class File
+  unless respond_to?(:exists?)
+    def self.exists?(path)
+      exist?(path)
+    end
+  end
+end
+
 RSpec.configure do |config|
   config.order = 'random'
   config.filter_run_when_matching :focus