Skip to content

Commit

Permalink
Updating engine_cart to 0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
awead committed Nov 4, 2015
1 parent 74397e4 commit dcdc35f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -49,6 +49,7 @@ pkg/
spec/dummy/db/*.sqlite3
spec/dummy/log/*.log
spec/dummy/tmp/
.internal_test_app/**/*

spec/mock_upload_directory

Expand Down Expand Up @@ -97,5 +98,3 @@ public/system/

## Sitemap
public/sitemap.xml

./spec/internal
23 changes: 16 additions & 7 deletions Gemfile
Expand Up @@ -16,17 +16,26 @@ group :development, :test do
gem 'rubocop-rspec', require: false
end

file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
# BEGIN ENGINE_CART BLOCK
# engine_cart: 0.8.0
# engine_cart stanza: 0.8.0
# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
if File.exists?(file)
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
instance_eval File.read(file)
begin
eval_gemfile file
rescue Bundler::GemfileError => e
Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
Bundler.ui.warn e.message
end
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'] and ENV['RAILS_VERSION'] !~ /^4.2/
gem 'sass-rails', "< 5.0"
else
if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
gem 'responders', "~> 2.0"
gem 'sass-rails', ">= 5.0"
else
gem 'sass-rails', "< 5.0"
end
end
# END ENGINE_CART BLOCK

0 comments on commit dcdc35f

Please sign in to comment.