diff --git a/.github/workflows/camel_trail.yml b/.github/workflows/camel_trail.yml index aec474ad..ec0d1cf2 100644 --- a/.github/workflows/camel_trail.yml +++ b/.github/workflows/camel_trail.yml @@ -9,5 +9,5 @@ jobs: with: package: ${{ github.workflow }} workdir: "packages/${{ github.workflow }}" - gemfiles: "['gemfiles/rails_6_0.gemfile','gemfiles/rails_6_1.gemfile']" + gemfiles: "['gemfiles/rails_6_0.gemfile','gemfiles/rails_6_1.gemfile','gemfiles/rails_7_1.gemfile']" secrets: inherit diff --git a/packages/camel_trail/.tool-versions b/packages/camel_trail/.tool-versions new file mode 100644 index 00000000..d6608a7e --- /dev/null +++ b/packages/camel_trail/.tool-versions @@ -0,0 +1 @@ +ruby 3.0.6 diff --git a/packages/camel_trail/Appraisals b/packages/camel_trail/Appraisals index 1fe2052a..295fb719 100644 --- a/packages/camel_trail/Appraisals +++ b/packages/camel_trail/Appraisals @@ -7,3 +7,7 @@ end appraise "rails-6-1" do gem "rails", "6.1.7.7" end + +appraise "rails-7-1" do + gem "rails", "7.1.3.2" +end diff --git a/packages/camel_trail/Gemfile.lock b/packages/camel_trail/Gemfile.lock index fffddb88..5955b931 100644 --- a/packages/camel_trail/Gemfile.lock +++ b/packages/camel_trail/Gemfile.lock @@ -11,10 +11,10 @@ PATH PATH remote: . specs: - camel_trail (0.0.2) + camel_trail (1.0.0) + attr_encrypted (= 4.0.0) nitro_config - powerhome-attr_encrypted (= 1.2.0) - rails (>= 6.0.6.1, < 7.0) + rails (>= 6.0.6.1, < 7.2) GEM remote: https://rubygems.org/ @@ -83,6 +83,8 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + attr_encrypted (4.0.0) + encryptor (~> 3.0.0) builder (3.2.4) concurrent-ruby (1.2.3) crass (1.0.6) @@ -139,8 +141,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - powerhome-attr_encrypted (1.2.0) - encryptor (~> 3.0.0) racc (1.7.3) rack (2.2.8.1) rack-test (2.1.0) diff --git a/packages/camel_trail/camel_trail.gemspec b/packages/camel_trail/camel_trail.gemspec index 8f03e0da..cea74fb3 100644 --- a/packages/camel_trail/camel_trail.gemspec +++ b/packages/camel_trail/camel_trail.gemspec @@ -18,10 +18,10 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "docs/README.md"] + s.add_dependency "attr_encrypted", "4.0.0" s.add_dependency "nitro_config" - s.add_dependency "powerhome-attr_encrypted", "1.2.0" - s.add_dependency "rails", ">= 6.0.6.1", "< 7.0" + s.add_dependency "rails", ">= 6.0.6.1", "< 7.2" s.add_development_dependency "appraisal", "~> 2.4.1" s.add_development_dependency "license_finder", ">= 7.0" diff --git a/packages/camel_trail/docs/CHANGELOG.md b/packages/camel_trail/docs/CHANGELOG.md index 1d022163..0bdcaceb 100644 --- a/packages/camel_trail/docs/CHANGELOG.md +++ b/packages/camel_trail/docs/CHANGELOG.md @@ -1,5 +1,10 @@ ## [Unreleased] +## [1.0.0] - 2024-02-28 + +- Adds support for Rails 7.1 +- Uses upstream `attr_encrypted` gem + ## [0.0.2] - 2023-01-08 - Bugfixes, minor version bumps diff --git a/packages/camel_trail/gemfiles/rails_6_0.gemfile.lock b/packages/camel_trail/gemfiles/rails_6_0.gemfile.lock index 5927f31d..5aa9e52e 100644 --- a/packages/camel_trail/gemfiles/rails_6_0.gemfile.lock +++ b/packages/camel_trail/gemfiles/rails_6_0.gemfile.lock @@ -11,10 +11,10 @@ PATH PATH remote: .. specs: - camel_trail (0.0.2) + camel_trail (1.0.0) + attr_encrypted (= 4.0.0) nitro_config - powerhome-attr_encrypted (= 1.2.0) - rails (>= 6.0.6.1, < 7.0) + rails (>= 6.0.6.1, < 7.2) GEM remote: https://rubygems.org/ @@ -79,6 +79,8 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + attr_encrypted (4.0.0) + encryptor (~> 3.0.0) builder (3.2.4) concurrent-ruby (1.2.3) crass (1.0.6) @@ -135,8 +137,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - powerhome-attr_encrypted (1.2.0) - encryptor (~> 3.0.0) racc (1.7.3) rack (2.2.8.1) rack-test (2.1.0) diff --git a/packages/camel_trail/gemfiles/rails_6_1.gemfile b/packages/camel_trail/gemfiles/rails_6_1.gemfile index 2159e0a9..5e3aba77 100644 --- a/packages/camel_trail/gemfiles/rails_6_1.gemfile +++ b/packages/camel_trail/gemfiles/rails_6_1.gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" gem "nokogiri", "< 1.16" gem "rubocop-powerhome", path: "../../rubocop-powerhome" -gem "rails", "~> 6.1.0" +gem "rails", "6.1.7.7" gemspec path: "../" diff --git a/packages/camel_trail/gemfiles/rails_6_1.gemfile.lock b/packages/camel_trail/gemfiles/rails_6_1.gemfile.lock index 0f4b825b..b0874063 100644 --- a/packages/camel_trail/gemfiles/rails_6_1.gemfile.lock +++ b/packages/camel_trail/gemfiles/rails_6_1.gemfile.lock @@ -11,10 +11,10 @@ PATH PATH remote: .. specs: - camel_trail (0.0.2) + camel_trail (1.0.0) + attr_encrypted (= 4.0.0) nitro_config - powerhome-attr_encrypted (= 1.2.0) - rails (>= 6.0.6.1, < 7.0) + rails (>= 6.0.6.1, < 7.2) GEM remote: https://rubygems.org/ @@ -83,6 +83,8 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + attr_encrypted (4.0.0) + encryptor (~> 3.0.0) builder (3.2.4) concurrent-ruby (1.2.3) crass (1.0.6) @@ -139,8 +141,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - powerhome-attr_encrypted (1.2.0) - encryptor (~> 3.0.0) racc (1.7.3) rack (2.2.8.1) rack-test (2.1.0) @@ -268,7 +268,7 @@ DEPENDENCIES camel_trail! license_finder (>= 7.0) nokogiri (< 1.16) - rails (~> 6.1.0) + rails (= 6.1.7.7) rake (~> 13) rspec (~> 3.0) rspec-rails (~> 5.1.2) diff --git a/packages/camel_trail/gemfiles/rails_7_1.gemfile b/packages/camel_trail/gemfiles/rails_7_1.gemfile new file mode 100644 index 00000000..b3751244 --- /dev/null +++ b/packages/camel_trail/gemfiles/rails_7_1.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "nokogiri", "< 1.16" +gem "rubocop-powerhome", path: "../../rubocop-powerhome" +gem "rails", "7.1.3.2" + +gemspec path: "../" diff --git a/packages/camel_trail/gemfiles/rails_7_1.gemfile.lock b/packages/camel_trail/gemfiles/rails_7_1.gemfile.lock new file mode 100644 index 00000000..d9e34dc3 --- /dev/null +++ b/packages/camel_trail/gemfiles/rails_7_1.gemfile.lock @@ -0,0 +1,308 @@ +PATH + remote: ../../rubocop-powerhome + specs: + rubocop-powerhome (0.5.2) + rubocop (~> 1.52.0) + rubocop-performance + rubocop-rails + rubocop-rake + rubocop-rspec + +PATH + remote: .. + specs: + camel_trail (1.0.0) + attr_encrypted (= 4.0.0) + nitro_config + rails (>= 6.0.6.1, < 7.2) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.3.2) + actionpack (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activesupport (= 7.1.3.2) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.3.2) + actionpack (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.3.2) + activesupport (= 7.1.3.2) + globalid (>= 0.3.6) + activemodel (7.1.3.2) + activesupport (= 7.1.3.2) + activerecord (7.1.3.2) + activemodel (= 7.1.3.2) + activesupport (= 7.1.3.2) + timeout (>= 0.4.0) + activestorage (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activesupport (= 7.1.3.2) + marcel (~> 1.0) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + attr_encrypted (4.0.0) + encryptor (~> 3.0.0) + base64 (0.2.0) + bigdecimal (3.1.6) + builder (3.2.4) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.1) + docile (1.1.5) + drb (2.2.0) + ruby2_keywords + encryptor (3.0.0) + erubi (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.11.2) + rdoc + reline (>= 0.4.2) + json (2.7.1) + license_finder (7.1.0) + bundler + rubyzip (>= 1, < 3) + thor (~> 1.2) + tomlrb (>= 1.3, < 2.1) + with_env (= 1.1.0) + xml-simple (~> 1.1.9) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + mini_mime (1.1.5) + minitest (5.22.2) + mutex_m (0.2.0) + net-imap (0.4.10) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0.1) + net-protocol + nio4r (2.7.0) + nitro_config (0.2.0) + activesupport (>= 5.2.8.1) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.15.5-x86_64-linux) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.0.5) + ast (~> 2.4.1) + racc + psych (5.1.2) + stringio + racc (1.7.3) + rack (3.0.9.1) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.3.2) + actioncable (= 7.1.3.2) + actionmailbox (= 7.1.3.2) + actionmailer (= 7.1.3.2) + actionpack (= 7.1.3.2) + actiontext (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activemodel (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) + bundler (>= 1.15.0) + railties (= 7.1.3.2) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.1.0) + rdoc (6.6.2) + psych (>= 4.0.0) + regexp_parser (2.9.0) + reline (0.4.3) + io-console (~> 0.5) + rexml (3.2.6) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-rails (5.1.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.13.1) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.20.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.26.1) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + simplecov (0.15.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sqlite3 (1.4.4) + stringio (3.1.0) + thor (1.3.1) + timeout (0.4.1) + tomlrb (2.0.3) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + webrick (1.8.1) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + with_env (1.1.0) + xml-simple (1.1.9) + rexml + yard (0.9.21) + zeitwerk (2.6.13) + +PLATFORMS + arm64-darwin + x86_64-linux + +DEPENDENCIES + appraisal (~> 2.4.1) + camel_trail! + license_finder (>= 7.0) + nokogiri (< 1.16) + rails (= 7.1.3.2) + rake (~> 13) + rspec (~> 3.0) + rspec-rails (~> 5.1.2) + rubocop-powerhome! + simplecov (= 0.15.1) + sqlite3 (~> 1.4.2) + yard (= 0.9.21) + +BUNDLED WITH + 2.5.4 diff --git a/packages/camel_trail/lib/camel_trail/version.rb b/packages/camel_trail/lib/camel_trail/version.rb index 0a75d4ea..f02455b7 100644 --- a/packages/camel_trail/lib/camel_trail/version.rb +++ b/packages/camel_trail/lib/camel_trail/version.rb @@ -2,5 +2,5 @@ module CamelTrail # The current version of the gem. - VERSION = "0.0.2" + VERSION = "1.0.0" end