chef-api 0.10.7 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d924ca79422311f6742cb0c5a247faec5384e9dce483e09137011053edcd0e0b
-  data.tar.gz: b712903d1f9081794bb836ce4d2109a903fa53ea1ff99b337b91192cef9a16cd
+  metadata.gz: 9190cfe613a46da5a280ffc69ba7f58a0a955a354e3272c166f8e76c8bbbbc49
+  data.tar.gz: a8851cab2284d7935300c90883eb27ffc3c88673cb1d3566528fb37167a120de
 SHA512:
-  metadata.gz: a16fd64fa33993a05a5e2e28dbfa98558103417ba2ea2d6f75743d4ed3bc1e4d6d626ba9b130ecf655d3142185da45a420e126152f44f67c8477dd1c412f998a
-  data.tar.gz: 5c2f16382bb8086d9998f3f20edcac97df9600459b4c18f06e74b82c003c161f4c980875a8f3be9c098f4794779d5a571e32041acac6f65b891ba9061f784af8
+  metadata.gz: 5275c0487d47da3cb81c1a9eff0bb07cdd5a71fe24534dff2b5e78e547db9c8c2e65b63fc817b0041f952770ea10a97e5438083829ed4c0a76439a37b225970e
+  data.tar.gz: bf8f4fb60b9c8da3a4071da529f4b54093bf73c80d0e806594f6ed741f4d8df8e2dc6ddd69bcc4fae9779c65a2d4f305d73919fc19dbcd7d19a1343cff114ad1

data/lib/chef-api.rb

@@ -1,5 +1,5 @@
-require "json"
-require "pathname"
+require "json" unless defined?(JSON)
+require "pathname" unless defined?(Pathname)
 require_relative "chef-api/log"
 require_relative "chef-api/version"
 

data/lib/chef-api/authentication.rb

@@ -1,7 +1,7 @@
-require "base64"
-require "digest"
-require "openssl"
-require "time"
+require "base64" unless defined?(Base64)
+require "digest" unless defined?(Digest)
+require "openssl" unless defined?(OpenSSL)
+require "time" unless defined?(Time)
 
 #
 # DEBUG steps:

data/lib/chef-api/connection.rb

@@ -1,7 +1,7 @@
-require "net/http"
-require "net/https"
-require "openssl"
-require "uri"
+require "net/http" unless defined?(Net::HTTP)
+require "openssl" unless defined?(OpenSSL)
+require "uri" unless defined?(URI)
+require "cgi" unless defined?(CGI)
 
 module ChefAPI
   #
@@ -376,7 +376,7 @@ module ChefAPI
     #
     def to_query_string(hash)
       hash.map do |key, value|
-        "#{URI.escape(key.to_s)}=#{URI.escape(value.to_s)}"
+        "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
       end.join("&")[/.+/]
     end
 

data/lib/chef-api/defaults.rb

@@ -1,6 +1,6 @@
 require_relative "version"
-require "pathname"
-require "json"
+require "pathname" unless defined?(Pathname)
+require "json" unless defined?(JSON)
 
 module ChefAPI
   module Defaults

data/lib/chef-api/errors.rb

@@ -1,4 +1,4 @@
-require "erb"
+require "erb" unless defined?(Erb)
 
 module ChefAPI
   module Error

data/lib/chef-api/multipart.rb

@@ -1,5 +1,5 @@
-require "cgi"
-require "mime/types"
+require "cgi" unless defined?(CGI)
+require "mime/types" unless defined?(MIME::Types)
 
 module ChefAPI
   module Multipart

data/lib/chef-api/resources/base.rb

@@ -1,6 +1,8 @@
 module ChefAPI
   class Resource::Base
     class << self
+      require "cgi" unless defined?(CGI)
+
       # Including the Enumberable module gives us magic
       include Enumerable
 
@@ -512,7 +514,7 @@ module ChefAPI
             raise Error::MissingURLParameter.new(param: key)
           end
 
-          URI.escape(value)
+          CGI.escape(value)
         end.sub(%r{^/}, "") # Remove leading slash
       end
 

data/lib/chef-api/resources/user.rb

@@ -1,5 +1,7 @@
 module ChefAPI
   class Resource::User < Resource::Base
+    require "cgi" unless defined?(CGI)
+
     collection_path "/users"
 
     schema do
@@ -38,7 +40,7 @@ module ChefAPI
         # HEC/EC returns a slightly different response than OSC/CZ
         if users.is_a?(Array)
           users.each do |info|
-            name = URI.escape(info["user"]["username"])
+            name = CGI.escape(info["user"]["username"])
             response = connection.get("/users/#{name}")
             result = from_json(response, prefix)
 

data/lib/chef-api/version.rb

@@ -1,3 +1,3 @@
 module ChefAPI
-  VERSION = "0.10.7".freeze
+  VERSION = "0.10.10".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-api
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.10
 platform: ruby
 authors:
 - Seth Vargo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log