Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add appraisal for Rails 6.1 and bump version #15

Merged
merged 1 commit into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ jobs:
ruby:
- 2.5.x
- 2.6.x
- 2.7.x
activerecord:
- 5.1.5
- 5.2.0
- 6.0.0
- 6.1.0
strategy:
- array
- ltree
Expand All @@ -25,7 +27,7 @@ jobs:

services:
postgres:
image: postgres:12.2
image: postgres:12.4
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand Down Expand Up @@ -56,8 +58,8 @@ jobs:

- name: Configure Bundler
run: |
gem install bundler -v 1.17.3 --no-document
bundle config path 'vendor/bundle'
gem install bundler:2.1.4 --no-document
bundle config set path 'vendor/bundle'
bundle install --jobs 4 --retry 3

- name: Run tests with RSpec
Expand Down
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 2.7.2
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ end
appraise 'activerecord-6.0.0' do
gem 'activerecord', '6.0.0'
end

appraise 'activerecord-6.1.0' do
gem 'activerecord', '6.0.0'
end
10 changes: 5 additions & 5 deletions gemfiles/activerecord_5.1.5.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
parentry (1.3.0)
activerecord (>= 5.1, < 6.1)
activerecord (>= 5.1, < 6.2)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -52,7 +52,7 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.1.0)
json (2.3.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand Down Expand Up @@ -118,7 +118,7 @@ GEM
simplecov-html (0.10.2)
thor (0.20.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.8)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)

Expand All @@ -128,7 +128,7 @@ PLATFORMS
DEPENDENCIES
activerecord (= 5.1.5)
appraisal
bundler (~> 1.17)
bundler (~> 2.1)
combustion (~> 1.1)
database_cleaner (~> 1.6)
parentry!
Expand All @@ -140,4 +140,4 @@ DEPENDENCIES
simplecov (~> 0.16)

BUNDLED WITH
1.17.3
2.1.4
10 changes: 5 additions & 5 deletions gemfiles/activerecord_5.2.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
parentry (1.3.0)
activerecord (>= 5.1, < 6.1)
activerecord (>= 5.1, < 6.2)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -52,7 +52,7 @@ GEM
i18n (1.0.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.1.0)
json (2.3.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand Down Expand Up @@ -118,7 +118,7 @@ GEM
simplecov-html (0.10.2)
thor (0.20.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.8)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)

Expand All @@ -128,7 +128,7 @@ PLATFORMS
DEPENDENCIES
activerecord (= 5.2.0)
appraisal
bundler (~> 1.17)
bundler (~> 2.1)
combustion (~> 1.1)
database_cleaner (~> 1.6)
parentry!
Expand All @@ -140,4 +140,4 @@ DEPENDENCIES
simplecov (~> 0.16)

BUNDLED WITH
1.17.3
2.1.4
10 changes: 5 additions & 5 deletions gemfiles/activerecord_6.0.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
parentry (1.3.0)
activerecord (>= 5.1, < 6.1)
activerecord (>= 5.1, < 6.2)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -51,7 +51,7 @@ GEM
i18n (1.6.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.2.0)
json (2.3.1)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand Down Expand Up @@ -117,7 +117,7 @@ GEM
simplecov-html (0.10.2)
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.8)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)
zeitwerk (2.1.9)
Expand All @@ -128,7 +128,7 @@ PLATFORMS
DEPENDENCIES
activerecord (= 6.0.0)
appraisal
bundler (~> 1.17)
bundler (~> 2.1)
combustion (~> 1.1)
database_cleaner (~> 1.6)
parentry!
Expand All @@ -140,4 +140,4 @@ DEPENDENCIES
simplecov (~> 0.16)

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

source "https://rubygems.org"

gem "appraisal"
gem "activerecord", "6.0.0"

gemspec path: "../"
147 changes: 147 additions & 0 deletions gemfiles/activerecord_6.1.0.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
PATH
remote: ..
specs:
parentry (1.3.0)
activerecord (>= 5.1, < 6.2)

GEM
remote: https://rubygems.org/
specs:
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.0)
activesupport (= 6.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activemodel (6.0.0)
activesupport (= 6.0.0)
activerecord (6.0.0)
activemodel (= 6.0.0)
activesupport (= 6.0.0)
activesupport (6.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
appraisal (2.3.0)
bundler
rake
thor (>= 0.14.0)
ast (2.4.1)
builder (3.2.4)
coderay (1.1.3)
combustion (1.3.1)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
thor (>= 0.14.6)
concurrent-ruby (1.1.7)
crass (1.0.6)
database_cleaner (1.8.5)
diff-lcs (1.4.4)
docile (1.3.2)
erubi (1.10.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.4.0)
minitest (5.14.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
parallel (1.20.0)
parser (2.7.2.0)
ast (~> 2.4.1)
pg (1.2.3)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (12.3.3)
regexp_parser (1.8.2)
rexml (3.2.4)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (3.9.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.1.1)
parser (>= 2.7.1.5)
rubocop-rspec (1.44.1)
rubocop (~> 0.87)
rubocop-ast (>= 0.7.1)
ruby-progressbar (1.10.1)
simplecov (0.19.1)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.3)
thor (1.0.1)
thread_safe (0.3.6)
tzinfo (1.2.8)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
zeitwerk (2.4.2)

PLATFORMS
ruby

DEPENDENCIES
activerecord (= 6.0.0)
appraisal
bundler (~> 2.1)
combustion (~> 1.1)
database_cleaner (~> 1.6)
parentry!
pg (~> 1.2)
pry (~> 0.10)
rake (~> 12.3)
rspec-rails (~> 3.7)
rubocop-rspec (~> 1.37)
simplecov (~> 0.16)

BUNDLED WITH
2.1.4
2 changes: 1 addition & 1 deletion lib/parentry/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Parentry
VERSION = '1.3.0'.freeze
VERSION = '1.4.0'.freeze
end
4 changes: 2 additions & 2 deletions parentry.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Gem::Specification.new do |spec|
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
spec.require_paths = ['lib']

spec.add_dependency 'activerecord', '>= 5.1', '< 6.1'
spec.add_dependency 'activerecord', '>= 5.1', '< 6.2'

spec.add_development_dependency 'bundler', '~> 1.17'
spec.add_development_dependency 'bundler', '~> 2.1'
spec.add_development_dependency 'combustion', '~> 1.1'
spec.add_development_dependency 'database_cleaner', '~> 1.6'
spec.add_development_dependency 'pg', '~> 1.2'
Expand Down