circleci 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b593d6e0bcf64fc14fb6ad923be106b6909cbd3
-  data.tar.gz: 702ed7c6b41beef442a87c7d1f6ce0139a0fd51e
+  metadata.gz: 426c654a19583455c23e8d161e920c830c46ff88
+  data.tar.gz: 223fe31474077ccaa5e9ae0ac0be8e7a14c9df18
 SHA512:
-  metadata.gz: a13042709bc07021325712265b2060d7b9fa4551bfd78163b90f337d6008c52d77cfe201f11d1a3f3331c3aafe705337e49f6064ca8bb89af870c4c97447772a
-  data.tar.gz: b795a0a4b3bbff5acac6b7bd8441e82859ae4e9a696df45b1fc86c189c185de0991c5ccbbf4ce5a478ac788729f94d1c1460df6453dfd292b4bbce9daf7e06e0
+  metadata.gz: 9b6ea327972d7410aa4f2517b371039d87eeb9c91e7e16579a7610fc204188af9aba60bd7264ccc52782079a7bc0c13a5ed4faf141e80331f010d74c2888839d
+  data.tar.gz: 8f06b56a261f848aafc53ebc5f37d5c4042606e7be3e25b726522afcbf562cfb6eab86273a06800bda73826d3119a39f4d6ae2a290718507a56be27fb9380451

data/README.md

@@ -7,7 +7,7 @@ circleci
 [![Coverage Status](https://coveralls.io/repos/mtchavez/circleci/badge.png)](https://coveralls.io/r/mtchavez/circleci)
 [![Dependency Status](https://gemnasium.com/mtchavez/circleci.svg)](https://gemnasium.com/mtchavez/circleci)
 
-Circle CI API Wrapper
+Circle CI API Wrapper. Requires ruby `>= 2.0.0`.
 
 ## Install
 
@@ -49,12 +49,29 @@ Overriding request settings such as not verifying SSL
 ```ruby
 CircleCi.configure do |config|
   config.token = ENV['CIRCLECI_TOKEN']
+  config.host = 'http://ci.mycompany.com'
+  config.port = 80
   config.request_overrides = {
+    use_ssl: false,
     verify_ssl: false
   }
 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_user = 'myci'
+  config.proxy_pass = 'supersecret'
+  config.proxy = true
+end
+```
+
 ## API Endpoints
 
 * [User](#user)
@@ -190,6 +207,18 @@ Build a specific branch of a project
 res = CircleCi::Project.build_branch 'username', 'reponame', 'branch'
 res.body['status'] # Not running
 res.body['build_url'] # Get url of build
+
+# Passing build parameters in the post body
+build_params = { build_parameters: { 'MY_TOKEN' => '123asd123asd' } }
+res = CircleCi::Project.build_branch 'username', 'reponame', 'branch', {}, build_params
+res.body['status'] # Not running
+res.body['build_url'] # Get url of build
+
+# Adding URL params for revision or parallel
+params = { revision: 'fda12345asdf', parallel: 2 }
+res = CircleCi::Project.build_branch 'username', 'reponame', 'branch', params
+res.body['status'] # Not running
+res.body['build_url'] # Get url of build
 ```
 
 Example response

data/lib/circleci.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
 require 'json'
-require 'rest-client'
 require 'net/http'
+require 'uri'
 
 files = %w[
   build
   config
-  http
   project
   recent_builds
-  request_error
+  request
   response
   user
 ]
@@ -27,7 +27,6 @@ module CircleCi
   #   CircleCi.configure do |config|
   #     config.token = 'my-token'
   #   end
-
   def configure
     yield config
   end
@@ -35,12 +34,11 @@ module CircleCi
   ##
   #
   # @return [CircleCi::Config]
-
   def config
     @config ||= Config.new
   end
 
-  def http # @private
-    Http.new(config)
+  def request(path, params = {})
+    Request.new config, path, params
   end
 end

data/lib/circleci/build.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CircleCi
   ##
   #
@@ -11,9 +12,8 @@ module CircleCi
     # @param project  [String] - Name of project
     # @param build    [String] - Build ID
     # @return         [CircleCi::Response] - Response object
-
     def self.artifacts(username, project, build)
-      CircleCi.http.get "/project/#{username}/#{project}/#{build}/artifacts"
+      CircleCi.request("/project/#{username}/#{project}/#{build}/artifacts").get
     end
 
     ##
@@ -24,9 +24,8 @@ module CircleCi
     # @param project  [String] - Name of project
     # @param build    [String] - Build ID
     # @return         [CircleCi::Response] - Response object
-
     def self.cancel(username, project, build)
-      CircleCi.http.post "/project/#{username}/#{project}/#{build}/cancel"
+      CircleCi.request("/project/#{username}/#{project}/#{build}/cancel").post
     end
 
     ##
@@ -37,9 +36,8 @@ module CircleCi
     # @param project  [String] - Name of project
     # @param build    [String] - Build ID
     # @return         [CircleCi::Response] - Response object
-
     def self.get(username, project, build)
-      CircleCi.http.get "/project/#{username}/#{project}/#{build}"
+      CircleCi.request("/project/#{username}/#{project}/#{build}").get
     end
 
     ##
@@ -50,9 +48,8 @@ module CircleCi
     # @param project  [String] - Name of project
     # @param build    [String] - Build ID
     # @return         [CircleCi::Response] - Response object
-
     def self.retry(username, project, build)
-      CircleCi.http.post "/project/#{username}/#{project}/#{build}/retry"
+      CircleCi.request("/project/#{username}/#{project}/#{build}/retry").post
     end
 
     ##
@@ -65,7 +62,7 @@ module CircleCi
     # @return [CircleCi::Response] - Response object
 
     def self.tests(username, project, build)
-      CircleCi.http.get "/project/#{username}/#{project}/#{build}/tests"
+      CircleCi.request("/project/#{username}/#{project}/#{build}/tests").get
     end
   end
 end

data/lib/circleci/config.rb

@@ -1,41 +1,46 @@
+# frozen_string_literal: true
 module CircleCi
   ##
   #
   # Config class used internally.
-  # Configure API calls using AlPapi.configure
+  # Configure API calls using CircleCi.configure
   class Config
     DEFAULT_VERSION = 'v1'.freeze
     DEFAULT_HOST = 'https://circleci.com'.freeze
     DEFAULT_URI = "#{DEFAULT_HOST}/api/#{DEFAULT_VERSION}".freeze
-    DEFAULT_PORT = 80
+    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
-      base = @host
-      base += ":#{@port}" unless port_80? || host_has_port?
-      base + "/api/#{@version}"
+      URI.parse("#{@host || DEFAULT_HOST}:#{@port || DEFAULT_PORT}/api/#{@version || DEFAULT_VERSION}")
     end
 
-    private
+    def proxy_userinfo?
+      @proxy_user && @proxy_pass
+    end
 
-    def port_80?
-      @port == DEFAULT_PORT
+    def proxy_port
+      @proxy_port ? @proxy_port : 80
     end
 
-    def host_has_port?
-      @host =~ /:\d{1,7}$/
+    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

data/lib/circleci/project.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CircleCi
   ##
   #
@@ -8,9 +9,8 @@ module CircleCi
     # Return all projects for your API key
     #
     # @return [CircleCi::Response] - Response object
-
     def self.all
-      CircleCi.http.get '/projects'
+      CircleCi.request('/projects').get
     end
 
     ##
@@ -20,9 +20,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.build(username, project)
-      CircleCi.http.post "/project/#{username}/#{project}"
+      CircleCi.request("/project/#{username}/#{project}").post
     end
 
     ##
@@ -32,13 +31,10 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @param branch   [String] - Name of branch
-    # @param build_parameters   [Hash] - Optional Build Parameters
+    # @param body     [Hash] - Optional post body with build parameters
     # @return         [CircleCi::Response] - Response object
-
-    def self.build_branch(username, project, branch, build_parameters = {})
-      body = {}
-      body['build_parameters'] = build_parameters unless build_parameters.empty?
-      CircleCi.http.post "/project/#{username}/#{project}/tree/#{branch}", {}, body
+    def self.build_branch(username, project, branch, params = {}, body = {})
+      CircleCi.request("/project/#{username}/#{project}/tree/#{branch}", params).post(body)
     end
 
     ##
@@ -53,7 +49,7 @@ module CircleCi
     # @return         [CircleCi::Response] - Response object
     def self.build_ssh_key(username, project, build, key, hostname)
       body = { hostname: hostname, private_key: key }
-      CircleCi.http.post "/project/#{username}/#{project}/#{build}/ssh-users", {}, body
+      CircleCi.request("/project/#{username}/#{project}/#{build}/ssh-users").post(body)
     end
 
     ##
@@ -63,9 +59,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.clear_cache(username, project)
-      CircleCi.http.delete "/project/#{username}/#{project}/build-cache"
+      CircleCi.request("/project/#{username}/#{project}/build-cache").delete
     end
 
     ##
@@ -76,9 +71,8 @@ module CircleCi
     # @param project      [String] - Name of project
     # @param fingerprint  [String] - Fingerprint of a checkout key
     # @return             [CircleCi::Response] - Response object
-
     def self.delete_checkout_key(username, project, fingerprint)
-      CircleCi.http.delete "/project/#{username}/#{project}/checkout-key/#{fingerprint}"
+      CircleCi.request("/project/#{username}/#{project}/checkout-key/#{fingerprint}").delete
     end
 
     ##
@@ -89,9 +83,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.enable(username, project)
-      CircleCi.http.post "/project/#{username}/#{project}/enable"
+      CircleCi.request("/project/#{username}/#{project}/enable").delete
     end
 
     ##
@@ -101,9 +94,18 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
+    def self.envvar(username, project)
+      CircleCi.request("/project/#{username}/#{project}/envvar").get
+    end
 
+    ##
+    #
+    # @deprecated Please use [CircleCi::Project#envvar]
     def self.envvars(username, project)
-      CircleCi.http.get "/project/#{username}/#{project}/envvar"
+      # NOTE: Make logger configurable on config object?
+      logger = Logger.new(STDOUT)
+      logger.warn('[Deprecated] Project#envvars is deprecated please use Project#envvar')
+      envvar username, project
     end
 
     ##
@@ -114,10 +116,8 @@ module CircleCi
     # @param project  [String] - Name of project
     # @param envvar   [Hash] - {name: 'foo', value: 'bar'}
     # @return         [CircleCi::Response] - Response object
-
     def self.set_envvar(username, project, envvar)
-      body = envvar
-      CircleCi.http.post "/project/#{username}/#{project}/envvar", {}, body
+      CircleCi.request("/project/#{username}/#{project}/envvar").post(envvar)
     end
 
     ##
@@ -127,9 +127,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.follow(username, project)
-      CircleCi.http.post "/project/#{username}/#{project}/follow"
+      CircleCi.request("/project/#{username}/#{project}/follow").post
     end
 
     ##
@@ -140,9 +139,8 @@ module CircleCi
     # @param project      [String] - Name of project
     # @param fingerprint  [String] - Fingerprint of a checkout key
     # @return             [CircleCi::Response] - Response object
-
     def self.get_checkout_key(username, project, fingerprint)
-      CircleCi.http.get "/project/#{username}/#{project}/checkout-key/#{fingerprint}"
+      CircleCi.request("/project/#{username}/#{project}/checkout-key/#{fingerprint}").get
     end
 
     ##
@@ -152,9 +150,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.list_checkout_keys(username, project)
-      CircleCi.http.get "/project/#{username}/#{project}/checkout-key"
+      CircleCi.request("/project/#{username}/#{project}/checkout-key").get
     end
 
     ##
@@ -167,8 +164,7 @@ module CircleCi
     # @return         [CircleCi::Response] - Response object
 
     def self.new_checkout_key(username, project, type)
-      body = { type: type }
-      CircleCi.http.post "/project/#{username}/#{project}/checkout-key", {}, body
+      CircleCi.request("/project/#{username}/#{project}/checkout-key").post(type: type)
     end
 
     ##
@@ -181,7 +177,7 @@ module CircleCi
     # @return         [CircleCi::Response] - Response object
 
     def self.recent_builds(username, project, params = {})
-      CircleCi.http.get "/project/#{username}/#{project}", params
+      CircleCi.request("/project/#{username}/#{project}", params).get
     end
 
     ##
@@ -192,9 +188,8 @@ module CircleCi
     # @param project  [String] - Name of project
     # @param branch   [String] - Name of branch
     # @return         [CircleCi::Response] - Response object
-
     def self.recent_builds_branch(username, project, branch)
-      CircleCi.http.get "/project/#{username}/#{project}/tree/#{branch}"
+      CircleCi.request("/project/#{username}/#{project}/tree/#{branch}").get
     end
 
     ##
@@ -204,9 +199,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.settings(username, project)
-      CircleCi.http.get "/project/#{username}/#{project}/settings"
+      CircleCi.request("/project/#{username}/#{project}/settings").get
     end
 
     ##
@@ -218,10 +212,9 @@ module CircleCi
     # @param key      [String] - The ssh private key
     # @param hostname [String] - The hostname identified by the key
     # @return         [CircleCi::Response] - Response object
-
     def self.ssh_key(username, project, key, hostname)
       body = { hostname: hostname, private_key: key }
-      CircleCi.http.post "/project/#{username}/#{project}/ssh-key", {}, body
+      CircleCi.request("/project/#{username}/#{project}/ssh-key").post(body)
     end
 
     ##
@@ -231,9 +224,8 @@ module CircleCi
     # @param username [String] - User or org name who owns project
     # @param project  [String] - Name of project
     # @return         [CircleCi::Response] - Response object
-
     def self.unfollow(username, project)
-      CircleCi.http.post "/project/#{username}/#{project}/unfollow"
+      CircleCi.request("/project/#{username}/#{project}/unfollow").post
     end
   end
 end

data/lib/circleci/recent_builds.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CircleCi
   ##
   #
@@ -9,9 +10,8 @@ module CircleCi
     #
     # @param params [Hash] - Params to send for recent builds (limit, offset)
     # @return         [CircleCi::Response] - Response object
-
     def self.get(params = {})
-      CircleCi.http.get '/recent-builds', params
+      CircleCi.request('/recent-builds', params).get
     end
   end
 end

data/lib/circleci/request.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+module CircleCi
+  ##
+  #
+  # Request class to handle HTTP API interactions
+  #
+  class Request
+    DEFAULT_OPTIONS = {
+      use_ssl: true,
+      verify_ssl: true,
+      verify_mode: OpenSSL::SSL::VERIFY_PEER
+    }.freeze
+
+    DEFAULT_HEADERS = {
+      'accept' => 'application/json',
+      'content-type' => 'application/json'
+    }.freeze
+
+    def initialize(config, path, params = {})
+      @config = config
+      @uri = build_uri(path, params)
+      @net = net_http
+      setup_http(@net)
+    end
+
+    def get
+      execute :get
+    end
+
+    def post(body = {})
+      execute :post, body
+    end
+
+    def delete
+      execute :delete
+    end
+
+    private
+
+    def execute(verb, body = {})
+      http = connection(verb, body)
+      setup_http(http)
+      transmit http
+    end
+
+    def connection(verb, body = {})
+      req = Net::HTTP.const_get(verb.to_s.capitalize, false).new(@uri, DEFAULT_HEADERS)
+      req.body = JSON.dump(body)
+      req
+    end
+
+    def setup_http(http)
+      options = DEFAULT_OPTIONS.merge(@config.request_overrides)
+      options.each do |option, value|
+        setter = "#{option.to_sym}="
+        http.send(setter, value) if http.respond_to?(setter)
+      end
+    end
+
+    def build_uri(path, params = {})
+      uri = @config.uri
+      uri.path += path
+      params['circle-token'] = @config.token
+      uri.query = URI.encode_www_form(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|
+        response = http.request(req, nil, &:read_body)
+      end
+      Response.new response
+    end
+  end
+end

data/lib/circleci/response.rb

@@ -1,39 +1,47 @@
+# frozen_string_literal: true
 module CircleCi
   ##
   #
   # Response class is used to get access to raw HTTP request info
   class Response
-    attr_reader :success, :body, :errors, :code, :path
+    extend Forwardable
+
+    def_delegators :@resp, :code, :message, :uri
+
+    attr_reader :body
+
     ##
     # Initializing response object to be returned from API calls, used internally.
     #
     # @private
-
-    def initialize(http, resp_code, resp_path) # @private
-      @success = http.success
-      @body = http.response
-      @errors = http.errors
-      @code = resp_code
-      @path = resp_path
+    def initialize(resp) # @private
+      @resp = resp
+      @body = parsed_body
     end
 
     ##
     #
     # Convenience method to determine if request was successfull or not
     # @return [Boolean]
-
     def success?
-      @success == true
+      case @resp.code.to_i
+      when (200..299) then true
+      else
+        false
+      end
     end
 
+    private
+
     ##
+    # Attempts to parse the response as JSON. Will rescue and return original
+    # if unable to parse.
     #
-    # *Deprecated* - To remove hashie dependency
-    # Parses JSON body of request
-    # @return [@body]
-
+    # @return [Hash,Array,String] A parsed JSON object or the original response body
     def parsed_body
-      @body
+      JSON.parse @resp.body
+    rescue JSON::ParserError
+      @resp.body
     end
   end
 end

data/lib/circleci/user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CircleCi
   ##
   #
@@ -8,9 +9,8 @@ module CircleCi
     # Get user account details
     #
     # @return [CircleCi::Response] - Response object
-
     def self.me
-      CircleCi.http.get '/me'
+      CircleCi.request('/me').get
     end
 
     ##
@@ -20,8 +20,7 @@ module CircleCi
     # @param apikey   [String] - The Heroku API key
     # @return         [CircleCi::Response] - Response object
     def self.heroku_key(apikey)
-      body = { apikey: apikey }
-      CircleCi.http.post '/user/heroku-key', {}, body
+      CircleCi.request('/user/heroku-key').post(apikey: apikey)
     end
   end
 end

metadata

@@ -1,69 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: circleci
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Chavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.8.14
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.8.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.8.14
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.8.14
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
@@ -90,60 +76,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.2.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.2.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -170,140 +156,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.42.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.42.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 2.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 2.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.5
 description: Ruby gem for Circle CI REST API
 email: contact@el-chavez.me
 executables: []
@@ -315,10 +301,9 @@ files:
 - lib/circleci.rb
 - lib/circleci/build.rb
 - lib/circleci/config.rb
-- lib/circleci/http.rb
 - lib/circleci/project.rb
 - lib/circleci/recent_builds.rb
-- lib/circleci/request_error.rb
+- lib/circleci/request.rb
 - lib/circleci/response.rb
 - lib/circleci/user.rb
 homepage: http://github.com/mtchavez/circleci
@@ -335,7 +320,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -343,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Circle CI REST API gem

data/lib/circleci/http.rb

@@ -1,88 +0,0 @@
-# encoding: utf-8
-
-module CircleCi
-  ##
-  #
-  # Http class handles all HTTP requests
-  class Http # @private
-    attr_accessor :errors, :response, :success, :config, :over_limit, :suspended
-
-    def initialize(config)
-      @config = config
-      @errors = []
-      @success = false
-      @over_limit = false
-      @suspended = false
-    end
-
-    def get(path, params = {})
-      request 'get', "#{path}?#{RestClient::Payload.generate(build_params(params))}"
-    end
-
-    def post(path, params = {}, body = {})
-      request 'post', "#{path}?#{RestClient::Payload.generate(build_params(params))}", body
-    end
-
-    def delete(path, params = {})
-      request 'delete', "#{path}?#{RestClient::Payload.generate(build_params(params))}"
-    end
-
-    def headers
-      { 'accept' => 'application/json', 'content-type' => 'application/json' }
-    end
-
-    def build_params(params = {})
-      params.merge('circle-token' => @config.token)
-    end
-
-    def create_request_args(http_verb, url, body)
-      args = {
-        method: http_verb.to_sym,
-        url: url,
-        headers: headers }
-      args[:payload] = body if http_verb == 'post'
-      args.merge!(@config.request_overrides)
-      args
-    end
-
-    def request(http_verb, path, body = {})
-      url  = "#{@config.uri}#{path}"
-      args = create_request_args http_verb, url, body
-
-      RestClient::Request.execute(args) do |res, _, raw_res|
-        body = res.body.to_s
-        body.force_encoding(Encoding::UTF_8)
-        code = raw_res.code.to_i
-
-        self.response = body
-        self.errors   = []
-
-        handle_response(body, code, path)
-        Response.new(self, code, path)
-      end
-    end
-
-    def parsed_body(body)
-      JSON.parse(body)
-    rescue
-      nil
-    end
-
-    def handle_response(body, code, path)
-      parsed = parsed_body(body)
-      successful_code = (200..299).cover?(code)
-      self.response = parsed if parsed
-      self.success = true
-
-      # Some responses are empty but are successful
-      if body == '""' && successful_code
-        self.response = ''
-      elsif parsed && successful_code
-        # Response is successful
-      else
-        self.success = false
-        self.errors = [RequestError.new(body, code, path)]
-      end
-    end
-  end
-end

data/lib/circleci/request_error.rb

@@ -1,14 +0,0 @@
-module CircleCi
-  ##
-  #
-  # RequestError takes http request info to raise more meaningful errors
-  class RequestError
-    attr_reader :message, :code, :path
-
-    def initialize(err_message, err_code, err_path) # @private
-      @message = err_message
-      @code = err_code
-      @path = err_path
-    end
-  end
-end