engine_cart 2.2.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981d524e320b0f40c2e6b0ce8f99fe0d0b7452cc79024e6531f7cb4019a90a78
-  data.tar.gz: f283a064bc04ba5dd42a999a2d406af597ef880fb9d9866ae38f3fb4c6326e53
+  metadata.gz: db419965be01fa06326e357013ea09c444dec04e71428a38ee9eaa24cc79426f
+  data.tar.gz: ee7b17829334ddeeb2e1b48c4557cce763b0bb7b12cd436713f6ddca97680fe1
 SHA512:
-  metadata.gz: 450ca9319e6a6cfadec4f475dad9e8db5c291d1d2d8147a4ab31d9a6cc686ae7ebe3adcb233c0ae880ddc3e414fb24c46d99f16cdf8e61a42b9e3dd5fc2701bb
-  data.tar.gz: 63de32381b94d210837dd06a04b3d9f6f5bcaadb9ee22ae5b8638a0bca1cdaca492d96ea6a6b4e90f38f0f9397f20f0a28963040a2e8fcd350de6741b9f5f7bc
+  metadata.gz: 817da9a19e20ed5ad760a3c7e3ad0b10ac484c341d8823487aae83c2a049d437de97134d7d966e9fae239f5d1faf57e1c2e7cf541c73c97498922ef6a07a8e62
+  data.tar.gz: 8c520fea25e5ce140ce9e53c6ad5ec6015a679b783272383dbe9785c969dec91db194c592fed72d7c062a01b3649470edfd8fbeefdef6334c75fd39f02380b6b

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+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.8.1
+          - 6.0.5.1
+          - 6.1.6.1
+          - 7.0.3.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,19 +10,32 @@ end
 
 task :generate_test_gem => ['engine_cart:setup'] do
   system("rm -rf .internal_test_gem")
-  gem 'rails'
+  gem 'rails', ENV['RAILS_VERSION']
 
   rails_path = Gem.bin_path('railties', 'rails')
+  puts rails_path
 
-  Bundler.with_clean_env do
-    system("#{rails_path} plugin new internal_test_gem")
+  require "rails/generators"
+  require "rails/generators/rails/plugin/plugin_generator"
+
+  pwd = Dir.pwd
+  Rails::Generators::PluginGenerator.start ['internal_test_gem']
+
+  Dir.chdir(pwd)
+
+  system("mv #{Dir.pwd}/internal_test_gem #{Dir.pwd}/.internal_test_gem")
+
+  gemspec_data = File.open(".internal_test_gem/internal_test_gem.gemspec") do |f|
+    f.read.gsub(/FIXME/, "DONTCARE")
+          .gsub(/TODO/, "DONTCARE")
+          .gsub(/.*homepage.*/, "")
+          .gsub(/.*sqlite3.*/, "")
+          .gsub(/.*source_code_uri.*/, "")
+          .gsub(/.*changelog_uri.*/, "")
   end
-  system("mv internal_test_gem .internal_test_gem")
 
-  IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/FIXME/, "DONTCARE")})
-  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", gemspec_data)
+  IO.write(".internal_test_gem/Gemfile", File.open(".internal_test_gem/Gemfile") {|f| f.read.gsub(/.*sqlite3.*/, "")})
 
   Rake::Task['engine_cart:inject_gemfile_extras'].invoke
   EngineCart.within_test_app do
@@ -44,10 +57,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/configuration.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'erb'
+require 'shellwords'
 
 module EngineCart
   class Configuration
@@ -86,10 +87,11 @@ module EngineCart
     # Split a string of options into individual options.
     # @example
     #   parse_options('--skip-foo --skip-bar -d postgres --skip-lala')
-    #   # => ["--skip-foo", "--skip-bar", "-d postgres", "--skip-lala"]
+    #   # => ["--skip-foo", "--skip-bar", "-d", "postgres", "--skip-lala"]
     def parse_options(options)
       return if options.nil?
-      options.scan(/(--[^\s]+|-[^\s]+\s+[^\s]+)/).flatten
+
+      Shellwords.shellwords(options)
     end
 
     def read_config(config_file)

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,9 +34,27 @@ 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(['internal', '--skip_spring', *EngineCart.rails_options, ("-m #{EngineCart.template}" if EngineCart.template)].compact)
+          Rails::Generators::AppGenerator.start([
+            'internal',
+            '--skip-git',
+            '--skip-keeps',
+            '--skip_spring',
+            '--skip-bootsnap',
+            '--skip-listen',
+            '--skip-test',
+            *EngineCart.rails_options,
+            ("-m #{EngineCart.template}" if EngineCart.template)
+          ].compact)
+
+          # Restore our gemfile
+          ENV['BUNDLE_GEMFILE'] = backup_gemfile
+
         end
         exit 0
       end
@@ -56,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
 
@@ -85,15 +87,21 @@ namespace :engine_cart do
     end
   end
 
+  desc 'find out if the generated app needs to be rebuilt'
+  task :test => [:setup] do
+    EngineCart.debug = true
+    if EngineCart.fingerprint_expired?
+      puts "Expired!"
+      exit 1
+    end
+  end
+
   desc "Create the test rails app"
   task :generate => [:setup] do
     if EngineCart.fingerprint_expired?
 
       # 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
@@ -104,7 +112,8 @@ namespace :engine_cart do
       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 db:test:prepare"
+              system "bundle exec rake db:migrate" and
+              system "bundle exec rake db:test:prepare"
           raise "EngineCart failed on with: #{$?}"
         end
       end

data/lib/engine_cart/version.rb

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

data/lib/engine_cart.rb

@@ -25,10 +25,32 @@ module EngineCart
   end
 
   def self.fingerprint_current?
-    return false unless File.exist? stored_fingerprint_file
+
+    unless File.exist? stored_fingerprint_file
+      STDERR.puts "No finger print file found: #{stored_fingerprint_file}" if debug?
+      return false
+    end
     content = File.read(stored_fingerprint_file)
     data = JSON.parse(content, symbolize_names: true)
-    data == fingerprint
+    calculated = fingerprint
+
+    return true if data == calculated
+    if debug?
+      STDERR.puts "Fingerprint mismatch:\n\n"
+
+      data.keys.each do |key|
+        case data[key]
+        when Array
+          data[key].zip(calculated[key]).each do |(stored, calc)|
+            STDERR.puts("#{key}:\nstored: #{stored}\ncalculate: #{calc}") if stored != calc
+          end
+        else
+          STDERR.puts("#{key}:\nstored: #{data[key]}\ncalculate: #{calculated[key]}") if data[key] != calculated[key]
+        end
+      end
+    end
+
+    false
   rescue
     false
   end
@@ -53,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 } +
@@ -69,7 +91,7 @@ module EngineCart
   end
 
   def self.env_fingerprint
-    { 'RUBY_DESCRIPTION' => RUBY_DESCRIPTION, 'BUNDLE_GEMFILE' => Bundler.default_gemfile.to_s }.reject { |k, v| v.nil? || v.empty? }.to_s
+    { RUBY_DESCRIPTION: RUBY_DESCRIPTION, BUNDLE_GEMFILE: Bundler.default_gemfile.to_s }.reject { |k, v| v.nil? || v.empty? }
   end
 
   def self.configuration(options = {})
@@ -92,4 +114,12 @@ module EngineCart
       Bundler.ui.warn EngineCart.gemfile_stanza_text
     end
   end
+
+  def self.debug=(debug)
+    @debug = debug
+  end
+
+  def self.debug?
+    @debug
+  end
 end

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.2.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2022-07-27 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
@@ -81,7 +81,7 @@ homepage: https://github.com/cbeer/engine_cart
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Helper for testing Rails Engines sanely
 test_files:

data/.travis.yml

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