making components work

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@210 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 12 insertions, 3 deletions

diff --git a/lib/blink/type.rb b/lib/blink/type.rb
index ec36f7099..28ba60bbd 100644
--- a/lib/blink/type.rb
+++ b/lib/blink/type.rb
@@ -377,6 +377,8 @@ class Blink::Type < Blink::Element
         # because it might be used in creating the other states
         if hash.has_key?(self.class.namevar)
             self[self.class.namevar] = hash[self.class.namevar]
+            #Blink.notice("%s: namevar [%s], hash name [%s], name [%s], name2 [%s]" %
+            #    [self.class,self.class.namevar,hash[self.class.namevar],self.name,self[self.class.namevar]])
             hash.delete(self.class.namevar)
         else
             #p hash
@@ -392,6 +394,7 @@ class Blink::Type < Blink::Element
         }
 
         # add this object to the specific class's list of objects
+        #Blink.notice("Adding [%s] to %s" % [self.name,self.class])
         self.class[self.name] = self
 
         # and then add it to the master list
@@ -442,6 +445,12 @@ class Blink::Type < Blink::Element
     #---------------------------------------------------------------
 
     #---------------------------------------------------------------
+    def push(*child)
+        @children.push(*child)
+    end
+    #---------------------------------------------------------------
+
+    #---------------------------------------------------------------
     #---------------------------------------------------------------
     # instance methods dealing with actually doing work
     #---------------------------------------------------------------
@@ -505,5 +514,5 @@ require 'blink/type/service'
 require 'blink/type/file'
 require 'blink/type/symlink'
 require 'blink/type/package'
-require 'blink/component'
+require 'blink/type/component'
 require 'blink/statechange'
diff --git a/lib/blink/type/component.rb b/lib/blink/type/component.rb
index d0b23a622..99ffdc836 100644
--- a/lib/blink/type/component.rb
+++ b/lib/blink/type/component.rb
@@ -9,13 +9,13 @@ require 'blink/type'
 
 module Blink
 	class Component < Blink::Type
-        attr_accessor :name
-
         @name = :component
         @namevar = :name
 
         @parameters = [
             :name
         ]
+
+        @states = []
 	end
 end