Skip to content

Commit c74a539

Browse files
simideivid-rodriguez
authored andcommitted
Merge pull request #4640 from rubygems/no_resolv
Don't load `resolv` unnecessarily (cherry picked from commit 9b054d9)
1 parent 19cb165 commit c74a539

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

bundler/lib/bundler/fetcher/index.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# frozen_string_literal: true
22

33
require_relative "base"
4-
require "rubygems/remote_fetcher"
54

65
module Bundler
76
class Fetcher

bundler/lib/bundler/rubygems_integration.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,10 +529,9 @@ def download_gem(spec, uri, path)
529529
end
530530

531531
def gem_remote_fetcher
532-
require "resolv"
532+
require "rubygems/remote_fetcher"
533533
proxy = configuration[:http_proxy]
534-
dns = Resolv::DNS.new
535-
Gem::RemoteFetcher.new(proxy, dns)
534+
Gem::RemoteFetcher.new(proxy)
536535
end
537536

538537
def gem_from_path(path, policy = nil)

bundler/spec/bundler/fetcher/index_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# frozen_string_literal: true
22

3+
require "rubygems/remote_fetcher"
4+
35
RSpec.describe Bundler::Fetcher::Index do
46
let(:downloader) { nil }
57
let(:remote) { nil }

0 commit comments

Comments
 (0)