We no longer inherit the action of the prior resource - fixes CHEF-92

Author: adamhjk

chef/lib/chef/resource.rb

@@ -64,7 +64,7 @@ def load_prior_resource
         prior_resource = @collection.lookup(self.to_s)
         Chef::Log.debug("Setting #{self.to_s} to the state of the prior #{self.to_s}")
         prior_resource.instance_variables.each do |iv|
-          unless iv == "@source_line"
+          unless iv == "@source_line" || iv == "@action"
             self.instance_variable_set(iv, prior_resource.instance_variable_get(iv))
           end
         end

chef/lib/chef/resource_collection.rb

@@ -41,15 +41,15 @@ def <<(*args)
       args.flatten.each do |a|
         is_chef_resource(a)
         @resources << a
-        @resources_by_name[a.to_s] = @resources.length - 1
+        @resources_by_name[a.to_s] = @resources.length - 1 
       end
     end
 
     def push(*args)
       args.flatten.each do |a|
         is_chef_resource(a)
         @resources.push(a)
-        @resources_by_name[a.to_s] = @resources.length - 1 
+        @resources_by_name[a.to_s] = @resources.length - 1
       end
     end
 

chef/spec/unit/resource_collection_spec.rb

@@ -25,149 +25,170 @@
     @resource = Chef::Resource::ZenMaster.new("makoto")
   end
 
-  it "should return a Chef::ResourceCollection" do
-    @rc.should be_kind_of(Chef::ResourceCollection)
-  end
-  
-  it "should accept Chef::Resources through [index]" do
-    lambda { @rc[0] = @resource }.should_not raise_error
-    lambda { @rc[0] = "string" }.should raise_error
+  describe "initialize" do
+    it "should return a Chef::ResourceCollection" do
+      @rc.should be_kind_of(Chef::ResourceCollection)
+    end
   end
 
-  it "should accept Chef::Resources through pushing" do
-    lambda { @rc.push(@resource) }.should_not raise_error
-    lambda { @rc.push("string") }.should raise_error
+  describe "[]" do
+    it "should accept Chef::Resources through [index]" do
+      lambda { @rc[0] = @resource }.should_not raise_error
+      lambda { @rc[0] = "string" }.should raise_error
+    end
+    
+    it "should allow you to fetch Chef::Resources by position" do
+      @rc[0] = @resource
+      @rc[0].should eql(@resource)
+    end
   end
 
-  it "should allow you to fetch Chef::Resources by position" do
-    @rc[0] = @resource
-    @rc[0].should eql(@resource)
+  describe "push" do
+    it "should accept Chef::Resources through pushing" do
+      lambda { @rc.push(@resource) }.should_not raise_error
+      lambda { @rc.push("string") }.should raise_error
+    end
   end
 
-  it "should accept the << operator" do
-    lambda { @rc << @resource }.should_not raise_error
+  describe "<<" do
+    it "should accept the << operator" do
+      lambda { @rc << @resource }.should_not raise_error
+    end
   end
 
-  it "should allow you to iterate over every resource in the collection" do
-    load_up_resources
-    results = Array.new
-    lambda { 
-      @rc.each do |r|
-        results << r.name
-      end
-    }.should_not raise_error
-    results.each_index do |i|
-      case i
-      when 0
-        results[i].should eql("dog")
-      when 1
-        results[i].should eql("cat")
-      when 2
-        results[i].should eql("monkey")
+  describe "each" do
+    it "should allow you to iterate over every resource in the collection" do
+      load_up_resources
+      results = Array.new
+      lambda { 
+        @rc.each do |r|
+          results << r.name
+        end
+      }.should_not raise_error
+      results.each_index do |i|
+        case i
+        when 0
+          results[i].should eql("dog")
+        when 1
+          results[i].should eql("cat")
+        when 2
+          results[i].should eql("monkey")
+        end
       end
     end
   end
 
-  it "should allow you to iterate over every resource by index" do
-    load_up_resources
-    results = Array.new
-    lambda { 
-      @rc.each_index do |i|
-        results << @rc[i].name
-      end 
-    }.should_not raise_error()
-    results.each_index do |i|
-      case i
-      when 0
-        results[i].should eql("dog")
-      when 1
-        results[i].should eql("cat")
-      when 2
-        results[i].should eql("monkey")
+  describe "each_index" do
+    it "should allow you to iterate over every resource by index" do
+      load_up_resources
+      results = Array.new
+      lambda { 
+        @rc.each_index do |i|
+          results << @rc[i].name
+        end 
+      }.should_not raise_error()
+      results.each_index do |i|
+        case i
+        when 0
+          results[i].should eql("dog")
+        when 1
+          results[i].should eql("cat")
+        when 2
+          results[i].should eql("monkey")
+        end
       end
     end
   end
 
-  it "should allow you to find resources by name via lookup" do
-    zmr = Chef::Resource::ZenMaster.new("dog")
-    @rc << zmr
-    @rc.lookup(zmr.to_s).should eql(zmr)
+  describe "lookup" do
+    it "should allow you to find resources by name via lookup" do
+      zmr = Chef::Resource::ZenMaster.new("dog")
+      @rc << zmr
+      @rc.lookup(zmr.to_s).should eql(zmr)
 
-    zmr = Chef::Resource::ZenMaster.new("cat")
-    @rc[0] = zmr
-    @rc.lookup(zmr).should eql(zmr)
+      zmr = Chef::Resource::ZenMaster.new("cat")
+      @rc[0] = zmr
+      @rc.lookup(zmr).should eql(zmr)
 
-    zmr = Chef::Resource::ZenMaster.new("monkey")
-    @rc.push(zmr)
-    @rc.lookup(zmr).should eql(zmr)
-  end
+      zmr = Chef::Resource::ZenMaster.new("monkey")
+      @rc.push(zmr)
+      @rc.lookup(zmr).should eql(zmr)
+    end
 
-  it "should raise an exception if you send something strange to lookup" do
-    lambda { @rc.lookup(:symbol) }.should raise_error(ArgumentError)
-  end
+    it "should raise an exception if you send something strange to lookup" do
+      lambda { @rc.lookup(:symbol) }.should raise_error(ArgumentError)
+    end
 
-  it "should raise an exception if it cannot find a resource with lookup" do
-    lambda { @rc.lookup("zen_master[dog]") }.should raise_error(ArgumentError)
+    it "should raise an exception if it cannot find a resource with lookup" do
+      lambda { @rc.lookup("zen_master[dog]") }.should raise_error(ArgumentError)
+    end
   end
+  
+  describe "resources" do
 
-  it "should find a resource by symbol and name (:zen_master => monkey)" do
-    load_up_resources
-    @rc.resources(:zen_master => "monkey").name.should eql("monkey")
-  end
+    it "should find a resource by symbol and name (:zen_master => monkey)" do
+      load_up_resources
+      @rc.resources(:zen_master => "monkey").name.should eql("monkey")
+    end
 
-  it "should find a resource by symbol and array of names (:zen_master => [a,b])" do
-    load_up_resources
-    results = @rc.resources(:zen_master => [ "monkey", "dog" ])
-    results.length.should eql(2)
-    check_by_names(results, "monkey", "dog")
-  end
+    it "should find a resource by symbol and array of names (:zen_master => [a,b])" do
+      load_up_resources
+      results = @rc.resources(:zen_master => [ "monkey", "dog" ])
+      results.length.should eql(2)
+      check_by_names(results, "monkey", "dog")
+    end
 
-  it "should find resources of multiple kinds (:zen_master => a, :file => b)" do
-    load_up_resources
-    results = @rc.resources(:zen_master => "monkey", :file => "something")
-    results.length.should eql(2)
-    check_by_names(results, "monkey", "something")
-  end
+    it "should find resources of multiple kinds (:zen_master => a, :file => b)" do
+      load_up_resources
+      results = @rc.resources(:zen_master => "monkey", :file => "something")
+      results.length.should eql(2)
+      check_by_names(results, "monkey", "something")
+    end
 
-  it "should find a resource by string zen_master[a]" do
-    load_up_resources
-    @rc.resources("zen_master[monkey]").name.should eql("monkey")
-  end
+    it "should find a resource by string zen_master[a]" do
+      load_up_resources
+      @rc.resources("zen_master[monkey]").name.should eql("monkey")
+    end
 
-  it "should find resources by strings of zen_master[a,b]" do
-    load_up_resources
-    results = @rc.resources("zen_master[monkey,dog]")
-    results.length.should eql(2)
-    check_by_names(results, "monkey", "dog")
-  end
+    it "should find resources by strings of zen_master[a,b]" do
+      load_up_resources
+      results = @rc.resources("zen_master[monkey,dog]")
+      results.length.should eql(2)
+      check_by_names(results, "monkey", "dog")
+    end
 
-  it "should find resources of multiple types by strings of zen_master[a]" do
-    load_up_resources
-    results = @rc.resources("zen_master[monkey]", "file[something]")
-    results.length.should eql(2)
-    check_by_names(results, "monkey", "something")
-  end
+    it "should find resources of multiple types by strings of zen_master[a]" do
+      load_up_resources
+      results = @rc.resources("zen_master[monkey]", "file[something]")
+      results.length.should eql(2)
+      check_by_names(results, "monkey", "something")
+    end
 
-  it "should raise an exception if you pass a bad name to resources" do
-    lambda { @rc.resources("michael jackson") }.should raise_error(ArgumentError)    
-  end
+    it "should raise an exception if you pass a bad name to resources" do
+      lambda { @rc.resources("michael jackson") }.should raise_error(ArgumentError)    
+    end
 
-  it "should raise an exception if you pass something other than a string or hash to resource" do
-    lambda { @rc.resources([Array.new]) }.should raise_error(ArgumentError)
+    it "should raise an exception if you pass something other than a string or hash to resource" do
+      lambda { @rc.resources([Array.new]) }.should raise_error(ArgumentError)
+    end
   end
 
-  it "should serialize to json" do
-    json = @rc.to_json
-    json.should =~ /json_class/
-    json.should =~ /instance_vars/
+  describe "to_json" do
+    it "should serialize to json" do
+      json = @rc.to_json
+      json.should =~ /json_class/
+      json.should =~ /instance_vars/
+    end
   end
 
-  it "should deserialize itself from json" do
-    @rc << @resource
-    json = @rc.to_json
-    s_rc = JSON.parse(json)
-    s_rc.should be_a_kind_of(Chef::ResourceCollection)
-    s_rc[0].name.should eql(@resource.name)
+  describe "self.from_json" do
+    it "should deserialize itself from json" do
+      @rc << @resource
+      json = @rc.to_json
+      s_rc = JSON.parse(json)
+      s_rc.should be_a_kind_of(Chef::ResourceCollection)
+      s_rc[0].name.should eql(@resource.name)
+    end
   end
 
   def check_by_names(results, *names)