escobar 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71745bfcd53e7c75a54b5694813bd011d29fe29
-  data.tar.gz: b2feb2071751806a09f9ca8b18919fc125e12b41
+  metadata.gz: 035950776942aaae20ca8e18c5f81c049c33d04f
+  data.tar.gz: 3e02f301fcc4ec2a6073f2add4b751638632d3d5
 SHA512:
-  metadata.gz: 9810909eff6588fef615bcb68571aae1036ee4072804d14d86de26f8266d9dabe503f104bd3acc735f1e525d577b9c95f7e1f223a617190b8f4fdaec57242cfb
-  data.tar.gz: 4778ac1e78dae976db05cd1b5bc2cc79dfc4460297a0543d9cea14ef1b0b7052ff7fdef3b6b3d7c54f443a2b27c855192c3c18e79feb064af2d048c6eb3d20df
+  metadata.gz: 83cae7d927fb2c220d90aba09a3686bd0968feb67eac7e873a6ee7bc12148c088c5359aa55a63e91ff4190e77d328169251d4e175fd852bc64f8c7e6ca11ab85
+  data.tar.gz: 00f5a6b7d2317100127c27ccaa5df9d738061d27e417b8d89ba8959fd11e1eefc6245a862c262ab0a2f6bd539a41f4cfd5358f6a4f7094b1d081dc1dcde03476

data/lib/escobar.rb

@@ -48,6 +48,14 @@ module Escobar
   def self.zipkin_enabled?
     !ENV["ZIPKIN_SERVICE_NAME"].nil? && !ENV["ZIPKIN_API_HOST"].nil?
   end
+
+  def self.http_open_timeout
+    3
+  end
+
+  def self.http_timeout
+    6
+  end
 end
 
 require_relative "./escobar/client"

data/lib/escobar/client.rb

@@ -1,6 +1,21 @@
 module Escobar
   # Top-level client for heroku
   class Client
+    # Class for returning API errors to escobar clients
+    class HTTPError < StandardError
+      attr_accessor :body, :headers, :status
+      def self.from_response(err, response)
+        error = new("Error from Heroku API")
+
+        error.body    = response.body
+        error.status  = response.status
+        error.headers = response.headers
+
+        error.set_backtrace(err.backtrace)
+        error
+      end
+    end
+
     def self.from_environment
       new(Escobar.github_api_token, Escobar.heroku_api_token)
     end

data/lib/escobar/github/client.rb

@@ -78,8 +78,8 @@ module Escobar
       def get(path)
         response = http_method(:get, path)
         JSON.parse(response.body)
-      rescue StandardError
-        response && response.body
+      rescue StandardError => e
+        raise Escobar::Client::HTTPError.from_response(e, response)
       end
 
       def accept_headers
@@ -92,26 +92,28 @@ module Escobar
           request.headers["Accept"] = accept_headers
           request.headers["Content-Type"] = "application/json"
           request.headers["Authorization"] = "token #{token}"
-          request.options.timeout = 5
-          request.options.open_timeout = 2
+          request.options.timeout = Escobar.http_timeout
+          request.options.open_timeout = Escobar.http_open_timeout
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       def post(path, body)
         response = client.post do |request|
           request.url path
           request.headers["Accept"] = accept_headers
           request.headers["Content-Type"] = "application/json"
           request.headers["Authorization"] = "token #{token}"
-          request.options.timeout = 5
-          request.options.open_timeout = 2
+          request.options.timeout = Escobar.http_timeout
+          request.options.open_timeout = Escobar.http_open_timeout
           request.body = body.to_json
         end
 
         JSON.parse(response.body)
-      rescue StandardError
-        response && response.body
+      rescue StandardError => e
+        raise Escobar::Client::HTTPError.from_response(e, response)
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 

data/lib/escobar/heroku/app.rb

@@ -52,6 +52,9 @@ module Escobar
       def locked?
         response = client.heroku.get("/apps/#{id}/config-vars")
         response["id"] == "two_factor"
+      rescue Escobar::Heroku::Client::HTTPError => e
+        response = JSON.parse(e.response.body)
+        response["id"] == "two_factor"
       end
 
       def build_request_for(pipeline)

data/lib/escobar/heroku/client.rb

@@ -26,8 +26,8 @@ module Escobar
         end
 
         JSON.parse(response.body)
-      rescue StandardError
-        response && response.body
+      rescue StandardError => e
+        raise Escobar::Client::HTTPError.from_response(e, response)
       end
 
       def get_range(path, range, version = 3)
@@ -38,8 +38,8 @@ module Escobar
         end
 
         JSON.parse(response.body)
-      rescue StandardError
-        response && response.body
+      rescue StandardError => e
+        raise Escobar::Client::HTTPError.from_response(e, response)
       end
 
       def post(path, body)
@@ -50,8 +50,8 @@ module Escobar
         end
 
         JSON.parse(response.body)
-      rescue StandardError
-        response && response.body
+      rescue StandardError => e
+        raise Escobar::Client::HTTPError.from_response(e, response)
       end
 
       def put(path, second_factor = nil)
@@ -64,8 +64,8 @@ module Escobar
         end
 
         JSON.parse(response.body)
-      rescue StandardError
-        response && response.body
+      rescue StandardError => e
+        raise Escobar::Client::HTTPError.from_response(e, response)
       end
 
       private
@@ -77,8 +77,8 @@ module Escobar
         if token
           request.headers["Authorization"] = "Bearer #{token}"
         end
-        request.options.timeout = 5
-        request.options.open_timeout = 2
+        request.options.timeout = Escobar.http_timeout
+        request.options.open_timeout = Escobar.http_open_timeout
       end
 
       def heroku_accept_header(version)

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.13".freeze
+  VERSION = "0.3.14".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday