Trying to fix ci errors

Author: crmne

.github/workflows/cicd.yml

@@ -72,7 +72,7 @@ jobs:
       run: bundle exec rubocop
 
     - name: Run tests
-      if: matrix.ruby-version != '3.4' || matrix.rails-version != 'rails-8.0'
+      if: matrix.ruby-version != '4.0' || matrix.rails-version != 'rails-8.1'
       run: bundle exec appraisal ${{ matrix.rails-version }} rspec --tag '~generator'
       env: # Dummy environment variables for local providers
         OLLAMA_API_BASE: http://localhost:11434/v1
@@ -81,15 +81,15 @@ jobs:
         SKIP_COVERAGE: true
 
     - name: Run full test suite with coverage (latest Ruby/Rails)
-      if: matrix.ruby-version == '3.4' && matrix.rails-version == 'rails-8.0'
+      if: matrix.ruby-version == '4.0' && matrix.rails-version == 'rails-8.1'
       run: bundle exec appraisal ${{ matrix.rails-version }} rspec
       env: # Dummy environment variables for local providers
         OLLAMA_API_BASE: http://localhost:11434/v1
         GPUSTACK_API_BASE: http://localhost:11444/v1
         GPUSTACK_API_KEY: test
 
     - name: Upload coverage to Codecov
-      if: matrix.ruby-version == '3.4' && matrix.rails-version == 'rails-8.0'
+      if: matrix.ruby-version == '4.0' && matrix.rails-version == 'rails-8.1'
       uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -124,7 +124,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.4'
+        ruby-version: '4.0'
         bundler-cache: true
 
     - name: Check if version needs publishing

spec/fixtures/templates/default_models_template.rb

@@ -2,8 +2,7 @@
 
 gem 'ruby_llm', path: ENV['RUBYLLM_PATH'] || '../../../..'
 
-after_bundle do
-  generate 'ruby_llm:install'
-  rails_command 'db:migrate'
-  generate 'ruby_llm:chat_ui'
-end
+bundle_command 'install'
+generate 'ruby_llm:install'
+rails_command 'db:migrate'
+generate 'ruby_llm:chat_ui'

spec/fixtures/templates/namespaced_models_template.rb

@@ -2,15 +2,14 @@
 
 gem 'ruby_llm', path: ENV['RUBYLLM_PATH'] || '../../../..'
 
-after_bundle do
-  generate 'ruby_llm:install',
-           'chat:Llm::Chat',
-           'message:Llm::Message',
-           'model:Llm::Model',
-           'tool_call:Llm::ToolCall'
-  rails_command 'db:migrate'
-  generate 'ruby_llm:chat_ui',
-           'chat:Llm::Chat',
-           'message:Llm::Message',
-           'model:Llm::Model'
-end
+bundle_command 'install'
+generate 'ruby_llm:install',
+         'chat:Llm::Chat',
+         'message:Llm::Message',
+         'model:Llm::Model',
+         'tool_call:Llm::ToolCall'
+rails_command 'db:migrate'
+generate 'ruby_llm:chat_ui',
+         'chat:Llm::Chat',
+         'message:Llm::Message',
+         'model:Llm::Model'

spec/support/generator_test_helpers.rb

@@ -1,22 +1,58 @@
 # frozen_string_literal: true
 
 require 'English'
+require 'open3'
+require 'tmpdir'
 module GeneratorTestHelpers
   def self.cleanup_test_app(app_path)
     FileUtils.rm_rf(app_path)
   end
 
   def self.create_test_app(name, template:, template_path:)
     template_file = File.join(template_path, template)
+    ruby_llm_path = File.expand_path('../..', __dir__)
+    root_bundle_gemfile = ENV['BUNDLE_GEMFILE'] || Bundler.default_gemfile.to_s
 
-    Bundler.with_unbundled_env do
-      Dir.chdir(Dir.tmpdir) do
-        ENV['RUBYLLM_PATH'] = File.expand_path('../..', __dir__)
-        `rails new #{name} --skip-bootsnap -m #{template_file} 2>&1`
-        success = $CHILD_STATUS.success?
-        raise "Failed to create test app #{name}" unless success
-      end
-    end
+    root_env = {
+      'RUBYLLM_PATH' => ruby_llm_path,
+      'BUNDLE_GEMFILE' => root_bundle_gemfile
+    }
+    root_env['BUNDLE_PATH'] = ENV['BUNDLE_PATH'] if ENV.key?('BUNDLE_PATH')
+    root_env['BUNDLE_DISABLE_SHARED_GEMS'] = ENV['BUNDLE_DISABLE_SHARED_GEMS'] if ENV.key?('BUNDLE_DISABLE_SHARED_GEMS')
+
+    app_path = File.join(Dir.tmpdir, name)
+
+    create_command = [
+      'bundle', 'exec', 'rails', 'new', name,
+      '--skip-bootsnap', '--skip-bundle', '--skip-kamal', '--skip-thruster'
+    ]
+    output, status = run_command(root_env, create_command, chdir: Dir.tmpdir)
+    raise_command_error(name, create_command, status, output) unless status.success?
+
+    app_env = root_env.merge('BUNDLE_GEMFILE' => File.join(app_path, 'Gemfile'))
+
+    install_command = ['bundle', 'install', '--quiet']
+    output, status = run_command(app_env, install_command, chdir: app_path)
+    raise_command_error(name, install_command, status, output) unless status.success?
+
+    template_command = ['bundle', 'exec', 'rails', 'app:template', "LOCATION=#{template_file}"]
+    output, status = run_command(app_env, template_command, chdir: app_path)
+    raise_command_error(name, template_command, status, output) unless status.success?
+  end
+
+  def self.run_command(env, command, chdir:)
+    stdout, stderr, process_status = Open3.capture3(env, *command, chdir:)
+    ["#{stdout}#{stderr}", process_status]
+  end
+
+  def self.raise_command_error(name, command, status, output)
+    raise <<~ERROR
+      Failed to create test app #{name}
+      Command: #{command.join(' ')}
+      Exit status: #{status.exitstatus}
+      Output:
+      #{output}
+    ERROR
   end
 
   def within_test_app(app_path, &)