aboutsummaryrefslogtreecommitdiffstats
path: root/spec/support
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-16 14:47:22 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-16 14:47:22 -0800
commitc4ad73c30d74904c851ada8132970da798c86aa9 (patch)
treea51bd493c5d4cc070269e81f2d76a492310d8c3c /spec/support
parentc731f79af1dd6bf83a3facc0421dc6e4ccfc0e1c (diff)
downloadbundler-c4ad73c30d74904c851ada8132970da798c86aa9.tar.gz
Fix Bundler on 1.9
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/helpers.rb2
-rw-r--r--spec/support/rubygems_ext.rb (renamed from spec/support/rubygems.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index ac259cec..7083fabd 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 7c534c3a..7c534c3a 100644
--- a/spec/support/rubygems.rb
+++ b/spec/support/rubygems_ext.rb