Permalink
Browse files

Merge in v1.0.5 from branch '1-0-stable'

Conflicts:
	lib/bundler/version.rb
  • Loading branch information...
2 parents 52c954f + 6a94687 commit 6bee5f6ce6c7befc4604ce5428975c4132f2335c @indirect indirect committed Nov 13, 2010
Showing with 10 additions and 4 deletions.
  1. +6 −0 CHANGELOG.md
  2. +1 −1 lib/bundler.rb
  3. +1 −1 lib/bundler/cli.rb
  4. +1 −1 spec/other/help_spec.rb
  5. +1 −1 spec/support/sudo.rb
View
@@ -1,3 +1,9 @@
+## 1.0.5 (November 13, 2010)
+
+Bugfixes:
+
+ - Fix regression disabling all operations that employ sudo
+
## 1.0.4 (November 12, 2010)
Bugfixes:
View
@@ -198,7 +198,7 @@ def requires_sudo?
path = bundle_path
path = path.parent until path.exist?
- sudo_present = !(`which sudo 2>&1 >#{NULL}` rescue '').empty?
+ sudo_present = !(`which sudo` rescue '').empty?
@checked_for_sudo = true
@requires_sudo = settings.allow_sudo? && !File.writable?(path) && sudo_present
View
@@ -497,7 +497,7 @@ def clean
private
def have_groff?
- system("which groff 2>&1 >#{NULL}") rescue false
+ !(`which groff` rescue '').empty?
end
def locate_gem(name)
View
@@ -25,7 +25,7 @@
it "simply outputs the txt file when there is no groff on the path" do
kill_path!
- bundle "help install"
+ bundle "help install", :expect_err => true
out.should =~ /BUNDLE-INSTALL/
end
View
@@ -1,7 +1,7 @@
module Spec
module Sudo
def self.present?
- @which_sudo ||= `which sudo`.strip rescue ''
+ @which_sudo ||= (`which sudo`.chomp rescue '')
!@which_sudo.empty? && ENV['BUNDLER_SUDO_TESTS']
end

0 comments on commit 6bee5f6

Please sign in to comment.