Update CamelTrail to support Rails 7.1 (#247)

Updates CamelTrail to support Rails 7.1. To do this, we also needed to use the upstream version of `attr_encrypted` because our forked version is outdated and doesn't support Rails 7. --------- Co-authored-by: Carlos Palhares <[email protected]>
powerhome · Feb 28, 2024 · 535dc1b · 535dc1b
1 parent eecc00b
commit 535dc1b
Show file tree

Hide file tree

Showing 12 changed files with 348 additions and 21 deletions.
diff --git 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
@@ -0,0 +1 @@
+ruby 3.0.6
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: "../"