Merge tag 'v1.7.5'

Version 1.7.5

Conflicts:
	.travis.yml
	CHANGELOG.md
	lib/bundler/fetcher.rb
	lib/bundler/source_list.rb
	man/gemfile.5.ronn
	spec/bundler/source_list_spec.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index a35ea135..09e954cd 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -236,6 +236,12 @@ module Bundler
     end
 
     def use_api
+      _use_api(true)
+    rescue AuthenticationRequiredError
+      retry_with_auth{_use_api(false)}
+    end
+
+    def _use_api(reraise_auth_error = false)
       return @use_api if defined?(@use_api)
 
       if @remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
@@ -245,6 +251,9 @@ module Bundler
       end
     rescue NetworkDownError => e
       raise HTTPError, e.message
+    rescue AuthenticationRequiredError => e
+      raise e if reraise_auth_error
+      false
     rescue HTTPError
       @use_api = false
     end
@@ -289,6 +298,8 @@ module Bundler
         response.body
       when Net::HTTPRequestEntityTooLarge
         raise FallbackError, response.body
+      when Net::HTTPUnauthorized
+        raise AuthenticationRequiredError, "#{response.class}: #{response.body}"
       else
         raise HTTPError, "#{response.class}: #{response.body}"
       end