Skip to content

Commit 2b4621f

Browse files
committed
Rails 5
1 parent afaef19 commit 2b4621f

9 files changed

Lines changed: 38 additions & 24 deletions

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
rvm:
22
- 1.9.3
33
- 2.0.0
4+
- 2.2.3
45
- ree
56
- jruby
67

@@ -9,10 +10,15 @@ gemfile:
910
- gemfiles/rails_4_0.gemfile
1011
- gemfiles/rails_4_1.gemfile
1112
- gemfiles/rails_4_2.gemfile
13+
- gemfiles/rails_5_0.gemfile
1214

1315
matrix:
1416
exclude:
1517
- rvm: ree
1618
gemfile: gemfiles/rails_4_0.gemfile
1719
gemfile: gemfiles/rails_4_1.gemfile
1820
gemfile: gemfiles/rails_4_2.gemfile
21+
- rvm: 1.9.3
22+
gemfile: gemfiles/rails_5_0.gemfile
23+
- rvm: 2.0.0
24+
gemfile: gemfiles/rails_5_0.gemfile

Appraisals

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,29 @@ appraise "rails_3_2" do
22
gem "activerecord", "~> 3.2.0"
33
gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
44
gem 'sqlite3', :platforms => :ruby
5-
gem 'database_cleaner', '1.0.1'
5+
gem 'test-unit', '~> 3.0'
66
end
77

88
appraise "rails_4_0" do
99
gem "activerecord", "~> 4.0.0"
1010
gem "activerecord-jdbcsqlite3-adapter", '1.3.0.rc1', :platforms=>:jruby
1111
gem 'sqlite3', :platforms => :ruby
12-
gem 'database_cleaner', '1.0.1'
1312
end
1413

1514
appraise "rails_4_1" do
1615
gem "activerecord", "~> 4.1"
1716
gem "activerecord-jdbcsqlite3-adapter", '1.3.0.rc1', :platforms=>:jruby
1817
gem 'sqlite3', :platforms => :ruby
19-
gem 'database_cleaner', '1.0.1'
2018
end
2119

2220
appraise "rails_4_2" do
2321
gem "activerecord", "~> 4.2"
2422
gem "activerecord-jdbcsqlite3-adapter", '1.3.0.rc1', :platforms=>:jruby
2523
gem 'sqlite3', :platforms => :ruby
26-
gem 'database_cleaner', '1.0.1'
24+
end
25+
26+
appraise "rails_5_0" do
27+
gem "activerecord", "~> 5.0"
28+
# gem "activerecord-jdbcsqlite3-adapter", '1.3.0.rc1', :platforms=>:jruby
29+
gem 'sqlite3', :platforms => :ruby
2730
end

gemfiles/rails_3_2.gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
source "https://rubygems.org"
44

5+
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
6+
gem "sqlite3", :platforms => :ruby
57
gem "activerecord", "~> 3.2.0"
6-
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
7-
gem "sqlite3", :platforms=>:ruby
8-
gem "database_cleaner", "1.0.1"
8+
gem "test-unit", "~> 3.0"
99

10-
gemspec :path=>"../"
10+
gemspec :path => "../"

gemfiles/rails_4_0.gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "activerecord", "~> 4.0.0"
6-
gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms=>:jruby
5+
gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms => :jruby
76
gem "sqlite3", :platforms => :ruby
8-
gem "database_cleaner", "1.0.1"
7+
gem "activerecord", "~> 4.0.0"
98

109
gemspec :path => "../"

gemfiles/rails_4_1.gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "activerecord", "~> 4.1"
6-
gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms=>:jruby
5+
gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms => :jruby
76
gem "sqlite3", :platforms => :ruby
8-
gem "database_cleaner", "1.0.1"
7+
gem "activerecord", "~> 4.1"
98

109
gemspec :path => "../"

gemfiles/rails_4_2.gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "activerecord", "~> 4.2"
6-
gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms=>:jruby
5+
gem "activerecord-jdbcsqlite3-adapter", "1.3.0.rc1", :platforms => :jruby
76
gem "sqlite3", :platforms => :ruby
8-
gem "database_cleaner", "1.0.1"
7+
gem "activerecord", "~> 4.2"
98

109
gemspec :path => "../"

gemfiles/rails_5_0.gemfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
6+
gem "sqlite3", :platforms => :ruby
7+
gem "activerecord", "~> 5.0"
8+
9+
gemspec :path => "../"

make_flaggable.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
1414
s.required_rubygems_version = ">= 1.3.6"
1515
s.rubyforge_project = "make_flaggable"
1616

17-
s.add_dependency "activerecord", ">= 3.0"
17+
s.add_dependency "activerecord", ">= 3.2"
18+
1819
s.add_development_dependency "bundler", ">= 1.0.0"
19-
s.add_development_dependency "rspec", "~>2.14.0"
20+
s.add_development_dependency "rspec", "~> 2.14.0"
2021
s.add_development_dependency "database_cleaner", "1.0.1"
2122
s.add_development_dependency "generator_spec", "~> 0.9.0"
2223
s.add_development_dependency "rake", ">= 0.9.2"

spec/spec_helper.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
ActiveRecord::Base.configurations = YAML::load_file(File.dirname(__FILE__) + '/database.yml')
1313
ActiveRecord::Base.establish_connection(ENV['DB'] || :sqlite3)
1414

15-
ActiveRecord::Base.silence(:stdout) do
16-
ActiveRecord::Migration.verbose = false
15+
ActiveRecord::Migration.verbose = false
1716

18-
load(File.dirname(__FILE__) + '/schema.rb')
19-
load(File.dirname(__FILE__) + '/models.rb')
20-
end
17+
load(File.dirname(__FILE__) + '/schema.rb')
18+
load(File.dirname(__FILE__) + '/models.rb')
2119

2220
RSpec.configure do |config|
2321
config.filter_run :focus => true

0 commit comments

Comments
 (0)