From 332fbd2f37462a24815c3c1656398e02990f19fe Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Mon, 29 Jun 2020 22:20:28 +0100 Subject: [PATCH] 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 --- .travis.yml | 6 ------ Appraisals | 12 ------------ Gemfile | 14 +++++++------- README.md | 2 +- gemfiles/activerecord_4.gemfile | 11 +++++------ gemfiles/activerecord_5.gemfile | 16 +++++----------- gemfiles/activerecord_6.gemfile | 16 +++++----------- gemfiles/mongoid_5.gemfile | 11 +++++------ gemfiles/mongoid_6.gemfile | 11 +++++------ gemfiles/mongoid_7.gemfile | 11 +++++------ rolify.gemspec | 3 ++- 11 files changed, 40 insertions(+), 73 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41b76144..0fae3331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ rvm: - 2.7.0 - 2.6.3 - 2.5.5 - - 2.4.6 - - 2.3.8 gemfile: - gemfiles/activerecord_4.gemfile @@ -37,10 +35,6 @@ matrix: env: ADAPTER=mongoid - gemfile: gemfiles/activerecord_6.gemfile env: ADAPTER=mongoid - - gemfile: gemfiles/activerecord_6.gemfile - rvm: 2.4.6 - - gemfile: gemfiles/activerecord_6.gemfile - rvm: 2.3.8 - gemfile: gemfiles/mongoid_5.gemfile env: ADAPTER=active_record - gemfile: gemfiles/mongoid_6.gemfile diff --git a/Appraisals b/Appraisals index 11fc552c..5bb901ee 100644 --- a/Appraisals +++ b/Appraisals @@ -29,12 +29,6 @@ appraise 'activerecord-5' do gem "actionpack", "~> 5.2.4" gem "activemodel", "~> 5.2.4" gem "railties", "~> 5.2.4" - - gem 'rspec-rails' , github: 'rspec/rspec-rails' - gem 'rspec-core' , github: 'rspec/rspec-core' - gem 'rspec-expectations', github: 'rspec/rspec-expectations' - gem 'rspec-mocks' , github: 'rspec/rspec-mocks' - gem 'rspec-support' , github: 'rspec/rspec-support' end appraise 'activerecord-6' do @@ -45,10 +39,4 @@ appraise 'activerecord-6' do gem "actionpack", ">= 6.0.0" gem "activemodel", ">= 6.0.0" gem "railties", ">= 6.0.0" - - gem 'rspec-rails' , github: 'rspec/rspec-rails' - gem 'rspec-core' , github: 'rspec/rspec-core' - gem 'rspec-expectations', github: 'rspec/rspec-expectations' - gem 'rspec-mocks' , github: 'rspec/rspec-mocks' - gem 'rspec-support' , github: 'rspec/rspec-support' end diff --git a/Gemfile b/Gemfile index 8a40ff4a..047c6a67 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,15 @@ source "https://rubygems.org" group :test do - gem 'appraisal' - gem 'coveralls', :require => false + gem 'codeclimate-test-reporter', require: nil + gem 'coveralls', require: false + gem 'database_cleaner', '~> 1.6.2' gem 'its' - gem 'pry', '< 0.13.0' # pry pins can be removed when we drop Ruby 2.3 - gem 'byebug' - gem 'pry-byebug', '< 3.8.0' gem 'test-unit' # Implicitly loaded by ammeter - gem 'database_cleaner', '~> 1.6.2' - gem 'codeclimate-test-reporter', :require => nil + + gem 'byebug' + gem 'pry' + gem 'pry-byebug' end gemspec diff --git a/README.md b/README.md index 14e99ba4..8cb93c6d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ rails g rolify Role User rails g rolify:role Role User ``` -The generator will create your Role model, add a migration file, and update your User class with new class methods. +The generator will create your Role model, add a migration file, and update your User class with new class methods. ### 2. Run the migration (only required when using ActiveRecord) diff --git a/gemfiles/activerecord_4.gemfile b/gemfiles/activerecord_4.gemfile index b1e5415a..201a18a9 100644 --- a/gemfiles/activerecord_4.gemfile +++ b/gemfiles/activerecord_4.gemfile @@ -7,15 +7,14 @@ gem "activerecord", "~> 4.2.11", require: "active_record" gem "bigdecimal", "1.4.2" group :test do - gem "appraisal" + gem "codeclimate-test-reporter", require: nil gem "coveralls", require: false + gem "database_cleaner", "~> 1.6.2" gem "its" - gem "pry", "< 0.13.0" - gem "byebug" - gem "pry-byebug", "< 3.8.0" gem "test-unit" - gem "database_cleaner", "~> 1.6.2" - gem "codeclimate-test-reporter", require: nil + gem "byebug" + gem "pry" + gem "pry-byebug" end gemspec path: "../" diff --git a/gemfiles/activerecord_5.gemfile b/gemfiles/activerecord_5.gemfile index 33555879..db7cba05 100644 --- a/gemfiles/activerecord_5.gemfile +++ b/gemfiles/activerecord_5.gemfile @@ -7,22 +7,16 @@ gem "activerecord", "~> 5.2.4", require: "active_record" gem "actionpack", "~> 5.2.4" gem "activemodel", "~> 5.2.4" gem "railties", "~> 5.2.4" -gem "rspec-rails", github: "rspec/rspec-rails" -gem "rspec-core", github: "rspec/rspec-core" -gem "rspec-expectations", github: "rspec/rspec-expectations" -gem "rspec-mocks", github: "rspec/rspec-mocks" -gem "rspec-support", github: "rspec/rspec-support" group :test do - gem "appraisal" + gem "codeclimate-test-reporter", require: nil gem "coveralls", require: false + gem "database_cleaner", "~> 1.6.2" gem "its" - gem "pry", "< 0.13.0" - gem "byebug" - gem "pry-byebug", "< 3.8.0" gem "test-unit" - gem "database_cleaner", "~> 1.6.2" - gem "codeclimate-test-reporter", require: nil + gem "byebug" + gem "pry" + gem "pry-byebug" end gemspec path: "../" diff --git a/gemfiles/activerecord_6.gemfile b/gemfiles/activerecord_6.gemfile index ce0a40ea..bbce8e17 100644 --- a/gemfiles/activerecord_6.gemfile +++ b/gemfiles/activerecord_6.gemfile @@ -7,22 +7,16 @@ gem "activerecord", ">= 6.0.0", require: "active_record" gem "actionpack", ">= 6.0.0" gem "activemodel", ">= 6.0.0" gem "railties", ">= 6.0.0" -gem "rspec-rails", github: "rspec/rspec-rails" -gem "rspec-core", github: "rspec/rspec-core" -gem "rspec-expectations", github: "rspec/rspec-expectations" -gem "rspec-mocks", github: "rspec/rspec-mocks" -gem "rspec-support", github: "rspec/rspec-support" group :test do - gem "appraisal" + gem "codeclimate-test-reporter", require: nil gem "coveralls", require: false + gem "database_cleaner", "~> 1.6.2" gem "its" - gem "pry", "< 0.13.0" - gem "byebug" - gem "pry-byebug", "< 3.8.0" gem "test-unit" - gem "database_cleaner", "~> 1.6.2" - gem "codeclimate-test-reporter", require: nil + gem "byebug" + gem "pry" + gem "pry-byebug" end gemspec path: "../" diff --git a/gemfiles/mongoid_5.gemfile b/gemfiles/mongoid_5.gemfile index d48f7f44..7380608e 100644 --- a/gemfiles/mongoid_5.gemfile +++ b/gemfiles/mongoid_5.gemfile @@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1" gem "bigdecimal", "1.4.2" group :test do - gem "appraisal" + gem "codeclimate-test-reporter", require: nil gem "coveralls", require: false + gem "database_cleaner", "~> 1.6.2" gem "its" - gem "pry", "< 0.13.0" - gem "byebug" - gem "pry-byebug", "< 3.8.0" gem "test-unit" - gem "database_cleaner", "~> 1.6.2" - gem "codeclimate-test-reporter", require: nil + gem "byebug" + gem "pry" + gem "pry-byebug" end gemspec path: "../" diff --git a/gemfiles/mongoid_6.gemfile b/gemfiles/mongoid_6.gemfile index 685d9bae..53c05461 100644 --- a/gemfiles/mongoid_6.gemfile +++ b/gemfiles/mongoid_6.gemfile @@ -6,15 +6,14 @@ gem "mongoid", "~> 6" gem "bson_ext", "1.5.1" group :test do - gem "appraisal" + gem "codeclimate-test-reporter", require: nil gem "coveralls", require: false + gem "database_cleaner", "~> 1.6.2" gem "its" - gem "pry", "< 0.13.0" - gem "byebug" - gem "pry-byebug", "< 3.8.0" gem "test-unit" - gem "database_cleaner", "~> 1.6.2" - gem "codeclimate-test-reporter", require: nil + gem "byebug" + gem "pry" + gem "pry-byebug" end gemspec path: "../" diff --git a/gemfiles/mongoid_7.gemfile b/gemfiles/mongoid_7.gemfile index 44ca4202..2b43a2f6 100644 --- a/gemfiles/mongoid_7.gemfile +++ b/gemfiles/mongoid_7.gemfile @@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1" gem "railties", "5.2.4.1" group :test do - gem "appraisal" + gem "codeclimate-test-reporter", require: nil gem "coveralls", require: false + gem "database_cleaner", "~> 1.6.2" gem "its" - gem "pry", "< 0.13.0" - gem "byebug" - gem "pry-byebug", "< 3.8.0" gem "test-unit" - gem "database_cleaner", "~> 1.6.2" - gem "codeclimate-test-reporter", require: nil + gem "byebug" + gem "pry" + gem "pry-byebug" end gemspec path: "../" diff --git a/rolify.gemspec b/rolify.gemspec index a1600c02..3a06f919 100644 --- a/rolify.gemspec +++ b/rolify.gemspec @@ -26,9 +26,10 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ['lib'] - s.required_ruby_version = '>= 2.3' + s.required_ruby_version = '>= 2.5' s.add_development_dependency 'ammeter', '~> 1.1' # Spec generator + s.add_development_dependency 'appraisal', '~> 2.0' s.add_development_dependency 'bundler', '~> 2.0' # packaging feature s.add_development_dependency 'rake', '~> 12.3' # Tasks manager s.add_development_dependency 'rspec-rails', '~> 3.8'