Auto merge of #4302 - bundler:seg-no-proxy-support, r=indirect

[Fetcher] Support setting http_proxy to :no_proxy

Closes #4294

lib/bundler/fetcher.rb

@@ -236,7 +236,7 @@ def connection
 
         con = Net::HTTP::Persistent.new "bundler", :ENV
         if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
-          con.proxy = URI.parse(gem_proxy)
+          con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
 
         if remote_uri.scheme == "https"

spec/bundler/fetcher_spec.rb

@@ -24,8 +24,9 @@
       end
     end
     context "when Gem.configuration specifies http_proxy " do
+      let(:proxy) { "http://proxy-example2.com" }
       before do
-        allow(Bundler.rubygems.configuration).to receive(:[]).and_return("http://proxy-example2.com")
+        allow(Bundler.rubygems.configuration).to receive(:[]).with(:http_proxy).and_return(proxy)
       end
       it "consider Gem.configuration when determine proxy" do
         expect(fetcher.http_proxy).to match("http://proxy-example2.com")
@@ -35,6 +36,12 @@
           expect(fetcher.http_proxy).to match("http://proxy-example2.com")
         end
       end
+      context "when the proxy is :no_proxy" do
+        let(:proxy) { :no_proxy }
+        it "does not set a proxy" do
+          expect(fetcher.http_proxy).to be_nil
+        end
+      end
     end
 
     context "when a rubygems source mirror is set" do