runcible 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921c6c3a784e12f417dca5e350f9a14c33fcc395
-  data.tar.gz: '08715f64e1fe52e30cd00e143c00e81cd3d9e017'
+  metadata.gz: 1752f5317fd0820a9fc61bb2979bc3530ef4c767
+  data.tar.gz: ff37b83265fa1a199b684d3115f212ab6823f2cb
 SHA512:
-  metadata.gz: ad8a531d9c0aebfb534d6ca6240f45827861d124c809c6b68306f9e73f33385730a0fe74bfa5a1ebeb87782a59c40fcec5e83c5ace0b85c983029ba9445bf12b
-  data.tar.gz: 1b180731fb71e91ebd5437bf12b24b6f4b2f1d42477d9ba05ccb85b15ec1eb1e0ebccbf43c4ce7438c2b4eed75b3aa27c5dc8a6c85591618143cd1bb0bef4a15
+  metadata.gz: 380df650cafb5fecb9b64696934c5cc83a1e092743857b917fd3dd1f17b102187ee42578c008522d473a2f0994ff91ea65991a29321688275333618ebb111bc9
+  data.tar.gz: acad017aa4ccff2a4c7744fcbc4f1b0d9c7eaaa4c5bd3333f62a51200bc02858a3b12072d34de379682f0ab72900d86a03a0535addb555acb2ae3b19f838b951

data/lib/runcible/base.rb

@@ -5,9 +5,12 @@ require 'thread'
 
 module Runcible
   class Base
+    attr_accessor :logs
+
     def initialize(config = {})
       @mutex = Mutex.new
       @config = config
+      @logs = []
     end
 
     def lazy_config=(a_block)
@@ -28,11 +31,11 @@ module Runcible
 
     # rubocop:disable Metrics/AbcSize:
     def call(method, path, options = {})
+      self.logs = []
       clone_config = self.config.clone
       #on occation path will already have prefix (sync cancel)
       path = clone_config[:api_path] + path unless path.start_with?(clone_config[:api_path])
 
-      RestClient.log = []
       headers = clone_config[:headers].clone
 
       get_params = options[:params] if options[:params]
@@ -65,21 +68,29 @@ module Runcible
       args << generate_payload(options) if [:post, :put].include?(method)
       args << headers
 
+      self.logs << ([method.upcase, URI.join(client.url, path)] + args[1..-1]).join(': ')
       response = get_response(client, path, *args)
-      process_response(response)
-
+      processed = process_response(response)
+      self.logs << "Response: #{response.code}: #{response.body}"
+      log_info
+      processed
     rescue RestClient::ResourceNotFound => e
+      self.logs << exception_to_log(e)
       log_info
       raise e
     rescue => e
+      self.logs << exception_to_log(e)
       log_exception
       raise e
     end
 
+    def exception_to_log(exception, body = exception.try(:response).try(:body))
+      "#{exception.message}: #{body}"
+    end
+
     def get_response(client, path, *args)
       client[path].send(*args) do |response, _request, _result, &_block|
         resp = response.return!
-        log_debug
         return resp
       end
     end
@@ -135,8 +146,8 @@ module Runcible
           end
         end
         response = Runcible::Response.new(body, response)
-      rescue JSON::ParserError
-        log_exception
+      rescue JSON::ParserError => e
+        self.logs << "Unable to parse JSON: #{e.message}"
       end
 
       return response
@@ -188,28 +199,15 @@ module Runcible
     end
 
     def log_debug
-      if self.config[:logging][:debug]
-        log_message = generate_log_message
-        self.config[:logging][:logger].debug(log_message)
-      end
+      self.config[:logging][:logger].debug(self.logs.join("\n")) if self.config[:logging][:debug]
     end
 
     def log_exception
-      if self.config[:logging][:exception]
-        log_message = generate_log_message
-        self.config[:logging][:logger].error(log_message)
-      end
+      self.config[:logging][:logger].error(self.logs.join("\n")) if self.config[:logging][:exception]
     end
 
     def log_info
-      if self.config[:logging][:info]
-        log_message = generate_log_message
-        self.config[:logging][:logger].info(log_message)
-      end
-    end
-
-    def generate_log_message
-      RestClient.log.join('\n')
+      self.config[:logging][:logger].info(self.logs.join("\n")) if self.config[:logging][:info]
     end
 
     def logger

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = '2.8.0'.freeze
+  VERSION = '2.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runcible
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Eric D Helms, Justin Sherrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ''