Don't add nonexistent bindirs to the load path

Conflicts:

	spec/bundler/cli_spec.rb

lib/bundler/bundle.rb

@@ -245,7 +245,9 @@ def load_paths_for_specs(specs, options)
       specs.each do |spec|
         next if options[:no_bundle].include?(spec.name)
         gem_path = Pathname.new(spec.full_gem_path)
-        load_paths << load_path_for(gem_path, spec.bindir) if spec.bindir
+        if spec.bindir && gem_path.join(spec.bindir).exist?
+          load_paths << load_path_for(gem_path, spec.bindir)
+        end
         spec.require_paths.each do |path|
           load_paths << load_path_for(gem_path, path)
         end

spec/bundler/cli_spec.rb

@@ -91,6 +91,16 @@
       @manifest.gem_path.join('../../environment.rb').file?.should == true
     end
 
+    it "adds existing bin directories to the load path" do
+      load_paths = run_in_context("require 'rake'; puts $:").split("\n")
+      load_paths.should include(@manifest.gem_path.join('gems/rake-0.8.7/bin').to_s)
+    end
+
+    it "doesn't add non-existant bin directories to the load path'" do
+      load_paths = run_in_context("require 'activesupport'; puts $:").split("\n")
+      load_paths.should_not include(@manifest.gem_path.join('gems/activesupport-2.3.2/bin').to_s)
+    end
+
     it "creates valid executables in ./bin" do
       app_root do
         `bin/rake`.should == "0.8.7\n"