Skip to content

Commit 25e5b4a

Browse files
committed
Use Appraisal to test both Rails 4.0 and 4.1
1 parent 8f63473 commit 25e5b4a

File tree

6 files changed

+147
-3
lines changed

6 files changed

+147
-3
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.rvmrc
88
.yardoc
99
/.emacs.desktop
10+
/gemfiles/*.lock
1011
/rails_admin.gems
1112
/spec/generators/tmp
1213
/spec/lib/tmp

.travis.yml

+17-3
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,41 @@ bundler_args: --without development
33
rvm:
44
- 1.9.3
55
- 2.0.0
6-
- 2.1.0
6+
- 2.1.1
77
- rbx-2
88
- ruby-head
9+
gemfile:
10+
- gemfiles/rails_4_1.gemfile
911
env:
1012
- CI_ORM=mongoid
1113
- CI_ORM=active_record CI_DB_ADAPTER=sqlite3
1214
language: ruby
1315
matrix:
1416
include:
15-
- rvm: 2.1.0
17+
- rvm: 2.1.1
1618
env: CI_ORM=active_record CI_DB_ADAPTER=mysql2
17-
- rvm: 2.1.0
19+
gemfile: gemfiles/rails_4_1.gemfile
20+
- rvm: 2.1.1
1821
env: CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres
22+
gemfile: gemfiles/rails_4_1.gemfile
23+
- rvm: 2.1.1
24+
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
25+
gemfile: gemfiles/rails_4_0.gemfile
26+
- rvm: 2.1.1
27+
env: CI_ORM=mongoid
28+
gemfile: gemfiles/rails_4_0.gemfile
1929
- rvm: jruby-19mode
2030
env: CI_ORM=mongoid JRUBY_OPTS="$JRUBY_OPTS --debug"
31+
gemfile: gemfiles/rails_4_1.gemfile
2132
- rvm: jruby-19mode
2233
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3 JRUBY_OPTS="$JRUBY_OPTS --debug"
34+
gemfile: gemfiles/rails_4_1.gemfile
2335
- rvm: jruby-head
2436
env: CI_ORM=mongoid JRUBY_OPTS="$JRUBY_OPTS --debug"
37+
gemfile: gemfiles/rails_4_1.gemfile
2538
- rvm: jruby-head
2639
env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3 JRUBY_OPTS="$JRUBY_OPTS --debug"
40+
gemfile: gemfiles/rails_4_1.gemfile
2741
allow_failures:
2842
- rvm: jruby-head
2943
- rvm: rbx-2

Appraisals

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
appraise 'rails-4-0' do
2+
gem 'rails', '~> 4.0.0'
3+
end
4+
5+
appraise 'rails-4-1' do
6+
gem 'rails', '~> 4.1.0.rc1'
7+
gem 'mime-types', '~> 1.0'
8+
end

Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ group :mongoid do
3333
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
3434
end
3535

36+
group :development do
37+
gem 'appraisal', '~> 1.0.0.beta3'
38+
end
39+
3640
group :development, :test do
3741
gem 'pry', '>= 0.9'
3842
platforms :mri_19, :mri_20 do

gemfiles/rails_4_0.gemfile

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 4.0.0"
6+
7+
group :active_record do
8+
platforms :jruby do
9+
gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.beta1"
10+
gem "jdbc-sqlite3", ">= 3.7"
11+
end
12+
13+
platforms :ruby, :mswin, :mingw do
14+
gem "sqlite3", ">= 1.3"
15+
end
16+
end
17+
18+
group :mongoid do
19+
gem "mongoid", "~> 4.0.0.beta1"
20+
gem "mongoid-paperclip", ">= 0.0.8", :require=>"mongoid_paperclip"
21+
gem "carrierwave-mongoid", ">= 0.6.3", :require=>"carrierwave/mongoid"
22+
end
23+
24+
group :development do
25+
gem "appraisal", "~> 1.0.0.beta3"
26+
end
27+
28+
group :development, :test do
29+
gem "pry", ">= 0.9"
30+
31+
platforms :mri_19, :mri_20 do
32+
gem "pry-debugger", ">= 0.2"
33+
gem "pry-stack_explorer", ">= 0.4.9.1"
34+
end
35+
end
36+
37+
group :test do
38+
gem "cancan", ">= 1.6"
39+
gem "capybara", ">= 2.1"
40+
gem "carrierwave", ">= 0.8"
41+
gem "coveralls", :require=>false
42+
gem "database_cleaner", ">= 1.2"
43+
gem "devise", ">= 3.2"
44+
gem "dragonfly", "~> 1.0"
45+
gem "factory_girl", ">= 4.2"
46+
gem "generator_spec", ">= 0.8"
47+
gem "launchy", ">= 2.2"
48+
gem "mini_magick", ">= 3.4"
49+
gem "paperclip", "3.5.2"
50+
gem "poltergeist", "~> 1.5"
51+
gem "rack-cache", :require=>"rack/cache"
52+
gem "rspec-rails", ">= 2.14"
53+
gem "rubocop", ">= 0.19.0"
54+
gem "simplecov", :require=>false
55+
gem "timecop", ">= 0.5"
56+
end
57+
58+
gemspec :path=>".././"

gemfiles/rails_4_1.gemfile

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 4.1.0.rc1"
6+
gem "mime-types", "~> 1.0"
7+
8+
group :active_record do
9+
platforms :jruby do
10+
gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.beta1"
11+
gem "jdbc-sqlite3", ">= 3.7"
12+
end
13+
14+
platforms :ruby, :mswin, :mingw do
15+
gem "sqlite3", ">= 1.3"
16+
end
17+
end
18+
19+
group :mongoid do
20+
gem "mongoid", "~> 4.0.0.beta1"
21+
gem "mongoid-paperclip", ">= 0.0.8", :require=>"mongoid_paperclip"
22+
gem "carrierwave-mongoid", ">= 0.6.3", :require=>"carrierwave/mongoid"
23+
end
24+
25+
group :development do
26+
gem "appraisal", "~> 1.0.0.beta3"
27+
end
28+
29+
group :development, :test do
30+
gem "pry", ">= 0.9"
31+
32+
platforms :mri_19, :mri_20 do
33+
gem "pry-debugger", ">= 0.2"
34+
gem "pry-stack_explorer", ">= 0.4.9.1"
35+
end
36+
end
37+
38+
group :test do
39+
gem "cancan", ">= 1.6"
40+
gem "capybara", ">= 2.1"
41+
gem "carrierwave", ">= 0.8"
42+
gem "coveralls", :require=>false
43+
gem "database_cleaner", ">= 1.2"
44+
gem "devise", ">= 3.2"
45+
gem "dragonfly", "~> 1.0"
46+
gem "factory_girl", ">= 4.2"
47+
gem "generator_spec", ">= 0.8"
48+
gem "launchy", ">= 2.2"
49+
gem "mini_magick", ">= 3.4"
50+
gem "paperclip", "3.5.2"
51+
gem "poltergeist", "~> 1.5"
52+
gem "rack-cache", :require=>"rack/cache"
53+
gem "rspec-rails", ">= 2.14"
54+
gem "rubocop", ">= 0.19.0"
55+
gem "simplecov", :require=>false
56+
gem "timecop", ">= 0.5"
57+
end
58+
59+
gemspec :path=>".././"

0 commit comments

Comments
 (0)