chef-zero 4.3.0 → 4.3.1

data/lib/chef_zero/data_store/raw_file_store.rb

@@ -1,147 +1,147 @@
-#
-# 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
-#
-#     http://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 '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
-    class RawFileStore < ChefZero::DataStore::InterfaceV2
-      def initialize(root, destructible = false)
-        @root = root
-        @destructible = destructible
-      end
-
-      attr_reader :root
-      attr_reader :destructible
-
-      def path_to(path, name=nil)
-        if name
-          File.join(root, *path, name)
-        else
-          File.join(root, *path)
-        end
-      end
-
-      def clear
-        if destructible
-          Dir.entries(root).each do |entry|
-            next if entry == '.' || entry == '..'
-            FileUtils.rm_rf(Path.join(root, entry))
-          end
-        end
-      end
-
-      def create_dir(path, name, *options)
-        real_path = path_to(path, name)
-        if options.include?(:recursive)
-          FileUtils.mkdir_p(real_path)
-        else
-          begin
-            Dir.mkdir(File.join(path, name))
-          rescue Errno::ENOENT
-            raise DataNotFoundError.new(path)
-          rescue Errno::EEXIST
-            raise DataAlreadyExistsError.new(path + [name])
-          end
-        end
-      end
-
-      def create(path, name, data, *options)
-        if options.include?(:create_dir)
-          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.write data
-          end
-        rescue Errno::ENOENT
-          raise DataNotFoundError.new(path)
-        rescue Errno::EEXIST
-          raise DataAlreadyExistsError.new(path + [name])
-        end
-      end
-
-      def get(path, request=nil)
-        begin
-          return IO.read(path_to(path))
-        rescue Errno::ENOENT
-          raise DataNotFoundError.new(path)
-        end
-      end
-
-      def set(path, data, *options)
-        if options.include?(:create_dir)
-          FileUtils.mkdir_p(path_to(path[0..-2]))
-        end
-        begin
-          mode = File::WRONLY|File::TRUNC|File::BINARY
-          if options.include?(:create)
-            mode |= File::CREAT
-          end
-          File.open(path_to(path), mode, :internal_encoding => nil) do |file|
-            file.write data
-          end
-        rescue Errno::ENOENT
-          raise DataNotFoundError.new(path)
-        end
-      end
-
-      def delete(path)
-        begin
-          File.delete(path_to(path))
-        rescue Errno::ENOENT
-          raise DataNotFoundError.new(path)
-        end
-      end
-
-      def delete_dir(path, *options)
-        if options.include?(:recursive)
-          if !File.exist?(path_to(path))
-            raise DataNotFoundError.new(path)
-          end
-          FileUtils.rm_rf(path_to(path))
-        else
-          begin
-            Dir.rmdir(path_to(path))
-          rescue Errno::ENOENT
-            raise DataNotFoundError.new(path)
-          end
-        end
-      end
-
-      def list(path)
-        begin
-          Dir.entries(path_to(path)).select { |entry| entry != '.' && entry != '..' }.to_a
-        rescue Errno::ENOENT
-          raise DataNotFoundError.new(path)
-        end
-      end
-
-      def exists?(path, options = {})
-        File.exists?(path_to(path))
-      end
-
-      def exists_dir?(path)
-        File.exists?(path_to(path))
-      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
+#
+#     http://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 '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
+    class RawFileStore < ChefZero::DataStore::InterfaceV2
+      def initialize(root, destructible = false)
+        @root = root
+        @destructible = destructible
+      end
+
+      attr_reader :root
+      attr_reader :destructible
+
+      def path_to(path, name=nil)
+        if name
+          File.join(root, *path, name)
+        else
+          File.join(root, *path)
+        end
+      end
+
+      def clear
+        if destructible
+          Dir.entries(root).each do |entry|
+            next if entry == '.' || entry == '..'
+            FileUtils.rm_rf(Path.join(root, entry))
+          end
+        end
+      end
+
+      def create_dir(path, name, *options)
+        real_path = path_to(path, name)
+        if options.include?(:recursive)
+          FileUtils.mkdir_p(real_path)
+        else
+          begin
+            Dir.mkdir(File.join(path, name))
+          rescue Errno::ENOENT
+            raise DataNotFoundError.new(path)
+          rescue Errno::EEXIST
+            raise DataAlreadyExistsError.new(path + [name])
+          end
+        end
+      end
+
+      def create(path, name, data, *options)
+        if options.include?(:create_dir)
+          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.write data
+          end
+        rescue Errno::ENOENT
+          raise DataNotFoundError.new(path)
+        rescue Errno::EEXIST
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+      end
+
+      def get(path, request=nil)
+        begin
+          return IO.read(path_to(path))
+        rescue Errno::ENOENT
+          raise DataNotFoundError.new(path)
+        end
+      end
+
+      def set(path, data, *options)
+        if options.include?(:create_dir)
+          FileUtils.mkdir_p(path_to(path[0..-2]))
+        end
+        begin
+          mode = File::WRONLY|File::TRUNC|File::BINARY
+          if options.include?(:create)
+            mode |= File::CREAT
+          end
+          File.open(path_to(path), mode, :internal_encoding => nil) do |file|
+            file.write data
+          end
+        rescue Errno::ENOENT
+          raise DataNotFoundError.new(path)
+        end
+      end
+
+      def delete(path)
+        begin
+          File.delete(path_to(path))
+        rescue Errno::ENOENT
+          raise DataNotFoundError.new(path)
+        end
+      end
+
+      def delete_dir(path, *options)
+        if options.include?(:recursive)
+          if !File.exist?(path_to(path))
+            raise DataNotFoundError.new(path)
+          end
+          FileUtils.rm_rf(path_to(path))
+        else
+          begin
+            Dir.rmdir(path_to(path))
+          rescue Errno::ENOENT
+            raise DataNotFoundError.new(path)
+          end
+        end
+      end
+
+      def list(path)
+        begin
+          Dir.entries(path_to(path)).select { |entry| entry != '.' && entry != '..' }.to_a
+        rescue Errno::ENOENT
+          raise DataNotFoundError.new(path)
+        end
+      end
+
+      def exists?(path, options = {})
+        File.exists?(path_to(path))
+      end
+
+      def exists_dir?(path)
+        File.exists?(path_to(path))
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -1,142 +1,142 @@
-require 'chef_zero/data_store/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
-        begin
-          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
-      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 'chef_zero/data_store/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
+        begin
+          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
+      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