chef-cookie_cutter 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393e8183e4a8bfdf5e0711871b29dae7ad897a3c
-  data.tar.gz: df372a6b6342845e13a80f81a9a69d44453d33ca
+  metadata.gz: 4246908dca8f0d509ebb6cf23c6b8e104ad85394
+  data.tar.gz: cd07e7cf228e450988f8fd683006a58dd734c939
 SHA512:
-  metadata.gz: 3bc2ffde8f09a5d41a9cfd01c501f609afae97231921a687c3030d9b7dc4f7d00ea987ed6190e123067f1e2a3dda570d6e313c08ac66d173bf506efc89b224fa
-  data.tar.gz: 0b727fbf2e2a348a722dcb69bd31da7adc4d5d9d4b71ac9cb6da780ac209767689dc8b0ded476ec2d4003cd2d25b4cafc0657dbbbe228d8553ba4bf127b4359e
+  metadata.gz: 9578264778f45b5162a75506d2733414b98b362585bd8dd6ebc3a8787887de7eb5d2a6cf9c8d98c7e0b42ab05072f36efc0b499ec47577df56d59798e316677d
+  data.tar.gz: 2d27b1efdd5eac956b39403251ee831a1450281f9fd341a6bbb5adf7babfc7aab91fd7fd3350687fda0fa05925c1285dda6e92ddfdbfc5a65ffd472ddf904f47

data/lib/chef/cookie_cutter/extended_provides.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+#
+# Copyright 2015, Ole Claussen <claussen.ole@gmail.com>
+#
+# 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.
+#
+
+class Chef
+  module CookieCutter
+    module MonkeyPatches
+      module RunContext
+        attr_reader :resource_builder
+
+        def build_resource(builder)
+          @resource_builder = builder
+        end
+      end
+
+      module ResourceBuilder
+        def build(&block)
+          run_context.build_resource(self)
+          super(&block)
+        end
+      end
+    end
+  end
+end

data/lib/chef/cookie_cutter/fancy_property.rb

@@ -21,6 +21,7 @@ class Chef
     class FancyProperty < ::Chef::Property
       def call(resource, *args, **kwargs, &blk)
         return get(resource) if args.empty? && kwargs.empty? && !block_given?
+        return get(resource) if args[0] == NOT_PASSED
         set(resource, *args, **kwargs, &blk)
       end
 
@@ -43,12 +44,14 @@ class Chef
       end
 
       def coerce(resource, *args, **kwargs, &blk)
-        if options.key?(:coerce_class) && options.key?(:coerce)
+        if options.key?(:coerce_class)
           value = coerce_class(options[:coerce_class], *args, **kwargs, &blk)
-          value = coerce_proc(resource, options[:coerce], value)
+          value = coerce_proc(resource, options[:coerce], value) if options.key?(:coerce)
+          value
+        elsif options.key?(:coerce_resource)
+          value = coerce_resource(resource, options[:coerce_resource], args[0], &blk)
+          value = coerce_proc(resource, options[:coerce], value) if options.key?(:coerce)
           value
-        elsif options.key?(:coerce_class)
-          coerce_class(options[:coerce_class], *args, **kwargs, &blk)
         elsif options.key?(:coerce)
           coerce_proc(resource, options[:coerce], *args, **kwargs, &blk)
         elsif args.length == 1 && kwargs.empty?
@@ -59,13 +62,35 @@ class Chef
       end
 
       def coerce_class(clazz, *args, **kwargs, &blk)
-        value = clazz.new(*args, **kwargs)
+        args << kwargs unless kwargs.empty?
+        value = clazz.new(*args)
         value.instance_eval(&blk) if block_given?
         value
       end
 
+      def coerce_resource(resource, resource_type, value, &blk)
+        return value if value.is_a?(::Chef::Resource) && value.declared_type == resource_type
+        new_resource = ::Chef::ResourceBuilder.new(
+          type: resource_type,
+          name: value,
+          created_at: caller[0],
+          params: nil,
+          run_context: resource.run_context,
+          cookbook_name: resource.cookbook_name,
+          recipe_name: resource.recipe_name,
+          enclosing_provider: nil
+        ).build(&blk)
+        resource.run_context.resource_collection.insert(
+          new_resource,
+          resource_type: resource_type,
+          instance_name: value
+        )
+        new_resource
+      end
+
       def coerce_proc(resource, coerce, *args, **kwargs, &blk)
-        value = resource.instance_exec(*args, **kwargs, &coerce) unless resource.nil?
+        args << kwargs unless kwargs.empty?
+        value = resource.instance_exec(*args, &coerce) unless resource.nil?
         value.instance_eval(&blk) if block_given?
         value = coerce(resource, value) if value.is_a?(DelayedEvaluator)
         value
@@ -73,24 +98,42 @@ class Chef
 
       def emit_dsl
         return unless instance_variable_name
-        # Holy shit, this looks evil. But Chef does it the same way so yeah.
-        declared_in.class_eval <<-EOM, __FILE__, __LINE__ + 1
-          def #{name}(*args, **kwargs, &blk)
-            self.class.properties[#{name.inspect}].call(self, *args, **kwargs, &blk)
-          end
-        EOM
+
+        if allow_kwargs?
+          declared_in.class_eval <<-EOM, __FILE__, __LINE__ + 1
+            def #{name}(*args, **kwargs, &blk)
+              self.class.properties[#{name.inspect}].call(self, *args, **kwargs, &blk)
+            end
+          EOM
+        else
+          declared_in.class_eval <<-EOM, __FILE__, __LINE__ + 1
+            def #{name}(value=NOT_PASSED, &blk)
+              self.class.properties[#{name.inspect}].call(self, value, {}, &blk)
+            end
+            def #{name}=(value)
+              self.class.properties[#{name.inspect}].set(self, value, {})
+            end
+          EOM
+        end
       end
 
       def collect?
         options[:collect]
       end
 
+      def allow_kwargs?
+        return true if options[:allow_kwargs]
+        return true if options.key?(:coerce) && options[:coerce].arity != 1
+        return true if options.key?(:coerce_class) && options[:coerce_class].instance_method(:initialize).arity != 1
+        false
+      end
+
       def validation_options
         @validation_options ||= options.reject do |k, _|
           [
             :declared_in, :name, :instance_variable_name, :desired_state,
             :identity, :default, :name_property, :coerce, :required, :collect,
-            :coerce_class
+            :allow_kwargs, :coerce_class, :coerce_resource
           ].include?(k)
         end
       end

data/lib/chef/cookie_cutter.rb

@@ -29,6 +29,7 @@ class Chef
 
     require_relative 'cookie_cutter/fancy_property' if chef_version('~> 12.5')
 
+    require_relative 'cookie_cutter/extended_provides'
     require_relative 'cookie_cutter/lwrp_build_params'
     require_relative 'cookie_cutter/lwrp_include'
     require_relative 'cookie_cutter/namespace'
@@ -41,6 +42,8 @@ CC = Chef::CookieCutter
 
 # Register Monkey Patches
 Chef::Node.send :prepend, CC::MonkeyPatches::Node
+Chef::RunContext.send :prepend, CC::MonkeyPatches::RunContext
+Chef::ResourceBuilder.send :prepend, CC::MonkeyPatches::ResourceBuilder
 Chef::Resource::LWRPBase.send :prepend, CC::MonkeyPatches::LWRPResource
 Chef::Provider::LWRPBase.send :prepend, CC::MonkeyPatches::LWRPProvider
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cookie_cutter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Ole Claussen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.34'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: A small collection of Chef hacks and workarounds.
 email: claussen.ole@gmail.com
 executables: []
@@ -59,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/chef/cookie_cutter.rb
+- lib/chef/cookie_cutter/extended_provides.rb
 - lib/chef/cookie_cutter/fancy_property.rb
 - lib/chef/cookie_cutter/lwrp_build_params.rb
 - lib/chef/cookie_cutter/lwrp_include.rb