Skip to content

Commit

Permalink
Appraisals: add rails-5 appraisal
Browse files Browse the repository at this point in the history
Rails 5 was released a few days ago.
`rails-edge` is `rails-5.1.0.alpha` for the time being.
  • Loading branch information
kyrylo committed Jul 8, 2016
1 parent 8d91aa7 commit 0f5ad3f
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 26 deletions.
44 changes: 30 additions & 14 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand All @@ -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'

Expand All @@ -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'

Expand All @@ -65,34 +65,50 @@ 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'
end
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
1 change: 1 addition & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rack.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_3.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "../"
16 changes: 16 additions & 0 deletions gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
@@ -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 => "../"
10 changes: 5 additions & 5 deletions gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/sinatra.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "../"

0 comments on commit 0f5ad3f

Please sign in to comment.