Merge pull request rubygems#1217 from evanphx/1-0-stable

Quite deprecations and fix a bad test

lib/bundler/rubygems_integration.rb

@@ -157,6 +157,16 @@ def replace_gem(specs)
       end
     end
 
+    if defined? ::Deprecate
+      Deprecate = ::Deprecate
+    elsif defined? Gem::Deprecate
+      Deprecate = Gem::Deprecate
+    else
+      class Deprecate
+        def skip_during; yield; end
+      end
+    end
+
     def stub_source_index137(specs)
       # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
       source_index_class = (class << Gem::SourceIndex ; self ; end)
@@ -172,8 +182,19 @@ def stub_source_index137(specs)
     def stub_source_index170(specs)
       Gem::SourceIndex.send(:define_method, :initialize) do |*args|
         @gems = {}
-        self.spec_dirs = *args
-        add_specs(*specs)
+        # You're looking at this thinking: Oh! This is how I make those
+        # rubygems deprecations go away!
+        #
+        # You'd be correct BUT using of this method in production code
+        # must be approved by the rubygems team itself!
+        #
+        # This is your warning. If you use this and don't have approval
+        # we can't protect you.
+        #
+        Deprecate.skip_during do
+          self.spec_dirs = *args
+          add_specs(*specs)
+        end
       end
     end
 

spec/install/git_spec.rb

@@ -351,7 +351,6 @@
     out.should include("Git error:")
     err.should include("fatal")
     err.should include("omgomg")
-    err.should include("fatal: The remote end hung up unexpectedly")
   end
 
   it "works when the gem path has spaces in it" do