chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -1,150 +1,150 @@
-require_relative "interface_v2"
-
-module ChefZero
-  module DataStore
-    class V1ToV2Adapter < ChefZero::DataStore::InterfaceV2
-      def initialize(real_store, single_org, options = {})
-        @real_store = real_store
-        @single_org = single_org
-        @options = options
-        clear
-      end
-
-      attr_reader :real_store
-      attr_reader :single_org
-
-      def clear
-        real_store.clear if real_store.respond_to?(:clear)
-      end
-
-      def create_dir(path, name, *options)
-        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
-      end
-
-      def create(path, name, data, *options)
-        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
-      end
-
-      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)
-          end
-          begin
-            real_store.get(path[2..-1], request)
-          ensure
-            request.base_uri = old_base_uri if request && request.rest_base_prefix.size == 0
-          end
-        end
-      end
-
-      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
-      end
-
-      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
-      end
-
-      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
-      end
-
-      def list(path)
-        raise DataNotFoundError.new(path) if skip_organizations?(path)
-
-        if path == []
-          [ "organizations" ]
-        elsif path == [ "organizations" ]
-          [ single_org ]
-        else
-          fix_exceptions do
-            real_store.list(path[2..-1])
-          end
-        end
-      end
-
-      def exists?(path)
-        return false if skip_organizations?(path)
-
-        fix_exceptions do
-          real_store.exists?(path[2..-1])
-        end
-      end
-
-      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
-        end
-      end
-
-      private
-
-      def fix_exceptions
-        yield
-      rescue DataAlreadyExistsError => 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.set_backtrace(e.backtrace)
-        raise e
-      end
-
-      def skip_organizations?(path, name = nil)
-        if path == []
-          false
-        elsif path[0] == "organizations"
-          if path.size == 1
-            false
-          elsif path.size >= 2 && path[1] != single_org
-            true
-          else
-            false
-          end
-        else
-          true
-        end
-      end
-    end
-  end
-end
+require_relative "interface_v2"
+
+module ChefZero
+  module DataStore
+    class V1ToV2Adapter < ChefZero::DataStore::InterfaceV2
+      def initialize(real_store, single_org, options = {})
+        @real_store = real_store
+        @single_org = single_org
+        @options = options
+        clear
+      end
+
+      attr_reader :real_store
+      attr_reader :single_org
+
+      def clear
+        real_store.clear if real_store.respond_to?(:clear)
+      end
+
+      def create_dir(path, name, *options)
+        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
+      end
+
+      def create(path, name, data, *options)
+        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
+      end
+
+      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)
+          end
+          begin
+            real_store.get(path[2..-1], request)
+          ensure
+            request.base_uri = old_base_uri if request && request.rest_base_prefix.size == 0
+          end
+        end
+      end
+
+      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
+      end
+
+      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
+      end
+
+      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
+      end
+
+      def list(path)
+        raise DataNotFoundError.new(path) if skip_organizations?(path)
+
+        if path == []
+          [ "organizations" ]
+        elsif path == [ "organizations" ]
+          [ single_org ]
+        else
+          fix_exceptions do
+            real_store.list(path[2..-1])
+          end
+        end
+      end
+
+      def exists?(path)
+        return false if skip_organizations?(path)
+
+        fix_exceptions do
+          real_store.exists?(path[2..-1])
+        end
+      end
+
+      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
+        end
+      end
+
+      private
+
+      def fix_exceptions
+        yield
+      rescue DataAlreadyExistsError => 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.set_backtrace(e.backtrace)
+        raise e
+      end
+
+      def skip_organizations?(path, name = nil)
+        if path == []
+          false
+        elsif path[0] == "organizations"
+          if path.size == 1
+            false
+          elsif path.size >= 2 && path[1] != single_org
+            true
+          else
+            false
+          end
+        else
+          true
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -1,105 +1,105 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "interface_v1"
-
-module ChefZero
-  module DataStore
-    class V2ToV1Adapter < ChefZero::DataStore::InterfaceV1
-      def initialize
-        @single_org = "chef"
-      end
-
-      attr_reader :real_store
-      attr_reader :single_org
-
-      def clear
-        real_store.clear
-        real_store.create_dir([ "organizations" ], single_org, :recursive)
-      end
-
-      def create_dir(path, name, *options)
-        fix_exceptions do
-          real_store.create_dir(fix_path(path), name, *options)
-        end
-      end
-
-      def create(path, name, data, *options)
-        fix_exceptions do
-          real_store.create(fix_path(path), name, data, *options)
-        end
-      end
-
-      def get(path, request = nil)
-        fix_exceptions do
-          real_store.get(fix_path(path), request)
-        end
-      end
-
-      def set(path, data, *options)
-        fix_exceptions do
-          real_store.set(fix_path(path), data, *options)
-        end
-      end
-
-      def delete(path)
-        fix_exceptions do
-          real_store.delete(fix_path(path))
-        end
-      end
-
-      def delete_dir(path, *options)
-        fix_exceptions do
-          real_store.delete_dir(fix_path(path), *options)
-        end
-      end
-
-      def list(path)
-        fix_exceptions do
-          real_store.list(fix_path(path))
-        end
-      end
-
-      def exists?(path)
-        fix_exceptions do
-          real_store.exists?(fix_path(path))
-        end
-      end
-
-      def exists_dir?(path)
-        fix_exceptions do
-          real_store.exists_dir?(fix_path(path))
-        end
-      end
-
-      protected
-
-      def fix_exceptions
-        yield
-      rescue DataAlreadyExistsError => e
-        raise DataAlreadyExistsError.new(e.path[2..-1], e)
-      rescue DataNotFoundError => e
-        raise DataNotFoundError.new(e.path[2..-1], e)
-      end
-
-      def fix_path(path)
-        [ "organizations", single_org ] + path
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "interface_v1"
+
+module ChefZero
+  module DataStore
+    class V2ToV1Adapter < ChefZero::DataStore::InterfaceV1
+      def initialize
+        @single_org = "chef"
+      end
+
+      attr_reader :real_store
+      attr_reader :single_org
+
+      def clear
+        real_store.clear
+        real_store.create_dir([ "organizations" ], single_org, :recursive)
+      end
+
+      def create_dir(path, name, *options)
+        fix_exceptions do
+          real_store.create_dir(fix_path(path), name, *options)
+        end
+      end
+
+      def create(path, name, data, *options)
+        fix_exceptions do
+          real_store.create(fix_path(path), name, data, *options)
+        end
+      end
+
+      def get(path, request = nil)
+        fix_exceptions do
+          real_store.get(fix_path(path), request)
+        end
+      end
+
+      def set(path, data, *options)
+        fix_exceptions do
+          real_store.set(fix_path(path), data, *options)
+        end
+      end
+
+      def delete(path)
+        fix_exceptions do
+          real_store.delete(fix_path(path))
+        end
+      end
+
+      def delete_dir(path, *options)
+        fix_exceptions do
+          real_store.delete_dir(fix_path(path), *options)
+        end
+      end
+
+      def list(path)
+        fix_exceptions do
+          real_store.list(fix_path(path))
+        end
+      end
+
+      def exists?(path)
+        fix_exceptions do
+          real_store.exists?(fix_path(path))
+        end
+      end
+
+      def exists_dir?(path)
+        fix_exceptions do
+          real_store.exists_dir?(fix_path(path))
+        end
+      end
+
+      protected
+
+      def fix_exceptions
+        yield
+      rescue DataAlreadyExistsError => e
+        raise DataAlreadyExistsError.new(e.path[2..-1], e)
+      rescue DataNotFoundError => e
+        raise DataNotFoundError.new(e.path[2..-1], e)
+      end
+
+      def fix_path(path)
+        [ "organizations", single_org ] + path
+      end
+    end
+  end
+end

data/lib/chef_zero/dist.rb

@@ -1,9 +1,9 @@
-module ChefZero
-  class Dist
-    # When referencing a product directly
-    PRODUCT = "Chef Zero".freeze
-
-    # The binary alias
-    CLIENT = "chef-zero".freeze
-  end
-end
+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,39 +1,39 @@
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require_relative "../rest_base"
-require_relative "../chef_data/acl_path"
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/<thing>/NAME/_acl/PERM
-    # Where thing is:
-    # clients, data, containers, cookbooks, environments
-    # groups, roles, nodes, users
-    # or
-    # /organizations/ORG/organization/_acl/PERM
-    # or
-    # /users/NAME/_acl/PERM
-    #
-    # Where PERM is create,read,update,delete,grant
-    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])
-        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)
-          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
-        end
-
-        [acl_path, perm]
-      end
-
-      def put(request)
-        path, perm = validate_request(request)
-        acls = FFI_Yajl::Parser.parse(get_data(request, path))
-        acls[perm] = FFI_Yajl::Parser.parse(request.body)[perm]
-        set_data(request, path, FFI_Yajl::Encoder.encode(acls, pretty: true))
-        json_response(200, { "uri" => (build_uri(request.base_uri, request.rest_path)).to_s })
-      end
-    end
-  end
-end
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
+require_relative "../chef_data/acl_path"
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/<thing>/NAME/_acl/PERM
+    # Where thing is:
+    # clients, data, containers, cookbooks, environments
+    # groups, roles, nodes, users
+    # or
+    # /organizations/ORG/organization/_acl/PERM
+    # or
+    # /users/NAME/_acl/PERM
+    #
+    # Where PERM is create,read,update,delete,grant
+    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])
+        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)
+          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+        end
+
+        [acl_path, perm]
+      end
+
+      def put(request)
+        path, perm = validate_request(request)
+        acls = FFI_Yajl::Parser.parse(get_data(request, path))
+        acls[perm] = FFI_Yajl::Parser.parse(request.body)[perm]
+        set_data(request, path, FFI_Yajl::Encoder.encode(acls, pretty: true))
+        json_response(200, { "uri" => (build_uri(request.base_uri, request.rest_path)).to_s })
+      end
+    end
+  end
+end