puppet 0.23.2 → 0.24.0

data/lib/puppet/parser/templatewrapper.rb

@@ -7,16 +7,16 @@ class Puppet::Parser::TemplateWrapper
 
     def initialize(scope, file)
         @scope = scope
-        @file = Puppet::Module::find_template(file)
+        @file = Puppet::Module::find_template(file, @scope.compile.environment)
 
         unless FileTest.exists?(@file)
             raise Puppet::ParseError,
                 "Could not find template %s" % file
         end
 
-        # We'll only ever not have an interpreter in testing, but, eh.
-        if @scope.interp
-            @scope.interp.newfile(@file)
+        # We'll only ever not have a parser in testing, but, eh.
+        if @scope.parser
+            @scope.parser.watch_file(@file)
         end
     end
 
@@ -51,4 +51,3 @@ class Puppet::Parser::TemplateWrapper
     end
 end
 
-# $Id: templatewrapper.rb 2277 2007-03-09 00:48:28Z lutter $

data/lib/puppet/pgraph.rb

@@ -4,11 +4,13 @@
 require 'puppet/external/gratr/digraph'
 require 'puppet/external/gratr/import'
 require 'puppet/external/gratr/dot'
+
 require 'puppet/relationship'
+require 'puppet/simple_graph'
 
 # This class subclasses a graph class in order to handle relationships
 # among resources.
-class Puppet::PGraph < GRATR::Digraph
+class Puppet::PGraph < Puppet::SimpleGraph
     # This is the type used for splicing.
     attr_accessor :container_type
 
@@ -23,13 +25,6 @@ class Puppet::PGraph < GRATR::Digraph
         @reversal = nil
         super
     end
-    
-    def clear
-        @vertex_dict.clear
-        if defined? @edge_number
-            @edge_number.clear
-        end
-    end
 
     # Make sure whichever edge has a label keeps the label
     def copy_label(source, target, label)
@@ -84,7 +79,7 @@ class Puppet::PGraph < GRATR::Digraph
     def matching_edges(events, base = nil)
         events.collect do |event|
             source = base || event.source
-            
+
             unless vertex?(source)
                 Puppet.warning "Got an event from invalid vertex %s" % source.ref
                 next
@@ -95,7 +90,7 @@ class Puppet::PGraph < GRATR::Digraph
             adjacent(source, :direction => :out, :type => :edges).find_all do |edge|
                 edge.match?(event.event)
             end
-        end.flatten
+        end.compact.flatten
     end
     
     # Take container information from another graph and use it
@@ -149,7 +144,7 @@ class Puppet::PGraph < GRATR::Digraph
                     # Now get rid of the edge, so remove_vertex! works correctly.
                     remove_edge!(edge)
                     Puppet.debug "%s: %s => %s: %s" % [container,
-                        edge.source, edge.target, edge?(edge)]
+                        edge.source, edge.target, edge?(edge.source, edge.target)]
                 end
             end
             remove_vertex!(container)
@@ -190,6 +185,10 @@ class Puppet::PGraph < GRATR::Digraph
         return result
     end
 
+    def to_yaml_properties
+        instance_variables
+    end
+
     # A different way of walking a tree, and a much faster way than the
     # one that comes with GRATR.
     def tree_from_vertex2(start, direction = :out)
@@ -209,5 +208,3 @@ class Puppet::PGraph < GRATR::Digraph
         end
     end
 end
-
-# $Id: pgraph.rb 2521 2007-05-17 20:57:24Z luke $

data/lib/puppet/property.rb

@@ -56,8 +56,7 @@ class Property < Puppet::Parameter
 
     # Look up a value's name, so we can find options and such.
     def self.value_name(value)
-        name = symbolize(value)
-        if @parametervalues[name]
+        if value != '' and name = symbolize(value) and @parametervalues.include?(name)
             return name
         elsif ary = self.match?(value)
             return ary[0]
@@ -68,9 +67,7 @@ class Property < Puppet::Parameter
 
     # Retrieve an option set when a value was defined.
     def self.value_option(name, option)
-        if option.is_a?(String)
-            option = symbolize(option)
-        end
+        option = option.to_sym
         if hash = @parameteroptions[name]
             hash[option]
         else
@@ -161,7 +158,7 @@ class Property < Puppet::Parameter
     def call_valuemethod(name, value)
         event = nil
         if method = self.class.value_option(name, :method) and self.respond_to?(method)
-            self.debug "setting %s (currently %s)" % [value, self.retrieve]
+            #self.debug "setting %s (currently %s)" % [value, self.retrieve]
 
             begin
                 event = self.send(method)
@@ -210,28 +207,28 @@ class Property < Puppet::Parameter
     # Figure out which event to return.
     def event(name, event = nil)
         if value_event = self.class.value_option(name, :event)
-            return value_event
-        else
-            if event and event.is_a?(Symbol)
-                if event == :nochange
-                    return nil
-                else
-                    return event
-                end
+            return value_event 
+        end
+
+        if event and event.is_a?(Symbol)
+            if event == :nochange
+                return nil
             else
-                if self.class.name == :ensure
-                    event = case self.should
-                    when :present: (@resource.class.name.to_s + "_created").intern
-                    when :absent: (@resource.class.name.to_s + "_removed").intern
-                    else
-                        (@resource.class.name.to_s + "_changed").intern
-                    end
-                else
-                    event = (@resource.class.name.to_s + "_changed").intern
-                end
+                return event
             end
         end
 
+        if self.class.name == :ensure
+            event = case self.should
+            when :present: (@resource.class.name.to_s + "_created").intern
+            when :absent: (@resource.class.name.to_s + "_removed").intern
+            else
+                (@resource.class.name.to_s + "_changed").intern
+            end
+        else
+            event = (@resource.class.name.to_s + "_changed").intern
+        end
+
         return event
     end
     
@@ -298,8 +295,7 @@ class Property < Puppet::Parameter
     # Send a log message.
     def log(msg)
         unless @resource[:loglevel]
-            self.devfail "Parent %s has no loglevel" %
-                @resource.name
+            self.devfail "Parent %s has no loglevel" % @resource.name
         end
         Puppet::Util::Log.create(
             :level => @resource[:loglevel],
@@ -339,10 +335,7 @@ class Property < Puppet::Parameter
     # provider.  In other words, if the property name is 'gid', we'll call
     # 'provider.gid' to retrieve the current value.
     def retrieve
-        is = provider.send(self.class.name)
-#        puts "IS is: " + is.to_s
-#       puts "and its an array!!!" if is.is_a? Array
-        return is
+        provider.send(self.class.name)
     end
 
     # Set our value, using the provider, an associated block, or both.
@@ -421,17 +414,9 @@ class Property < Puppet::Parameter
         end
     end
 
-    # The default 'sync' method only selects among a list of registered
-    # values.
+    # The default 'sync' method only selects among a list of registered # values.
     def sync
-#        if self.insync?
-#            self.info "already in sync"
-#            return nil
-#        end
-        unless self.class.values
-            self.devfail "No values defined for %s" %
-                self.class.name
-        end
+        self.devfail("No values defined for %s" % self.class.name) unless self.class.values
 
         if value = self.should
             set(value)
@@ -557,4 +542,3 @@ class Property < Puppet::Parameter
 end
 end
 
-# $Id: property.rb 2678 2007-07-11 19:30:42Z luke $

data/lib/puppet/propertychange.rb

@@ -139,5 +139,3 @@ module Puppet
         end
 	end
 end
-
-# $Id: propertychange.rb 2678 2007-07-11 19:30:42Z luke $

data/lib/puppet/provider.rb

@@ -64,6 +64,11 @@ class Puppet::Provider
         end
     end
 
+    # Is the provided feature a declared feature?
+    def self.declared_feature?(name)
+        defined?(@declared_features) and @declared_features.include?(name)
+    end
+
     # Does this implementation match all of the default requirements?  If
     # defaults are empty, we return false.
     def self.default?
@@ -284,16 +289,16 @@ class Puppet::Provider
         end
     end
 
-    def self.to_s
-        unless defined? @str
-            if self.resource_type
-                @str = "%s provider %s" % [resource_type.name, self.name]
-            else
-                @str = "unattached provider %s" % [self.name]
-            end
-        end
-        @str
-    end
+#    def self.to_s
+#        unless defined? @str
+#            if self.resource_type
+#                @str = "%s provider %s" % [resource_type.name, self.name]
+#            else
+#                @str = "unattached provider %s" % [self.name]
+#            end
+#        end
+#        @str
+#    end
 
     dochook(:defaults) do
         if @defaults.length > 0
@@ -372,4 +377,3 @@ class Puppet::Provider
     end
 end
 
-# $Id: provider.rb 2753 2007-08-07 02:38:45Z luke $

data/lib/puppet/provider/cron/crontab.rb

@@ -102,15 +102,15 @@ Puppet::Type.type(:cron).provide(:crontab,
                 next if field == :command
                 next if field == :special
                 if record[field] and ! resource.value(field)
-                    Puppet.info "Cron is missing %s: %s and %s" %
-                        [field, record[field].inspect, resource.value(field).inspect]
+                    #Puppet.info "Cron is missing %s: %s and %s" %
+                    #    [field, record[field].inspect, resource.value(field).inspect]
                     matched = false
                     break
                 end
 
                 if ! record[field] and resource.value(field)
-                    Puppet.info "Hash is missing %s: %s and %s" %
-                        [field, resource.value(field).inspect, record[field].inspect]
+                    #Puppet.info "Hash is missing %s: %s and %s" %
+                    #    [field, resource.value(field).inspect, record[field].inspect]
                     matched = false
                     break
                 end
@@ -120,8 +120,8 @@ Puppet::Type.type(:cron).provide(:crontab,
 
                 # Everything should be in the form of arrays, not the normal text.
                 next if (record[field] == resource.value(field))
-                Puppet.info "Did not match %s: %s vs %s" %
-                    [field, resource.value(field).inspect, record[field].inspect]
+                #Puppet.info "Did not match %s: %s vs %s" %
+                #    [field, resource.value(field).inspect, record[field].inspect]
                 matched = false 
                 break
             end
@@ -198,4 +198,3 @@ Puppet::Type.type(:cron).provide(:crontab,
     end
 end
 
-# $Id: crontab.rb 2750 2007-08-06 17:59:37Z luke $

data/lib/puppet/provider/group/groupadd.rb

@@ -26,4 +26,3 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     end
 end
 
-# $Id: groupadd.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/group/netinfo.rb

@@ -9,4 +9,3 @@ Puppet::Type.type(:group).provide :netinfo, :parent => Puppet::Provider::NameSer
     defaultfor :operatingsystem => :darwin
 end
 
-# $Id: netinfo.rb 1502 2006-08-28 06:55:22Z luke $

data/lib/puppet/provider/group/pw.rb

@@ -28,4 +28,3 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
     end
 end
 
-# $Id: pw.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/host/netinfo.rb

@@ -14,4 +14,3 @@ Puppet::Type.type(:host).provide :netinfo, :parent => Puppet::Provider::NameServ
     defaultfor :operatingsystem => :darwin
 end
 
-# $Id: netinfo.rb 2714 2007-07-19 18:12:20Z luke $

data/lib/puppet/provider/host/parsed.rb

@@ -70,4 +70,3 @@ Puppet::Type.type(:host).provide(:parsed,
     end
 end
 
-# $Id: parsed.rb 1864 2006-11-13 03:28:47Z luke $

data/lib/puppet/provider/interface/redhat.rb

@@ -2,6 +2,9 @@ require 'puppet/provider/parsedfile'
 require 'erb'
 
 Puppet::Type.type(:interface).provide(:redhat) do
+    desc "Manage network interfaces on Red Hat operating systems.  This provider
+        parses and generates configuration files in ``/etc/sysconfig/network-scripts``."
+
 	INTERFACE_DIR = "/etc/sysconfig/network-scripts"
     confine :exists => INTERFACE_DIR
     defaultfor :operatingsystem => [:fedora, :centos, :redhat]
@@ -9,31 +12,42 @@ Puppet::Type.type(:interface).provide(:redhat) do
     # Create the setter/gettor methods to match the model.
     mk_resource_methods
 
-    ALIAS_TEMPLATE = ERB.new <<-ALIAS
+    @templates = {}
+
+    # Register a template.
+    def self.register_template(name, string)
+        @templates[name] = ERB.new(string)
+    end
+
+    # Retrieve a template by name.
+    def self.template(name)
+        @templates[name]
+    end
+
+    register_template :alias, <<-ALIAS
 DEVICE=<%= self.device %>
 ONBOOT=<%= self.on_boot %>
-BOOTPROTO=<%= self.bootproto %>
+BOOTPROTO=none
 IPADDR=<%= self.name %>
 NETMASK=<%= self.netmask %>
 BROADCAST=
 ALIAS
 
 
-    LOOPBACK_TEMPLATE = ERB.new <<-LOOPBACKDUMMY
+    register_template :normal, <<-LOOPBACKDUMMY
 DEVICE=<%= self.device %>
 ONBOOT=<%= self.on_boot %>
 BOOTPROTO=static
 IPADDR=<%= self.name %>
-NETMASK=255.255.255.255
+NETMASK=<%= self.netmask %>
 BROADCAST=
 LOOPBACKDUMMY
 
 	# maximum number of dummy interfaces
-	MAX_DUMMIES = 10
+	@max_dummies = 10
 
 	# maximum number of aliases per interface
-	MAX_ALIASES_PER_IFACE = 10
-
+	@max_aliases_per_iface = 10
 
 	@@dummies = []
 	@@aliases = Hash.new { |hash, key| hash[key] = [] }
@@ -43,17 +57,13 @@ LOOPBACKDUMMY
 	def self.instances
 		# parse all of the config files at once
 		Dir.glob("%s/ifcfg-*" % INTERFACE_DIR).collect do |file|
-
 			record = parse(file)
 
 			# store the existing dummy interfaces
-			if record[:interface_type] == :dummy
-				@@dummies << record[:ifnum] unless @@dummies.include?(record[:ifnum])
-			end
+            @@dummies << record[:ifnum] if (record[:interface_type] == :dummy and ! @@dummies.include?(record[:ifnum]))
+
+            @@aliases[record[:interface]] << record[:ifnum] if record[:interface_type] == :alias
 
-			if record[:interface_type] == :alias
-				@@aliases[record[:interface]] << record[:ifnum]
-			end
             new(record)
 		end
 	end
@@ -61,7 +71,7 @@ LOOPBACKDUMMY
 	# return the next avaliable dummy interface number, in the case where
 	# ifnum is not manually specified
 	def self.next_dummy
-		MAX_DUMMIES.times do |i|
+		@max_dummies.times do |i|
 			unless @@dummies.include?(i.to_s)
 				@@dummies << i.to_s
 				return i.to_s
@@ -72,7 +82,7 @@ LOOPBACKDUMMY
 	# return the next available alias on a given interface, in the case
 	# where ifnum if not manually specified
 	def self.next_alias(interface)
-		MAX_ALIASES_PER_IFACE.times do |i|
+		@max_aliases_per_iface.times do |i|
 			unless @@aliases[interface].include?(i.to_s)
 				@@aliases[interface] << i.to_s
 				return i.to_s
@@ -85,68 +95,16 @@ LOOPBACKDUMMY
 
     # Parse the existing file.
     def self.parse(file)
+        instance = new()
+        return instance unless FileTest.exist?(file)
 
-        opts = {}
-        return opts unless FileTest.exists?(file)
-
-        File.open(file) do |f|
-            f.readlines.each do |line|
-                if line =~ /^(\w+)=(.+)$/
-                    opts[$1.downcase.intern] = $2
-                end
-            end
-        end
-
-        # figure out the "real" device information
-        case opts[:device]
-        when /:/:
-            if opts[:device].include?(":")
-                opts[:interface], opts[:ifnum] = opts[:device].split(":")
-            end
-
-            opts[:interface_type] = :alias
-        when /^dummy/:
-            opts[:interface_type] = :loopback
-			opts[:interface] = "dummy"
-
-			# take the number of the dummy interface, as this is used
-			# when working out whether to call next_dummy when dynamically
-			# creating these
-			opts[:ifnum] = opts[:device].sub("dummy",'')
-
-			@@dummies << opts[:ifnum].to_s unless @@dummies.include?(opts[:ifnum].to_s)
-        else
-			opts[:interface_type] = :normal
-			opts[:interface] = opts[:device]
-        end
-
-		# translate whether we come up on boot to true/false
-		case opts[:onboot].downcase
-		when "yes":
-			opts[:onboot] = :true
-		when "no":
-			opts[:onboot] = :false
-		else
-			# this case should never happen, but just in case
-			opts[:onboot] = false
-		end
-
-
-        # Remove any attributes we don't want.  These would be
-        # pretty easy to support.
-        [:bootproto, :broadcast, :netmask, :device].each do |opt|
-            if opts.include?(opt)
-                opts.delete(opt)
+        File.readlines(file).each do |line|
+            if line =~ /^(\w+)=(.+)$/
+                instance.send($1.downcase + "=", $2)
             end
         end
 
-        if opts.include?(:ipaddr)
-            opts[:name] = opts[:ipaddr]
-            opts.delete(:ipaddr)
-        end
-
-        return opts
-
+        return instance
     end
 
     # Prefetch our interface list, yo.
@@ -159,7 +117,7 @@ LOOPBACKDUMMY
     end
 
     def create
-        @resource.class.validproperties.each do |property|
+        self.class.resource_type.validproperties.each do |property|
             if value = @resource.should(property)
                 @property_hash[property] = value
             end
@@ -170,11 +128,11 @@ LOOPBACKDUMMY
     end
 
     def destroy
-        File.unlink(@resource[:target])
+        File.unlink(file_path)
     end
 
     def exists?
-        FileTest.exists?(@resource[:target])
+        FileTest.exist?(file_path)
     end
 
     # generate the content for the interface file, so this is dependent
@@ -182,23 +140,49 @@ LOOPBACKDUMMY
     # address (also dummy) on linux. For linux it's quite involved, and we
     # will use an ERB template
 	def generate
-		# choose which template to use for the interface file, based on
-		# the interface type
-        case @resource.should(:interface_type)
-        when :loopback
-			return LOOPBACK_TEMPLATE.result(binding)
-        when :alias
-			return ALIAS_TEMPLATE.result(binding)
-		end
+        itype = self.interface_type == :alias ? :alias : :normal
+        self.class.template(itype).result(binding)
 	end
 
     # Where should the file be written out?
 	# This defaults to INTERFACE_DIR/ifcfg-<namevar>, but can have a
 	# more symbolic name by setting interface_desc in the type. 
     def file_path
-		@resource[:interface_desc] ||= @resource[:name]
-       	return File.join(INTERFACE_DIR, "ifcfg-" + @resource[:interface_desc])
+        if resource and val = resource[:interface_desc]
+            desc = val
+        else
+            desc = self.name
+        end
+
+        self.fail("Could not get name for interface") unless desc
+
+        if self.interface_type == :alias
+            return File.join(INTERFACE_DIR, "ifcfg-" + self.interface + ":" + desc)
+        else
+            return File.join(INTERFACE_DIR, "ifcfg-" + desc)
+        end
+    end
+
+    # Use the device value to figure out all kinds of nifty things.
+    def device=(value)
+        case value
+        when /:/:
+            @property_hash[:interface], @property_hash[:ifnum] = value.split(":")
+            @property_hash[:interface_type] = :alias
+        when /^dummy/:
+            @property_hash[:interface_type] = :loopback
+            @property_hash[:interface] = "dummy"
 
+            # take the number of the dummy interface, as this is used
+            # when working out whether to call next_dummy when dynamically
+            # creating these
+            @property_hash[:ifnum] = value.sub("dummy",'')
+
+            @@dummies << @property_hash[:ifnum].to_s unless @@dummies.include?(@property_hash[:ifnum].to_s)
+        else
+            @property_hash[:interface_type] = :normal
+            @property_hash[:interface] = value
+        end
     end
 
 	# create the device name, so this based on the IP, and interface + type
@@ -213,6 +197,11 @@ LOOPBACKDUMMY
 		end
     end
 
+    # Set the name to our ip address.
+    def ipaddr=(value)
+        @property_hash[:name] = value
+    end
+
 	# whether the device is to be brought up on boot or not. converts
 	# the true / false of the type, into yes / no values respectively
 	# writing out the ifcfg-* files
@@ -227,10 +216,21 @@ LOOPBACKDUMMY
 		end
 	end
 
+    # Mark whether the interface should be started on boot.
+    def on_boot=(value)
+        # translate whether we come up on boot to true/false
+        case value.downcase
+        when "yes":
+            @property_hash[:onboot] = :true
+        else
+            @property_hash[:onboot] = :false
+        end
+    end
+
     # Write the new file out.
     def flush
         # Don't flush to disk if we're removing the config.
-        return if @resource.should(:ensure) == :absent
+        return if self.ensure == :absent
 
         @property_hash.each do |name, val|
             if val == :absent
@@ -238,14 +238,13 @@ LOOPBACKDUMMY
             end
         end
 
-        File.open(@resource[:target], "w") do |f|
+        File.open(file_path, "w") do |f|
             f.puts generate()
         end
     end
 
     def prefetch
-        @property_hash = self.class.parse(@resource[:target])
+        @property_hash = self.class.parse(file_path)
     end
 end
 
-# $Id: redhat.rb 2747 2007-08-05 19:01:39Z luke $