Adding tag, tagged?, and untag support to recipes - closes CHEF-8

Author: adamhjk

chef/lib/chef/client.rb

@@ -140,6 +140,7 @@ def build_node(node_name=nil, solo=false)
       Chef::Log.debug("Platform is #{platform} version #{version}")
       @node[:platform] = platform
       @node[:platform_version] = version
+      @node[:tags] = Array.new unless @node.attribute?(:tags)
       @node
     end
 

chef/lib/chef/recipe.rb

@@ -93,6 +93,55 @@ def search(type, query, &block)
         block.call(sr)
       end
     end
+    
+    # Sets a tag, or list of tags, for this node.  Syntactic sugar for
+    # @node[:tags].  
+    #
+    # With no arguments, returns the list of tags.
+    #
+    # === Parameters
+    # tags<Array>:: A list of tags to add - can be a single string
+    #
+    # === Returns
+    # tags<Array>:: The contents of @node[:tags]
+    def tag(*args)
+      if args.length > 0
+        args.each do |tag|
+          @node[:tags] << tag unless @node[:tags].include?(tag)
+        end
+        @node[:tags]
+      else
+        @node[:tags]
+      end
+    end
+    
+    # Returns true if the node is tagged with the supplied list of tags.
+    #
+    # === Parameters
+    # tags<Array>:: A list of tags
+    #
+    # === Returns
+    # true<TrueClass>:: If all the parameters are present
+    # false<FalseClass>:: If any of the parameters are missing
+    def tagged?(*args)
+      args.each do |tag|
+        return false unless @node[:tags].include?(tag)
+      end
+      true
+    end
+    
+    # Removes the list of tags from the node.
+    #
+    # === Parameters
+    # tags<Array>:: A list of tags
+    #
+    # === Returns
+    # tags<Array>:: The current list of @node[:tags]
+    def untag(*args)
+      args.each do |tag|
+        @node[:tags].delete(tag)
+      end
+    end
 
     def method_missing(method_symbol, *args, &block)
       resource = nil

chef/spec/unit/client_spec.rb

@@ -174,6 +174,18 @@
     @client.build_node
     @client.node.recipes.should eql([ "one", "two", "three" ])
   end
+  
+  it "should set the tags attribute to an empty array if it is not already defined" do
+    @client.build_node
+    @client.node.tags.should eql([])
+  end
+  
+  it "should not set the tags attribute to an empty array if it is already defined" do
+    @client.node = @node
+    @client.node[:tags] = [ "radiohead" ]
+    @client.build_node
+    @client.node.tags.should eql([ "radiohead" ])
+  end
 end
 
 describe Chef::Client, "register" do

chef/spec/unit/recipe_spec.rb

@@ -21,6 +21,7 @@
 describe Chef::Recipe do
   before(:each) do
     @recipe = Chef::Recipe.new("hjk", "test", Chef::Node.new)
+    @recipe.node[:tags] = Array.new
   end
 
   it "should load a two word (zen_master) resource" do
@@ -140,4 +141,50 @@
     res.pretty_kitty.should eql(true)
   end
 
+  it "should set tags via tag" do
+    @recipe.tag "foo"
+    @recipe.node[:tags].should include("foo")
+  end
+  
+  it "should set multiple tags via tag" do
+    @recipe.tag "foo", "bar"
+    @recipe.node[:tags].should include("foo")
+    @recipe.node[:tags].should include("bar")
+  end
+  
+  it "should not set the same tag twice via tag" do
+    @recipe.tag "foo"
+    @recipe.tag "foo"
+    @recipe.node[:tags].should eql([ "foo" ])
+  end
+  
+  it "should return the current list of tags from tag with no arguments" do
+    @recipe.tag "foo"
+    @recipe.tag.should eql([ "foo" ])
+  end
+  
+  it "should return true from tagged? if node is tagged" do
+    @recipe.tag "foo"
+    @recipe.tagged?("foo").should be(true)
+  end
+  
+  it "should return false from tagged? if node is not tagged" do
+    @recipe.tagged?("foo").should be(false)
+  end
+  
+  it "should return false from tagged? if node is not tagged" do
+    @recipe.tagged?("foo").should be(false)
+  end
+  
+  it "should remove a tag from the tag list via untag" do
+    @recipe.tag "foo"
+    @recipe.untag "foo"
+    @recipe.node[:tags].should eql([])
+  end
+  
+  it "should remove multiple tags from the tag list via untag" do
+    @recipe.tag "foo", "bar"
+    @recipe.untag "bar", "foo"
+    @recipe.node[:tags].should eql([])
+  end
 end