Skip to content

Commit

Permalink
Add Ruby 3.0, 3.1, and 3.2 to CI
Browse files Browse the repository at this point in the history
Removes obsolete and unused gems.  Replaces use of unmaintained files gem to allow running under Ruby 3.2.
  • Loading branch information
petergoldstein committed Mar 31, 2023
1 parent 22ab676 commit 27c842c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.7']
ruby: ['2.7', '3.0', '3.1', '3.2']

steps:
- name: Checkout
Expand Down
7 changes: 1 addition & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ source 'https://rubygems.org'

ruby '>= 2.4.0'

gem 'activerecord', '>= 4.2.5', '< 6', require: false
gem 'activerecord', '>= 4.2.5', '< 8', require: false
gem 'rake', require: false

group :development do
gem 'bump'
gem 'mg', require: false
gem 'travis', require: false
platforms :mri, :mingw do
gem 'yard', require: false
end
Expand All @@ -25,11 +24,8 @@ group :development, :test do
gem 'simplecov', require: false
gem 'terminal-notifier-guard', require: false

gem 'codeclimate-test-reporter'
gem 'coveralls'

gem 'overcommit'
gem 'ruby_dep', '1.5.0'

platforms :mri, :mingw do
gem 'pry', require: false
Expand All @@ -38,6 +34,5 @@ group :development, :test do
end

group :test do
gem 'files', require: false
gem 'git', require: false
end
22 changes: 9 additions & 13 deletions spec/lib/annotate/annotate_models_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'annotate/annotate_models'
require 'annotate/active_record_patch'
require 'active_support/core_ext/string'
require 'files'
require 'tmpdir'

describe AnnotateModels do
Expand Down Expand Up @@ -1874,18 +1873,15 @@ def mock_column(name, type, options = {})

context 'when `model_dir` is valid' do
let(:model_dir) do
Files do
file 'foo.rb'
dir 'bar' do
file 'baz.rb'
dir 'qux' do
file 'quux.rb'
end
end
dir 'concerns' do
file 'corge.rb'
end
end
dir = Dir.mktmpdir
FileUtils.touch(File.join(dir, 'foo.rb'))
FileUtils.mkdir_p(File.join(dir, 'bar'))
FileUtils.touch(File.join(dir, 'bar', 'baz.rb'))
FileUtils.mkdir_p(File.join(dir, 'bar', 'qux'))
FileUtils.touch(File.join(dir, 'bar', 'qux', 'quux.rb'))
FileUtils.mkdir_p(File.join(dir, 'concerns'))
FileUtils.touch(File.join(dir, 'concerns', 'corge.rb'))
dir
end

context 'when the model files are not specified' do
Expand Down

0 comments on commit 27c842c

Please sign in to comment.