chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/data_store/data_already_exists_error.rb

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

data/lib/chef_zero/data_store/data_not_found_error.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef_zero/data_store/data_error'
+require "chef_zero/data_store/data_error"
 
 module ChefZero
   module DataStore
@@ -26,4 +26,4 @@ module ChefZero
       end
     end
   end
-end
+end

data/lib/chef_zero/data_store/default_facade.rb

@@ -1,5 +1,5 @@
-require 'chef_zero/data_store/interface_v2'
-require 'chef_zero/chef_data/default_creator'
+require "chef_zero/data_store/interface_v2"
+require "chef_zero/chef_data/default_creator"
 
 module ChefZero
   module DataStore
@@ -65,7 +65,7 @@ module ChefZero
         default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:create_dir))
       end
 
-      def get(path, request=nil)
+      def get(path, request = nil)
         begin
           real_store.get(path, request)
         rescue DataNotFoundError
@@ -83,8 +83,8 @@ module ChefZero
           real_store.set(path, data, *options)
         rescue DataNotFoundError
           if options.include?(:create_dir) ||
-             options.include?(:create) && default_creator.exists?(path[0..-2]) ||
-             default_creator.exists?(path)
+              options.include?(:create) && default_creator.exists?(path[0..-2]) ||
+              default_creator.exists?(path)
             real_store.set(path, data, :create, :create_dir, *options)
           else
             raise

data/lib/chef_zero/data_store/interface_v1.rb

@@ -24,7 +24,7 @@ module ChefZero
       end
 
       # Get a file.
-      def get(path, request=nil)
+      def get(path, request = nil)
         raise "get not implemented by class #{self.class}"
       end
 

data/lib/chef_zero/data_store/interface_v2.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/data_store/interface_v1'
+require "chef_zero/data_store/interface_v1"
 
 module ChefZero
   module DataStore

data/lib/chef_zero/data_store/memory_store.rb

@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-require 'chef_zero/data_store/v2_to_v1_adapter'
-require 'chef_zero/data_store/memory_store_v2'
-require 'chef_zero/data_store/default_facade'
+require "chef_zero/data_store/v2_to_v1_adapter"
+require "chef_zero/data_store/memory_store_v2"
+require "chef_zero/data_store/default_facade"
 
 module ChefZero
   module DataStore
     class MemoryStore < ChefZero::DataStore::V2ToV1Adapter
       def initialize
         super
-        @real_store = ChefZero::DataStore::DefaultFacade.new(ChefZero::DataStore::MemoryStoreV2.new, 'chef', true)
+        @real_store = ChefZero::DataStore::DefaultFacade.new(ChefZero::DataStore::MemoryStoreV2.new, "chef", true)
         clear
       end
     end

data/lib/chef_zero/data_store/memory_store_v2.rb

@@ -16,9 +16,9 @@
 # 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 "chef_zero/data_store/data_already_exists_error"
+require "chef_zero/data_store/data_not_found_error"
+require "chef_zero/data_store/interface_v2"
 
 module ChefZero
   module DataStore
@@ -58,7 +58,7 @@ module ChefZero
         parent[name] = data
       end
 
-      def get(path, request=nil)
+      def get(path, request = nil)
         value = _get(path)
         if value.is_a?(Hash)
           raise "get() called on directory #{path.join('/')}"
@@ -81,7 +81,7 @@ module ChefZero
       end
 
       def delete(path)
-        parent = _get(path[0,path.length-1])
+        parent = _get(path[0, path.length - 1])
         if !parent.has_key?(path[-1])
           raise DataNotFoundError.new(path)
         end
@@ -92,7 +92,7 @@ module ChefZero
       end
 
       def delete_dir(path, *options)
-        parent = _get(path[0,path.length-1])
+        parent = _get(path[0, path.length - 1])
         if !parent.has_key?(path[-1])
           raise DataNotFoundError.new(path)
         end
@@ -136,14 +136,14 @@ module ChefZero
 
       private
 
-      def _get(path, create_dir=false)
+      def _get(path, create_dir = false)
         value = @data
         path.each_with_index do |path_part, index|
           if !value.has_key?(path_part)
             if create_dir
               value[path_part] = {}
             else
-              raise DataNotFoundError.new(path[0,index+1])
+              raise DataNotFoundError.new(path[0, index + 1])
             end
           end
           value = value[path_part]

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 "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"
 
 module ChefZero
   module DataStore
@@ -32,7 +32,7 @@ module ChefZero
       attr_reader :root
       attr_reader :destructible
 
-      def path_to(path, name=nil)
+      def path_to(path, name = nil)
         if name
           File.join(root, *path, name)
         else
@@ -43,7 +43,7 @@ module ChefZero
       def clear
         if destructible
           Dir.entries(root).each do |entry|
-            next if entry == '.' || entry == '..'
+            next if entry == "." || entry == ".."
             FileUtils.rm_rf(Path.join(root, entry))
           end
         end
@@ -69,7 +69,7 @@ module ChefZero
           FileUtils.mkdir_p(path_to(path))
         end
         begin
-          File.open(path_to(path, name), File::WRONLY|File::CREAT|File::EXCL|File::BINARY, :internal_encoding => nil) do |file|
+          File.open(path_to(path, name), File::WRONLY | File::CREAT | File::EXCL | File::BINARY, :internal_encoding => nil) do |file|
             file.write data
           end
         rescue Errno::ENOENT
@@ -79,7 +79,7 @@ module ChefZero
         end
       end
 
-      def get(path, request=nil)
+      def get(path, request = nil)
         begin
           return IO.read(path_to(path))
         rescue Errno::ENOENT
@@ -92,7 +92,7 @@ module ChefZero
           FileUtils.mkdir_p(path_to(path[0..-2]))
         end
         begin
-          mode = File::WRONLY|File::TRUNC|File::BINARY
+          mode = File::WRONLY | File::TRUNC | File::BINARY
           if options.include?(:create)
             mode |= File::CREAT
           end
@@ -129,7 +129,7 @@ module ChefZero
 
       def list(path)
         begin
-          Dir.entries(path_to(path)).select { |entry| entry != '.' && entry != '..' }.to_a
+          Dir.entries(path_to(path)).select { |entry| entry != "." && entry != ".." }.to_a
         rescue Errno::ENOENT
           raise DataNotFoundError.new(path)
         end

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/data_store/interface_v2'
+require "chef_zero/data_store/interface_v2"
 
 module ChefZero
   module DataStore
@@ -35,13 +35,13 @@ module ChefZero
         end
       end
 
-      def get(path, request=nil)
+      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
             old_base_uri = request.base_uri
-            request.base_uri = File.join(request.base_uri, 'organizations', single_org)
+            request.base_uri = File.join(request.base_uri, "organizations", single_org)
           end
           begin
             real_store.get(path[2..-1], request)
@@ -75,8 +75,8 @@ module ChefZero
       def list(path)
         raise DataNotFoundError.new(path) if skip_organizations?(path)
         if path == []
-          [ 'organizations' ]
-        elsif path == [ 'organizations' ]
+          [ "organizations" ]
+        elsif path == [ "organizations" ]
           [ single_org ]
         else
           fix_exceptions do
@@ -96,7 +96,7 @@ module ChefZero
         return false if skip_organizations?(path)
         if path == []
           true
-        elsif path == [ 'organizations' ] || path == [ 'users' ]
+        elsif path == [ "organizations" ] || path == [ "users" ]
           true
         else
           return false if skip_organizations?(path)
@@ -112,11 +112,11 @@ module ChefZero
         begin
           yield
         rescue DataAlreadyExistsError => e
-          err = DataAlreadyExistsError.new([ 'organizations', single_org ] + e.path, e)
+          err = DataAlreadyExistsError.new([ "organizations", single_org ] + e.path, e)
           err.set_backtrace(e.backtrace)
           raise err
         rescue DataNotFoundError => e
-          err = DataNotFoundError.new([ 'organizations', single_org ] + e.path, e)
+          err = DataNotFoundError.new([ "organizations", single_org ] + e.path, e)
           err.set_backtrace(e.backtrace)
           raise e
         end
@@ -125,7 +125,7 @@ module ChefZero
       def skip_organizations?(path, name = nil)
         if path == []
           false
-        elsif path[0] == 'organizations'
+        elsif path[0] == "organizations"
           if path.size == 1
             false
           elsif path.size >= 2 && path[1] != single_org

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -16,13 +16,13 @@
 # limitations under the License.
 #
 
-require 'chef_zero/data_store/interface_v1'
+require "chef_zero/data_store/interface_v1"
 
 module ChefZero
   module DataStore
     class V2ToV1Adapter < ChefZero::DataStore::InterfaceV1
       def initialize
-        @single_org = 'chef'
+        @single_org = "chef"
       end
 
       attr_reader :real_store
@@ -30,7 +30,7 @@ module ChefZero
 
       def clear
         real_store.clear
-        real_store.create_dir([ 'organizations' ], single_org, :recursive)
+        real_store.create_dir([ "organizations" ], single_org, :recursive)
       end
 
       def create_dir(path, name, *options)
@@ -45,7 +45,7 @@ module ChefZero
         end
       end
 
-      def get(path, request=nil)
+      def get(path, request = nil)
         fix_exceptions do
           real_store.get(fix_path(path), request)
         end
@@ -100,7 +100,7 @@ module ChefZero
       end
 
       def fix_path(path)
-        [ 'organizations', single_org ] + path
+        [ "organizations", single_org ] + path
       end
     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"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/acl_path"
 
 module ChefZero
   module Endpoints
@@ -17,10 +17,10 @@ module ChefZero
     class AclEndpoint < RestBase
       def validate_request(request)
         path = request.rest_path[0..-3] # Strip off _acl/PERM
-        path = path[0..1] if path.size == 3 && path[0] == 'organizations' && %w(organization organizations).include?(path[2])
+        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)
         perm = request.rest_path[-1]
-        if !acl_path || !%w(read create update delete grant).include?(perm)
+        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]
@@ -31,7 +31,7 @@ module ChefZero
         acls = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
         acls[perm] = FFI_Yajl::Parser.parse(request.body, :create_additions => false)[perm]
         set_data(request, path, FFI_Yajl::Encoder.encode(acls, :pretty => true))
-        json_response(200, {'uri' => "#{build_uri(request.base_uri, request.rest_path)}"})
+        json_response(200, { "uri" => "#{build_uri(request.base_uri, request.rest_path)}" })
       end
     end
   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"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/data_normalizer"
+require "chef_zero/chef_data/acl_path"
 
 module ChefZero
   module Endpoints
@@ -15,7 +15,7 @@ module ChefZero
     class AclsEndpoint < RestBase
       def get(request)
         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])
+        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
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")

data/lib/chef_zero/endpoints/actor_default_key_endpoint.rb

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

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"
+require "chef_zero/endpoints/rest_object_endpoint"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -21,10 +21,10 @@ module ChefZero
       def delete(request)
         result = super
 
-        if request.rest_path[0] == 'users'
-          list_data(request, [ 'organizations' ]).each do |org|
+        if request.rest_path[0] == "users"
+          list_data(request, [ "organizations" ]).each do |org|
             begin
-              delete_data(request, [ 'organizations', org, 'users', request.rest_path[1] ], :data_store_exceptions)
+              delete_data(request, [ "organizations", org, "users", request.rest_path[1] ], :data_store_exceptions)
             rescue DataStore::DataNotFoundError
             end
           end
@@ -38,22 +38,22 @@ module ChefZero
         # Find out if we're updating the public key.
         request_body = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
 
-        if request_body['public_key'].nil?
+        if request_body["public_key"].nil?
           # If public_key is null, then don't overwrite it.  Weird patchiness.
           body_modified = true
-          request_body.delete('public_key')
+          request_body.delete("public_key")
         else
           updating_public_key = true
         end
 
         # Generate private_key if requested.
-        if request_body.key?('private_key')
+        if request_body.key?("private_key")
           body_modified = true
 
-          if request_body.delete('private_key')
+          if request_body.delete("private_key")
             private_key, public_key = server.gen_key_pair
             updating_public_key = true
-            request_body['public_key'] = public_key
+            request_body["public_key"] = public_key
           end
         end
 
@@ -73,22 +73,22 @@ module ChefZero
             rename_keys!(request, client_or_user_name)
           end
 
-          if request.rest_path[0] == 'users'
+          if request.rest_path[0] == "users"
             response = {
-              'uri' => build_uri(request.base_uri, [ 'users', client_or_user_name ])
+              "uri" => build_uri(request.base_uri, [ "users", client_or_user_name ]),
             }
           else
             response = parse_json(result[2])
           end
 
           if client?(request)
-            response['private_key'] = private_key ? private_key : false
+            response["private_key"] = private_key ? private_key : false
           else
-            response['private_key'] = private_key if private_key
-            response.delete('public_key') unless updating_public_key
+            response["private_key"] = private_key if private_key
+            response.delete("public_key") unless updating_public_key
           end
 
-          response.delete('password')
+          response.delete("password")
 
           json_response(result[0], response)
         else
@@ -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
@@ -154,7 +154,7 @@ module ChefZero
       rescue DataStore::DataNotFoundError
       end
 
-      def client?(request, rest_path=nil)
+      def client?(request, rest_path = nil)
         rest_path ||= request.rest_path
         request.rest_path[2] == "clients"
       end
@@ -165,7 +165,7 @@ module ChefZero
       # /organizations/ORG/users/USER -> /organizations/ORG/user_keys/USER/keys
       # /users/USER -> /user_keys/USER
       #
-      def keys_path_base(request, client_or_user_name=nil)
+      def keys_path_base(request, client_or_user_name = nil)
         rest_path = (rest_path || request.rest_path).dup
         rest_path = rest_path.dup
         case rest_path[-2]