Gemfile in spotlight-dor-resources-0.0.4 vs Gemfile in spotlight-dor-resources-0.0.5

- old
+ new

@@ -10,23 +10,30 @@ gem 'rubocop-rspec', require: false gem 'pry', require: false gem 'pry-byebug', require: false end -# 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("../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.exist?(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 - gem 'rails', ENV['RAILS_VERSION'] + Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies" - # explicitly include sass-rails to get compatible sprocket dependencies + gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION'] + if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/ - gem 'coffee-rails', '~> 4.1.0' - gem 'sass-rails', '~> 5.0' gem 'responders', "~> 2.0" + gem 'sass-rails', ">= 5.0" else gem 'sass-rails', "< 5.0" - gem 'coffee-rails', "~> 4.0.0" end end +# END ENGINE_CART BLOCK