engine_cart 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db419965be01fa06326e357013ea09c444dec04e71428a38ee9eaa24cc79426f
-  data.tar.gz: ee7b17829334ddeeb2e1b48c4557cce763b0bb7b12cd436713f6ddca97680fe1
+  metadata.gz: 864ca4cc0c524ad80281f92e1dce77df32cb2a2c4b6f27d293721ee8e9305412
+  data.tar.gz: 5c8ec70e88e2a6efd9d919c04c56be20509afebacce106118d3061de56a40cfc
 SHA512:
-  metadata.gz: 817da9a19e20ed5ad760a3c7e3ad0b10ac484c341d8823487aae83c2a049d437de97134d7d966e9fae239f5d1faf57e1c2e7cf541c73c97498922ef6a07a8e62
-  data.tar.gz: 8c520fea25e5ce140ce9e53c6ad5ec6015a679b783272383dbe9785c969dec91db194c592fed72d7c062a01b3649470edfd8fbeefdef6334c75fd39f02380b6b
+  metadata.gz: 324a7c844887c7f43923d6d8dadd72f599567158ad6bd8876496865700239be2a28a0314feef816e7ce2b8cb5dff405b4d6bc3ec93d8912ac8e7bb13554e56b1
+  data.tar.gz: f377f63b4585553142802de3451eaaa4882de55bd821976e45c892e820d43bb708ef9c6afba7d166a883d8150be6d03bfdaec62aa93614d9a21ce521eb8e7d10

data/.github/workflows/ci.yml

@@ -12,18 +12,26 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.7
+          - 3.1
         rails_version:
-          - 5.2.8.1
-          - 6.0.5.1
           - 6.1.6.1
           - 7.0.3.1
+        include:
+          - ruby: '2.7.8' # Rails 6.0 will not run on Ruby 3
+            rails_version: '6.0.5.1'
+          - ruby: '2.7.8' # Rails 5.2 will not run on Ruby 3
+            rails_version: '5.2.8.1'
+          - ruby: '3.2.2'
+            rails_version: '7.1.1'
+          - ruby: '3.3.0'
+            rails_version: '7.1.1'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler: 'latest'
     - name: Install dependencies
       run: bundle install
       env:

data/Rakefile

@@ -57,12 +57,15 @@ task :generate_test_gem => ['engine_cart:setup'] do
     end
 
     system "echo '\ngem \"rspec-rails\"\n' >> Gemfile"
+    if RUBY_VERSION < '3.0'
+      system "echo '\ngem \"sqlite3\", \"< 1.7.0\"\n' >> Gemfile"
+    end
 
-    Bundler.clean_system "bundle update --quiet"
+    Bundler.unbundled_system "bundle update --quiet"
     system "echo 'require \"engine_cart/rake_task\"\n' >> Rakefile"
 
     system("bundle exec rake engine_cart:prepare")
-    Bundler.clean_system "bundle install --quiet"
+    Bundler.unbundled_system "bundle install --quiet"
   end
 end
 

data/lib/engine_cart/tasks/engine_cart.rake

@@ -27,6 +27,8 @@ namespace :engine_cart do
   task :create_test_rails_app => [:setup] do
     require 'tmpdir'
     require 'fileutils'
+    require 'rails/version'
+
     Dir.mktmpdir do |dir|
       # Fork into a new process to avoid polluting the current one with the partial Rails environment ...
       pid = fork do
@@ -66,7 +68,7 @@ namespace :engine_cart do
       Rake::Task['engine_cart:clean'].invoke if File.exist? EngineCart.destination
       FileUtils.move "#{dir}/internal", "#{EngineCart.destination}"
 
-      if Gem.loaded_specs['rails'].version.to_s < '5.2.3'
+      if Rails.version < '5.2.3'
         # Hack for https://github.com/rails/rails/issues/35153
         gemfile = File.join(EngineCart.destination, 'Gemfile')
         IO.write(gemfile, File.open(gemfile) do |f|
@@ -74,6 +76,15 @@ namespace :engine_cart do
           text.gsub(/^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"')
         end)
       end
+
+      if RUBY_VERSION < '3.0'
+        # Hack for https://github.com/cbeer/engine_cart/issues/125
+        gemfile = File.join(EngineCart.destination, 'Gemfile')
+        IO.write(gemfile, File.open(gemfile) do |f|
+          text = f.read
+          text.gsub(/^gem ["']sqlite3["']$/, 'gem "sqlite3", "< 1.7"')
+        end)
+      end
     end
   end
 
@@ -106,19 +117,19 @@ namespace :engine_cart do
 
       # Copy our test app generators into the app and prepare it
       if File.exist? "#{EngineCart.templates_path}/lib/generators"
-        Bundler.clean_system "cp -r #{EngineCart.templates_path}/lib/generators #{EngineCart.destination}/lib"
+        Bundler.unbundled_system "cp -r #{EngineCart.templates_path}/lib/generators #{EngineCart.destination}/lib"
       end
 
       within_test_app do
         unless (system("bundle install --quiet") or system("bundle update --quiet")) and
-              system "(bundle exec rails g | grep test_app) && bundle exec rails generate test_app" and
-              system "bundle exec rake db:migrate" and
-              system "bundle exec rake db:test:prepare"
+              system "(bin/rails g | grep test_app) && bin/rails generate test_app" and
+              system "bin/rails db:migrate" and
+              system "bin/rails db:test:prepare"
           raise "EngineCart failed on with: #{$?}"
         end
       end
 
-      Bundler.clean_system "bundle install --quiet"
+      Bundler.unbundled_system "bundle install --quiet"
 
       EngineCart.write_fingerprint
 
@@ -129,14 +140,14 @@ namespace :engine_cart do
   desc 'Start the internal test application using `rails server`'
   task :server, [:rails_server_args] => [:generate] do |_, args|
     within_test_app do
-      system "bundle exec rails server #{args[:rails_server_args]}"
+      system "bin/rails server #{args[:rails_server_args]}"
     end
   end
 
   desc 'Start the internal test application using `rails console`'
   task :console, [:rails_console_args] => [:generate] do |_, args|
     within_test_app do
-      system "bundle exec rails console #{args[:rails_console_args]}"
+      system "bin/rails console #{args[:rails_console_args]}"
     end
   end
 end
@@ -144,7 +155,7 @@ end
 def within_test_app
   puts "\rtravis_fold:start:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
   Dir.chdir(EngineCart.destination) do
-    Bundler.with_clean_env do
+    EngineCart.with_unbundled_env do
       yield
     end
   end

data/lib/engine_cart/version.rb

@@ -1,3 +1,3 @@
 module EngineCart
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/lib/engine_cart.rb

@@ -12,9 +12,21 @@ module EngineCart
     require File.expand_path("config/environment", path || EngineCart.destination)
   end
 
+  def self.with_unbundled_env
+    method = if Bundler.respond_to?(:with_unbundled_env)
+      :with_unbundled_env
+    else
+      :with_clean_env
+    end
+
+    Bundler.public_send(method) do
+      yield
+    end
+  end
+
   def self.within_test_app
     Dir.chdir(EngineCart.destination) do
-      Bundler.with_clean_env do
+      EngineCart.with_unbundled_env do
         yield
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine_cart
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Helper for testing Rails Engines sanely