Skip to content

Commit

Permalink
Merge pull request #110 from spdawson/rails-5.2-support
Browse files Browse the repository at this point in the history
Rails 5.2 support
  • Loading branch information
eitoball authored Apr 11, 2018
2 parents 3bac94c + 71ebd50 commit 5ae979a
Show file tree
Hide file tree
Showing 34 changed files with 374 additions and 65 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,26 @@ gemfile:
- gemfiles/active4.2.8.gemfile
- gemfiles/active5.0.1.gemfile
- gemfiles/active5.1.0.gemfile
- gemfiles/active5.2.0.gemfile
- gemfiles/rails4.1.16.gemfile
- gemfiles/rails4.2.8.gemfile
- gemfiles/rails5.0.1.gemfile
- gemfiles/rails5.1.0.gemfile
- gemfiles/rails5.2.0.gemfile
matrix:
exclude:
- rvm: 2.1.10
gemfile: gemfiles/active5.0.1.gemfile
- rvm: 2.1.10
gemfile: gemfiles/active5.1.0.gemfile
- rvm: 2.1.10
gemfile: gemfiles/active5.2.0.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails5.0.1.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails5.1.0.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails5.2.0.gemfile
- rvm: 2.4.1
gemfile: gemfiles/active4.1.16.gemfile
- rvm: 2.4.1
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
['4.1.16', '4.2.8', '5.0.1', '5.1.0'].each do |version_number|
['4.1.16', '4.2.8', '5.0.1', '5.1.0', '5.2.0'].each do |version_number|
clean_number = version_number.gsub(/[<>~=]*/, '')

appraise "rails#{clean_number}" do
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -30,7 +30,7 @@ GEM
diff-lcs (1.2.5)
docile (1.1.5)
i18n (0.7.0)
json (1.8.2)
json (1.8.6)
mime-types (1.25.1)
minitest (5.9.0)
multi_json (1.1.0)
Expand Down
6 changes: 2 additions & 4 deletions comma.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# -*- encoding: utf-8 -*-

$:.push File.expand_path("../lib", __FILE__)
$:.push File.expand_path("lib", __dir__)
require "comma/version"

Gem::Specification.new do |s|
Expand All @@ -20,7 +18,7 @@ Gem::Specification.new do |s|

s.licenses = ['MIT']

s.add_dependency 'activesupport', ['>= 4.0.0', '< 5.2']
s.add_dependency 'activesupport', ['>= 4.0.0', '< 6']

s.add_development_dependency 'appraisal', ['~> 1.0.0']
s.add_development_dependency 'rake', ['~> 10.5.0']
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/active4.1.16.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -36,7 +36,7 @@ GEM
diff-lcs (1.2.5)
docile (1.1.5)
i18n (0.7.0)
json (1.8.3)
json (1.8.6)
minitest (5.9.0)
parser (2.4.0.0)
ast (~> 2.2)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/active4.2.8.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/active5.0.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/active5.1.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down
10 changes: 10 additions & 0 deletions gemfiles/active5.2.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "coveralls", :require => false
gem "rubocop", :require => false
gem "activesupport", "5.2.0"
gem "activerecord", "5.2.0"

gemspec :path => "../"
106 changes: 106 additions & 0 deletions gemfiles/active5.2.0.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
specs:
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
appraisal (1.0.3)
bundler
rake
thor (>= 0.14.0)
arel (9.0.0)
ast (2.4.0)
concurrent-ruby (1.0.5)
coveralls (0.8.21)
json (>= 1.8, < 3)
simplecov (~> 0.14.1)
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
diff-lcs (1.3)
docile (1.1.5)
i18n (1.0.0)
concurrent-ruby (~> 1.0)
json (2.1.0)
minitest (5.11.3)
parallel (1.12.1)
parser (2.5.0.5)
ast (~> 2.4.0)
powerpack (0.1.1)
rainbow (3.0.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.4)
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)
rubocop (0.54.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sqlite3 (1.3.13)
term-ansicolor (1.6.0)
tins (~> 1.0)
thor (0.19.4)
thread_safe (0.3.6)
tins (1.16.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)

PLATFORMS
ruby

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

BUNDLED WITH
1.16.0
31 changes: 15 additions & 16 deletions gemfiles/rails4.1.16.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -39,8 +39,8 @@ GEM
thor (>= 0.14.0)
arel (5.0.1.20140414130214)
ast (2.3.0)
builder (3.2.2)
concurrent-ruby (1.0.2)
builder (3.2.3)
concurrent-ruby (1.0.5)
coveralls (0.8.15)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
Expand All @@ -50,14 +50,13 @@ GEM
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
i18n (0.7.0)
json (1.8.3)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
minitest (5.9.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (1.8.6)
mail (2.7.0)
mini_mime (>= 0.1.1)
mini_mime (1.0.0)
minitest (5.11.3)
parser (2.4.0.0)
ast (~> 2.2)
power_assert (0.3.0)
Expand Down Expand Up @@ -123,7 +122,7 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sprockets (3.7.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
Expand All @@ -135,10 +134,10 @@ GEM
tins (~> 1.0)
test-unit (3.2.1)
power_assert
thor (0.19.1)
thread_safe (0.3.5)
thor (0.19.4)
thread_safe (0.3.6)
tins (1.12.0)
tzinfo (1.2.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.2.1)

Expand All @@ -160,4 +159,4 @@ DEPENDENCIES
test-unit

BUNDLED WITH
1.14.6
1.16.0
2 changes: 1 addition & 1 deletion gemfiles/rails4.2.8.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails5.0.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails5.1.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.1.0)
activesupport (>= 4.0.0, < 5.2)
activesupport (>= 4.0.0, < 6)

GEM
remote: https://rubygems.org/
Expand Down
11 changes: 11 additions & 0 deletions gemfiles/rails5.2.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "coveralls", :require => false
gem "rubocop", :require => false
gem "rails", "5.2.0"
gem "rspec-rails"
gem "test-unit"

gemspec :path => "../"
Loading

0 comments on commit 5ae979a

Please sign in to comment.