Fix Bundler on 1.9

4 files changed, 5 insertions, 2 deletions

diff --git a/spec/runtime/environment_rb_spec.rb b/spec/runtime/environment_rb_spec.rb
index c172fc3ea9..c7a3ba0c2f 100644
--- a/spec/runtime/environment_rb_spec.rb
+++ b/spec/runtime/environment_rb_spec.rb
@@ -16,6 +16,7 @@ describe "environment.rb file" do
   it "does not pull in system gems" do
     run <<-R, :lite_runtime => true
       require 'rubygems'
+
       begin;
         require 'rack'
       rescue LoadError
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 58f35c7b2e..0c8e1b922e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,7 +10,9 @@ Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
   require file
 end
 
-$debug = false
+$debug    = false
+$show_err = false
+
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
 
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index ac259cec97..7083fabd4d 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -44,7 +44,7 @@ module Spec
       gemfile = File.expand_path('../../../bin/bundle', __FILE__)
       input, out, err, waitthread = Open3.popen3("#{Gem.ruby} -I#{lib} #{gemfile} #{cmd}#{args}")
       @err = err.read.strip
-      puts @err if $debug && !err.empty?
+      puts @err if $show_err && !@err.empty?
       @out = out.read.strip
       @exitstatus = nil
       @exitstatus = waitthread.value.to_i if waitthread
diff --git a/spec/support/rubygems.rb b/spec/support/rubygems_ext.rb
index 7c534c3a44..7c534c3a44 100644
--- a/spec/support/rubygems.rb
+++ b/spec/support/rubygems_ext.rb