The last commits before I actually start on the multi-environment support. There are still failing tests, but apparently only those that are also failing in trunk.

5 files changed, 65 insertions, 64 deletions

diff --git a/lib/puppet/dsl.rb b/lib/puppet/dsl.rb
index 3a7a7f059..bd0fcbf96 100644
--- a/lib/puppet/dsl.rb
+++ b/lib/puppet/dsl.rb
@@ -257,7 +257,7 @@ module Puppet
                 @interp = Puppet::Parser::Interpreter.new :Code => ""
                 # Load the class, so the node object class is available.
                 require 'puppet/network/handler/node'
-                @node = Puppet::Network::Handler::Node::SimpleNode.new(Facter.value(:hostname))
+                @node = Puppet::Node.new(Facter.value(:hostname))
                 @node.parameters = Facter.to_hash
                 @interp = Puppet::Parser::Interpreter.new :Code => ""
                 @config = Puppet::Parser::Configuration.new(@node, @interp.parser)
diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb
index 3539ab9a4..7e91d74d6 100644
--- a/lib/puppet/network/handler/configuration.rb
+++ b/lib/puppet/network/handler/configuration.rb
@@ -193,7 +193,7 @@ class Puppet::Network::Handler
         end
 
         # Mark that the node has checked in. FIXME this needs to be moved into
-        # the SimpleNode class, or somewhere that's got abstract backends.
+        # the Node class, or somewhere that's got abstract backends.
         def update_node_check(node)
             if Puppet.features.rails? and Puppet[:storeconfigs]
                 Puppet::Rails.connect
diff --git a/lib/puppet/network/handler/node.rb b/lib/puppet/network/handler/node.rb
index a21d571b0..2c4d3e1b5 100644
--- a/lib/puppet/network/handler/node.rb
+++ b/lib/puppet/network/handler/node.rb
@@ -2,74 +2,14 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppet/util'
+require 'puppet/node'
 require 'puppet/util/classgen'
 require 'puppet/util/instance_loader'
 
 # Look up a node, along with all the details about it.
 class Puppet::Network::Handler::Node < Puppet::Network::Handler
-    # A simplistic class for managing the node information itself.
-    class SimpleNode
-        attr_accessor :name, :classes, :parameters, :environment, :source, :ipaddress, :names
-        attr_reader :time
-
-        def initialize(name, options = {})
-            @name = name
-
-            # Provide a default value.
-            @names = [name]
-
-            if classes = options[:classes]
-                if classes.is_a?(String)
-                    @classes = [classes]
-                else
-                    @classes = classes
-                end
-            else
-                @classes = []
-            end
-
-            @parameters = options[:parameters] || {}
-
-            unless @environment = options[:environment] 
-                if env = Puppet[:environment] and env != ""
-                    @environment = env
-                end
-            end
-
-            @time = Time.now
-        end
-
-        # Merge the node facts with parameters from the node source.
-        # This is only called if the node source has 'fact_merge' set to true.
-        def fact_merge(facts)
-            facts.each do |name, value|
-                @parameters[name] = value unless @parameters.include?(name)
-            end
-        end
-    end
-
     desc "Retrieve information about nodes."
 
-    extend Puppet::Util::ClassGen
-    extend Puppet::Util::InstanceLoader
-
-    # A simple base module we can use for modifying how our node sources work.
-    module SourceBase
-        include Puppet::Util::Docs
-    end
-
-    @interface = XMLRPC::Service::Interface.new("nodes") { |iface|
-        iface.add_method("string details(key)")
-        iface.add_method("string parameters(key)")
-        iface.add_method("string environment(key)")
-        iface.add_method("string classes(key)")
-    }
-
-    # Set up autoloading and retrieving of reports.
-    autoload :node_source, 'puppet/node_source'
-
-    attr_reader :source
-
     # Add a new node source.
     def self.newnode_source(name, options = {}, &block)
         name = symbolize(name)
@@ -109,6 +49,26 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler
         rmclass(name, :hash => instance_hash(:node_source))
     end
 
+    extend Puppet::Util::ClassGen
+    extend Puppet::Util::InstanceLoader
+
+    # A simple base module we can use for modifying how our node sources work.
+    module SourceBase
+        include Puppet::Util::Docs
+    end
+
+    @interface = XMLRPC::Service::Interface.new("nodes") { |iface|
+        iface.add_method("string details(key)")
+        iface.add_method("string parameters(key)")
+        iface.add_method("string environment(key)")
+        iface.add_method("string classes(key)")
+    }
+
+    # Set up autoloading and retrieving of reports.
+    autoload :node_source, 'puppet/node_source'
+
+    attr_reader :source
+
     # Return a given node's classes.
     def classes(key)
         if node = details(key)
@@ -218,7 +178,7 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler
     # Short-hand for creating a new node, so the node sources don't need to
     # specify the constant.
     def newnode(options)
-        SimpleNode.new(options)
+        Puppet::Node.new(options)
     end
 
     # Look up the node facts from our fact handler.
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
new file mode 100644
index 000000000..3bbbe5979
--- /dev/null
+++ b/lib/puppet/node.rb
@@ -0,0 +1,40 @@
+# A simplistic class for managing the node information itself.
+class Puppet::Node
+    attr_accessor :name, :classes, :parameters, :environment, :source, :ipaddress, :names
+    attr_reader :time
+
+    def initialize(name, options = {})
+        @name = name
+
+        # Provide a default value.
+        @names = [name]
+
+        if classes = options[:classes]
+            if classes.is_a?(String)
+                @classes = [classes]
+            else
+                @classes = classes
+            end
+        else
+            @classes = []
+        end
+
+        @parameters = options[:parameters] || {}
+
+        unless @environment = options[:environment] 
+            if env = Puppet[:environment] and env != ""
+                @environment = env
+            end
+        end
+
+        @time = Time.now
+    end
+
+    # Merge the node facts with parameters from the node source.
+    # This is only called if the node source has 'fact_merge' set to true.
+    def fact_merge(facts)
+        facts.each do |name, value|
+            @parameters[name] = value unless @parameters.include?(name)
+        end
+    end
+end
diff --git a/lib/puppet/parser/configuration.rb b/lib/puppet/parser/configuration.rb
index ea784da05..44fb8c476 100644
--- a/lib/puppet/parser/configuration.rb
+++ b/lib/puppet/parser/configuration.rb
@@ -5,6 +5,7 @@ require 'puppet/external/gratr/digraph'
 require 'puppet/external/gratr/import'
 require 'puppet/external/gratr/dot'
 
+require 'puppet/node'
 require 'puppet/util/errors'
 
 # Maintain a graph of scopes, along with a bunch of data