Fix "method redefined" warnings.

stephencelis · Sep 13, 2011 · b4b409d · b4b409d
1 parent 4925f52
commit b4b409d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
@@ -40,6 +40,7 @@ def load_paths
     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 @@ class Platform
     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
@@ -180,6 +180,7 @@ def stub_source_index137(specs)
     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