chef-api 0.9.0 → 0.10.10

data/lib/chef-api/defaults.rb

@@ -1,11 +1,11 @@
-require 'chef-api/version'
-require 'pathname'
-require 'json'
+require_relative "version"
+require "pathname" unless defined?(Pathname)
+require "json" unless defined?(JSON)
 
 module ChefAPI
   module Defaults
     # Default API endpoint
-    ENDPOINT = 'https://api.opscode.com/'.freeze
+    ENDPOINT = "https://api.opscode.com/".freeze
 
     # Default User Agent header string
     USER_AGENT = "ChefAPI Ruby Gem #{ChefAPI::VERSION}".freeze
@@ -37,7 +37,7 @@ module ChefAPI
         if result = chef_api_config_path
           Pathname(result).expand_path
         else
-          Pathname('')
+          Pathname("")
         end
       end
 
@@ -46,8 +46,8 @@ module ChefAPI
       #
       # @return [String, nil] Path to config file, or nil
       def chef_api_config_path
-        ENV['CHEF_API_CONFIG'] || if ENV.key?('HOME')
-                                    '~/.chef-api'
+        ENV["CHEF_API_CONFIG"] || if ENV.key?("HOME")
+                                    "~/.chef-api"
                                   else
                                     nil
                                   end
@@ -70,7 +70,7 @@ module ChefAPI
       # @return [String] (default: +https://api.opscode.com/+)
       #
       def endpoint
-        ENV['CHEF_API_ENDPOINT'] || config['CHEF_API_ENDPOINT'] || ENDPOINT
+        ENV["CHEF_API_ENDPOINT"] || config["CHEF_API_ENDPOINT"] || ENDPOINT
       end
 
       #
@@ -85,12 +85,12 @@ module ChefAPI
       # @return [true, false]
       #
       def flavor
-        if ENV['CHEF_API_FLAVOR']
-          ENV['CHEF_API_FLAVOR'].to_sym
-        elsif config['CHEF_API_FLAVOR']
-          config['CHEF_API_FLAVOR']
+        if ENV["CHEF_API_FLAVOR"]
+          ENV["CHEF_API_FLAVOR"].to_sym
+        elsif config["CHEF_API_FLAVOR"]
+          config["CHEF_API_FLAVOR"]
         else
-          endpoint.include?('/organizations') ? :enterprise : :open_source
+          endpoint.include?("/organizations") ? :enterprise : :open_source
         end
       end
 
@@ -100,7 +100,7 @@ module ChefAPI
       # @return [String]
       #
       def user_agent
-        ENV['CHEF_API_USER_AGENT'] || config['CHEF_API_USER_AGENT'] || USER_AGENT
+        ENV["CHEF_API_USER_AGENT"] || config["CHEF_API_USER_AGENT"] || USER_AGENT
       end
 
       #
@@ -111,7 +111,7 @@ module ChefAPI
       # @return [String, nil]
       #
       def client
-        ENV['CHEF_API_CLIENT'] || config['CHEF_API_CLIENT']
+        ENV["CHEF_API_CLIENT"] || config["CHEF_API_CLIENT"]
       end
 
       #
@@ -122,15 +122,16 @@ module ChefAPI
       # @return [String, nil]
       #
       def key
-         ENV['CHEF_API_KEY'] || config['CHEF_API_KEY']
+        ENV["CHEF_API_KEY"] || config["CHEF_API_KEY"]
       end
+
       #
       # The HTTP Proxy server address as a string
       #
       # @return [String, nil]
       #
       def proxy_address
-        ENV['CHEF_API_PROXY_ADDRESS'] || config['CHEF_API_PROXY_ADDRESS']
+        ENV["CHEF_API_PROXY_ADDRESS"] || config["CHEF_API_PROXY_ADDRESS"]
       end
 
       #
@@ -139,7 +140,7 @@ module ChefAPI
       # @return [String, nil]
       #
       def proxy_password
-        ENV['CHEF_API_PROXY_PASSWORD'] || config['CHEF_API_PROXY_PASSWORD']
+        ENV["CHEF_API_PROXY_PASSWORD"] || config["CHEF_API_PROXY_PASSWORD"]
       end
 
       #
@@ -148,7 +149,7 @@ module ChefAPI
       # @return [String, nil]
       #
       def proxy_port
-        ENV['CHEF_API_PROXY_PORT'] || config['CHEF_API_PROXY_PORT']
+        ENV["CHEF_API_PROXY_PORT"] || config["CHEF_API_PROXY_PORT"]
       end
 
       #
@@ -157,7 +158,7 @@ module ChefAPI
       # @return [String, nil]
       #
       def proxy_username
-        ENV['CHEF_API_PROXY_USERNAME'] || config['CHEF_API_PROXY_USERNAME']
+        ENV["CHEF_API_PROXY_USERNAME"] || config["CHEF_API_PROXY_USERNAME"]
       end
 
       #
@@ -166,7 +167,7 @@ module ChefAPI
       # @return [String, nil]
       #
       def ssl_pem_file
-        ENV['CHEF_API_SSL_PEM_FILE'] || config['CHEF_API_SSL_PEM_FILE']
+        ENV["CHEF_API_SSL_PEM_FILE"] || config["CHEF_API_SSL_PEM_FILE"]
       end
 
       #
@@ -175,10 +176,10 @@ module ChefAPI
       # @return [true, false]
       #
       def ssl_verify
-        if ENV['CHEF_API_SSL_VERIFY'].nil? && config['CHEF_API_SSL_VERIFY'].nil?
+        if ENV["CHEF_API_SSL_VERIFY"].nil? && config["CHEF_API_SSL_VERIFY"].nil?
           true
         else
-          %w[t y].include?(ENV['CHEF_API_SSL_VERIFY'].downcase[0]) || config['CHEF_API_SSL_VERIFY']
+          %w{t y}.include?(ENV["CHEF_API_SSL_VERIFY"].downcase[0]) || config["CHEF_API_SSL_VERIFY"]
         end
       end
 
@@ -188,7 +189,7 @@ module ChefAPI
       # @return [Integer, nil]
       #
       def read_timeout
-        timeout_from_env = ENV['CHEF_API_READ_TIMEOUT'] || config['CHEF_API_READ_TIMEOUT']
+        timeout_from_env = ENV["CHEF_API_READ_TIMEOUT"] || config["CHEF_API_READ_TIMEOUT"]
 
         Integer(timeout_from_env) unless timeout_from_env.nil?
       end

data/lib/chef-api/error_collection.rb

@@ -34,7 +34,7 @@ module ChefAPI
     # @return [Array<String>]
     #
     def full_messages
-      self.map do |key, errors|
+      map do |key, errors|
         errors.map do |error|
           "`#{key}' #{error}"
         end

data/lib/chef-api/errors.rb

@@ -1,4 +1,4 @@
-require 'erb'
+require "erb" unless defined?(Erb)
 
 module ChefAPI
   module Error
@@ -31,9 +31,9 @@ module ChefAPI
       private
 
       def template
-        class_name = self.class.to_s.split('::').last
+        class_name = self.class.to_s.split("::").last
         filename   = @filename || Util.underscore(class_name)
-        ChefAPI.root.join('templates', 'errors', "#{filename}.erb")
+        ChefAPI.root.join("templates", "errors", "#{filename}.erb")
       end
     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/multipart.rb

@@ -1,9 +1,9 @@
-require 'cgi'
-require 'mime/types'
+require "cgi" unless defined?(CGI)
+require "mime/types" unless defined?(MIME::Types)
 
 module ChefAPI
   module Multipart
-    BOUNDARY = '------ChefAPIMultipartBoundary'.freeze
+    BOUNDARY = "------ChefAPIMultipartBoundary".freeze
 
     class Body
       def initialize(params = {})
@@ -48,12 +48,12 @@ module ChefAPI
       # Read from IOs in order until `length` bytes have been received.
       def read(length = nil, outbuf = nil)
         got_result = false
-        outbuf = outbuf ? outbuf.replace('') : ''
+        outbuf = outbuf ? outbuf.replace("") : ""
 
         while io = current_io
           if result = io.read(length)
             got_result ||= !result.nil?
-            result.force_encoding('BINARY') if result.respond_to?(:force_encoding)
+            result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
             outbuf << result
             length -= result.length if length
             break if length == 0
@@ -65,7 +65,7 @@ module ChefAPI
       end
 
       def rewind
-        @ios.each { |io| io.rewind }
+        @ios.each(&:rewind)
         @index = 0
       end
 
@@ -99,9 +99,9 @@ module ChefAPI
       private
 
       def build(name, value)
-        part =  %|--#{BOUNDARY}\r\n|
-        part << %|Content-Disposition: form-data; name="#{CGI.escape(name)}"\r\n\r\n|
-        part << %|#{value}\r\n|
+        part =  %{--#{BOUNDARY}\r\n}
+        part << %{Content-Disposition: form-data; name="#{CGI.escape(name)}"\r\n\r\n}
+        part << %{#{value}\r\n}
         part
       end
     end
@@ -132,14 +132,14 @@ module ChefAPI
 
       def build(name, file)
         filename  = File.basename(file.path)
-        mime_type = MIME::Types.type_for(filename)[0] || MIME::Types['application/octet-stream'][0]
-
-        part =  %|--#{BOUNDARY}\r\n|
-        part << %|Content-Disposition: form-data; name="#{CGI.escape(name)}"; filename="#{filename}"\r\n|
-        part << %|Content-Length: #{file.size}\r\n|
-        part << %|Content-Type: #{mime_type.simplified}\r\n|
-        part << %|Content-Transfer-Encoding: binary\r\n|
-        part << %|\r\n|
+        mime_type = MIME::Types.type_for(filename)[0] || MIME::Types["application/octet-stream"][0]
+
+        part =  %{--#{BOUNDARY}\r\n}
+        part << %{Content-Disposition: form-data; name="#{CGI.escape(name)}"; filename="#{filename}"\r\n}
+        part << %{Content-Length: #{file.size}\r\n}
+        part << %{Content-Type: #{mime_type.simplified}\r\n}
+        part << %{Content-Transfer-Encoding: binary\r\n}
+        part << %{\r\n}
         part
       end
     end

data/lib/chef-api/resource.rb

@@ -1,19 +1,21 @@
+require_relative "aclable"
 module ChefAPI
   module Resource
-    autoload :Base,            'chef-api/resources/base'
-    autoload :Client,          'chef-api/resources/client'
-    autoload :CollectionProxy, 'chef-api/resources/collection_proxy'
-    autoload :Cookbook,        'chef-api/resources/cookbook'
-    autoload :CookbookVersion, 'chef-api/resources/cookbook_version'
-    autoload :DataBag,         'chef-api/resources/data_bag'
-    autoload :DataBagItem,     'chef-api/resources/data_bag_item'
-    autoload :Environment,     'chef-api/resources/environment'
-    autoload :Node,            'chef-api/resources/node'
-    autoload :Organization,    'chef-api/resources/organization'
-    autoload :PartialSearch,   'chef-api/resources/partial_search'
-    autoload :Principal,       'chef-api/resources/principal'
-    autoload :Role,            'chef-api/resources/role'
-    autoload :Search,          'chef-api/resources/search'
-    autoload :User,            'chef-api/resources/user'
+    autoload :Base,            "chef-api/resources/base"
+    autoload :Client,          "chef-api/resources/client"
+    autoload :CollectionProxy, "chef-api/resources/collection_proxy"
+    autoload :Cookbook,        "chef-api/resources/cookbook"
+    autoload :CookbookVersion, "chef-api/resources/cookbook_version"
+    autoload :DataBag,         "chef-api/resources/data_bag"
+    autoload :DataBagItem,     "chef-api/resources/data_bag_item"
+    autoload :Environment,     "chef-api/resources/environment"
+    autoload :Group,           "chef-api/resources/group"
+    autoload :Node,            "chef-api/resources/node"
+    autoload :Organization,    "chef-api/resources/organization"
+    autoload :PartialSearch,   "chef-api/resources/partial_search"
+    autoload :Principal,       "chef-api/resources/principal"
+    autoload :Role,            "chef-api/resources/role"
+    autoload :Search,          "chef-api/resources/search"
+    autoload :User,            "chef-api/resources/user"
   end
 end

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
 
@@ -13,7 +15,7 @@ module ChefAPI
       #   the path to the file on disk
       #
       def from_file(path)
-        raise Error::AbstractMethod.new(method: 'Resource::Base#from_file')
+        raise Error::AbstractMethod.new(method: "Resource::Base#from_file")
       end
 
       #
@@ -78,7 +80,7 @@ module ChefAPI
       #   has_many :environments, class_name: 'Environment'
       #
       def has_many(method, options = {})
-        class_name    = options[:class_name] || "Resource::#{Util.camelize(method).sub(/s$/, '')}"
+        class_name    = options[:class_name] || "Resource::#{Util.camelize(method).sub(/s$/, "")}"
         rest_endpoint = options[:rest_endpoint] || method
 
         class_eval <<-EOH, __FILE__, __LINE__ + 1
@@ -227,7 +229,7 @@ module ChefAPI
       #   an array containing the list of resources that were deleted
       #
       def destroy_all(prefix = {})
-        map { |resource| resource.destroy }
+        map(&:destroy)
       end
 
       #
@@ -404,8 +406,8 @@ module ChefAPI
       #   an instance of the resource represented by this JSON
       #
       def from_json(response, prefix = {})
-        response.delete('json_class')
-        response.delete('chef_type')
+        response.delete("json_class")
+        response.delete("chef_type")
 
         new(response, prefix)
       end
@@ -432,7 +434,7 @@ module ChefAPI
       # @return [String]
       #
       def inspect
-        "#{classname}(#{schema.attributes.keys.join(', ')})"
+        "#{classname}(#{schema.attributes.keys.join(", ")})"
       end
 
       #
@@ -444,7 +446,7 @@ module ChefAPI
       # @return [String]
       #
       def classname
-        name.split('::')[1..-1].join('::')
+        name.split("::")[1..-1].join("::")
       end
 
       #
@@ -456,7 +458,7 @@ module ChefAPI
       # @return [String]
       #
       def type
-        Util.underscore(name.split('::').last).gsub('_', ' ')
+        Util.underscore(name.split("::").last).gsub("_", " ")
       end
 
       #
@@ -482,7 +484,7 @@ module ChefAPI
       #   the path to the resource
       #
       def resource_path(id, prefix = {})
-        [expanded_collection_path(prefix), id].join('/')
+        [expanded_collection_path(prefix), id].join("/")
       end
 
       #
@@ -505,15 +507,15 @@ module ChefAPI
       #
       def expanded_collection_path(prefix = {})
         collection_path.gsub(/:\w+/) do |param|
-          key = param.delete(':')
+          key = param.delete(":")
           value = prefix[key] || prefix[key.to_sym]
 
           if value.nil?
             raise Error::MissingURLParameter.new(param: key)
           end
 
-          URI.escape(value)
-        end.sub(/^\//, '') # Remove leading slash
+          CGI.escape(value)
+        end.sub(%r{^/}, "") # Remove leading slash
       end
 
       #
@@ -522,7 +524,7 @@ module ChefAPI
       # @return [ChefAPI::Connection]
       #
       def connection
-        Thread.current['chefapi.connection'] || ChefAPI.connection
+        Thread.current["chefapi.connection"] || ChefAPI.connection
       end
     end
 
@@ -620,7 +622,7 @@ module ChefAPI
     #   true if the attribute exists, false otherwise
     #
     def attribute?(key)
-      _attributes.has_key?(key.to_sym)
+      _attributes.key?(key.to_sym)
     end
 
     #
@@ -633,12 +635,12 @@ module ChefAPI
     #
     def protected?
       @protected ||= self.class.protected_resources.any? do |thing|
-                       if thing.is_a?(Proc)
-                         thing.call(self)
-                       else
-                         id == thing
-                       end
-                     end
+        if thing.is_a?(Proc)
+          thing.call(self)
+        else
+          id == thing
+        end
+      end
     end
 
     #
@@ -775,7 +777,7 @@ module ChefAPI
     #
     def validate!
       unless valid?
-        sentence = errors.full_messages.join(', ')
+        sentence = errors.full_messages.join(", ")
         raise Error::InvalidResource.new(errors: sentence)
       end
 
@@ -896,7 +898,7 @@ module ChefAPI
     # @return [Boolean]
     #
     def ignore_attribute?(key)
-      @schema.ignored_attributes.has_key?(key.to_sym)
+      @schema.ignored_attributes.key?(key.to_sym)
     end
 
     #
@@ -954,7 +956,7 @@ module ChefAPI
         end
       end
 
-      "#<#{self.class.classname} #{attrs.join(', ')}>"
+      "#<#{self.class.classname} #{attrs.join(", ")}>"
     end
   end
 end