Merge branch '1-0-stable' of git://github.com/carlhuda/bundler into 1…

…-0-stable

UPGRADING.md

@@ -61,8 +61,8 @@ Bundler 0.9 removes the following Bundler 0.8 Gemfile APIs:
    via `bundle install /path/to/bundle`. Bundler will remember
    where you installed the dependencies to on a particular
    machine for future installs, loads, setups, etc.
-5. `bin_path`: Bundler no longer generates binaries in the root
-   of your app. You should use `bundle exec` to execute binaries
+5. `bin_path`: Bundler no longer generates executables in the root
+   of your app. You should use `bundle exec` to execute executables
    in the current context.
 
 ### Gemfile Changes

lib/bundler/cli.rb

@@ -347,7 +347,7 @@ def exec(*)
         exit 126
       rescue Errno::ENOENT
         Bundler.ui.error "bundler: command not found: #{ARGV.first}"
-        Bundler.ui.warn  "Install missing gem binaries with `bundle install`"
+        Bundler.ui.warn  "Install missing gem executables with `bundle install`"
         exit 127
       end
     end

lib/bundler/source.rb

@@ -362,9 +362,9 @@ def load_spec_files
               s.relative_loaded_from = "#{@name}.gemspec"
               s.authors  = ["no one"]
               if expanded_path.join("bin").exist?
-                binaries = expanded_path.join("bin").children
-                binaries.reject!{|p| File.directory?(p) }
-                s.executables = binaries.map{|c| c.basename.to_s }
+                executables = expanded_path.join("bin").children
+                executables.reject!{|p| File.directory?(p) }
+                s.executables = executables.map{|c| c.basename.to_s }
               end
             end
           end

spec/other/exec_spec.rb

@@ -101,7 +101,7 @@
     bundle "exec foobarbaz", :exitstatus => true
     exitstatus.should eq(127)
     out.should include("bundler: command not found: foobarbaz")
-    out.should include("Install missing gem binaries with `bundle install`")
+    out.should include("Install missing gem executables with `bundle install`")
   end
 
   it "errors nicely when the argument is not executable" do
@@ -115,7 +115,7 @@
     out.should include("bundler: not executable: ./foo")
   end
 
-  describe "with gem binaries" do
+  describe "with gem executables" do
     describe "run from a random directory" do
       before(:each) do
         install_gemfile <<-G