chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/data_store/data_already_exists_error.rb

@@ -1,29 +1,29 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 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 "data_error"
-
-module ChefZero
-  module DataStore
-    class DataAlreadyExistsError < DataError
-      def initialize(path, cause = nil)
-        super
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2013 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 "data_error"
+
+module ChefZero
+  module DataStore
+    class DataAlreadyExistsError < DataError
+      def initialize(path, cause = nil)
+        super
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/data_error.rb

@@ -1,32 +1,32 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 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.
-#
-
-module ChefZero
-  module DataStore
-    class DataError < StandardError
-      attr_reader :path, :cause
-
-      def initialize(path, cause = nil)
-        @path = path
-        @cause = cause
-        path_for_msg = path.nil? ? "nil" : "/#{path.join("/")}"
-        super "Data path: #{path_for_msg}"
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2013 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.
+#
+
+module ChefZero
+  module DataStore
+    class DataError < StandardError
+      attr_reader :path, :cause
+
+      def initialize(path, cause = nil)
+        @path = path
+        @cause = cause
+        path_for_msg = path.nil? ? "nil" : "/#{path.join("/")}"
+        super "Data path: #{path_for_msg}"
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/data_not_found_error.rb

@@ -1,29 +1,29 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 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 "data_error"
-
-module ChefZero
-  module DataStore
-    class DataNotFoundError < DataError
-      def initialize(path, cause = nil)
-        super
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2013 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 "data_error"
+
+module ChefZero
+  module DataStore
+    class DataNotFoundError < DataError
+      def initialize(path, cause = nil)
+        super
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/default_facade.rb

@@ -1,147 +1,143 @@
-require_relative "interface_v2"
-require_relative "../chef_data/default_creator"
-
-module ChefZero
-  module DataStore
-    #
-    # The DefaultFacade exists to layer defaults on top of an existing data
-    # store.  When you create an org, you just create the directory itself:
-    # the rest of the org (such as environments/_default) will not actually
-    # exist anywhere, but when you get(/organizations/org/environments/_default),
-    # the DefaultFacade will create one for you on the fly.
-    #
-    # acls in particular are instantiated on the fly using this method.
-    #
-    class DefaultFacade < ChefZero::DataStore::InterfaceV2
-      def initialize(real_store, single_org, osc_compat, superusers = nil)
-        @real_store = real_store
-        @default_creator = ChefData::DefaultCreator.new(self, single_org, osc_compat, superusers)
-        clear
-      end
-
-      attr_reader :real_store
-      attr_reader :default_creator
-
-      def clear
-        real_store.clear if real_store.respond_to?(:clear)
-        default_creator.clear
-      end
-
-      def create_dir(path, name, *options)
-        if default_creator.exists?(path + [ name ]) && !options.include?(:recursive)
-          raise DataAlreadyExistsError.new(path + [name])
-        end
-
-        begin
-          real_store.create_dir(path, name, *options)
-        rescue DataNotFoundError
-          if default_creator.exists?(path)
-            real_store.create_dir(path, name, :recursive, *options)
-          else
-            raise
-          end
-        end
-
-        options_hash = options.last.is_a?(Hash) ? options.last : {}
-        default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:recursive))
-      end
-
-      def create(path, name, data, *options)
-        if default_creator.exists?(path + [ name ]) && !options.include?(:create_dir)
-          raise DataAlreadyExistsError.new(path + [name])
-        end
-
-        begin
-          real_store.create(path, name, data, *options)
-        rescue DataNotFoundError
-          if default_creator.exists?(path)
-            real_store.create(path, name, data, :create_dir, *options)
-          else
-            raise
-          end
-        end
-
-        options_hash = options.last.is_a?(Hash) ? options.last : {}
-        default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:create_dir))
-      end
-
-      def get(path, request = nil)
-        real_store.get(path, request)
-      rescue DataNotFoundError
-        result = default_creator.get(path)
-        if result
-          FFI_Yajl::Encoder.encode(result, pretty: true)
-        else
-          raise
-        end
-      end
-
-      def set(path, data, *options)
-        begin
-          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)
-            real_store.set(path, data, :create, :create_dir, *options)
-          else
-            raise
-          end
-        end
-
-        if options.include?(:create)
-          options_hash = options.last.is_a?(Hash) ? options.last : {}
-          default_creator.created(path, options_hash[:requestor], options.include?(:create_dir))
-        end
-      end
-
-      def delete(path, *options)
-        deleted = default_creator.deleted(path)
-        begin
-          real_store.delete(path)
-        rescue DataNotFoundError
-          unless deleted
-            raise
-          end
-        end
-      end
-
-      def delete_dir(path, *options)
-        deleted = default_creator.deleted(path)
-        begin
-          real_store.delete_dir(path, *options)
-        rescue DataNotFoundError
-          unless deleted
-            raise
-          end
-        end
-      end
-
-      def list(path)
-        default_results = default_creator.list(path)
-        begin
-          real_results = real_store.list(path)
-          if default_results
-            (real_results + default_results).uniq
-          else
-            real_results
-          end
-        rescue DataNotFoundError
-          if default_results
-            default_results
-          else
-            raise
-          end
-        end
-      end
-
-      def exists?(path)
-        real_store.exists?(path) || default_creator.exists?(path)
-      end
-
-      def exists_dir?(path)
-        real_store.exists_dir?(path) || default_creator.exists?(path)
-      end
-    end
-  end
-end
+require_relative "interface_v2"
+require_relative "../chef_data/default_creator"
+
+module ChefZero
+  module DataStore
+    #
+    # The DefaultFacade exists to layer defaults on top of an existing data
+    # store.  When you create an org, you just create the directory itself:
+    # the rest of the org (such as environments/_default) will not actually
+    # exist anywhere, but when you get(/organizations/org/environments/_default),
+    # the DefaultFacade will create one for you on the fly.
+    #
+    # acls in particular are instantiated on the fly using this method.
+    #
+    class DefaultFacade < ChefZero::DataStore::InterfaceV2
+      def initialize(real_store, single_org, osc_compat, superusers = nil)
+        @real_store = real_store
+        @default_creator = ChefData::DefaultCreator.new(self, single_org, osc_compat, superusers)
+        clear
+      end
+
+      attr_reader :real_store
+      attr_reader :default_creator
+
+      def clear
+        real_store.clear if real_store.respond_to?(:clear)
+        default_creator.clear
+      end
+
+      def create_dir(path, name, *options)
+        if default_creator.exists?(path + [ name ]) && !options.include?(:recursive)
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+
+        begin
+          real_store.create_dir(path, name, *options)
+        rescue DataNotFoundError
+          if default_creator.exists?(path)
+            real_store.create_dir(path, name, :recursive, *options)
+          else
+            raise
+          end
+        end
+
+        options_hash = options.last.is_a?(Hash) ? options.last : {}
+        default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:recursive))
+      end
+
+      def create(path, name, data, *options)
+        if default_creator.exists?(path + [ name ]) && !options.include?(:create_dir)
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+
+        begin
+          real_store.create(path, name, data, *options)
+        rescue DataNotFoundError
+          if default_creator.exists?(path)
+            real_store.create(path, name, data, :create_dir, *options)
+          else
+            raise
+          end
+        end
+
+        options_hash = options.last.is_a?(Hash) ? options.last : {}
+        default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:create_dir))
+      end
+
+      def get(path, request = nil)
+        real_store.get(path, request)
+      rescue DataNotFoundError
+        result = default_creator.get(path)
+        if result
+          FFI_Yajl::Encoder.encode(result, pretty: true)
+        else
+          raise
+        end
+      end
+
+      def set(path, data, *options)
+        begin
+          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)
+            real_store.set(path, data, :create, :create_dir, *options)
+          else
+            raise
+          end
+        end
+
+        if options.include?(:create)
+          options_hash = options.last.is_a?(Hash) ? options.last : {}
+          default_creator.created(path, options_hash[:requestor], options.include?(:create_dir))
+        end
+      end
+
+      def delete(path, *options)
+        deleted = default_creator.deleted(path)
+        begin
+          real_store.delete(path)
+        rescue DataNotFoundError
+          unless deleted
+            raise
+          end
+        end
+      end
+
+      def delete_dir(path, *options)
+        deleted = default_creator.deleted(path)
+        begin
+          real_store.delete_dir(path, *options)
+        rescue DataNotFoundError
+          unless deleted
+            raise
+          end
+        end
+      end
+
+      def list(path)
+        default_results = default_creator.list(path)
+        begin
+          real_results = real_store.list(path)
+          if default_results
+            (real_results + default_results).uniq
+          else
+            real_results
+          end
+        rescue DataNotFoundError
+          default_results || raise
+        end
+      end
+
+      def exists?(path)
+        real_store.exists?(path) || default_creator.exists?(path)
+      end
+
+      def exists_dir?(path)
+        real_store.exists_dir?(path) || default_creator.exists?(path)
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/interface_v1.rb

@@ -1,67 +1,67 @@
-module ChefZero
-  module DataStore
-    class InterfaceV1
-      def interface_version
-        1
-      end
-
-      def clear
-        raise "clear not implemented by class #{self.class}"
-      end
-
-      # Create a directory.
-      # options is a list of symbols, including:
-      #   :recursive - create any parents needed
-      def create_dir(path, name, *options)
-        raise "create_dir not implemented by class #{self.class}"
-      end
-
-      # Create a file.
-      # options is a list of symbols, including:
-      #   :create_dir - create any parents needed
-      def create(path, name, data, *options)
-        raise "create not implemented by class #{self.class}"
-      end
-
-      # Get a file.
-      def get(path, request = nil)
-        raise "get not implemented by class #{self.class}"
-      end
-
-      # Set a file's value.
-      # options is a list of symbols, including:
-      #    :create - create the file if it does not exist
-      #    :create_dir - create the directory if it does not exist
-      def set(path, data, *options)
-        raise "set not implemented by class #{self.class}"
-      end
-
-      # Delete a file.
-      def delete(path)
-        raise "delete not implemented by class #{self.class}"
-      end
-
-      # Delete a directory.
-      # options is a list of symbols, including:
-      #   :recursive - delete even if empty
-      def delete_dir(path, *options)
-        raise "delete_dir not implemented by class #{self.class}"
-      end
-
-      # List a directory.
-      def list(path)
-        raise "list not implemented by class #{self.class}"
-      end
-
-      # Check a file's existence.
-      def exists?(path)
-        raise "exists? not implemented by class #{self.class}"
-      end
-
-      # Check a directory's existence.
-      def exists_dir?(path)
-        raise "exists_dir? not implemented by class #{self.class}"
-      end
-    end
-  end
-end
+module ChefZero
+  module DataStore
+    class InterfaceV1
+      def interface_version
+        1
+      end
+
+      def clear
+        raise "clear not implemented by class #{self.class}"
+      end
+
+      # Create a directory.
+      # options is a list of symbols, including:
+      #   :recursive - create any parents needed
+      def create_dir(path, name, *options)
+        raise "create_dir not implemented by class #{self.class}"
+      end
+
+      # Create a file.
+      # options is a list of symbols, including:
+      #   :create_dir - create any parents needed
+      def create(path, name, data, *options)
+        raise "create not implemented by class #{self.class}"
+      end
+
+      # Get a file.
+      def get(path, request = nil)
+        raise "get not implemented by class #{self.class}"
+      end
+
+      # Set a file's value.
+      # options is a list of symbols, including:
+      #    :create - create the file if it does not exist
+      #    :create_dir - create the directory if it does not exist
+      def set(path, data, *options)
+        raise "set not implemented by class #{self.class}"
+      end
+
+      # Delete a file.
+      def delete(path)
+        raise "delete not implemented by class #{self.class}"
+      end
+
+      # Delete a directory.
+      # options is a list of symbols, including:
+      #   :recursive - delete even if empty
+      def delete_dir(path, *options)
+        raise "delete_dir not implemented by class #{self.class}"
+      end
+
+      # List a directory.
+      def list(path)
+        raise "list not implemented by class #{self.class}"
+      end
+
+      # Check a file's existence.
+      def exists?(path)
+        raise "exists? not implemented by class #{self.class}"
+      end
+
+      # Check a directory's existence.
+      def exists_dir?(path)
+        raise "exists_dir? not implemented by class #{self.class}"
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/interface_v2.rb

@@ -1,18 +1,18 @@
-require_relative "interface_v1"
-
-module ChefZero
-  module DataStore
-    # V2 assumes paths starting with /organizations/ORGNAME.  It also REQUIRES that
-    # new organizations have these defaults:
-    # chef-validator client: '{ "validator": true }',
-    # chef-webui client: '{ "admin": true }'
-    # _default environment: '{ "description": "The default Chef environment" }'
-    # admin user: '{ "admin": "true" }'
-
-    class InterfaceV2 < ChefZero::DataStore::InterfaceV1
-      def interface_version
-        2
-      end
-    end
-  end
-end
+require_relative "interface_v1"
+
+module ChefZero
+  module DataStore
+    # V2 assumes paths starting with /organizations/ORGNAME.  It also REQUIRES that
+    # new organizations have these defaults:
+    # chef-validator client: '{ "validator": true }',
+    # chef-webui client: '{ "admin": true }'
+    # _default environment: '{ "description": "The default Chef environment" }'
+    # admin user: '{ "admin": "true" }'
+
+    class InterfaceV2 < ChefZero::DataStore::InterfaceV1
+      def interface_version
+        2
+      end
+    end
+  end
+end