bundler 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd61d3f649a2286c95d0bc5515d4ea65c973eb9
-  data.tar.gz: 76e9fa0bc5815e53bb843aba5740beb312c0e431
+  metadata.gz: b7fccfcec378505ae78a308e9f840497a8a6593f
+  data.tar.gz: 36f474d0d2bd87d1d4883e7b452dc3b9f44a8e84
 SHA512:
-  metadata.gz: b8632f839d3b851aa0616049fba43da47ae30cb3ccb2ec08b17bff58500918587734e5355fea0b4315b60a393a573a11991bac41c606a4762ec69dbe76f60c36
-  data.tar.gz: 03c4b99989fc26da6126342f4e79625d153bb06c1675b426fd64bb1e2570592e8123c5c5adddcc4bfff8e7dc9ec5c0331b01d724f8d9e7d25e6d38f1a3445d34
+  metadata.gz: 7052ec5a2415965569c0a85a1c403b40b37eaa642fc3bb512cd80690505661dc1cf658bfd24100d1146faa28c904e94074e5be64783845b1be139248d449981f
+  data.tar.gz: 6cfc213cafa8e3c381dd52c04b20a6eec60dc6471c4d197694893834ce5cad1d97fec10c723432a352b2393c24d3e29387bfbab2864338c3c62339742c589375

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.6.5 (2014-07-23)
+
+Bugfixes:
+
+  - require openssl explicitly to fix rare HTTPS request failures (@indirect, #3107)
+
 ## 1.6.4 (2014-07-17)
 
 Bugfixes:

data/lib/bundler.rb

@@ -189,7 +189,7 @@ module Bundler
     end
 
     def root
-      default_gemfile.dirname.expand_path
+      @root ||= default_gemfile.dirname.expand_path
     end
 
     def app_config_path

data/lib/bundler/fetcher.rb

@@ -91,47 +91,43 @@ module Bundler
     end
 
     def initialize(remote_uri)
-
-      # How many redirects to allew in one request
-      @redirect_limit = 5
-      # How long to wait for each gemcutter API call
-      @api_timeout = 10
-      # How many retries for the gemcutter API call
-      @max_retries = 3
+      @redirect_limit = 5  # How many redirects to allow in one request
+      @api_timeout    = 10 # How long to wait for each API call
+      @max_retries    = 3  # How many retries for the API call
 
       @remote_uri = Bundler::Source.mirror_for(remote_uri)
       @public_uri = @remote_uri.dup
       @public_uri.user, @public_uri.password = nil, nil # don't print these
 
       Socket.do_not_reverse_lookup = true
+      connection # create persistent connection
     end
 
     def connection
-      return @connection if @connection
-
-      needs_ssl = @remote_uri.scheme == "https" ||
-        Bundler.settings[:ssl_verify_mode] ||
-        Bundler.settings[:ssl_client_cert]
-      raise SSLError if needs_ssl && !defined?(OpenSSL)
-
-      @connection = Net::HTTP::Persistent.new 'bundler', :ENV
+      @connection ||= begin
+        needs_ssl = @remote_uri.scheme == "https" ||
+          Bundler.settings[:ssl_verify_mode] ||
+          Bundler.settings[:ssl_client_cert]
+        raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
+
+        con = Net::HTTP::Persistent.new 'bundler', :ENV
+
+        if @remote_uri.scheme == "https"
+          con.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
+            OpenSSL::SSL::VERIFY_PEER)
+          con.cert_store = bundler_cert_store
+        end
 
-      if @remote_uri.scheme == "https"
-        @connection.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
-          OpenSSL::SSL::VERIFY_PEER)
-        @connection.cert_store = bundler_cert_store
-      end
+        if Bundler.settings[:ssl_client_cert]
+          pem = File.read(Bundler.settings[:ssl_client_cert])
+          con.cert = OpenSSL::X509::Certificate.new(pem)
+          con.key  = OpenSSL::PKey::RSA.new(pem)
+        end
 
-      if Bundler.settings[:ssl_client_cert]
-        pem = File.read(Bundler.settings[:ssl_client_cert])
-        @connection.cert = OpenSSL::X509::Certificate.new(pem)
-        @connection.key  = OpenSSL::PKey::RSA.new(pem)
+        con.read_timeout = @api_timeout
+        con.override_headers["User-Agent"] = self.class.user_agent
+        con
       end
-
-      @connection.read_timeout = @api_timeout
-      @connection.override_headers["User-Agent"] = self.class.user_agent
-
-      @connection
     end
 
     def uri
@@ -255,9 +251,10 @@ module Bundler
       raise HTTPError, "Too many redirects" if counter >= @redirect_limit
 
       response = request(uri)
+      Bundler.ui.debug("HTTP #{response.code} #{response.message}")
+
       case response
       when Net::HTTPRedirection
-        Bundler.ui.debug("HTTP Redirection")
         new_uri = URI.parse(response["location"])
         if new_uri.host == uri.host
           new_uri.user = uri.user
@@ -265,7 +262,6 @@ module Bundler
         end
         fetch(new_uri, counter + 1)
       when Net::HTTPSuccess
-        Bundler.ui.debug("HTTP Success")
         response.body
       when Net::HTTPRequestEntityTooLarge
         raise FallbackError, response.body
@@ -275,7 +271,7 @@ module Bundler
     end
 
     def request(uri)
-      Bundler.ui.debug "Fetching from: #{uri}"
+      Bundler.ui.debug "HTTP GET #{uri}"
       req = Net::HTTP::Get.new uri.request_uri
       if uri.user
         user = CGI.unescape(uri.user)
@@ -287,7 +283,8 @@ module Bundler
       retry_with_auth { request(uri) }
     rescue OpenSSL::SSL::SSLError
       raise CertificateFailureError.new(uri)
-    rescue *HTTP_ERRORS
+    rescue *HTTP_ERRORS => e
+      Bundler.ui.trace e
       raise HTTPError, "Network error while fetching #{uri}"
     end
 

data/lib/bundler/ui/shell.rb

@@ -56,12 +56,9 @@ module Bundler
       end
 
       def trace(e, newline = nil)
+        return unless debug?
         msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
-        if debug?
-          tell_me(msg, nil, newline)
-        elsif @trace
-          STDERR.puts "#{msg}#{newline}"
-        end
+        tell_me(msg, nil, newline)
       end
 
       def silence

data/lib/bundler/vendored_persistent.rb

@@ -1,3 +1,11 @@
+# We forcibly require OpenSSL, because net/http/persistent will only autoload
+# it. On some Rubies, autoload fails but explicit require succeeds.
+begin
+  require 'openssl'
+rescue LoadError
+  # some Ruby builds don't have OpenSSL
+end
+
 vendor = File.expand_path('../vendor', __FILE__)
 $:.unshift(vendor) unless $:.include?(vendor)
 require 'net/http/persistent'

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.6.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.5" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount