diff options
Diffstat (limited to 'lib/rubygems/request')
-rw-r--r-- | lib/rubygems/request/connection_pools.rb | 12 | ||||
-rw-r--r-- | lib/rubygems/request/http_pool.rb | 3 | ||||
-rw-r--r-- | lib/rubygems/request/https_pool.rb | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb index a4c2929b38..6c1b04ab65 100644 --- a/lib/rubygems/request/connection_pools.rb +++ b/lib/rubygems/request/connection_pools.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Gem::Request::ConnectionPools # :nodoc: - @client = Net::HTTP + @client = Gem::Net::HTTP class << self attr_accessor :client @@ -28,7 +28,7 @@ class Gem::Request::ConnectionPools # :nodoc: end def close_all - @pools.each_value {|pool| pool.close_all } + @pools.each_value(&:close_all) end private @@ -37,15 +37,15 @@ class Gem::Request::ConnectionPools # :nodoc: # Returns list of no_proxy entries (if any) from the environment def get_no_proxy_from_env - env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY'] + env_no_proxy = ENV["no_proxy"] || ENV["NO_PROXY"] - return [] if env_no_proxy.nil? or env_no_proxy.empty? + return [] if env_no_proxy.nil? || env_no_proxy.empty? env_no_proxy.split(/\s*,\s*/) end def https?(uri) - uri.scheme.downcase == 'https' + uri.scheme.casecmp("https").zero? end def no_proxy?(host, env_no_proxy) @@ -78,7 +78,7 @@ class Gem::Request::ConnectionPools # :nodoc: no_proxy = get_no_proxy_from_env - if proxy_uri and not no_proxy?(hostname, no_proxy) + if proxy_uri && !no_proxy?(hostname, no_proxy) proxy_hostname = proxy_uri.respond_to?(:hostname) ? proxy_uri.hostname : proxy_uri.host net_http_args + [ proxy_hostname, diff --git a/lib/rubygems/request/http_pool.rb b/lib/rubygems/request/http_pool.rb index f028516db8..52543de41f 100644 --- a/lib/rubygems/request/http_pool.rb +++ b/lib/rubygems/request/http_pool.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + ## # A connection "pool" that only manages one connection for now. Provides # thread safe `checkout` and `checkin` methods. The pool consists of one @@ -26,7 +27,7 @@ class Gem::Request::HTTPPool # :nodoc: def close_all until @queue.empty? - if connection = @queue.pop(true) and connection.started? + if (connection = @queue.pop(true)) && connection.started? connection.finish end end diff --git a/lib/rubygems/request/https_pool.rb b/lib/rubygems/request/https_pool.rb index 50f42d9e0d..cb1d4b59b6 100644 --- a/lib/rubygems/request/https_pool.rb +++ b/lib/rubygems/request/https_pool.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class Gem::Request::HTTPSPool < Gem::Request::HTTPPool # :nodoc: private |