From 988a614dd289ea27d41f8ab0d76a3b64124768b1 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 23:33:54 -0500 Subject: Don't run `gem bundle` by default --- actionpack/test/bundler_helper.rb | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'actionpack/test/bundler_helper.rb') diff --git a/actionpack/test/bundler_helper.rb b/actionpack/test/bundler_helper.rb index 5f3e982f19..1e379b9a9b 100644 --- a/actionpack/test/bundler_helper.rb +++ b/actionpack/test/bundler_helper.rb @@ -1,30 +1,11 @@ -BUNDLER_ENV_FILE = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') - -def load_bundled_gems - load_bundled_gems! if File.exist?("#{BUNDLER_ENV_FILE}.rb") -end - -def load_bundled_gems! - puts "Checking if the bundled testing requirements are up to date..." - - result = system "gem bundle" - unless result - puts "The gem bundler is not installed. Installing." - system "gem install bundler" - system "gem bundle" - end - - require BUNDLER_ENV_FILE -end - def ensure_requirable(libs) - load_bundled_gems + bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') + require bundler if File.exist?("#{bundler}.rb") begin libs.each { |lib| require lib } rescue LoadError => e - puts "Missing required libs to run test" puts e.message - load_bundled_gems! + exit 1 end end -- cgit v1.2.3