Another intermediate commit. The node and fact classes are now functional and are used instead of the network handlers, which have been removed. There are some failing tests as a result, but I want to get this code committed before I massage the rest of the system to make it work again.

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
index eddf44def..e5774127b 100755
--- a/lib/puppet/node/facts.rb
+++ b/lib/puppet/node/facts.rb
@@ -1,9 +1,11 @@
+require 'puppet/node'
+require 'puppet/indirector'
+
 # Manage a given node's facts.  This either accepts facts and stores them, or
 # returns facts for a given node.
 class Puppet::Node::Facts
     # Set up indirection, so that nodes can be looked for in
     # the node sources.
-    require 'puppet/indirector'
     extend Puppet::Indirector
 
     # Use the node source as the indirection terminus.
@@ -14,23 +16,21 @@ class Puppet::Node::Facts
     def initialize(name, values = {})
         @name = name
         @values = values
+
+        add_internal
     end
 
     private
 
-    # FIXME These methods are currently unused.
-
     # Add internal data to the facts for storage.
-    def add_internal(facts)
-        facts = facts.dup
-        facts[:_puppet_timestamp] = Time.now
-        facts
+    def add_internal
+        self.values[:_timestamp] = Time.now
     end
 
     # Strip out that internal data.
-    def strip_internal(facts)
-        facts = facts.dup
-        facts.find_all { |name, value| name.to_s =~ /^_puppet_/ }.each { |name, value| facts.delete(name) }
-        facts
+    def strip_internal
+        newvals = values.dup
+        newvals.find_all { |name, value| name.to_s =~ /^_/ }.each { |name, value| newvals.delete(name) }
+        newvals
     end
 end