chef-zero 14.0.11 → 15.0.1

data/lib/chef_zero/data_store/raw_file_store.rb

@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_already_exists_error"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/data_store/interface_v2"
-require "fileutils"
+require_relative "data_already_exists_error"
+require_relative "data_not_found_error"
+require_relative "interface_v2"
+require "fileutils" unless defined?(FileUtils)
 
 module ChefZero
   module DataStore
@@ -44,6 +44,7 @@ module ChefZero
         if destructible
           Dir.entries(root).each do |entry|
             next if entry == "." || entry == ".."
+
             FileUtils.rm_rf(Path.join(root, entry))
           end
         end
@@ -110,9 +111,10 @@ module ChefZero
 
       def delete_dir(path, *options)
         if options.include?(:recursive)
-          if !File.exist?(path_to(path))
+          unless File.exist?(path_to(path))
             raise DataNotFoundError.new(path)
           end
+
           FileUtils.rm_rf(path_to(path))
         else
           begin

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -1,4 +1,4 @@
-require "chef_zero/data_store/interface_v2"
+require_relative "interface_v2"
 
 module ChefZero
   module DataStore
@@ -21,6 +21,7 @@ module ChefZero
         raise DataNotFoundError.new(path) if skip_organizations?(path)
         raise "Cannot create #{name} at #{path} with V1ToV2Adapter: only handles a single org named #{single_org}." if skip_organizations?(path, name)
         raise DataAlreadyExistsError.new(path + [ name ]) if path.size < 2
+
         fix_exceptions do
           real_store.create_dir(path[2..-1], name, *options)
         end
@@ -30,6 +31,7 @@ module ChefZero
         raise DataNotFoundError.new(path) if skip_organizations?(path)
         raise "Cannot create #{name} at #{path} with V1ToV2Adapter: only handles a single org named #{single_org}." if skip_organizations?(path, name)
         raise DataAlreadyExistsError.new(path + [ name ]) if path.size < 2
+
         fix_exceptions do
           real_store.create(path[2..-1], name, data, *options)
         end
@@ -37,6 +39,7 @@ module ChefZero
 
       def get(path, request = nil)
         raise DataNotFoundError.new(path) if skip_organizations?(path)
+
         fix_exceptions do
           # Make it so build_uri will include /organizations/ORG inside the V1 data store
           if request && request.rest_base_prefix.size == 0
@@ -53,6 +56,7 @@ module ChefZero
 
       def set(path, data, *options)
         raise DataNotFoundError.new(path) if skip_organizations?(path)
+
         fix_exceptions do
           real_store.set(path[2..-1], data, *options)
         end
@@ -60,6 +64,7 @@ module ChefZero
 
       def delete(path, *options)
         raise DataNotFoundError.new(path) if skip_organizations?(path) && !options.include?(:recursive)
+
         fix_exceptions do
           real_store.delete(path[2..-1])
         end
@@ -67,6 +72,7 @@ module ChefZero
 
       def delete_dir(path, *options)
         raise DataNotFoundError.new(path) if skip_organizations?(path) && !options.include?(:recursive)
+
         fix_exceptions do
           real_store.delete_dir(path[2..-1], *options)
         end
@@ -74,6 +80,7 @@ module ChefZero
 
       def list(path)
         raise DataNotFoundError.new(path) if skip_organizations?(path)
+
         if path == []
           [ "organizations" ]
         elsif path == [ "organizations" ]
@@ -87,6 +94,7 @@ module ChefZero
 
       def exists?(path)
         return false if skip_organizations?(path)
+
         fix_exceptions do
           real_store.exists?(path[2..-1])
         end
@@ -94,12 +102,14 @@ module ChefZero
 
       def exists_dir?(path)
         return false if skip_organizations?(path)
+
         if path == []
           true
         elsif path == [ "organizations" ] || path == [ "users" ]
           true
         else
           return false if skip_organizations?(path)
+
           fix_exceptions do
             real_store.exists_dir?(path[2..-1])
           end

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/interface_v1"
+require_relative "interface_v1"
 
 module ChefZero
   module DataStore

data/lib/chef_zero/dist.rb

@@ -0,0 +1,9 @@
+module ChefZero
+  class Dist
+    # When referencing a product directly
+    PRODUCT = "Chef Zero".freeze
+
+    # The binary alias
+    CLIENT = "chef-zero".freeze
+  end
+end

data/lib/chef_zero/endpoints/acl_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/acl_path"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/acl_path"
 
 module ChefZero
   module Endpoints
@@ -23,6 +23,7 @@ module ChefZero
         if !acl_path || !%w{read create update delete grant}.include?(perm)
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
         end
+
         [acl_path, perm]
       end
 

data/lib/chef_zero/endpoints/acls_endpoint.rb

@@ -1,7 +1,7 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
-require "chef_zero/chef_data/acl_path"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
+require_relative "../chef_data/acl_path"
 
 module ChefZero
   module Endpoints
@@ -17,9 +17,10 @@ module ChefZero
         path = request.rest_path[0..-2] # Strip off _acl
         path = path[0..1] if path.size == 3 && path[0] == "organizations" && %w{organization organizations}.include?(path[2])
         acl_path = ChefData::AclPath.get_acl_data_path(path)
-        if !acl_path
+        unless acl_path
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
         end
+
         acls = FFI_Yajl::Parser.parse(get_data(request, acl_path))
         acls = ChefData::DataNormalizer.normalize_acls(acls)
         if request.query_params["detail"] == "granular"

data/lib/chef_zero/endpoints/actor_default_key_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -53,6 +53,7 @@ module ChefZero
 
       def actor_path(request)
         return request.rest_path[0..3] if request.rest_path[2] == "clients"
+
         request.rest_path[0..1]
       end
 

data/lib/chef_zero/endpoints/actor_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
@@ -125,7 +125,7 @@ module ChefZero
       def rename_keys!(request, new_client_or_user_name)
         orig_keys_path = keys_path_base(request)
         new_keys_path = orig_keys_path.dup
-                          .tap { |path| path[-2] = new_client_or_user_name }
+          .tap { |path| path[-2] = new_client_or_user_name }
 
         key_names = list_data_or_else(request, orig_keys_path, nil)
         return unless key_names # No keys to move

data/lib/chef_zero/endpoints/actor_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/actor_keys_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -50,7 +50,7 @@ module ChefZero
         response_body["private_key"] = private_key if generate_keys
 
         json_response(201, response_body,
-                      headers: { "Location" => response_body["uri"] })
+          headers: { "Location" => response_body["uri"] })
       end
 
       private
@@ -117,6 +117,7 @@ module ChefZero
 
       def actor_path(request)
         return request.rest_path[0..3] if client?(request)
+
         request.rest_path[0..1]
       end
 

data/lib/chef_zero/endpoints/actors_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/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
@@ -19,6 +19,7 @@ module ChefZero
         if user["password"] != password
           raise RestErrorResponse.new(401, "Bad username or password")
         end
+
         # Include only particular user data in the response
         user.keep_if { |key, value| %w{first_name last_name display_name email username}.include?(key) }
         json_response(200, {

data/lib/chef_zero/endpoints/container_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/containers_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
@@ -15,7 +15,7 @@ module ChefZero
         data = parse_json(request.body)
         # if they don't match, id wins.
         container_name = data["id"] || data["containername"]
-        container_path_suffix = data["containerpath"].split("/").reject { |o| o.empty? }
+        container_path_suffix = data["containerpath"].split("/").reject(&:empty?)
         create_data(request, request.rest_path, container_name, to_json({}), :create_dir)
 
         json_response(201, { uri: build_uri(request.base_uri, request.rest_path + container_path_suffix + [container_name]) })

data/lib/chef_zero/endpoints/controls_endpoint.rb

@@ -1,14 +1,15 @@
+require_relative "../dist"
 module ChefZero
   module Endpoints
     # /organizations/ORG/controls
     class ControlsEndpoint < RestBase
       # ours is not to wonder why; ours is but to make the pedant specs pass.
       def get(request)
-        error(410, "Server says 410, chef-zero says 410.")
+        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
       end
 
       def post(request)
-        error(410, "Server says 410, chef-zero says 410.")
+        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
       end
     end
   end

data/lib/chef_zero/endpoints/cookbook_artifact_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/cookbook_artifact_identifier_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -60,8 +60,8 @@ module ChefZero
       def normalize(request, cookbook_artifact_data)
         cookbook = parse_json(cookbook_artifact_data)
         ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1],
-                                                    cookbook, request.rest_path[3], request.rest_path[4],
-                                                    request.base_uri, request.method, true, api_version: request.api_version)
+          cookbook, request.rest_path[3], request.rest_path[4],
+          request.base_uri, request.method, true, api_version: request.api_version)
       end
     end
   end

data/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -8,12 +8,12 @@ module ChefZero
         data = {}
 
         artifacts = begin
-          list_data(request)
-        rescue Exception => e
-          if e.response_code == 404
-            return already_json_response(200, "{}")
-          end
-        end
+                      list_data(request)
+                    rescue Exception => e
+                      if e.response_code == 404
+                        return already_json_response(200, "{}")
+                      end
+                    end
 
         artifacts.each do |cookbook_artifact|
           cookbook_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact])

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -1,8 +1,8 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/rest_error_response"
-require "chef_zero/chef_data/data_normalizer"
-require "chef_zero/data_store/data_not_found_error"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../rest_error_response"
+require_relative "../chef_data/data_normalizer"
+require_relative "../data_store/data_not_found_error"
 
 module ChefZero
   module Endpoints
@@ -27,9 +27,10 @@ module ChefZero
             if request.query_params["force"] != "true"
               raise RestErrorResponse.new(409, "The cookbook #{name} at version #{version} is frozen. Use the 'force' option to override.")
             end
+
             # For some reason, you are forever unable to modify "frozen?" on a frozen cookbook.
             request_body = FFI_Yajl::Parser.parse(request.body)
-            if !request_body["frozen?"]
+            unless request_body["frozen?"]
               request_body["frozen?"] = true
               request.body = FFI_Yajl::Encoder.encode(request_body, pretty: true)
             end
@@ -92,6 +93,7 @@ module ChefZero
           rescue ChefZero::DataStore::DataNotFoundError
             # Not all chef versions support cookbook_artifacts
             raise unless cookbook_type == "cookbook_artifacts"
+
             cookbooks = []
           end
           cookbooks.each do |cookbook_name|

data/lib/chef_zero/endpoints/cookbooks_base.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
@@ -52,8 +52,9 @@ module ChefZero
         cookbooks_list.keys.sort.each do |name|
           constraint = Gem::Requirement.new(constraints[name])
           versions = []
-          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse.each do |version|
+          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse_each do |version|
             break if num_versions && versions.size >= num_versions
+
             if constraint.satisfied_by?(Gem::Version.new(version.dup))
               versions << version
             end
@@ -66,6 +67,7 @@ module ChefZero
         cookbook["all_files"].inject([]) do |acc, file|
           part, name = file["name"].split("/")
           next acc unless part == "recipes" || File.extname(name) != ".rb"
+
           if name == "default.rb"
             acc << cookbook_name
           else

data/lib/chef_zero/endpoints/cookbooks_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

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