Merge branch '1-0-stable'

Conflicts:
	lib/bundler/version.rb
	spec/support/rubygems_ext.rb

2 files changed, 9 insertions, 6 deletions

diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index e07f78596c..68361f09aa 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/support/rubygems_ext.rb
@@ -9,8 +9,11 @@ module Spec
 
       unless File.exist?("#{Path.base_system_gems}")
         FileUtils.mkdir_p(Path.base_system_gems)
-        puts "running `gem install builder rake fakeweb artifice sinatra --no-rdoc --no-ri`"
-        `gem install builder rake fakeweb artifice sinatra --no-rdoc --no-ri`
+        puts "running `gem install rake fakeweb artifice sinatra --no-rdoc --no-ri`"
+        `gem install rake fakeweb artifice sinatra --no-rdoc --no-ri`
+        # 3.0.0 breaks 1.9.2 specs
+        puts "running `gem install builder --version 2.1.2 --no-rdoc --no-ri`"
+        `gem install builder --version 2.1.2 --no-rdoc --no-ri`
       end
 
       ENV['HOME'] = Path.home.to_s
diff --git a/spec/support/sudo.rb b/spec/support/sudo.rb
index 491408ffd5..3530e126de 100644
--- a/spec/support/sudo.rb
+++ b/spec/support/sudo.rb
@@ -2,11 +2,11 @@ module Spec
   module Sudo
     def self.present?
       @which_sudo ||= (`which sudo`.chomp rescue '')
-      !@which_sudo.empty? && ENV['BUNDLER_SUDO_TESTS']
+      !@which_sudo.empty?
     end
 
-    def test_sudo?
-      Sudo.present?
+    def self.test_sudo?
+      present? && ENV['BUNDLER_SUDO_TESTS']
     end
 
     def sudo(cmd)
@@ -18,4 +18,4 @@ module Spec
       sudo "chown -R root #{system_gem_path}"
     end
   end
-end
\ No newline at end of file
+end