chef-zero 2.0.2 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724196a25d016237466c1536eff497dbdd1e2a1e
-  data.tar.gz: 4ebf2ae81da945160926ba408be3e6ce802d1d8d
+  metadata.gz: 7f471a666e1d3e6bf940a786920438a6a956e10b
+  data.tar.gz: 15d364fda6c211d6f306909c5c7380830d9e66ad
 SHA512:
-  metadata.gz: 5e6869dfcfee74354fa1438fa6b6289d7bccf7d24f932e0af67b8fc2bfe8499466ed624a78715a2e80f13280eb11a6c3fd49f5acf648c224bd8ef54890a9d39b
-  data.tar.gz: 7f03e15a3e895e1e7423c0061ce8e78ff7399d178a40f1da13ca99d0a79419d3baead62d4fc9546ccd0f4121f057bef2658bbc02f977ac9c8c2ce74e7a5be955
+  metadata.gz: b3333fe38f5a88350b324ffae8889cd9440b66db783338aca651a77a1480b9e6f5aac3e122e57d046776ac327ede11f8422bb8f4cf260ff4326951771e7219dd
+  data.tar.gz: 1aaeb7212a5c29090a6b3f83d6a0a66f565c104e92e32c421cb1830c865c51f2377341b5e046f2e173ccd89ffd8f504abe44a5f6e703dc25fd2095318e2858dc

data/lib/chef_zero/data_normalizer.rb

@@ -6,8 +6,10 @@ module ChefZero
     def self.normalize_client(client, name)
       client['name'] ||= name
       client['admin'] ||= false
+      client['admin'] = !!client['admin']
       client['public_key'] ||= PUBLIC_KEY
       client['validator'] ||= false
+      client['validator'] = !!client['validator']
       client['json_class'] ||= "Chef::ApiClient"
       client['chef_type'] ||= "client"
       client
@@ -16,6 +18,8 @@ module ChefZero
     def self.normalize_user(user, name)
       user['name'] ||= name
       user['admin'] ||= false
+      user['admin'] = !!user['admin']
+      user['openid'] ||= nil
       user['public_key'] ||= PUBLIC_KEY
       user
     end
@@ -57,14 +61,14 @@ module ChefZero
       environment
     end
 
-    def self.normalize_cookbook(cookbook, name, version, base_uri, method)
+    def self.normalize_cookbook(endpoint, org_prefix, cookbook, name, version, base_uri, method)
       # TODO I feel dirty
       if method != 'PUT'
         cookbook.each_pair do |key, value|
           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', 'checksums', file['checksum']])
+                file['url'] ||= endpoint.build_uri(base_uri, org_prefix + ['file_store', 'checksums', file['checksum']])
               end
             end
           end

data/lib/chef_zero/data_store/interface_v1.rb

@@ -0,0 +1,49 @@
+module ChefZero
+  module DataStore
+    class InterfaceV1
+      def interface_version
+        1
+      end
+
+      def clear
+        raise "clear not implemented by class #{self.class}"
+      end
+
+      def create_dir(path, name, *options)
+        raise "create_dir not implemented by class #{self.class}"
+      end
+
+      def create(path, name, data, *options)
+        raise "create not implemented by class #{self.class}"
+      end
+
+      def get(path, request=nil)
+        raise "get not implemented by class #{self.class}"
+      end
+
+      def set(path, data, *options)
+        raise "set not implemented by class #{self.class}"
+      end
+
+      def delete(path)
+        raise "delete not implemented by class #{self.class}"
+      end
+
+      def delete_dir(path, *options)
+        raise "delete_dir not implemented by class #{self.class}"
+      end
+
+      def list(path)
+        raise "list not implemented by class #{self.class}"
+      end
+
+      def exists?(path)
+        raise "exists? not implemented by class #{self.class}"
+      end
+
+      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

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

data/lib/chef_zero/data_store/memory_store.rb

@@ -16,152 +16,17 @@
 # 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/v2_to_v1_adapter'
+require 'chef_zero/data_store/memory_store_v2'
 
 module ChefZero
   module DataStore
-    class MemoryStore
+    class MemoryStore < ChefZero::DataStore::V2ToV1Adapter
       def initialize
+        super
+        @real_store = ChefZero::DataStore::MemoryStoreV2.new
         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)
-          if !options.include?(:recursive)
-            raise DataAlreadyExistsError.new(path + [name])
-          end
-        else
-          parent[name] = {}
-        end
-      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, *options)
-        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
+end

data/lib/chef_zero/data_store/memory_store_v2.rb

@@ -0,0 +1,188 @@
+#
+# 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'
+
+module ChefZero
+  module DataStore
+    class MemoryStoreV2 < ChefZero::DataStore::InterfaceV2
+      def initialize
+        clear
+      end
+
+      attr_reader :data
+
+      def clear
+        @data = {}
+
+        create_dir([], 'organizations')
+      end
+
+      def create_org
+        org = {
+          'clients' => {
+            'chef-validator' => '{ "validator": true }',
+            'chef-webui' => '{ "admin": true }'
+          },
+          'cookbooks' => {},
+          'data' => {},
+          'environments' => {
+            '_default' => '{ "description": "The default Chef environment" }'
+          },
+          'file_store' => {
+            'checksums' => {}
+          },
+          'nodes' => {},
+          'roles' => {},
+          'sandboxes' => {},
+          'users' => {
+            'admin' => '{ "admin": "true" }'
+          }
+        }
+      end
+
+      def create_dir(path, name, *options)
+        parent = _get(path, options.include?(:recursive))
+
+        if parent.has_key?(name)
+          if !options.include?(:recursive)
+            raise DataAlreadyExistsError.new(path + [name])
+          end
+        else
+          _create_dir(path, parent, name)
+        end
+      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, *options)
+        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, options = {})
+        begin
+          value = _get(path)
+          if value.is_a?(Hash) && !options[:allow_dirs]
+            raise "exists? does not work with directories (#{path} = #{dir.class})"
+          end
+          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
+              _create_dir(path[0,index], value, path_part)
+            else
+              raise DataNotFoundError.new(path[0,index+1])
+            end
+          end
+          value = value[path_part]
+        end
+        value
+      end
+
+      def _create_dir(parent_path, parent, name)
+        if parent_path == [ 'organizations' ]
+          parent[name] = create_org
+        else
+          parent[name] = {}
+        end
+      end
+    end
+  end
+end