engine_cart 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583865c648b39d4179a2bd3b6e42bdc9b725ab42
-  data.tar.gz: 3a4fffb4e7070305d601e068eea163ada0fcd5fc
+  metadata.gz: 9c04d95e36edb84b7dea3b5681a416df82d6505a
+  data.tar.gz: 7bbbf882051a2d7286add6d53a7988a61a74e6db
 SHA512:
-  metadata.gz: 205f8c42d5ccd3a251a4248ae6cb5995e1ac0af8b474277b7c53044d7387a2e846eacfdce87b7416f967143d2244b1caedf00904575ea954b8109771966b1e21
-  data.tar.gz: 890223b703fe8e535b30a274902ebcd8b511914d5e4497c4a1f5f049eabab62027416216075fd0c5e852117f191c689ada0567740c814ccc399268710855d782
+  metadata.gz: 19a1cf6d4787639f2b0b47ecfb1ff8c64c63c76e690ea3bfecff32025e9c951befd50a82bde24d70d360a355765f6a0076aef2a89d5ee0fdd7f401e0cb978763
+  data.tar.gz: 842f1c6f32a57188b0acb8c00b36eb726ed79826a6997dd5acaa0ab99a220a1417242d9c71d2683d0bfdee64f16be2257d53bd0e171174105617b497023b5269

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.2
+  - 2.3.0
 
 matrix:
   include:
-    - rvm: '2.2.2'
-      env: "RAILS_VERSION=4.1.13"
+    - rvm: '2.2.4'
+      env: "RAILS_VERSION=4.1.14"

data/Rakefile

@@ -36,7 +36,6 @@ task :generate_test_gem => ['engine_cart:setup'] do
         EngineCart.load_application!
 
         require 'rspec/rails'
-        require 'rspec/autorun'
 
         require 'internal_test_gem'
         RSpec.configure do |config|

data/lib/engine_cart/gemfile_stanza.rb

@@ -22,11 +22,20 @@ module EngineCart
     else
       Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in \#{file}, using placeholder dependencies"
 
-      gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+      if ENV['RAILS_VERSION']
+        if ENV['RAILS_VERSION'] == 'edge'
+          gem 'rails', github: 'rails/rails'
+          ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+        else
+          gem 'rails', ENV['RAILS_VERSION']
+        end
+      end
 
-      if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+      if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4\.2/
         gem 'responders', "~> 2.0"
         gem 'sass-rails', ">= 5.0"
+      elsif ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
+        # nop
       else
         gem 'sass-rails', "< 5.0"
       end

data/lib/engine_cart/tasks/engine_cart.rake

@@ -29,11 +29,11 @@ namespace :engine_cart do
     require 'fileutils'
     Dir.mktmpdir do |dir|
       Dir.chdir dir do
-        rails_path = Gem.bin_path('railties', 'rails')
+        version = ENV.fetch('RAILS_VERSION', ">= 0")
+        rails_path = Gem.bin_path('railties', 'rails', version)
 
         Bundler.with_clean_env do
-          rails_version = "_#{ENV['RAILS_VERSION']}_" if ENV['RAILS_VERSION']
-          `#{rails_path} #{rails_version} new internal --skip-spring #{EngineCart.rails_options} #{"-m #{EngineCart.template}" if EngineCart.template}`
+          `#{rails_path} new internal --skip-spring #{EngineCart.rails_options} #{"-m #{EngineCart.template}" if EngineCart.template}`
         end
 
         unless $?
@@ -67,10 +67,8 @@ namespace :engine_cart do
     open(File.expand_path('Gemfile', EngineCart.destination), 'a') do |f|
       gemfile_extras_path = File.expand_path("Gemfile.extra", EngineCart.templates_path)
 
-      f.write <<-EOF
-        #{File.read(gemfile_extras_path) if File.exist?(gemfile_extras_path)}
-        gem '#{EngineCart.current_engine_name}', :path => '#{File.expand_path('.')}'
-EOF
+      f.write File.read(gemfile_extras_path) if File.exist?(gemfile_extras_path)
+      f.write "gem '#{EngineCart.current_engine_name}', path: '#{File.expand_path('.')}'"
     end
   end
 

data/lib/engine_cart/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine_cart
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,3 +117,4 @@ summary: Helper for testing Rails Engines sanely
 test_files:
 - spec/integration/engine_cart_spec.rb
 - spec/spec_helper.rb
+has_rdoc: