Skip to content

Commit

Permalink
Merge pull request #131 from comma-csv/pr-128
Browse files Browse the repository at this point in the history
Add rails 7.0.0 alpha2 and update gems (was #128)
  • Loading branch information
eitoball authored Nov 13, 2021
2 parents 2f67463 + 8ac1036 commit 0e2a6c1
Show file tree
Hide file tree
Showing 16 changed files with 427 additions and 32 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on: [push, pull_request]
jobs:
build:
strategy:
fail-fast: true
matrix:
ruby: ['2.5', '2.6', '2.7', '3.0']
gemfile: ['active6.0.3.6', 'active6.1.3.1', 'rails6.0.3.6', 'rails6.1.3.1']
Expand All @@ -20,6 +19,14 @@ jobs:
gemfile: rails5.2.5
- ruby: 2.7
gemfile: rails5.2.5
- ruby: 2.7
gemfile: active7.0.0
- ruby: 3.0
gemfile: active7.0.0
- ruby: 2.7
gemfile: rails7.0.0
- ruby: 3.0
gemfile: rails7.0.0
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
Expand All @@ -34,5 +41,7 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
cache-version: 1
- run: bundle install --jobs 2 --retry 3
- run: bundle exec rubocop -P
- run: bundle exec rspec -f d spec
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ gemfile:
- gemfiles/rails5.2.4.3.gemfile
- gemfiles/rails6.0.3.1.gemfile
- gemfiles/rails6.1.0.gemfile
- gemfiles/railsedge.gemfile
matrix:
exclude:
- rvm: 2.4.10
Expand All @@ -30,6 +31,10 @@ matrix:
gemfile: gemfiles/rails6.0.3.1.gemfile
- rvm: 2.4.10
gemfile: gemfiles/rails6.1.0.gemfile
- rvm: 2.4.10
gemfile: gemfiles/railsedge.gemfile
- rvm: 2.5.8
gemfile: gemfiles/railsedge.gemfile
fast_finish: true
before_install:
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
Expand Down
12 changes: 12 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,15 @@ appraise 'active6.1.3.1' do
gem 'activesupport', '6.1.3.1'
gem 'activerecord', '6.1.3.1'
end

appraise 'rails7.0.0' do
gem 'rails', '~> 7.0.0.alpha2'
gem 'rspec-rails'
gem 'activesupport', '~> 7.0.0.alpha2'
gem 'activerecord', '~> 7.0.0.alpha2'
end

appraise 'active7.0.0' do
gem 'activesupport', '~> 7.0.0.alpha2'
gem 'activerecord', '~> 7.0.0.alpha2'
end
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -41,7 +41,7 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
minitest (5.14.1)
minitest (5.14.4)
multi_json (1.1.0)
netrc (0.11.0)
parallel (1.17.0)
Expand Down Expand Up @@ -108,6 +108,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand All @@ -117,4 +118,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.17.3
2.1.4
3 changes: 2 additions & 1 deletion comma.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ Gem::Specification.new do |s|

s.licenses = ['MIT']

s.add_dependency 'activesupport', ['>= 4.2.0', '< 6.2']
s.add_dependency 'activesupport', '>= 4.2.0'

s.add_development_dependency 'appraisal', ['~> 1.0.0']
s.add_development_dependency 'minitest', '5.14.4'
s.add_development_dependency 'rake', '~> 13.0.1'
s.add_development_dependency 'rspec', ['~> 3.5.0']
s.add_development_dependency 'rspec-activemodel-mocks'
Expand Down
7 changes: 4 additions & 3 deletions gemfiles/active5.2.5.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -41,7 +41,7 @@ GEM
parallel (1.21.0)
parser (3.0.2.0)
ast (~> 2.4.1)
psych (4.0.2)
psych (3.3.0)
rainbow (3.0.0)
rake (13.0.6)
rspec (3.5.0)
Expand Down Expand Up @@ -101,6 +101,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand All @@ -110,4 +111,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.17.3
2.1.4
7 changes: 4 additions & 3 deletions gemfiles/active6.0.3.6.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -40,7 +40,7 @@ GEM
parallel (1.21.0)
parser (3.0.2.0)
ast (~> 2.4.1)
psych (4.0.2)
psych (3.3.0)
rainbow (3.0.0)
rake (13.0.6)
rspec (3.5.0)
Expand Down Expand Up @@ -101,6 +101,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand All @@ -110,4 +111,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.17.3
2.1.4
7 changes: 4 additions & 3 deletions gemfiles/active6.1.3.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -40,7 +40,7 @@ GEM
parallel (1.21.0)
parser (3.0.2.0)
ast (~> 2.4.1)
psych (4.0.2)
psych (3.3.0)
rainbow (3.0.0)
rake (13.0.6)
rspec (3.5.0)
Expand Down Expand Up @@ -100,6 +100,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
Expand All @@ -109,4 +110,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.17.3
2.1.4
12 changes: 12 additions & 0 deletions gemfiles/active7.0.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "coveralls", :require => false
gem "rubocop", "~> 0.67.2", :require => false
gem "rubocop-performance", :require => false
gem "sqlite3"
gem "activesupport", "~> 7.0.0.alpha2"
gem "activerecord", "~> 7.0.0.alpha2"

gemspec :path => "../"
111 changes: 111 additions & 0 deletions gemfiles/active7.0.0.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
specs:
activemodel (7.0.0.alpha2)
activesupport (= 7.0.0.alpha2)
activerecord (7.0.0.alpha2)
activemodel (= 7.0.0.alpha2)
activesupport (= 7.0.0.alpha2)
activesupport (7.0.0.alpha2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
appraisal (1.0.3)
bundler
rake
thor (>= 0.14.0)
ast (2.4.2)
concurrent-ruby (1.1.9)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
diff-lcs (1.4.4)
docile (1.4.0)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.6.1)
minitest (5.14.4)
parallel (1.21.0)
parser (3.0.2.0)
ast (~> 2.4.1)
psych (3.3.0)
rainbow (3.0.0)
rake (13.0.6)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-activemodel-mocks (1.1.0)
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.3.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.67.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
ruby-progressbar (1.11.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sqlite3 (1.4.2)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.1.0)
tins (1.29.1)
sync
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (1.5.0)

PLATFORMS
ruby

DEPENDENCIES
activerecord (~> 7.0.0.alpha2)
activesupport (~> 7.0.0.alpha2)
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rake (~> 13.0.1)
rspec (~> 3.5.0)
rspec-activemodel-mocks
rspec-its
rubocop (~> 0.67.2)
rubocop-performance
sqlite3

BUNDLED WITH
2.1.4
7 changes: 4 additions & 3 deletions gemfiles/rails5.2.5.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -90,7 +90,7 @@ GEM
parser (3.0.2.0)
ast (~> 2.4.1)
power_assert (2.0.1)
psych (4.0.2)
psych (3.3.0)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
Expand Down Expand Up @@ -196,6 +196,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rails (= 5.2.5)
rake (~> 13.0.1)
rspec (~> 3.5.0)
Expand All @@ -209,4 +210,4 @@ DEPENDENCIES
test-unit

BUNDLED WITH
1.17.3
2.1.4
7 changes: 4 additions & 3 deletions gemfiles/rails6.0.3.6.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
comma (4.5.0)
activesupport (>= 4.2.0, < 6.2)
activesupport (>= 4.2.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -103,7 +103,7 @@ GEM
parser (3.0.2.0)
ast (~> 2.4.1)
power_assert (2.0.1)
psych (4.0.2)
psych (3.3.0)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
Expand Down Expand Up @@ -212,6 +212,7 @@ DEPENDENCIES
appraisal (~> 1.0.0)
comma!
coveralls
minitest (= 5.14.4)
rails (= 6.0.3.6)
rake (~> 13.0.1)
rspec (~> 3.5.0)
Expand All @@ -224,4 +225,4 @@ DEPENDENCIES
test-unit

BUNDLED WITH
1.17.3
2.1.4
Loading

0 comments on commit 0e2a6c1

Please sign in to comment.