chef-zero 1.0.1 → 1.1

data/lib/chef_zero/cookbook_data.rb

@@ -18,6 +18,24 @@ module ChefZero
       result
     end
 
+    def self.metadata_from(directory, name, version, recipe_names)
+      metadata = PretendCookbookMetadata.new(PretendCookbook.new(name, recipe_names))
+      # If both .rb and .json exist, read .rb
+      # TODO if recipes has 3 recipes in it, and the Ruby/JSON has only one, should
+      # the resulting recipe list have 1, or 3-4 recipes in it?
+      if has_child(directory, 'metadata.rb')
+        metadata.instance_eval(read_file(directory, 'metadata.rb'))
+      elsif has_child(directory, 'metadata.json')
+        metadata.from_json(read_file(directory, 'metadata.json'))
+      end
+      result = {}
+      metadata.to_hash.each_pair do |key,value|
+        result[key.to_sym] = value
+      end
+      result[:version] = version if version
+      result
+    end
+
     private
 
     # Just enough cookbook to make a Metadata object
@@ -101,24 +119,6 @@ module ChefZero
       end
     end
 
-    def self.metadata_from(directory, name, version, recipe_names)
-      metadata = PretendCookbookMetadata.new(PretendCookbook.new(name, recipe_names))
-      # If both .rb and .json exist, read .rb
-      # TODO if recipes has 3 recipes in it, and the Ruby/JSON has only one, should
-      # the resulting recipe list have 1, or 3-4 recipes in it?
-      if directory['metadata.rb']
-        metadata.instance_eval(directory['metadata.rb'])
-      elsif directory['metadata.json']
-        metadata.from_json(directory['metadata.json'])
-      end
-      result = {}
-      metadata.to_hash.each_pair do |key,value|
-        result[key.to_sym] = value
-      end
-      result[:version] = version
-      result
-    end
-
     def self.files_from(directory)
       # TODO some support .rb only
       result = {
@@ -137,8 +137,41 @@ module ChefZero
       result
     end
 
+    def self.has_child(directory, name)
+      if directory.is_a?(Hash)
+        directory.has_key?(name)
+      else
+        directory.child(name).exists?
+      end
+    end
+
+    def self.read_file(directory, name)
+      if directory.is_a?(Hash)
+        directory[name]
+      else
+        directory.child(name).read
+      end
+    end
+
+    def self.get_directory(directory, name)
+      if directory.is_a?(Hash)
+        directory[name].is_a?(Hash) ? directory[name] : nil
+      else
+        result = directory.child(name)
+        result.dir? ? result : nil
+      end
+    end
+
+    def self.list_directory(directory)
+      if directory.is_a?(Hash)
+        directory.keys
+      else
+        directory.children.map { |c| c.name }
+      end
+    end
+
     def self.load_child_files(parent, key, recursive)
-      result = load_files(parent[key], recursive)
+      result = load_files(get_directory(parent, key), recursive)
       result.each do |file|
         file[:path] = "#{key}/#{file[:path]}"
       end
@@ -148,13 +181,14 @@ module ChefZero
     def self.load_files(directory, recursive)
       result = []
       if directory
-        directory.each_pair do |child_key, child|
-          if child.is_a? Hash
+        list(directory) do |child_name|
+          dir = get_directory(directory, child_name)
+          if dir
             if recursive
-              result += load_child_files(directory, child_key, recursive)
-           end
+              result += load_child_files(directory, child_name, recursive)
+            end
           else
-            result += load_file(child, child_key)
+            result += load_file(read_file(directory, child_name), child_name)
           end
         end
       end

data/lib/chef_zero/data_normalizer.rb

@@ -64,7 +64,7 @@ module ChefZero
           if value.is_a?(Array)
             value.each do |file|
               if file.is_a?(Hash) && file.has_key?('checksum')
-                file['url'] ||= RestBase::build_uri(base_uri, ['file_store', file['checksum']])
+                file['url'] ||= RestBase::build_uri(base_uri, ['file_store', 'checksums', file['checksum']])
               end
             end
           end

data/lib/chef_zero/data_store/chef_fs_store.rb

@@ -0,0 +1,96 @@
+#
+# 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_fs/file_system'
+require 'chef_fs/file_system/not_found_error'
+require 'chef_zero/data_store/data_already_exists_error'
+require 'chef_zero/data_store/data_not_found_error'
+
+module ChefZero
+  module DataStore
+    class ChefFSStore
+      def initialize(chef_fs)
+        @chef_fs = chef_fs
+      end
+
+      def create_dir(path, name, *options)
+        parent = get_dir(path, options.include?(:create_dir))
+        parent.create_child(name, nil)
+      end
+
+      def create(path, name, data, *options)
+        if !data.is_a?(String)
+          raise "set only works with strings"
+        end
+
+        parent = get_dir(path, options.include?(:create_dir))
+        parent.create_child(name, data)
+      end
+
+      def get(path)
+        begin
+          ChefFS::FileSystem.resolve_path(path.join('/')).read
+        rescue ChefFS::FileSystem::NotFoundError => e
+          raise DataNotFoundError.new(path, e)
+        end
+      end
+
+      def set(path, data, *options)
+        if !data.is_a?(String)
+          raise "set only works with strings: #{path} = #{data.inspect}"
+        end
+
+        parent = get_dir(path[0..-2], options.include?(:create_dir))
+        parent.create_child(path[-1], data)
+      end
+
+      def delete(path)
+        begin
+          ChefFS::FileSystem.resolve_path(path.join('/')).delete
+        rescue ChefFS::FileSystem::NotFoundError => e
+          raise DataNotFoundError.new(path, e)
+        end
+      end
+
+      def list(path)
+        begin
+          ChefFS::FileSystem.resolve_path(path.join('/')).children.map { |c| c.name }.sort
+        rescue ChefFS::FileSystem::NotFoundError => e
+          raise DataNotFoundError.new(path, e)
+        end
+      end
+
+      def exists?(path)
+        ChefFS::FileSystem.resolve_path(path.join('/')).exists?
+      end
+
+      private
+
+      def get_dir(path, create=false)
+        result = Chef::FileSystem.resolve_path('/' + path.join('/'))
+        if result.exists?
+          result
+        elsif create
+          get_dir(path[0..-2], create).create_child(result.name, nil)
+        else
+          raise DataNotFoundError.new(path)
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/data_already_exists_error.rb

@@ -0,0 +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
+#
+#     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_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

@@ -0,0 +1,31 @@
+#
+# 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.
+#
+
+module ChefZero
+  module DataStore
+    class DataError < StandardError
+      def initialize(path, cause = nil)
+        @path = path
+        @cause = cause
+      end
+
+      attr_reader :path
+      attr_reader :cause
+    end
+  end
+end

data/lib/chef_zero/data_store/data_not_found_error.rb

@@ -0,0 +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
+#
+#     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_error'
+
+module ChefZero
+  module DataStore
+    class DataNotFoundError < DataError
+      def initialize(path, cause = nil)
+        super
+      end
+    end
+  end
+end

data/lib/chef_zero/data_store/memory_store.rb

@@ -0,0 +1,164 @@
+#
+# 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'
+
+module ChefZero
+  module DataStore
+    class MemoryStore
+      def initialize
+        clear
+      end
+
+      def clear
+        @data = {}
+
+        # Create containers
+        create_dir([], 'clients')
+        create_dir([], 'cookbooks')
+        create_dir([], 'data')
+        create_dir([], 'environments')
+        create_dir([], 'file_store')
+        create_dir(['file_store'], 'checksums')
+        create_dir([], 'nodes')
+        create_dir([], 'roles')
+        create_dir([], 'sandboxes')
+        create_dir([], 'users')
+
+        # Set defaults
+        create(['clients'], 'chef-validator', '{ "validator": true }')
+        create(['clients'], 'chef-webui', '{ "admin": true }')
+        create(['environments'], '_default', '{ "description": "The default Chef environment" }')
+        create(['users'], 'admin', '{ "admin": true }')
+      end
+
+      def create_dir(path, name, *options)
+        parent = _get(path, options.include?(:recursive))
+
+        if parent.has_key?(name)
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+        parent[name] = {}
+      end
+
+      def create(path, name, data, *options)
+        if !data.is_a?(String)
+          raise "set only works with strings"
+        end
+
+        parent = _get(path, options.include?(:create_dir))
+
+        if parent.has_key?(name)
+          raise DataAlreadyExistsError.new(path + [name])
+        end
+        parent[name] = data
+      end
+
+      def get(path, request=nil)
+        value = _get(path)
+        if value.is_a?(Hash)
+          raise "get() called on directory #{path.join('/')}"
+        end
+        value
+      end
+
+      def set(path, data, *options)
+        if !data.is_a?(String)
+          raise "set only works with strings: #{path} = #{data.inspect}"
+        end
+
+        # Get the parent
+        parent = _get(path[0..-2], options.include?(:create_dir))
+
+        if !options.include?(:create) && !parent[path[-1]]
+          raise DataNotFoundError.new(path)
+        end
+        parent[path[-1]] = data
+      end
+
+      def delete(path)
+        parent = _get(path[0,path.length-1])
+        if !parent.has_key?(path[-1])
+          raise DataNotFoundError.new(path)
+        end
+        if !parent[path[-1]].is_a?(String)
+          raise "delete only works with strings: #{path}"
+        end
+        parent.delete(path[-1])
+      end
+
+      def delete_dir(path)
+        parent = _get(path[0,path.length-1])
+        if !parent.has_key?(path[-1])
+          raise DataNotFoundError.new(path)
+        end
+        if !parent[path[-1]].is_a?(Hash)
+          raise "delete_dir only works with directories: #{path}"
+        end
+        parent.delete(path[-1])
+      end
+
+      def list(path)
+        dir = _get(path)
+        if !dir.is_a? Hash
+          raise "list only works with directories (#{path} = #{dir.class}"
+        end
+        dir.keys.sort
+      end
+
+      def exists?(path)
+        begin
+          get(path)
+          return true
+        rescue DataNotFoundError
+          return false
+        end
+      end
+
+      def exists_dir?(path)
+        begin
+          dir = _get(path)
+          if !dir.is_a? Hash
+            raise "exists_dir? only works with directories (#{path} = #{dir.class}"
+          end
+          return true
+        rescue DataNotFoundError
+          return false
+        end
+      end
+
+      private
+
+      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])
+            end
+          end
+          value = value[path_part]
+        end
+        value
+      end
+    end
+  end
+end