chef-api 0.10.2 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c0549e102320d5807b0489a96c6b361ae8f9c394f850379f5eff6919d51401
-  data.tar.gz: 0e9c8f3684fa76bb9044e97b66cc77272adfe44b4612542cc8e4ca19d7370bf0
+  metadata.gz: ec5a839e8937a29b1b1c4b7aa8ab3fd4731d9947548d6a645f88df832aeaab3d
+  data.tar.gz: f9a3624337f97aa8b7ef547e7bebfc6370e086382a9cc2567e199a05233b00f3
 SHA512:
-  metadata.gz: 232b3d9f101f12d57e6a8594faa2c7e595a05052bcd331df708a8221db1168529a4c204037d1dc8e7b160cc507aa21f4854f2ec0d3fe5db7a51c7669cf860a19
-  data.tar.gz: 30310067ede141b9c8873d01371560ceb3f1127b3da6d6a0f96772a0f266b47b25c1dbb3a480d035f97923545e030d3132b7eb8b2a0abe959b53aeab2ed139cb
+  metadata.gz: 483c3d4d8a29f8e694e18d33d156143c376d34632c05ef99d97db6264ed0dc6640cd1c8b218f23a8573b3e526e44e8232467bffb25ce260000ea7a916662b373
+  data.tar.gz: a43aaf4ab7e65c04e2276deec6448d2cd2c61382c75fb5d92743ed82fab365cd5cc90ca604fddc415f240716b099493d8aad23848e159148b45ceb7143bf7764

data/lib/chef-api.rb

@@ -1,6 +1,6 @@
 require "json"
-require "logify"
 require "pathname"
+require_relative "chef-api/log"
 require_relative "chef-api/version"
 
 module ChefAPI
@@ -35,7 +35,7 @@ module ChefAPI
     #   the log level to set
     #
     def log_level=(level)
-      Logify.level = level
+      ChefAPI::Log.level = level
     end
 
     #
@@ -44,7 +44,7 @@ module ChefAPI
     # @return [Symbol]
     #
     def log_level
-      Logify.level
+      ChefAPI::Log.level
     end
 
     #

data/lib/chef-api/authentication.rb

@@ -11,7 +11,6 @@ require "time"
 
 module ChefAPI
   class Authentication
-    include Logify
 
     # @todo: Enable this in the future when Mixlib::Authentication supports
     # signing the full request body instead of just the uploaded file parameter.
@@ -148,22 +147,22 @@ module ChefAPI
     def canonical_key
       return @canonical_key if @canonical_key
 
-      log.info "Parsing private key..."
+      ChefAPI::Log.info "Parsing private key..."
 
       if @key.nil?
-        log.warn "No private key given!"
+        ChefAPI::Log.warn "No private key given!"
         raise "No private key given!"
       end
 
       if @key.is_a?(OpenSSL::PKey::RSA)
-        log.debug "Detected private key is an OpenSSL Ruby object"
+        ChefAPI::Log.debug "Detected private key is an OpenSSL Ruby object"
         @canonical_key = @key
       elsif @key =~ /(.+)\.pem$/ || File.exist?(File.expand_path(@key))
-        log.debug "Detected private key is the path to a file"
+        ChefAPI::Log.debug "Detected private key is the path to a file"
         contents = File.read(File.expand_path(@key))
         @canonical_key = OpenSSL::PKey::RSA.new(contents)
       else
-        log.debug "Detected private key was the literal string key"
+        ChefAPI::Log.debug "Detected private key was the literal string key"
         @canonical_key = OpenSSL::PKey::RSA.new(@key)
       end
 

data/lib/chef-api/connection.rb

@@ -34,7 +34,6 @@ module ChefAPI
       end
     end
 
-    include Logify
     include ChefAPI::Configurable
 
     proxy :clients,        "Resource::Client"
@@ -198,8 +197,8 @@ module ChefAPI
     #   the response body
     #
     def request(verb, path, data = {}, params = {}, request_options = {})
-      log.info  "#{verb.to_s.upcase} #{path}..."
-      log.debug "Chef flavor: #{flavor.inspect}"
+      ChefAPI::Log.info  "#{verb.to_s.upcase} #{path}..."
+      ChefAPI::Log.debug "Chef flavor: #{flavor.inspect}"
 
       # Build the URI and request object from the given information
       if %i{delete get}.include?(verb)
@@ -215,36 +214,36 @@ module ChefAPI
       # Setup PATCH/POST/PUT
       if %i{patch post put}.include?(verb)
         if data.respond_to?(:read)
-          log.info "Detected file/io presence"
+          ChefAPI::Log.info "Detected file/io presence"
           request.body_stream = data
         elsif data.is_a?(Hash)
           # If any of the values in the hash are File-like, assume this is a
           # multi-part post
           if data.values.any? { |value| value.respond_to?(:read) }
-            log.info "Detected multipart body"
+            ChefAPI::Log.info "Detected multipart body"
 
             multipart = Multipart::Body.new(data)
 
-            log.debug "Content-Type: #{multipart.content_type}"
-            log.debug "Content-Length: #{multipart.content_length}"
+            ChefAPI::Log.debug "Content-Type: #{multipart.content_type}"
+            ChefAPI::Log.debug "Content-Length: #{multipart.content_length}"
 
             request.content_length = multipart.content_length
             request.content_type   = multipart.content_type
 
             request.body_stream    = multipart.stream
           else
-            log.info "Detected form data"
+            ChefAPI::Log.info "Detected form data"
             request.form_data = data
           end
         else
-          log.info "Detected regular body"
+          ChefAPI::Log.info "Detected regular body"
           request.body = data
         end
       end
 
       # Sign the request
       if request_options[:sign] == false
-        log.info "Skipping signed header authentication (user requested)..."
+        ChefAPI::Log.info "Skipping signed header authentication (user requested)..."
       else
         add_signing_headers(verb, uri.path, request)
       end
@@ -276,8 +275,8 @@ module ChefAPI
         # Naughty, naughty, naughty! Don't blame when when someone hops in
         # and executes a MITM attack!
         unless ssl_verify
-          log.warn "Disabling SSL verification..."
-          log.warn "Neither ChefAPI nor the maintainers are responsible for " \
+          ChefAPI::Log.warn "Disabling SSL verification..."
+          ChefAPI::Log.warn "Neither ChefAPI nor the maintainers are responsible for " \
             "damages incurred as a result of disabling SSL verification. " \
             "Please use this with extreme caution, or consider specifying " \
             "a custom certificate using `config.ssl_pem_file'."
@@ -290,13 +289,13 @@ module ChefAPI
       connection.start do |http|
         response = http.request(request)
 
-        log.debug "Raw response:"
-        log.debug response.body
+        ChefAPI::Log.debug "Raw response:"
+        ChefAPI::Log.debug response.body
 
         case response
         when Net::HTTPRedirection
           redirect = URI.parse(response["location"]).to_s
-          log.debug "Performing HTTP redirect to #{redirect}"
+          ChefAPI::Log.debug "Performing HTTP redirect to #{redirect}"
           request(verb, redirect, data)
         when Net::HTTPSuccess
           success(response)
@@ -305,7 +304,7 @@ module ChefAPI
         end
       end
     rescue SocketError, Errno::ECONNREFUSED, EOFError
-      log.warn "Unable to reach the Chef Server"
+      ChefAPI::Log.warn "Unable to reach the Chef Server"
       raise Error::HTTPServerUnavailable.new
     end
 
@@ -328,13 +327,13 @@ module ChefAPI
     # @return [URI]
     #
     def build_uri(verb, path, params = {})
-      log.info "Building URI..."
+      ChefAPI::Log.info "Building URI..."
 
       # Add any query string parameters
       if querystring = to_query_string(params)
-        log.debug "Detected verb deserves a querystring"
-        log.debug "Building querystring using #{params.inspect}"
-        log.debug "Compiled querystring is #{querystring.inspect}"
+        ChefAPI::Log.debug "Detected verb deserves a querystring"
+        ChefAPI::Log.debug "Building querystring using #{params.inspect}"
+        ChefAPI::Log.debug "Compiled querystring is #{querystring.inspect}"
         path = [path, querystring].compact.join("?")
       end
 
@@ -343,8 +342,8 @@ module ChefAPI
 
       # Don't merge absolute URLs
       unless uri.absolute?
-        log.debug "Detected URI is relative"
-        log.debug "Appending #{path} to #{endpoint}"
+        ChefAPI::Log.debug "Detected URI is relative"
+        ChefAPI::Log.debug "Appending #{path} to #{endpoint}"
         uri = URI.parse(File.join(endpoint, path))
       end
 
@@ -395,15 +394,15 @@ module ChefAPI
     #   the parsed response, as an object
     #
     def success(response)
-      log.info "Parsing response as success..."
+      ChefAPI::Log.info "Parsing response as success..."
 
       case response["Content-Type"]
       when /json/
-        log.debug "Detected response as JSON"
-        log.debug "Parsing response body as JSON"
+        ChefAPI::Log.debug "Detected response as JSON"
+        ChefAPI::Log.debug "Parsing response body as JSON"
         JSON.parse(response.body)
       else
-        log.debug "Detected response as text/plain"
+        ChefAPI::Log.debug "Detected response as text/plain"
         response.body
       end
     end
@@ -416,15 +415,15 @@ module ChefAPI
     #   the response object from the request
     #
     def error(response)
-      log.info "Parsing response as error..."
+      ChefAPI::Log.info "Parsing response as error..."
 
       case response["Content-Type"]
       when /json/
-        log.debug "Detected error response as JSON"
-        log.debug "Parsing error response as JSON"
+        ChefAPI::Log.debug "Detected error response as JSON"
+        ChefAPI::Log.debug "Parsing error response as JSON"
         message = JSON.parse(response.body)
       else
-        log.debug "Detected response as text/plain"
+        ChefAPI::Log.debug "Detected response as text/plain"
         message = response.body
       end
 
@@ -456,7 +455,7 @@ module ChefAPI
     # @param [Net::HTTP::Request] request
     #
     def add_request_headers(request)
-      log.info "Adding request headers..."
+      ChefAPI::Log.info "Adding request headers..."
 
       headers = {
         "Accept" => "application/json",
@@ -468,7 +467,7 @@ module ChefAPI
       }
 
       headers.each do |key, value|
-        log.debug "#{key}: #{value}"
+        ChefAPI::Log.debug "#{key}: #{value}"
         request[key] = value
       end
     end
@@ -484,7 +483,7 @@ module ChefAPI
     # @param [Net::HTTP::Request] request
     #
     def add_signing_headers(verb, path, request)
-      log.info "Adding signed header authentication..."
+      ChefAPI::Log.info "Adding signed header authentication..."
 
       authentication = Authentication.from_options(
         user: client,
@@ -495,7 +494,7 @@ module ChefAPI
       )
 
       authentication.headers.each do |key, value|
-        log.debug "#{key}: #{value}"
+        ChefAPI::Log.debug "#{key}: #{value}"
         request[key] = value
       end
 

data/lib/chef-api/log.rb

@@ -0,0 +1,7 @@
+require "mixlib/log"
+
+module ChefAPI
+  class Log
+    extend Mixlib::Log
+  end
+end

data/lib/chef-api/version.rb

@@ -1,3 +1,3 @@
 module ChefAPI
-  VERSION = "0.10.2".freeze
+  VERSION = "0.10.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-api
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.5
 platform: ruby
 authors:
 - Seth Vargo
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logify
+  name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +63,7 @@ files:
 - lib/chef-api/defaults.rb
 - lib/chef-api/error_collection.rb
 - lib/chef-api/errors.rb
+- lib/chef-api/log.rb
 - lib/chef-api/multipart.rb
 - lib/chef-api/resource.rb
 - lib/chef-api/resources/base.rb