Merge branch '1-0-stable'

4 files changed, 47 insertions, 32 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30d3be9a0c..aa4d0a7da2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,9 +33,14 @@ Removed:
 
 Features:
 
-  - Compatibility with Rubygems master (soon to be v1.8)
-  - Check for Rubygems features before overriding them
+  - Compatibility with Rubygems master (soon to be v1.8) (@evanphx)
   - Informative error when --path points to a broken symlink
+  - Support Rake 0.9 and greater (@e2)
+  - Output full errors for non-TTYs e.g. pow (@josh)
+
+Bugfixes:
+
+  - Allow spaces in gem path names for gem tasks (@rslifka)
 
 ## 1.0.12 (April 8, 2011)
 
diff --git a/Rakefile b/Rakefile
index e50c2582ad..0bde126c84 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,8 +8,8 @@ def sudo?
 end
 
 begin
+  # set up rspec tasks
   require 'rspec/core/rake_task'
-  require 'ronn'
 
   desc "Run specs"
   RSpec::Core::RakeTask.new do |t|
@@ -129,6 +129,38 @@ begin
 
   end
 
+
+  # set up man tasks that use ronn
+  require 'ronn'
+
+  namespace :man do
+    directory "lib/bundler/man"
+
+    Dir["man/*.ronn"].each do |ronn|
+      basename = File.basename(ronn, ".ronn")
+      roff = "lib/bundler/man/#{basename}"
+
+      file roff => ["lib/bundler/man", ronn] do
+        sh "ronn --roff --pipe #{ronn} > #{roff}"
+      end
+
+      file "#{roff}.txt" => roff do
+        sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
+      end
+
+      task :build_all_pages => "#{roff}.txt"
+    end
+
+    desc "Build the man pages"
+    task :build => "man:build_all_pages"
+
+    desc "Clean up from the built man pages"
+    task :clean do
+      rm_rf "lib/bundler/man"
+    end
+  end
+
+
 rescue LoadError
   task :spec do
     abort "Run `rake spec:deps` to be able to run the specs"
@@ -144,33 +176,6 @@ rescue LoadError
 
 end
 
-namespace :man do
-  directory "lib/bundler/man"
-
-  Dir["man/*.ronn"].each do |ronn|
-    basename = File.basename(ronn, ".ronn")
-    roff = "lib/bundler/man/#{basename}"
-
-    file roff => ["lib/bundler/man", ronn] do
-      sh "ronn --roff --pipe #{ronn} > #{roff}"
-    end
-
-    file "#{roff}.txt" => roff do
-      sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
-    end
-
-    task :build_all_pages => "#{roff}.txt"
-  end
-
-  desc "Build the man pages"
-  task :build => "man:build_all_pages"
-
-  desc "Clean up from the built man pages"
-  task :clean do
-    rm_rf "lib/bundler/man"
-  end
-end
-
 namespace :vendor do
   desc "Build the vendor dir"
   task :build => :clean do
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 28c9e869ff..93aaca7b83 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -116,7 +116,7 @@ module Bundler
           sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/"
           sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/"
           spec.executables.each do |exe|
-            sudo "mkdir -p #{Bundler.rubygems.bindir}"
+            sudo "mkdir -p #{Bundler.rubygems.gem_bindir}"
             sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_bindir}"
           end
         end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 867d80a681..201b5c76aa 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -39,8 +39,13 @@ RSpec.configure do |config|
   config.include Spec::Platforms
   config.include Spec::Sudo
 
+  if Spec::Sudo.test_sudo?
+    config.filter_run :sudo => true
+  else
+    config.filter_run_excluding :sudo => true
+  end
+
   config.filter_run :focused => true unless ENV['CI']
-  config.filter_run_excluding :sudo => true unless Spec::Sudo.test_sudo?
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true