chef-zero 14.0.11 → 15.0.1

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

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

data/lib/chef_zero/endpoints/data_bags_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
@@ -10,7 +10,7 @@ module ChefZero
         json = FFI_Yajl::Parser.parse(contents)
         name = identity_keys.map { |k| json[k] }.select { |v| v }.first
         if name.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")
         elsif exists_data_dir?(request, request.rest_path[0..1] + ["data", name])
           error(409, "Object already exists")
         else

data/lib/chef_zero/endpoints/environment_cookbook_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_cookbook_versions_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
@@ -15,12 +15,14 @@ module ChefZero
         run_list = FFI_Yajl::Parser.parse(request.body)["run_list"]
         run_list.each do |run_list_entry|
           if run_list_entry =~ /(.+)::.+\@(.+)/ || run_list_entry =~ /(.+)\@(.+)/
-            raise RestErrorResponse.new(412, "No such cookbook: #{$1}") if !cookbook_names.include?($1)
-            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") if !list_data(request, request.rest_path[0..1] + ["cookbooks", $1]).include?($2)
+            raise RestErrorResponse.new(412, "No such cookbook: #{$1}") unless cookbook_names.include?($1)
+            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") unless list_data(request, request.rest_path[0..1] + ["cookbooks", $1]).include?($2)
+
             desired_versions[$1] = [ $2 ]
           else
             desired_cookbook = run_list_entry.split("::")[0]
-            raise RestErrorResponse.new(412, "No such cookbook: #{desired_cookbook}") if !cookbook_names.include?(desired_cookbook)
+            raise RestErrorResponse.new(412, "No such cookbook: #{desired_cookbook}") unless cookbook_names.include?(desired_cookbook)
+
             desired_versions[desired_cookbook] = list_data(request, request.rest_path[0..1] + ["cookbooks", desired_cookbook])
           end
         end
@@ -35,7 +37,7 @@ module ChefZero
 
         # Depsolve!
         solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
-        if !solved
+        unless solved
           if @last_missing_dep && !cookbook_names.include?(@last_missing_dep)
             return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}")
           elsif @last_constraint_failure
@@ -64,7 +66,7 @@ module ChefZero
 
         # If everything is already
         solve_for = unsolved[0]
-        return desired_versions if !solve_for
+        return desired_versions unless solve_for
 
         # Go through each desired version of this cookbook, starting with the latest,
         # until we find one we can solve successfully with
@@ -81,10 +83,10 @@ module ChefZero
           cookbook_dependencies.each_pair do |dep_name, dep_constraint|
             # If the dep is not already in the list, add it to the list to solve
             # and bring in all environment-allowed cookbook versions to desired_versions
-            if !new_desired_versions.key?(dep_name)
+            unless new_desired_versions.key?(dep_name)
               new_unsolved += [dep_name]
               # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
-              if !exists_data_dir?(request, request.rest_path[0..1] + ["cookbooks", dep_name])
+              unless exists_data_dir?(request, request.rest_path[0..1] + ["cookbooks", dep_name])
                 @last_missing_dep = dep_name.to_s
                 dep_not_found = true
                 break
@@ -110,7 +112,8 @@ module ChefZero
       end
 
       def filter_by_constraint(versions, cookbook_name, constraint)
-        return versions if !constraint
+        return versions unless constraint
+
         constraint = Gem::Requirement.new(constraint)
         new_versions = versions[cookbook_name]
         new_versions = new_versions.select { |version| constraint.satisfied_by?(Gem::Version.new(version.dup)) }

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 })