From 0f5ad3f9ee433a3ab0adb568440f705715b783a6 Mon Sep 17 00:00:00 2001 From: Kyrylo Silin Date: Mon, 4 Jul 2016 19:22:26 +0300 Subject: [PATCH] Appraisals: add rails-5 appraisal Rails 5 was released a few days ago. `rails-edge` is `rails-5.1.0.alpha` for the time being. --- Appraisals | 44 +++++++++++++++++++++++++------------ circle.yml | 1 + gemfiles/rack.gemfile | 2 +- gemfiles/rails_3.2.gemfile | 2 +- gemfiles/rails_4.0.gemfile | 2 +- gemfiles/rails_4.1.gemfile | 2 +- gemfiles/rails_4.2.gemfile | 2 +- gemfiles/rails_5.0.gemfile | 16 ++++++++++++++ gemfiles/rails_edge.gemfile | 10 ++++----- gemfiles/sinatra.gemfile | 4 ++-- 10 files changed, 59 insertions(+), 26 deletions(-) create mode 100644 gemfiles/rails_5.0.gemfile diff --git a/Appraisals b/Appraisals index d188f63e1..60c3faa91 100644 --- a/Appraisals +++ b/Appraisals @@ -6,7 +6,7 @@ appraise 'rails-3.2' do gem 'sqlite3', '~> 1.3.11', platforms: [:mri, :rbx] gem 'resque', '~> 1.25.2' - gem 'resque_spec', git: 'git@github.com:kyrylo/resque_spec.git' + gem 'resque_spec', github: 'airbrake/resque_spec' gem 'delayed_job_active_record', '~> 4.1.0' end @@ -19,7 +19,7 @@ appraise 'rails-4.0' do gem 'sqlite3', '~> 1.3.11', platforms: [:mri, :rbx] gem 'resque', '~> 1.25.2' - gem 'resque_spec', git: 'git@github.com:kyrylo/resque_spec.git' + gem 'resque_spec', github: 'airbrake/resque_spec' gem 'delayed_job_active_record', '~> 4.1.0' @@ -37,7 +37,7 @@ appraise 'rails-4.1' do gem 'sqlite3', '~> 1.3.11', platforms: [:mri, :rbx] gem 'resque', '~> 1.25.2' - gem 'resque_spec', git: 'git@github.com:kyrylo/resque_spec.git' + gem 'resque_spec', github: 'airbrake/resque_spec' gem 'delayed_job_active_record', '~> 4.1.0' @@ -55,7 +55,7 @@ appraise 'rails-4.2' do gem 'sqlite3', '~> 1.3.11', platforms: [:mri, :rbx] gem 'resque', '~> 1.25.2' - gem 'resque_spec', git: 'git@github.com:kyrylo/resque_spec.git' + gem 'resque_spec', github: 'airbrake/resque_spec' gem 'delayed_job_active_record', '~> 4.1.0' @@ -65,22 +65,38 @@ appraise 'rails-4.2' do end end -# Rails 5+ supports only Ruby 2.1+ -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0') +# Rails 5+ supports only modern Rubies (2.2.2+) +if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.2') + appraise 'rails-5.0' do + gem 'rails', '~> 5.0.0' + gem 'warden', '~> 1.2.6' + gem 'rack', '~> 2.0' + + gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.20', platforms: :jruby + gem 'sqlite3', '~> 1.3.11', platforms: [:mri, :rbx] + + gem 'resque', '~> 1.26' + gem 'resque_spec', github: 'airbrake/resque_spec' + + gem 'delayed_job_active_record', '~> 4.1.1' + + gem 'mime-types', '~> 3.1' + end + appraise 'rails-edge' do gem 'rails', github: 'rails/rails' gem 'arel', github: 'rails/arel' - gem 'rack', github: 'rack/rack' - gem 'warden', '~> 1.2.3' + gem 'rack', '~> 2.0' + gem 'warden', '~> 1.2.6' - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.18', platforms: :jruby + gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.20', platforms: :jruby gem 'sqlite3', '~> 1.3.11', platforms: [:mri, :rbx] - gem 'resque', '~> 1.25.2' + gem 'resque', '~> 1.6' # A temporary fork of https://github.com/leshill/resque_spec with # https://github.com/leshill/resque_spec/pull/88 merged in. This allows us # to test our Resque integration. - gem 'resque_spec', git: 'git@github.com:kyrylo/resque_spec.git' + gem 'resque_spec', github: 'airbrake/resque_spec' gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record' gem 'delayed_job', github: 'collectiveidea/delayed_job' @@ -88,11 +104,11 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0') end appraise 'sinatra' do - gem 'sinatra', '~> 1.4.6' + gem 'sinatra', '~> 1.4.7' gem 'rack-test', '~> 0.6.3' - gem 'warden', '~> 1.2.3' + gem 'warden', '~> 1.2.6' end appraise 'rack' do - gem 'warden', '~> 1.2.3' + gem 'warden', '~> 1.2.6' end diff --git a/circle.yml b/circle.yml index e31354b4a..f2b3284df 100644 --- a/circle.yml +++ b/circle.yml @@ -69,6 +69,7 @@ test: rvm-exec 2.3.0 bundle exec appraisal rails-4.0 rake spec:integration:rails rvm-exec 2.3.0 bundle exec appraisal rails-4.1 rake spec:integration:rails rvm-exec 2.3.0 bundle exec appraisal rails-4.2 rake spec:integration:rails + rvm-exec 2.3.0 bundle exec appraisal rails-5.0 rake spec:integration:rails rvm-exec 2.3.0 bundle exec appraisal rails-edge rake spec:integration:rails rvm-exec 2.3.0 bundle exec appraisal sinatra rake spec:integration:sinatra diff --git a/gemfiles/rack.gemfile b/gemfiles/rack.gemfile index 2ff4ed4c4..6819f51df 100644 --- a/gemfiles/rack.gemfile +++ b/gemfiles/rack.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "rubocop", "~> 0.40", :require => false -gem "warden", "~> 1.2.3" +gem "warden", "~> 1.2.6" gemspec :path => "../" diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index 9e70a13dc..f4fd0a1a0 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -8,7 +8,7 @@ gem "warden", "~> 1.2.3" gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.18", :platforms => :jruby gem "sqlite3", "~> 1.3.11", :platforms => [:mri, :rbx] gem "resque", "~> 1.25.2" -gem "resque_spec", :git => "git@github.com:kyrylo/resque_spec.git" +gem "resque_spec", :github => "airbrake/resque_spec" gem "delayed_job_active_record", "~> 4.1.0" gemspec :path => "../" diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index 6a63d31f2..7c4590812 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -8,7 +8,7 @@ gem "warden", "~> 1.2.3" gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.18", :platforms => :jruby gem "sqlite3", "~> 1.3.11", :platforms => [:mri, :rbx] gem "resque", "~> 1.25.2" -gem "resque_spec", :git => "git@github.com:kyrylo/resque_spec.git" +gem "resque_spec", :github => "airbrake/resque_spec" gem "delayed_job_active_record", "~> 4.1.0" gemspec :path => "../" diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile index cd0e65e91..f9741d81e 100644 --- a/gemfiles/rails_4.1.gemfile +++ b/gemfiles/rails_4.1.gemfile @@ -8,7 +8,7 @@ gem "warden", "~> 1.2.3" gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.18", :platforms => :jruby gem "sqlite3", "~> 1.3.11", :platforms => [:mri, :rbx] gem "resque", "~> 1.25.2" -gem "resque_spec", :git => "git@github.com:kyrylo/resque_spec.git" +gem "resque_spec", :github => "airbrake/resque_spec" gem "delayed_job_active_record", "~> 4.1.0" gemspec :path => "../" diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 9e561aa10..b2a6e5eb7 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -8,7 +8,7 @@ gem "warden", "~> 1.2.3" gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.18", :platforms => :jruby gem "sqlite3", "~> 1.3.11", :platforms => [:mri, :rbx] gem "resque", "~> 1.25.2" -gem "resque_spec", :git => "git@github.com:kyrylo/resque_spec.git" +gem "resque_spec", :github => "airbrake/resque_spec" gem "delayed_job_active_record", "~> 4.1.0" gemspec :path => "../" diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile new file mode 100644 index 000000000..8e1b4afb0 --- /dev/null +++ b/gemfiles/rails_5.0.gemfile @@ -0,0 +1,16 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rubocop", "~> 0.40", :require => false +gem "rails", "~> 5.0.0" +gem "warden", "~> 1.2.6" +gem "rack", "~> 2.0" +gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.20", :platforms => :jruby +gem "sqlite3", "~> 1.3.11", :platforms => [:mri, :rbx] +gem "resque", "~> 1.26" +gem "resque_spec", :github => "airbrake/resque_spec" +gem "delayed_job_active_record", "~> 4.1.1" +gem "mime-types", "~> 3.1" + +gemspec :path => "../" diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 9729bd8f2..9e560e77d 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -5,12 +5,12 @@ source "https://rubygems.org" gem "rubocop", "~> 0.40", :require => false gem "rails", :github => "rails/rails" gem "arel", :github => "rails/arel" -gem "rack", :github => "rack/rack" -gem "warden", "~> 1.2.3" -gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.18", :platforms => :jruby +gem "rack", "~> 2.0" +gem "warden", "~> 1.2.6" +gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.20", :platforms => :jruby gem "sqlite3", "~> 1.3.11", :platforms => [:mri, :rbx] -gem "resque", "~> 1.25.2" -gem "resque_spec", :git => "git@github.com:kyrylo/resque_spec.git" +gem "resque", "~> 1.6" +gem "resque_spec", :github => "airbrake/resque_spec" gem "delayed_job_active_record", :github => "collectiveidea/delayed_job_active_record" gem "delayed_job", :github => "collectiveidea/delayed_job" diff --git a/gemfiles/sinatra.gemfile b/gemfiles/sinatra.gemfile index 14d529da8..7c0faf5b6 100644 --- a/gemfiles/sinatra.gemfile +++ b/gemfiles/sinatra.gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" gem "rubocop", "~> 0.40", :require => false -gem "sinatra", "~> 1.4.6" +gem "sinatra", "~> 1.4.7" gem "rack-test", "~> 0.6.3" -gem "warden", "~> 1.2.3" +gem "warden", "~> 1.2.6" gemspec :path => "../"