Proxy configuration

* Add proxy config variables
* Use a proxy connection if proxy is enabled

README.md

@@ -58,6 +58,18 @@ CircleCi.configure do |config|
 end
 ```
 
+Setup for proxying requests
+```ruby
+require 'circleci'
+
+CircleCi.configure do |config|
+  config.token = ENV['CIRCLECI_TOKEN']
+  config.proxy_host = 'http://ciproxy.mycompany.com'
+  config.proxy_port = 8000
+  config.proxy = true
+end
+```
+
 ## API Endpoints
 
 * [User](#user)

lib/circleci/config.rb

@@ -10,20 +10,37 @@ class Config
     DEFAULT_URI = "#{DEFAULT_HOST}/api/#{DEFAULT_VERSION}".freeze
     DEFAULT_PORT = 443
 
-    attr_accessor :token, :host, :port, :request_overrides, :version
+    attr_accessor :token, :host, :port, :request_overrides, :version, :proxy,
+                  :proxy_host, :proxy_port, :proxy_user, :proxy_pass
 
     ##
     #
     # @private
     def initialize
       @host = DEFAULT_HOST
       @port = DEFAULT_PORT
+      @proxy = false
       @version = DEFAULT_VERSION
       @request_overrides = {}
     end
 
     def uri
       URI.parse("#{@host || DEFAULT_HOST}:#{@port || DEFAULT_PORT}/api/#{@version || DEFAULT_VERSION}")
     end
+
+    def proxy_userinfo?
+      @proxy_user && @proxy_pass
+    end
+
+    def proxy_port
+      @proxy_port ? @proxy_port : 80
+    end
+
+    def proxy_uri
+      return unless @proxy && @proxy_host
+      host_uri = URI.parse(@proxy_host)
+      userinfo = proxy_userinfo? ? "#{@proxy_user}:#{@proxy_pass}@" : ''
+      URI.parse("#{host_uri.scheme}://#{userinfo}#{host_uri.host}:#{proxy_port}#{host_uri.path}")
+    end
   end
 end

lib/circleci/request.rb

@@ -19,7 +19,7 @@ class Request
     def initialize(config, path, params = {})
       @config = config
       @uri = build_uri(path, params)
-      @net = Net::HTTP.new(@uri.hostname, @uri.port)
+      @net = net_http
       setup_http(@net)
     end
 
@@ -65,6 +65,16 @@ def build_uri(path, params = {})
       uri
     end
 
+    def net_http
+      proxy_uri = @config.proxy_uri
+      if @config.proxy && proxy_uri
+        Net::HTTP.new(@uri.hostname, @uri.port,
+                      proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+      else
+        Net::HTTP.new(@uri.hostname, @uri.port, nil, nil, nil, nil)
+      end
+    end
+
     def transmit(req)
       response = nil
       @net.start do |http|