p.include? is not a legitimate path comparison

Closes #328

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 61dd448b46..23e3d01cef 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -57,9 +57,9 @@ module Bundler
       if defined?(::Gem)
         me = File.expand_path("../../", __FILE__)
         $LOAD_PATH.reject! do |p|
-          next if File.expand_path(p).include?(me)
+          next if File.expand_path(p) =~ /^#{me}/
           p != File.dirname(__FILE__) &&
-            Gem.path.any? { |gp| p.include?(gp) }
+            Gem.path.any?{|gp| p =~ /^#{gp}/ }
         end
         $LOAD_PATH.uniq!
       end
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 73c070813b..1bfa4ca79a 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -156,6 +156,14 @@ describe "Bundler.setup" do
         run "require 'yard'"
         out.should == "bundler-#{Bundler::VERSION}\nyard-1.0"
       end
+
+      context "when the ruby stdlib is a substring of Gem.path" do
+        it "does not reject the stdlib from $LOAD_PATH" do
+          substring = "/" + $LOAD_PATH.find{|p| p =~ /vendor_ruby/ }.split("/")[2]
+          run "puts 'worked!'", :env => {"GEM_PATH" => substring}
+          out.should == "worked!"
+        end
+      end
     end
   end