The node object should be available from within the definitions paramater block - fixes CHEF-94

Author: adamhjk

chef/lib/chef/recipe.rb

@@ -161,6 +161,7 @@ def method_missing(method_symbol, *args, &block)
         # This dupes the high level object, but we still need to dup the params
         new_def = @definitions[method_symbol].dup
         new_def.params = new_def.params.dup
+        new_def.node = @node
         # This sets up the parameter overrides
         new_def.instance_eval(&block) if block
         new_recipe = Chef::Recipe.new(@cookbook_name, @recipe_name, @node, @collection, @definitions, @cookbook_loader)

chef/lib/chef/resource_definition.rb

@@ -25,12 +25,13 @@ class ResourceDefinition
     include Chef::Mixin::FromFile
     include Chef::Mixin::ParamsValidate
 
-    attr_accessor :name, :params, :recipe
+    attr_accessor :name, :params, :recipe, :node
 
-    def initialize
+    def initialize(node=nil)
       @name = nil
       @params = Hash.new
       @recipe = nil
+      @node = node
     end
 
     def define(resource_name, prototype_params=nil, &block)

chef/spec/unit/recipe_spec.rb

@@ -108,6 +108,22 @@
     @recipe.resources(:zen_master => "lao tzu").name.should eql("lao tzu")
     @recipe.resources(:zen_master => "lao tzu").something.should eql(true)
   end
+  
+  it "should set the node on defined resources" do
+    crow_define = Chef::ResourceDefinition.new
+    crow_define.define :crow, :peace => false, :something => true do
+      zen_master "lao tzu" do
+        peace params[:peace]
+        something params[:something]
+      end
+    end
+    @recipe.definitions[:crow] = crow_define    
+    @recipe.node[:foo] = false
+    @recipe.crow "mine" do
+      something node[:foo]
+    end
+    @recipe.resources(:zen_master => "lao tzu").something.should eql(false)
+  end
 
   it "should load a resource from a ruby file" do
     @recipe.from_file(File.join(File.dirname(__FILE__), "..", "data", "recipes", "test.rb"))

chef/spec/unit/resource_definition_spec.rb

@@ -23,6 +23,37 @@
     @def = Chef::ResourceDefinition.new()
   end
 
+  describe "initialize" do
+    it "should be a Chef::ResourceDefinition" do
+      @def.should be_a_kind_of(Chef::ResourceDefinition)
+    end
+    
+    it "should not initialize a new node if one is not provided" do
+      @def.node.should eql(nil)
+    end
+    
+    it "should accept a node as an argument" do
+      node = Chef::Node.new
+      node.name("bobo")
+      @def = Chef::ResourceDefinition.new(node)
+      @def.node.name.should == "bobo"
+    end
+  end
+  
+  describe "node" do
+    it "should set the node with node=" do
+      node = Chef::Node.new
+      node.name("bobo")
+      @def.node = node
+      @def.node.name.should == "bobo"
+    end
+    
+    it "should return the node" do
+      @def.node = Chef::Node.new
+      @def.node.should be_a_kind_of(Chef::Node)
+    end
+  end
+  
   it "should accept a new definition with a symbol for a name" do
     lambda { 
       @def.define :smoke do 
@@ -84,4 +115,5 @@
     @def.name = :woot
     @def.to_s.should eql("woot")
   end
+  
 end

example-repository/cookbooks/CHEF-94/attributes/gnomes.rb

@@ -0,0 +1,2 @@
+gnome Mash.new
+gnome[:underpants] = [ :one, :two, :three, :four, :five ]

example-repository/cookbooks/CHEF-94/definitions/gnome.rb

@@ -0,0 +1,7 @@
+define :gnome do
+  params[:underpants].each do |undies|
+    execute "echo gnome #{undies}" do
+      command "echo 'gnome has underpants #{undies}'"
+    end
+  end
+end

example-repository/cookbooks/CHEF-94/recipes/default.rb

@@ -0,0 +1,32 @@
+#
+# Cookbook Name:: CHEF-94
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# 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.
+#
+
+gnome "mygnome" do
+  underpants :one, :two, :three, :four
+end
+
+gnome "mygnome" do
+  underpants [ :one, :two ]
+end
+
+puts node[:gnome][:underpants].inspect
+
+gnome "mygnome" do
+  underpants node[:gnome][:underpants]
+end