Skip to content

Commit

Permalink
add rails 5 and update rails 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
eitoball committed Aug 20, 2016
1 parent 36db9be commit cfcb74c
Show file tree
Hide file tree
Showing 26 changed files with 811 additions and 404 deletions.
19 changes: 15 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,23 @@ rvm:
- jruby
gemfile:
- gemfiles/active4.0.13.gemfile
- gemfiles/active4.1.15.gemfile
- gemfiles/active4.2.6.gemfile
- gemfiles/active4.1.16.gemfile
- gemfiles/active4.2.7.1.gemfile
- gemfiles/active5.0.0.1.gemfile
- gemfiles/rails4.0.13.gemfile
- gemfiles/rails4.1.15.gemfile
- gemfiles/rails4.2.6.gemfile
- gemfiles/rails4.1.16.gemfile
- gemfiles/rails4.2.7.1.gemfile
- gemfiles/rails5.0.0.1.gemfile
matrix:
exclude:
- rvm: 2.0
gemfile: gemfiles/active5.0.0.1.gemfile
- rvm: 2.1
gemfile: gemfiles/active5.0.0.1.gemfile
- rvm: 2.0
gemfile: gemfiles/rails5.0.0.1.gemfile
- rvm: 2.1
gemfile: gemfiles/rails5.0.0.1.gemfile
allow_failures:
- rvm: rbx-2
- rvm: jruby
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
['4.0.13', '4.1.15', '4.2.6'].each do |version_number|
['4.0.13', '4.1.16', '4.2.7.1', '5.0.0.1'].each do |version_number|
clean_number = version_number.gsub(/[<>~=]*/, '')

appraise "rails#{ clean_number }" do
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/active4.0.13.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "https://rubygems.org"

gem "coveralls", :require=>false
gem "coveralls", :require => false
gem "activesupport", "4.0.13"
gem "activerecord", "4.0.13"

gemspec :path=>"../"
gemspec :path => "../"
43 changes: 29 additions & 14 deletions gemfiles/active4.0.13.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../
specs:
comma (3.2.4)
activesupport (>= 4.0.0, < 5.0)
activesupport (>= 4.0.0, < 5.1)

GEM
remote: https://rubygems.org/
Expand All @@ -22,9 +22,10 @@ GEM
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
appraisal (0.4.1)
appraisal (1.0.3)
bundler
rake
thor (>= 0.14.0)
arel (4.0.2)
builder (3.1.4)
coveralls (0.8.14)
Expand All @@ -33,21 +34,33 @@ GEM
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
diff-lcs (1.1.3)
diff-lcs (1.2.5)
docile (1.1.5)
i18n (0.7.0)
json (2.0.1)
minitest (4.7.5)
multi_json (1.12.1)
rake (10.5.0)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.8.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-activemodel-mocks (1.0.3)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand All @@ -67,12 +80,14 @@ PLATFORMS
DEPENDENCIES
activerecord (= 4.0.13)
activesupport (= 4.0.13)
appraisal (~> 0.4.1)
appraisal (~> 1.0.0)
comma!
coveralls
rake (~> 10.5.0)
rspec (~> 2.8.0)
rspec (~> 3.5.0)
rspec-activemodel-mocks
rspec-its
sqlite3 (~> 1.3.11)

BUNDLED WITH
1.12.5
1.11.2
9 changes: 0 additions & 9 deletions gemfiles/active4.1.15.gemfile

This file was deleted.

76 changes: 0 additions & 76 deletions gemfiles/active4.1.15.gemfile.lock

This file was deleted.

9 changes: 9 additions & 0 deletions gemfiles/active4.1.16.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "coveralls", :require => false
gem "activesupport", "4.1.16"
gem "activerecord", "4.1.16"

gemspec :path => "../"
91 changes: 91 additions & 0 deletions gemfiles/active4.1.16.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
PATH
remote: ../
specs:
comma (3.2.4)
activesupport (>= 4.0.0, < 5.1)

GEM
remote: https://rubygems.org/
specs:
activemodel (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
activerecord (4.1.16)
activemodel (= 4.1.16)
activesupport (= 4.1.16)
arel (~> 5.0.0)
activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
appraisal (1.0.3)
bundler
rake
thor (>= 0.14.0)
arel (5.0.1.20140414130214)
builder (3.2.2)
coveralls (0.8.15)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (>= 1.6.0, < 2)
diff-lcs (1.2.5)
docile (1.1.5)
i18n (0.7.0)
json (1.8.3)
minitest (5.9.0)
rake (10.5.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-activemodel-mocks (1.0.3)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sqlite3 (1.3.11)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tins (1.12.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
activerecord (= 4.1.16)
activesupport (= 4.1.16)
appraisal (~> 1.0.0)
comma!
coveralls
rake (~> 10.5.0)
rspec (~> 3.5.0)
rspec-activemodel-mocks
rspec-its
sqlite3 (~> 1.3.11)

BUNDLED WITH
1.11.2
9 changes: 0 additions & 9 deletions gemfiles/active4.2.6.gemfile

This file was deleted.

Loading

0 comments on commit cfcb74c

Please sign in to comment.