Merge pull request #1403 from stephencelis/bundler

---

This pull request fixes a few warnings I encounter with the `-w` flag enabled when I run `bundle exec rake`.

Conflicts:
	lib/bundler/rubygems_integration.rb

3 files changed, 4 insertions, 0 deletions

diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index 54e72c53b7..20c08b7379 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -40,6 +40,7 @@ module Gem
     end
 
     # RubyGems 1.8+ used only.
+    remove_method :gem_dir if method_defined? :gem_dir
     def gem_dir
       full_gem_path
     end
@@ -151,6 +152,7 @@ module Gem
     MSWIN = Gem::Platform.new('mswin32')
     MINGW = Gem::Platform.new('x86-mingw32')
 
+    undef_method :hash if method_defined? :hash
     def hash
       @cpu.hash ^ @os.hash ^ @version.hash
     end
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index d6721c876a..0978942130 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -180,6 +180,7 @@ module Bundler
     end
 
     def stub_source_index170(specs)
+      Gem::SourceIndex.send(:alias_method, :old_initialize, :initialize)
       Gem::SourceIndex.send(:define_method, :initialize) do |*args|
         @gems = {}
         # You're looking at this thinking: Oh! This is how I make those
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 25b59927af..139964061b 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -490,6 +490,7 @@ module Bundler
         @revision   = options["revision"]
         @submodules = options["submodules"]
         @update     = false
+        @installed  = nil
       end
 
       def self.from_lock(options)