Remove unnecessary code copied from rubygems

I think the comment is misleading and it referred to rubygems, not
gemstash, because this code is about the client side of things. If this
is correct, we can drop it because we don't support any rubygems version
under 2.5.2, and the fix was introduced in rubygems 2.5.

3 files changed, 1 insertions, 45 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 3b494a6cdf..df345539c8 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -50,7 +50,6 @@ module Bundler
   autoload :FeatureFlag,            File.expand_path("bundler/feature_flag", __dir__)
   autoload :GemHelper,              File.expand_path("bundler/gem_helper", __dir__)
   autoload :GemHelpers,             File.expand_path("bundler/gem_helpers", __dir__)
-  autoload :GemRemoteFetcher,       File.expand_path("bundler/gem_remote_fetcher", __dir__)
   autoload :GemVersionPromoter,     File.expand_path("bundler/gem_version_promoter", __dir__)
   autoload :Graph,                  File.expand_path("bundler/graph", __dir__)
   autoload :Index,                  File.expand_path("bundler/index", __dir__)
diff --git a/lib/bundler/gem_remote_fetcher.rb b/lib/bundler/gem_remote_fetcher.rb
deleted file mode 100644
index 9577535d63..0000000000
--- a/lib/bundler/gem_remote_fetcher.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/remote_fetcher"
-
-module Bundler
-  # Adds support for setting custom HTTP headers when fetching gems from the
-  # server.
-  #
-  # TODO: Get rid of this when and if gemstash only supports RubyGems versions
-  # that contain https://github.com/rubygems/rubygems/commit/3db265cc20b2f813.
-  class GemRemoteFetcher < Gem::RemoteFetcher
-    attr_accessor :headers
-
-    # Extracted from RubyGems 2.4.
-    def fetch_http(uri, last_modified = nil, head = false, depth = 0)
-      fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
-      # beginning of change
-      response   = request uri, fetch_type, last_modified do |req|
-        headers.each {|k, v| req.add_field(k, v) } if headers
-      end
-      # end of change
-
-      case response
-      when Net::HTTPOK, Net::HTTPNotModified then
-        response.uri = uri if response.respond_to? :uri
-        head ? response : response.body
-      when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
-           Net::HTTPTemporaryRedirect then
-        raise FetchError.new("too many redirects", uri) if depth > 10
-
-        location = URI.parse response["Location"]
-
-        if https?(uri) && !https?(location)
-          raise FetchError.new("redirecting to non-https resource: #{location}", uri)
-        end
-
-        fetch_http(location, last_modified, head, depth + 1)
-      else
-        raise FetchError.new("bad response #{response.message} #{response.code}", uri)
-      end
-    end
-  end
-end
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 0d4dc75dbd..8a184515ed 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -533,7 +533,7 @@ module Bundler
       require "resolv"
       proxy = configuration[:http_proxy]
       dns = Resolv::DNS.new
-      Bundler::GemRemoteFetcher.new(proxy, dns)
+      Gem::RemoteFetcher.new(proxy, dns)
     end
 
     def gem_from_path(path, policy = nil)