From 6583ba2047283309738549eb3588efa81c259c7d Mon Sep 17 00:00:00 2001 From: Yoshiyuki Hirano Date: Sun, 8 Apr 2018 13:45:48 +0900 Subject: [PATCH] Update Appraisal --- .gitignore | 1 + .rubocop.yml | 2 ++ .travis.yml | 8 ++++--- Appraisals | 17 +++++++-------- Gemfile | 13 +++++++----- active_admin_role.gemspec | 3 ++- gemfiles/.bundle/config | 2 -- gemfiles/{rails42.gemfile => 5.0.gemfile} | 16 +++++++------- gemfiles/{rails50.gemfile => 5.1.gemfile} | 17 +++++++-------- gemfiles/5.2.gemfile | 26 +++++++++++++++++++++++ 10 files changed, 68 insertions(+), 37 deletions(-) delete mode 100644 gemfiles/.bundle/config rename gemfiles/{rails42.gemfile => 5.0.gemfile} (63%) rename gemfiles/{rails50.gemfile => 5.1.gemfile} (52%) create mode 100644 gemfiles/5.2.gemfile diff --git a/.gitignore b/.gitignore index ace75cd..1fa8ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ /spec/reports/ /tmp/ /gemfiles/*.gemfile.lock +/gemfiles/.bundle/* /gemfiles/vendor/ diff --git a/.rubocop.yml b/.rubocop.yml index 84709ee..a6746c2 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,3 +15,5 @@ AllCops: Exclude: - "spec/rails/**/*" - "vendor/bundle/**/*" + - "gemfiles/vendor/**/*" + - "gemfiles/.bundle/**/*" diff --git a/.travis.yml b/.travis.yml index d21e960..f2dc374 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ language: ruby - before_install: - gem update --system - gem install bundler - +gemfiles: + - gemfiles/5.0.gemfile + - gemfiles/5.1.gemfile + - gemfiles/5.2.gemfile rvm: - 2.3.7 - 2.4.4 - + - 2.5.1 script: - bundle exec rspec diff --git a/Appraisals b/Appraisals index 8ca3584..d6fb59e 100644 --- a/Appraisals +++ b/Appraisals @@ -1,12 +1,11 @@ -appraise "rails42" do - gem "rails", "~> 4.2.0" - gem "devise", "~> 4.2.0" - gem "activeadmin", "1.0.0.pre4" +appraise "5.0" do + gem "rails", "~> 5.0.0" end -appraise "rails50" do - gem "rails", "~> 5.0.0" - gem "devise", "~> 4.2.0" - gem "inherited_resources", github: "activeadmin/inherited_resources" - gem "activeadmin", github: "activeadmin/activeadmin" +appraise "5.1" do + gem "rails", "~> 5.1.0" +end + +appraise "5.2" do + gem "rails", "~> 5.2.0.rc2" end diff --git a/Gemfile b/Gemfile index 7e6ffb6..06ca45b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,16 +1,20 @@ source "https://rubygems.org" +git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } + gemspec -gem "activeadmin", "1.0.0.pre4" gem "appraisal" -gem "devise", "~> 4.2.0" +gem "devise" gem "jquery-ui-rails", "~> 4.2.1" -gem "rails", "~> 4.2.0" +gem "rails", ">= 5.0.0" + +group :development, :test do + gem "sqlite3", platforms: :mri +end group :development do gem "onkcop", require: false - gem "rake", "~> 10.0" end group :test do @@ -19,5 +23,4 @@ group :test do gem "poltergeist" gem "rspec-rails" gem "shoulda-matchers" - gem "sqlite3", platforms: :mri end diff --git a/active_admin_role.gemspec b/active_admin_role.gemspec index 2a0f834..8918779 100644 --- a/active_admin_role.gemspec +++ b/active_admin_role.gemspec @@ -16,6 +16,7 @@ Gem::Specification.new do |gem| gem.required_ruby_version = ">= 2.1.0" - gem.add_dependency "activeadmin", ">= 1.0.0.pre4" + gem.add_dependency "activeadmin", ">= 1.2.0" gem.add_dependency "cancancan", ">= 1.15.0" + gem.add_dependency "railties", ">= 5.0.0" end diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config deleted file mode 100644 index 9c61b5c..0000000 --- a/gemfiles/.bundle/config +++ /dev/null @@ -1,2 +0,0 @@ ---- -BUNDLE_DISABLE_SHARED_GEMS: "true" diff --git a/gemfiles/rails42.gemfile b/gemfiles/5.0.gemfile similarity index 63% rename from gemfiles/rails42.gemfile rename to gemfiles/5.0.gemfile index f8c460d..5d63d58 100644 --- a/gemfiles/rails42.gemfile +++ b/gemfiles/5.0.gemfile @@ -2,16 +2,17 @@ source "https://rubygems.org" -gem "activeadmin", "1.0.0.pre4" gem "appraisal" -gem "devise", "~> 4.2.0" -gem "pry" -gem "rails", "~> 4.2.0" +gem "devise" +gem "jquery-ui-rails", "~> 4.2.1" +gem "rails", "~> 5.0.0" + +group :development, :test do + gem "sqlite3", platforms: :mri +end group :development do - gem "bundler", "~> 1.13.0" - gem "rake", "~> 10.0" - gem "rubocop", "~> 0.40.0" + gem "onkcop", require: false end group :test do @@ -20,7 +21,6 @@ group :test do gem "poltergeist" gem "rspec-rails" gem "shoulda-matchers" - gem "sqlite3", platforms: :mri end gemspec path: "../" diff --git a/gemfiles/rails50.gemfile b/gemfiles/5.1.gemfile similarity index 52% rename from gemfiles/rails50.gemfile rename to gemfiles/5.1.gemfile index 7e0eed2..9815bb7 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/5.1.gemfile @@ -2,17 +2,17 @@ source "https://rubygems.org" -gem "activeadmin", github: "activeadmin/activeadmin" gem "appraisal" -gem "devise", "~> 4.2.0" -gem "inherited_resources", github: "activeadmin/inherited_resources" -gem "pry" -gem "rails", "~> 5.0.0" +gem "devise" +gem "jquery-ui-rails", "~> 4.2.1" +gem "rails", "~> 5.1.0" + +group :development, :test do + gem "sqlite3", platforms: :mri +end group :development do - gem "bundler", "~> 1.13.0" - gem "rake", "~> 10.0" - gem "rubocop", "~> 0.40.0" + gem "onkcop", require: false end group :test do @@ -21,7 +21,6 @@ group :test do gem "poltergeist" gem "rspec-rails" gem "shoulda-matchers" - gem "sqlite3", platforms: :mri end gemspec path: "../" diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile new file mode 100644 index 0000000..bd7f3a0 --- /dev/null +++ b/gemfiles/5.2.gemfile @@ -0,0 +1,26 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "devise" +gem "jquery-ui-rails", "~> 4.2.1" +gem "rails", "~> 5.2.0.rc2" + +group :development, :test do + gem "sqlite3", platforms: :mri +end + +group :development do + gem "onkcop", require: false +end + +group :test do + gem "capybara" + gem "database_cleaner" + gem "poltergeist" + gem "rspec-rails" + gem "shoulda-matchers" +end + +gemspec path: "../"