Skip to content

Commit 332fbd2

Browse files
drop support for ruby 2.3 + 2.4 (#549)
* drop support for ruby 2.3 + 2.4 * tidy local gemfile, remove pin on pye-byebug
1 parent 03dcfd2 commit 332fbd2

11 files changed

+40
-73
lines changed

.travis.yml

-6
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ rvm:
1414
- 2.7.0
1515
- 2.6.3
1616
- 2.5.5
17-
- 2.4.6
18-
- 2.3.8
1917

2018
gemfile:
2119
- gemfiles/activerecord_4.gemfile
@@ -37,10 +35,6 @@ matrix:
3735
env: ADAPTER=mongoid
3836
- gemfile: gemfiles/activerecord_6.gemfile
3937
env: ADAPTER=mongoid
40-
- gemfile: gemfiles/activerecord_6.gemfile
41-
rvm: 2.4.6
42-
- gemfile: gemfiles/activerecord_6.gemfile
43-
rvm: 2.3.8
4438
- gemfile: gemfiles/mongoid_5.gemfile
4539
env: ADAPTER=active_record
4640
- gemfile: gemfiles/mongoid_6.gemfile

Appraisals

-12
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ appraise 'activerecord-5' do
2929
gem "actionpack", "~> 5.2.4"
3030
gem "activemodel", "~> 5.2.4"
3131
gem "railties", "~> 5.2.4"
32-
33-
gem 'rspec-rails' , github: 'rspec/rspec-rails'
34-
gem 'rspec-core' , github: 'rspec/rspec-core'
35-
gem 'rspec-expectations', github: 'rspec/rspec-expectations'
36-
gem 'rspec-mocks' , github: 'rspec/rspec-mocks'
37-
gem 'rspec-support' , github: 'rspec/rspec-support'
3832
end
3933

4034
appraise 'activerecord-6' do
@@ -45,10 +39,4 @@ appraise 'activerecord-6' do
4539
gem "actionpack", ">= 6.0.0"
4640
gem "activemodel", ">= 6.0.0"
4741
gem "railties", ">= 6.0.0"
48-
49-
gem 'rspec-rails' , github: 'rspec/rspec-rails'
50-
gem 'rspec-core' , github: 'rspec/rspec-core'
51-
gem 'rspec-expectations', github: 'rspec/rspec-expectations'
52-
gem 'rspec-mocks' , github: 'rspec/rspec-mocks'
53-
gem 'rspec-support' , github: 'rspec/rspec-support'
5442
end

Gemfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
source "https://rubygems.org"
22

33
group :test do
4-
gem 'appraisal'
5-
gem 'coveralls', :require => false
4+
gem 'codeclimate-test-reporter', require: nil
5+
gem 'coveralls', require: false
6+
gem 'database_cleaner', '~> 1.6.2'
67
gem 'its'
7-
gem 'pry', '< 0.13.0' # pry pins can be removed when we drop Ruby 2.3
8-
gem 'byebug'
9-
gem 'pry-byebug', '< 3.8.0'
108
gem 'test-unit' # Implicitly loaded by ammeter
11-
gem 'database_cleaner', '~> 1.6.2'
12-
gem 'codeclimate-test-reporter', :require => nil
9+
10+
gem 'byebug'
11+
gem 'pry'
12+
gem 'pry-byebug'
1313
end
1414

1515
gemspec

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ rails g rolify Role User
4646
rails g rolify:role Role User
4747
```
4848

49-
The generator will create your Role model, add a migration file, and update your User class with new class methods.
49+
The generator will create your Role model, add a migration file, and update your User class with new class methods.
5050

5151
### 2. Run the migration (only required when using ActiveRecord)
5252

gemfiles/activerecord_4.gemfile

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ gem "activerecord", "~> 4.2.11", require: "active_record"
77
gem "bigdecimal", "1.4.2"
88

99
group :test do
10-
gem "appraisal"
10+
gem "codeclimate-test-reporter", require: nil
1111
gem "coveralls", require: false
12+
gem "database_cleaner", "~> 1.6.2"
1213
gem "its"
13-
gem "pry", "< 0.13.0"
14-
gem "byebug"
15-
gem "pry-byebug", "< 3.8.0"
1614
gem "test-unit"
17-
gem "database_cleaner", "~> 1.6.2"
18-
gem "codeclimate-test-reporter", require: nil
15+
gem "byebug"
16+
gem "pry"
17+
gem "pry-byebug"
1918
end
2019

2120
gemspec path: "../"

gemfiles/activerecord_5.gemfile

+5-11
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@ gem "activerecord", "~> 5.2.4", require: "active_record"
77
gem "actionpack", "~> 5.2.4"
88
gem "activemodel", "~> 5.2.4"
99
gem "railties", "~> 5.2.4"
10-
gem "rspec-rails", github: "rspec/rspec-rails"
11-
gem "rspec-core", github: "rspec/rspec-core"
12-
gem "rspec-expectations", github: "rspec/rspec-expectations"
13-
gem "rspec-mocks", github: "rspec/rspec-mocks"
14-
gem "rspec-support", github: "rspec/rspec-support"
1510

1611
group :test do
17-
gem "appraisal"
12+
gem "codeclimate-test-reporter", require: nil
1813
gem "coveralls", require: false
14+
gem "database_cleaner", "~> 1.6.2"
1915
gem "its"
20-
gem "pry", "< 0.13.0"
21-
gem "byebug"
22-
gem "pry-byebug", "< 3.8.0"
2316
gem "test-unit"
24-
gem "database_cleaner", "~> 1.6.2"
25-
gem "codeclimate-test-reporter", require: nil
17+
gem "byebug"
18+
gem "pry"
19+
gem "pry-byebug"
2620
end
2721

2822
gemspec path: "../"

gemfiles/activerecord_6.gemfile

+5-11
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@ gem "activerecord", ">= 6.0.0", require: "active_record"
77
gem "actionpack", ">= 6.0.0"
88
gem "activemodel", ">= 6.0.0"
99
gem "railties", ">= 6.0.0"
10-
gem "rspec-rails", github: "rspec/rspec-rails"
11-
gem "rspec-core", github: "rspec/rspec-core"
12-
gem "rspec-expectations", github: "rspec/rspec-expectations"
13-
gem "rspec-mocks", github: "rspec/rspec-mocks"
14-
gem "rspec-support", github: "rspec/rspec-support"
1510

1611
group :test do
17-
gem "appraisal"
12+
gem "codeclimate-test-reporter", require: nil
1813
gem "coveralls", require: false
14+
gem "database_cleaner", "~> 1.6.2"
1915
gem "its"
20-
gem "pry", "< 0.13.0"
21-
gem "byebug"
22-
gem "pry-byebug", "< 3.8.0"
2316
gem "test-unit"
24-
gem "database_cleaner", "~> 1.6.2"
25-
gem "codeclimate-test-reporter", require: nil
17+
gem "byebug"
18+
gem "pry"
19+
gem "pry-byebug"
2620
end
2721

2822
gemspec path: "../"

gemfiles/mongoid_5.gemfile

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1"
77
gem "bigdecimal", "1.4.2"
88

99
group :test do
10-
gem "appraisal"
10+
gem "codeclimate-test-reporter", require: nil
1111
gem "coveralls", require: false
12+
gem "database_cleaner", "~> 1.6.2"
1213
gem "its"
13-
gem "pry", "< 0.13.0"
14-
gem "byebug"
15-
gem "pry-byebug", "< 3.8.0"
1614
gem "test-unit"
17-
gem "database_cleaner", "~> 1.6.2"
18-
gem "codeclimate-test-reporter", require: nil
15+
gem "byebug"
16+
gem "pry"
17+
gem "pry-byebug"
1918
end
2019

2120
gemspec path: "../"

gemfiles/mongoid_6.gemfile

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ gem "mongoid", "~> 6"
66
gem "bson_ext", "1.5.1"
77

88
group :test do
9-
gem "appraisal"
9+
gem "codeclimate-test-reporter", require: nil
1010
gem "coveralls", require: false
11+
gem "database_cleaner", "~> 1.6.2"
1112
gem "its"
12-
gem "pry", "< 0.13.0"
13-
gem "byebug"
14-
gem "pry-byebug", "< 3.8.0"
1513
gem "test-unit"
16-
gem "database_cleaner", "~> 1.6.2"
17-
gem "codeclimate-test-reporter", require: nil
14+
gem "byebug"
15+
gem "pry"
16+
gem "pry-byebug"
1817
end
1918

2019
gemspec path: "../"

gemfiles/mongoid_7.gemfile

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1"
77
gem "railties", "5.2.4.1"
88

99
group :test do
10-
gem "appraisal"
10+
gem "codeclimate-test-reporter", require: nil
1111
gem "coveralls", require: false
12+
gem "database_cleaner", "~> 1.6.2"
1213
gem "its"
13-
gem "pry", "< 0.13.0"
14-
gem "byebug"
15-
gem "pry-byebug", "< 3.8.0"
1614
gem "test-unit"
17-
gem "database_cleaner", "~> 1.6.2"
18-
gem "codeclimate-test-reporter", require: nil
15+
gem "byebug"
16+
gem "pry"
17+
gem "pry-byebug"
1918
end
2019

2120
gemspec path: "../"

rolify.gemspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ Gem::Specification.new do |s|
2626
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
2727
s.require_paths = ['lib']
2828

29-
s.required_ruby_version = '>= 2.3'
29+
s.required_ruby_version = '>= 2.5'
3030

3131
s.add_development_dependency 'ammeter', '~> 1.1' # Spec generator
32+
s.add_development_dependency 'appraisal', '~> 2.0'
3233
s.add_development_dependency 'bundler', '~> 2.0' # packaging feature
3334
s.add_development_dependency 'rake', '~> 12.3' # Tasks manager
3435
s.add_development_dependency 'rspec-rails', '~> 3.8'

0 commit comments

Comments
 (0)