chef-infra-api 0.9.1 → 0.10.10

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

@@ -1,7 +1,7 @@
 module ChefAPI
   class Resource::Client < Resource::Base
     include ChefAPI::AclAble
-    collection_path '/clients'
+    collection_path "/clients"
 
     schema do
       attribute :name,        type: String,  primary: true, required: true
@@ -14,7 +14,7 @@ module ChefAPI
     end
 
     # @todo implement
-    protect 'chef-webui', 'chef-validator'
+    protect "chef-webui", "chef-validator"
 
     class << self
       #
@@ -49,7 +49,7 @@ module ChefAPI
     #
     def initialize(attributes = {}, prefix = {})
       if certificate = attributes.delete(:certificate) ||
-                       attributes.delete('certificate')
+          attributes.delete("certificate")
         x509 = OpenSSL::X509::Certificate.new(certificate)
         attributes[:public_key] = x509.public_key.to_pem
       end
@@ -77,6 +77,7 @@ module ChefAPI
     #
     def regenerate_keys
       raise Error::CannotRegenerateKey if new_resource?
+
       update(private_key: true).save!
       self
     end

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

@@ -59,6 +59,7 @@ module ChefAPI
     #
     def fetch(id)
       return nil unless exists?(id)
+
       cached(id) { klass.from_url(get(id), prefix) }
     end
 
@@ -76,7 +77,7 @@ module ChefAPI
     #   true if the resource exists, false otherwise
     #
     def exists?(id)
-      collection.has_key?(id.to_s)
+      collection.key?(id.to_s)
     end
 
     #
@@ -131,9 +132,9 @@ module ChefAPI
     def inspect
       objects = collection
         .map { |id, _| cached(id) || klass.new(klass.schema.primary_key => id) }
-        .map { |object| object.to_s }
+        .map(&:to_s)
 
-      "#<#{self.class.name} [#{objects.join(', ')}]>"
+      "#<#{self.class.name} [#{objects.join(", ")}]>"
     end
 
     private

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

@@ -5,7 +5,7 @@ module ChefAPI
   # of +cookbook_version+ objects that fully detail the layout of a cookbook.
   #
   class Resource::Cookbook < Resource::Base
-    collection_path '/cookbooks'
+    collection_path "/cookbooks"
 
     schema do
       attribute :name, type: String, primary: true, required: true
@@ -13,7 +13,7 @@ module ChefAPI
 
     has_many :versions,
       class_name: CookbookVersion,
-      rest_endpoint: '/?num_versions=all'
+      rest_endpoint: "/?num_versions=all"
 
     class << self
       def from_json(response, prefix = {})

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::CookbookVersion < Resource::Base
-    collection_path '/cookbooks/:cookbook'
+    collection_path "/cookbooks/:cookbook"
 
     schema do
       attribute :name,          type: String,  primary: true, required: true

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::DataBag < Resource::Base
-    collection_path '/data'
+    collection_path "/data"
 
     schema do
       attribute :name, type: String, primary: true, required: true
@@ -26,9 +26,9 @@ module ChefAPI
       # @return [Array<DataBagItem>]
       #
       def from_file(path, name = File.basename(path))
-        path  = File.expand_path(path)
+        path = File.expand_path(path)
 
-        raise Error::FileNotFound.new(path: path)  unless File.exists?(path)
+        raise Error::FileNotFound.new(path: path)  unless File.exist?(path)
         raise Error::NotADirectory.new(path: path) unless File.directory?(path)
 
         raise ArgumentError unless File.directory?(path)

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::DataBagItem < Resource::Base
-    collection_path '/data/:bag'
+    collection_path "/data/:bag"
 
     schema do
       attribute :id,   type: String, primary: true, required: true
@@ -28,11 +28,10 @@ module ChefAPI
     def initialize(attributes = {}, prefix = {}, bag = nil)
       @bag = bag || Resource::DataBag.fetch(prefix[:bag])
 
-      id = attributes.delete(:id) || attributes.delete('id')
+      id = attributes.delete(:id) || attributes.delete("id")
       super({ id: id, data: attributes }, prefix)
     end
 
-
     #
     # Override the to_hash method to move data to the upper scope.
     #

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::Environment < Resource::Base
-    collection_path '/environments'
+    collection_path "/environments"
 
     schema do
       attribute :name,                type: String, primary: true, required: true

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::Group < Resource::Base
-    collection_path '/groups'
+    collection_path "/groups"
 
     schema do
       attribute :groupname, type: String, primary: true, required: true
@@ -13,4 +13,3 @@ module ChefAPI
     end
   end
 end
-

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

@@ -1,7 +1,7 @@
 module ChefAPI
   class Resource::Node < Resource::Base
     include ChefAPI::AclAble
-    collection_path '/nodes'
+    collection_path "/nodes"
 
     schema do
       attribute :name,         type: String, primary: true, required: true
@@ -14,7 +14,7 @@ module ChefAPI
       attribute :policy_group, type: String
 
       # Enterprise Chef attributes
-      attribute :chef_environment, type: String, default: '_default'
+      attribute :chef_environment, type: String, default: "_default"
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::Organization < Resource::Base
-    collection_path '/organizations'
+    collection_path "/organizations"
 
     schema do
       attribute :name,       type: String, primary: true, required: true
@@ -16,7 +16,7 @@ module ChefAPI
       ignore :billing_plan
       ignore :requester_id
       ignore :assigned_at
-      ignore 'couchrest-type'
+      ignore "couchrest-type"
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::PartialSearch < Resource::Base
-    collection_path '/search/:index'
+    collection_path "/search/:index"
 
     schema do
       attribute :total, type: Integer
@@ -24,19 +24,19 @@ module ChefAPI
       # @return [self]
       #   the current resource
       #
-      def query(index, keys, query = '*:*', options = {})
+      def query(index, keys, query = "*:*", options = {})
         return nil if index.nil?
 
         params = {}.tap do |o|
           o[:q]     = query
           o[:rows]  = options[:rows]  || 1000
-          o[:sort]  = options[:sort]  || 'X_CHEF_id_CHEF_X'
+          o[:sort]  = options[:sort]  || "X_CHEF_id_CHEF_X"
           o[:start] = options[:start] || 0
         end
 
         path = expanded_collection_path(index: index.to_s)
         response = connection.post(path, keys.to_json, params)
-        response['rows'].map! { |row| row['data'] }
+        response["rows"].map! { |row| row["data"] }
         from_json(response, index: index.to_s)
       end
     end

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::Principal < Resource::Base
-    collection_path '/principals'
+    collection_path "/principals"
 
     schema do
       attribute :name,       type: String, primary: true, required: true

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

@@ -1,7 +1,7 @@
 module ChefAPI
   class Resource::Role < Resource::Base
     include ChefAPI::AclAble
-    collection_path '/roles'
+    collection_path "/roles"
 
     schema do
       attribute :name,                type: String, primary: true, required: true

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

@@ -1,6 +1,6 @@
 module ChefAPI
   class Resource::Search < Resource::Base
-    collection_path '/search/:index'
+    collection_path "/search/:index"
 
     schema do
       attribute :total, type: Integer
@@ -22,22 +22,22 @@ module ChefAPI
       # @return [self]
       #   the current resource
       #
-      def query(index, query = '*:*', options = {})
+      def query(index, query = "*:*", options = {})
         return nil if index.nil?
 
         params = {}.tap do |o|
           o[:q]     = query
           o[:rows]  = options[:rows]  || 1000
-          o[:sort]  = options[:sort]  || 'X_CHEF_id_CHEF_X'
+          o[:sort]  = options[:sort]  || "X_CHEF_id_CHEF_X"
           o[:start] = options[:start] || 0
         end
 
         path = expanded_collection_path(index: index.to_s)
 
         response = if filter_result = options[:filter_result]
-          connection.post(path, filter_result.to_json, params)
-        else
-          connection.get(path, params)
+                     connection.post(path, filter_result.to_json, params)
+                   else
+                     connection.get(path, params)
         end
 
         from_json(response, index: index.to_s)

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

@@ -1,6 +1,8 @@
 module ChefAPI
   class Resource::User < Resource::Base
-    collection_path '/users'
+    require "cgi" unless defined?(CGI)
+
+    collection_path "/users"
 
     schema do
       flavor :enterprise 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)
 
@@ -75,7 +77,7 @@ module ChefAPI
       #   the parsed JSON response from the server
       #
       def authenticate(options = {})
-        connection.post('/authenticate_user', options.to_json)
+        connection.post("/authenticate_user", options.to_json)
       end
     end
   end

data/lib/chef-api/util.rb

@@ -14,10 +14,10 @@ module ChefAPI
     def underscore(string)
       string
         .to_s
-        .gsub(/::/, '/')
-        .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-        .gsub(/([a-z\d])([A-Z])/,'\1_\2')
-        .tr('-', '_')
+        .gsub(/::/, "/")
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr("-", "_")
         .downcase
     end
 
@@ -32,8 +32,8 @@ module ChefAPI
     def camelize(string)
       string
         .to_s
-        .split('_')
-        .map { |e| e.capitalize }
+        .split("_")
+        .map(&:capitalize)
         .join
     end
 
@@ -49,7 +49,7 @@ module ChefAPI
       length = options[:length] || 30
 
       if string.length > length
-        string[0..length-3] + '...'
+        string[0..length - 3] + "..."
       else
         string
       end
@@ -77,7 +77,7 @@ module ChefAPI
     #
     def safe_read(path)
       path     = File.expand_path(path)
-      name     = File.basename(path, '.*')
+      name     = File.basename(path, ".*")
       contents = File.read(path)
 
       [name, contents]

data/lib/chef-api/validator.rb

@@ -1,8 +1,8 @@
 module ChefAPI
   module Validator
-    autoload :Base,       'chef-api/validators/base'
-    autoload :Required,   'chef-api/validators/required'
-    autoload :Type,       'chef-api/validators/type'
+    autoload :Base,       "chef-api/validators/base"
+    autoload :Required,   "chef-api/validators/required"
+    autoload :Type,       "chef-api/validators/type"
 
     #
     # Find a validator by the given key.

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

@@ -35,7 +35,7 @@ module ChefAPI
     # @return [Symbol]
     #
     def key
-      name = self.class.name.split('::').last
+      name = self.class.name.split("::").last
       Util.underscore(name).to_sym
     end
 
@@ -47,7 +47,7 @@ module ChefAPI
     #   the parent resource to validate against
     #
     def validate(resource)
-      raise Error::AbstractMethod.new(method: 'Validators::Base#validate')
+      raise Error::AbstractMethod.new(method: "Validators::Base#validate")
     end
 
     #
@@ -76,7 +76,7 @@ module ChefAPI
     # @return [String]
     #
     def classname
-      @classname ||= self.class.name.split('::')[1..-1].join('::')
+      @classname ||= self.class.name.split("::")[1..-1].join("::")
     end
   end
 end

data/lib/chef-api/validators/required.rb

@@ -4,7 +4,7 @@ module ChefAPI
       value = resource._attributes[attribute]
 
       if value.to_s.strip.empty?
-        resource.errors.add(attribute, 'must be present')
+        resource.errors.add(attribute, "must be present")
       end
     end
   end

data/lib/chef-api/validators/type.rb

@@ -15,7 +15,7 @@ module ChefAPI
       value = resource._attributes[attribute]
 
       if value && !types.any? { |type| value.is_a?(type) }
-        short_name = type.to_s.split('::').last
+        short_name = types.to_s.split("::").last
         resource.errors.add(attribute, "must be a kind of #{short_name}")
       end
     end

data/lib/chef-api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-infra-api
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.10
 platform: ruby
 authors:
 - Seth Vargo
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2020-08-21 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
@@ -39,7 +45,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A tiny Chef API client with minimal dependencies
+description: A tiny Chef Infra API client with minimal dependencies
 email:
 - sethvargo@gmail.com
 - tsmith84@gmail.com
@@ -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
@@ -115,16 +122,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A Chef API client in Ruby
+summary: A Chef Infra API client in Ruby
 test_files: []