Skip to content

Commit 550b6f7

Browse files
Add Ruby 3.0, 3.1, and 3.2 to CI
Removes obsolete and unused gems. Replaces use of unmaintained files gem to allow running under Ruby 3.2.
1 parent 5d01c41 commit 550b6f7

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
ruby: ['2.7']
17+
ruby: ['2.7', '3.0', '3.1', '3.2']
1818

1919
steps:
2020
- name: Checkout

Gemfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ source 'https://rubygems.org'
22

33
ruby '>= 2.4.0'
44

5-
gem 'activerecord', '>= 4.2.5', '< 6', require: false
5+
gem 'activerecord', '>= 4.2.5', '< 8', require: false
66
gem 'rake', require: false
77

88
group :development do
99
gem 'bump'
1010
gem 'mg', require: false
11-
gem 'travis', require: false
1211
platforms :mri, :mingw do
1312
gem 'yard', require: false
1413
end
@@ -25,11 +24,8 @@ group :development, :test do
2524
gem 'simplecov', require: false
2625
gem 'terminal-notifier-guard', require: false
2726

28-
gem 'codeclimate-test-reporter'
29-
gem 'coveralls'
3027

3128
gem 'overcommit'
32-
gem 'ruby_dep', '1.5.0'
3329

3430
platforms :mri, :mingw do
3531
gem 'pry', require: false
@@ -38,6 +34,5 @@ group :development, :test do
3834
end
3935

4036
group :test do
41-
gem 'files', require: false
4237
gem 'git', require: false
4338
end

spec/lib/annotate/annotate_models_spec.rb

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
require 'annotate/annotate_models'
44
require 'annotate/active_record_patch'
55
require 'active_support/core_ext/string'
6-
require 'files'
76
require 'tmpdir'
87

98
describe AnnotateModels do
@@ -2014,18 +2013,15 @@ def mock_column(name, type, options = {})
20142013

20152014
context 'when `model_dir` is valid' do
20162015
let(:model_dir) do
2017-
Files do
2018-
file 'foo.rb'
2019-
dir 'bar' do
2020-
file 'baz.rb'
2021-
dir 'qux' do
2022-
file 'quux.rb'
2023-
end
2024-
end
2025-
dir 'concerns' do
2026-
file 'corge.rb'
2027-
end
2028-
end
2016+
dir = Dir.mktmpdir
2017+
FileUtils.touch(File.join(dir, 'foo.rb'))
2018+
FileUtils.mkdir_p(File.join(dir, 'bar'))
2019+
FileUtils.touch(File.join(dir, 'bar', 'baz.rb'))
2020+
FileUtils.mkdir_p(File.join(dir, 'bar', 'qux'))
2021+
FileUtils.touch(File.join(dir, 'bar', 'qux', 'quux.rb'))
2022+
FileUtils.mkdir_p(File.join(dir, 'concerns'))
2023+
FileUtils.touch(File.join(dir, 'concerns', 'corge.rb'))
2024+
dir
20292025
end
20302026

20312027
context 'when the model files are not specified' do

0 commit comments

Comments
 (0)