engine_cart 0.8.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c04d95e36edb84b7dea3b5681a416df82d6505a
-  data.tar.gz: 7bbbf882051a2d7286add6d53a7988a61a74e6db
+  metadata.gz: f28b9c3f6915fc494c0dda7bfe3139d75dd716f1
+  data.tar.gz: ca16aac3634c2f2c30027d642e382424768481f9
 SHA512:
-  metadata.gz: 19a1cf6d4787639f2b0b47ecfb1ff8c64c63c76e690ea3bfecff32025e9c951befd50a82bde24d70d360a355765f6a0076aef2a89d5ee0fdd7f401e0cb978763
-  data.tar.gz: 842f1c6f32a57188b0acb8c00b36eb726ed79826a6997dd5acaa0ab99a220a1417242d9c71d2683d0bfdee64f16be2257d53bd0e171174105617b497023b5269
+  metadata.gz: 7e7b45bb1d0c0aca7730068d05fbb4641c8966414d83ae2ae5d02c128048892bcb6f0754e28485bbd5223237603f3254be114fd36c69b7f70e67267feb57839f
+  data.tar.gz: d0dc6729dff7a666a29c3c7b6fcdd547df12efaf8abb883003efa2047433ea2455666c769a30b4093664e4b3bafdfb73abe2cd51be028ac12286eb69bdb028f4

data/.travis.yml

@@ -1,9 +1,14 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.0
+  - 2.3.1
 
 matrix:
   include:
-    - rvm: '2.2.4'
-      env: "RAILS_VERSION=4.1.14"
+    - rvm: '2.2.5'
+      env: "RAILS_VERSION=4.1.15"
+    - rvm: '2.2.5'
+      env: "RAILS_VERSION=4.2.6"
+
+env:
+ - "RAILS_VERSION=5.0.0"

data/Gemfile

@@ -4,5 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
-gem 'sass', '~> 3.2.15'
-gem 'sprockets', '~> 2.11.0'
+
+if ENV['RAILS_VERSION'] && ENV['RAILS_VERSION'] < '4.2'
+  gem 'sass', '~> 3.2.15'
+  gem 'sprockets', '~> 2.11.0'
+end

data/README.md

@@ -48,7 +48,7 @@ In order for your Rails engine gem to use engine_cart, some configuration is req
 $ rake engine_cart:prepare
 ```
 
-This will create `lib/generators/test_app_generator.rb` in your engine and it will also append some code to your engine's `Gemfile`.
+This will create `./spec/test_app_templates/lib/generators` in your engine and it will also append some code to your engine's `Gemfile`.
 
 You only need to run this rake task once.
 

data/Rakefile

@@ -45,8 +45,10 @@ task :generate_test_gem => ['engine_cart:setup'] do
     end
 
     system "echo '\ngem \"rspec-rails\"\n' >> Gemfile"
-    system %Q{echo '\ngem "sass", "~> 3.2.15"\n' >> Gemfile}
-    system %Q{echo '\ngem "sprockets", "~> 2.11.0"\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/lib/engine_cart/tasks/engine_cart.rake

@@ -28,19 +28,23 @@ namespace :engine_cart do
     require 'tmpdir'
     require 'fileutils'
     Dir.mktmpdir do |dir|
-      Dir.chdir dir do
-        version = ENV.fetch('RAILS_VERSION', ">= 0")
-        rails_path = Gem.bin_path('railties', 'rails', version)
-
-        Bundler.with_clean_env do
-          `#{rails_path} new internal --skip-spring #{EngineCart.rails_options} #{"-m #{EngineCart.template}" if EngineCart.template}`
-        end
-
-        unless $?
-          raise "Error generating new rails app. Aborting."
+      # Fork into a new process to avoid polluting the current one with the partial Rails environment ...
+      pid = fork do
+        Dir.chdir dir do
+          require 'rails/generators'
+          require 'rails/generators/rails/app/app_generator'
+
+          # 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)
         end
+        exit 0
       end
 
+      # ... and then wait for it to catch up.
+      _, status = Process.waitpid2 pid
+      exit status.exitstatus unless status.success?
+
       Rake::Task['engine_cart:clean'].invoke if File.exist? EngineCart.destination
       FileUtils.move "#{dir}/internal", "#{EngineCart.destination}"
 
@@ -122,9 +126,11 @@ namespace :engine_cart do
 end
 
 def within_test_app
+  puts "travis_fold:start:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
   Dir.chdir(EngineCart.destination) do
     Bundler.with_clean_env do
       yield
     end
   end
+  puts "travis_fold:end:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
 end

data/lib/engine_cart/version.rb

@@ -1,3 +1,3 @@
 module EngineCart
-  VERSION = '0.8.2'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine_cart
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,11 +110,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Helper for testing Rails Engines sanely
 test_files:
 - spec/integration/engine_cart_spec.rb
 - spec/spec_helper.rb
-has_rdoc: