engine_cart 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7b6269a9d1786f65843adae04c06259b1fa7a7e9cc90ff09f080e8e41e4679e
-  data.tar.gz: 88aeef4a96249d2bd2e9fcda5e082e35ef4a04e5515b7b534929257638285a34
+  metadata.gz: c910fecebf1668fff3496adb5ffbb775f8b26d6172c0bd852a42b2347ab37c5b
+  data.tar.gz: c9f3f648c782203de8dec936e58057432db338ead895ac7f142829b130692e00
 SHA512:
-  metadata.gz: e2113472ebefab8c0903fcaef60a2a8963a08d3e5cf1385757e7b317fac368d6f3aa81b5f07928a141a0de336cea6b73323293da9e9fc6a580bd08e974a8e995
-  data.tar.gz: ae28d1340af3fcbb475c0d29863725b2ff1fe8135b34693fdc7673f196d5a33e54deef10858356d0627db44dba01d4cf8fd9d97755719eb2fef47a892e38e577
+  metadata.gz: 2a5b3d945948e1b95120b621085ca3b560ce1ae6e4f1b10b99edfa288e97a8d6a43e98db7b16ece7d736a8878d80384ff76baf3577ee00a509c1fe0d9c5e4473
+  data.tar.gz: 54d05bb765b09739ae6e53816b488efa619d2d5b3730c8b8b30db427c51b33a32a822282c5d4b94f7e5eb841b71d9baad8d9d7707e6d3ea8dd86c74bb50d0d8f

data/.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+        rails_version:
+          - 5.2.6
+          - 6.0.4.1
+          - 6.1.4.1
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+    - name: Run tests
+      run: bundle exec rake
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}

data/Gemfile

@@ -4,3 +4,13 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+
+case ENV['RAILS_VERSION']
+when /^6.0/
+  gem 'sass-rails', '>= 6'
+  gem 'webpacker', '~> 4.0'
+when /^5.[12]/
+  gem 'sprockets', '< 4.0'
+  gem 'sass-rails', '~> 5.0'
+  gem 'thor', '~> 0.20'
+end

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/cbeer/engine_cart.svg?branch=master)](https://travis-ci.org/cbeer/engine_cart) [![Gem Version](https://badge.fury.io/rb/engine_cart.svg)](http://badge.fury.io/rb/engine_cart)
+[![Gem Version](https://badge.fury.io/rb/engine_cart.svg)](http://badge.fury.io/rb/engine_cart)
 
 # EngineCart
 
@@ -7,7 +7,7 @@ Rake tasks to generate a test application for a Rails Engine gem.
 If you have a Rails Engine and want to test it, the suggested approach is a small dummy application that loads up a Rails application with your engine loaded. This dummy application is usually checked into source control and maintained with the application. This works great, until you want to test:
 
  - different versions of Ruby (e.g. MRI and JRuby)
- - different versions of Rails (Rails 3.x, 4.0 and 4.1)
+ - different versions of Rails (Rails 5.0, 6.0)
  - different deployment environments (with and without devise, etc)
 
 where each scenario may involve different configurations, Gemfiles, etc.

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 task :generate_test_gem => ['engine_cart:setup'] do
   system("rm -rf .internal_test_gem")
-  gem 'rails', '5.2.3'
+  gem 'rails', ENV['RAILS_VERSION']
 
   rails_path = Gem.bin_path('railties', 'rails')
   puts rails_path
@@ -29,6 +29,8 @@ task :generate_test_gem => ['engine_cart:setup'] do
   IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/TODO/, "DONTCARE")})
   IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/.*homepage.*/, "")})
   IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/.*sqlite3.*/, "")})
+  IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/.*source_code_uri.*/, "")})
+  IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/.*changelog_uri.*/, "")})
 
   Rake::Task['engine_cart:inject_gemfile_extras'].invoke
   EngineCart.within_test_app do
@@ -50,10 +52,7 @@ task :generate_test_gem => ['engine_cart:setup'] do
     end
 
     system "echo '\ngem \"rspec-rails\"\n' >> Gemfile"
-    if Gem.loaded_specs["rails"].version.to_s < '4.2'
-      system %Q{echo '\ngem "sass", "~> 3.2.15"\n' >> Gemfile}
-      system %Q{echo '\ngem "sprockets", "~> 2.11.0"\n' >> Gemfile}
-    end
+
     Bundler.clean_system "bundle update --quiet"
     system "echo 'require \"engine_cart/rake_task\"\n' >> Rakefile"
 

data/engine_cart.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
+  spec.add_dependency 'rails', '>= 5.0'
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/engine_cart/gemfile_stanza.rb

@@ -1,6 +1,6 @@
 module EngineCart
   def self.gemfile_stanza_check_line
-    "engine_cart stanza: 0.10.0"
+    'engine_cart stanza: 2.5.0'
   end
 
   def self.gemfile_stanza_text
@@ -27,15 +27,16 @@ module EngineCart
         else
           gem 'rails', ENV['RAILS_VERSION']
         end
-      end
 
-      case ENV['RAILS_VERSION']
-      when /^4\.2/
-        gem 'responders', '~> 2.0'
-        gem 'sass-rails', '>= 5.0'
-        gem 'coffee-rails', '~> 4.1.0'
-      when /^4\.[01]/
-        gem 'sass-rails', '< 5.0'
+        case ENV['RAILS_VERSION']
+        when /^6.0/
+          gem 'sass-rails', '>= 6'
+          gem 'webpacker', '~> 4.0'
+        when /^5.[12]/
+          gem 'sass-rails', '~> 5.0'
+          gem 'sprockets', '~> 3.7'
+          gem 'thor', '~> 0.20'
+        end
       end
     end
     # END ENGINE_CART BLOCK

data/lib/engine_cart/tasks/engine_cart.rake

@@ -34,6 +34,10 @@ namespace :engine_cart do
           require 'rails/generators'
           require 'rails/generators/rails/app/app_generator'
 
+          # Clear out our current bundle so that the rails generator can run with it's own bundle
+          backup_gemfile = ENV['BUNDLE_GEMFILE']
+          ENV.delete('BUNDLE_GEMFILE')
+
           # Using the Rails generator directly, instead of shelling out, to
           # ensure we use the right version of Rails.
           Rails::Generators::AppGenerator.start([
@@ -43,11 +47,14 @@ namespace :engine_cart do
             '--skip_spring',
             '--skip-bootsnap',
             '--skip-listen',
-            '--skip-bundle',
             '--skip-test',
             *EngineCart.rails_options,
             ("-m #{EngineCart.template}" if EngineCart.template)
           ].compact)
+
+          # Restore our gemfile
+          ENV['BUNDLE_GEMFILE'] = backup_gemfile
+
         end
         exit 0
       end
@@ -67,22 +74,6 @@ namespace :engine_cart do
           text.gsub(/^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"')
         end)
       end
-
-      if Gem.loaded_specs["rails"].version.to_s < '4.2.4'
-        has_web_console = false
-
-        # Hack for https://github.com/rails/web-console/issues/150
-        gemfile = File.join(EngineCart.destination, 'Gemfile')
-        IO.write(gemfile, File.open(gemfile) do |f|
-          text = f.read
-          has_web_console = text.match('web-console')
-          text.gsub(/.*web-console.*/, "").gsub(/.*IRB console on exception pages.*/, "")
-        end)
-
-        File.open(gemfile, "a") do |f|
-          f.puts 'gem "web-console", group: :development'
-        end if has_web_console
-      end
     end
   end
 
@@ -111,9 +102,6 @@ namespace :engine_cart do
 
       # Create a new test rails app
       Rake::Task['engine_cart:create_test_rails_app'].invoke
-
-      Bundler.clean_system "bundle install --quiet"
-
       Rake::Task['engine_cart:inject_gemfile_extras'].invoke
 
       # Copy our test app generators into the app and prepare it

data/lib/engine_cart/version.rb

@@ -1,3 +1,3 @@
 module EngineCart
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/lib/engine_cart.rb

@@ -75,7 +75,7 @@ module EngineCart
 
   def self.fingerprinted_files
     Dir.glob("./*.gemspec").select { |f| File.file? f } +
-      [Bundler.default_gemfile.to_s, Bundler.default_lockfile.to_s] +
+      [Bundler.default_gemfile.to_s] +
       Dir.glob("./db/migrate/*").select { |f| File.file? f } +
       Dir.glob("./lib/generators/**/**").select { |f| File.file? f } +
       Dir.glob("./spec/test_app_templates/**/**").select { |f| File.file? f } +

data/spec/integration/engine_cart_spec.rb

@@ -79,7 +79,7 @@ describe "EngineCart powered application" do
       File.open('spec/require_spec.rb', 'w') do |f|
         f.puts <<-EOF
           require 'spec_helper'
-          require 'coffee-rails'
+          require 'sqlite3'
 
           describe ApplicationController do
             it "should be able to run specs that reference gems provided by the test app" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine_cart
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,8 +60,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".engine_cart.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Helper for testing Rails Engines sanely

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.6.1
-  - 2.5.3
-
-env:
- - "RAILS_VERSION=5.2.3"