chef-zero 14.0.12 → 15.0.2

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/environment_role_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/group_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/groups_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_list_endpoint"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_list_endpoint"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/license_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/node_identifiers_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 require "uuidtools"
 
 module ChefZero

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,10 +1,10 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefZero
   module Endpoints
     class NotFoundEndpoint
       def call(request)
-        [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env['REQUEST_PATH']}"] }, pretty: true)]
+        [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env["REQUEST_PATH"]}"] }, pretty: true)]
       end
     end
   end

data/lib/chef_zero/endpoints/organization_association_request_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -11,6 +11,7 @@ module ChefZero
         if id !~ /(.+)-#{orgname}$/
           raise HttpErrorResponse.new(404, "Invalid ID #{id}.  Must be of the form username-#{orgname}")
         end
+
         username = $1
         path = request.rest_path[0..-2] + [username]
         delete_data(request, path)

data/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -19,8 +19,9 @@ module ChefZero
         save_org = FFI_Yajl::Encoder.encode(org, pretty: true)
         if new_org["name"] != request.rest_path[-1]
           # This is a rename
-          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org['name']}: rename not supported for orgs")
+          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org["name"]}: rename not supported for orgs")
         end
+
         set_data(request, request.rest_path + [ "org" ], save_org)
         json_response(200, {
           "uri" => (build_uri(request.base_uri, request.rest_path)).to_s,

data/lib/chef_zero/endpoints/organization_user_base.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_user_key_endpoint.rb

@@ -1,5 +1,5 @@
-require "chef_zero/rest_base"
-require "chef_zero/endpoints/actor_keys_endpoint"
+require_relative "../rest_base"
+require_relative "actor_keys_endpoint"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/endpoints/organization_user_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "organization_user_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 require "uuidtools"
 
 module ChefZero

data/lib/chef_zero/endpoints/organizations_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 require "uuidtools"
 
 module ChefZero

data/lib/chef_zero/endpoints/policies_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_group_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -48,7 +48,7 @@ module ChefZero
         # If the policy revision being submitted does not exist, create it.
         # Storage: /organizations/ORG/policies/POLICY/revisions/REVISION
         policyfile_path = request.rest_path[0..1] + ["policies", policy_name, "revisions", revision_id]
-        if !exists_data?(request, policyfile_path)
+        unless exists_data?(request, policyfile_path)
           create_data(request, policyfile_path[0..-2], revision_id, request.body, :create_dir)
         end
 

data/lib/chef_zero/endpoints/policy_groups_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_revision_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_revisions_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/principal_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../../chef_zero"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -26,7 +26,7 @@ module ChefZero
         contents = request.body
         key = get_key(contents)
         if key.nil?
-          error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
+          error(400, "Must specify #{identity_keys.map(&:inspect).join(" or ")} in JSON")
         else
           create_data(request, request.rest_path, key, contents)
           json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [key])).to_s })

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/rest_error_response"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../rest_error_response"
 
 module ChefZero
   module Endpoints
@@ -70,6 +70,7 @@ module ChefZero
       # Does this request change the value of the identity key?
       def is_rename?(request)
         return false unless (key = identity_key_value(request))
+
         key != request.rest_path[-1]
       end
     end

data/lib/chef_zero/endpoints/role_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/role_environments_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -1,6 +1,6 @@
-require "chef_zero/rest_base"
-require "chef_zero/rest_error_response"
-require "ffi_yajl"
+require_relative "../rest_base"
+require_relative "../rest_error_response"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefZero
   module Endpoints
@@ -9,7 +9,7 @@ module ChefZero
       def put(request)
         existing_sandbox = FFI_Yajl::Parser.parse(get_data(request))
         existing_sandbox["checksums"].each do |checksum|
-          if !exists_data?(request, request.rest_path[0..1] + ["file_store", "checksums", checksum])
+          unless exists_data?(request, request.rest_path[0..1] + ["file_store", "checksums", checksum])
             raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
           end
         end

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -1,9 +1,9 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
-require "chef_zero/rest_error_response"
-require "chef_zero/solr/solr_parser"
-require "chef_zero/solr/solr_doc"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
+require_relative "../rest_error_response"
+require_relative "../solr/solr_parser"
+require_relative "../solr/solr_doc"
 
 module ChefZero
   module Endpoints
@@ -30,7 +30,7 @@ module ChefZero
             if path.size > 0
               value = search_value
               path.each do |path_part|
-                value = value[path_part] if !value.nil?
+                value = value[path_part] unless value.nil?
               end
               data[key] = value
             else
@@ -180,7 +180,7 @@ module ChefZero
           dest
         when Hash
           source.each do |src_key, src_value|
-            if dest.kind_of?(Hash)
+            if dest.is_a?(Hash)
               if dest[src_key]
                 dest[src_key] = deep_merge!(src_value, dest[src_key])
               else # dest[src_key] doesn't exist so we take whatever source has
@@ -191,7 +191,7 @@ module ChefZero
             end
           end
         when Array
-          if dest.kind_of?(Array)
+          if dest.is_a?(Array)
             dest |= source
           else
             dest = source