puppet 0.13.1 → 0.13.2

data/lib/puppet/type/nameservice.rb

@@ -52,7 +52,7 @@ class State
             # things like useradd, in which creation can be done with all
             # information in one swell foop.
             def allatonce?
-                Puppet.info "Returning allatonce %s" % @allatonce
+                #Puppet.info "Returning allatonce %s" % @allatonce
                 if defined? @allatonce
                     return @allatonce
                 else
@@ -139,21 +139,6 @@ class State
                     return nil
                 end
             end
-#            # if the object needs to be created or deleted,
-#            # depend on another method to do it all at once
-#            if @is == :absent or self.should == :absent
-#                Puppet.info "creating"
-#                event = syncname()
-#
-#                Puppet.info "created with event %s" % event
-#
-#                return event
-#                # if the whole object is created at once, just return
-#                # an event saying so
-#                #if self.class.allatonce?
-#                #    return event
-#                #end
-#            end
 
             unless @parent.exists?
                 self.devfail "%s %s does not exist; cannot set %s" %
@@ -244,4 +229,4 @@ else
 end
 
 
-# $Id: nameservice.rb 841 2006-01-18 17:24:15Z luke $
+# $Id: nameservice.rb 914 2006-02-15 21:04:14Z luke $

data/lib/puppet/type/package.rb

@@ -168,8 +168,8 @@ module Puppet
                                 return true
                             end
                         else
-                            self.debug "@is is %s, latest %s is %s" %
-                                [@is, @parent.name, latest]
+                            #self.debug "@is is %s, latest %s is %s" %
+                            #    [@is, @parent.name, latest]
                         end
                     when :absent
                         if @is == :absent
@@ -280,12 +280,19 @@ module Puppet
             desc "A read-only parameter set by the package."
         end
 
-        newparam(:answerfile) do
+        newparam(:adminfile) do
+            desc "A file containing package defaults for installing packages.
+                This is currently only used on Solaris.  The value will be
+                validated according to system rules, which in the case of
+                Solaris means that it should either be a fully qualified path
+                or it should be in /var/sadm/install/admin."
+        end
+
+        newparam(:responsefile) do
             desc "A file containing any necessary answers to questions asked by
                 the package.  This is currently only used on Solaris.  The
-                value will be validated according to system rules, which in
-                the case of Solaris means that it should either be a fully qualified
-                path or it should be in /var/sadm/install/admin."
+                value will be validated according to system rules, but it should
+                generally be a fully qualified path."
         end
 
         # FIXME Version is screwy -- most package systems can't specify a
@@ -321,6 +328,23 @@ module Puppet
         newparam(:description) do
             desc "A read-only parameter set by the package."
         end
+
+        autorequire(:file) do
+            autos = []
+            [:responsefile, :adminfile].each { |param|
+                if val = self[param]
+                    autos << val
+                end
+            }
+
+            if source = self[:source]
+                if source =~ /^#{File::SEPARATOR}/
+                    autos << source
+                end
+            end
+            autos
+        end
+
         @listed = false
 
         @allowedmethods = [:types]
@@ -569,4 +593,4 @@ require 'puppet/type/package/yum.rb'
 require 'puppet/type/package/sun.rb'
 require 'puppet/type/package/bsd.rb'
 
-# $Id: package.rb 888 2006-02-08 22:57:07Z luke $
+# $Id: package.rb 913 2006-02-15 18:34:00Z luke $

data/lib/puppet/type/package/sun.rb

@@ -6,12 +6,17 @@ module Puppet
             end
             #cmd = "pkgadd -d %s -n %s 2>&1" % [self[:source], self[:name]]
             cmd = ["pkgadd"]
-            cmd += ["-d", self[:source]]
-            cmd += ["-n", self[:name]]
 
-            if self[:answerfile]
-                cmd += ["-a", self[:answerfile]]
+            if self[:adminfile]
+                cmd += ["-a", self[:adminfile]]
+            end
+
+            if self[:responsefile]
+                cmd += ["-r", self[:responsefile]]
             end
+
+            cmd += ["-d", self[:source]]
+            cmd += ["-n", self[:name]]
             cmd << "2>&1"
             cmd = cmd.join(" ")
 
@@ -33,6 +38,7 @@ module Puppet
                 "BASEDIR" => :root,
                 "HOTLINE" => nil,
                 "EMAIL" => nil,
+                "VSTOCK" => nil,
                 "VENDOR" => :vendor,
                 "DESC" => :description,
                 "PSTAMP" => nil,
@@ -58,8 +64,7 @@ module Puppet
                                 hash[names[name]] = value
                             end
                         else
-                            self.err "'pkginfo' returned invalid name %s" %
-                                name
+                            self.notice "Ignoring unknown name %s" % name
                         end
                     when /\s+\d+.+/:
                         # nothing; we're ignoring the FILES info

data/lib/puppet/type/parsedtype.rb

@@ -9,6 +9,31 @@ module Puppet
         # the 'should' value to the 'is' value and to do support the right logging
         # and such.
         class ParsedParam < Puppet::State
+            def self.isoptional
+                @isoptional = true
+            end
+
+            def self.isoptional?
+                if defined? @isoptional
+                    return @isoptional
+                else
+                    return false
+                end
+            end
+
+            # By default, support ':absent' as a value for optional
+            # parameters.  Any parameters that define their own validation
+            # need to do this manuallly.
+            validate do |value|
+                if self.class.isoptional? and (
+                    value == "absent" or value == :absent
+                )
+                    return :absent
+                else
+                    return value
+                end
+            end
+
             # Fix things so that the fields have to match exactly, instead
             # of only kinda
             def insync?
@@ -32,40 +57,39 @@ module Puppet
                 end
             end
 
-            # Determine whether the host entry should be destroyed, and figure
-            # out which event to return.  Finally, call @parent.sync to write the
-            # host tab.
+            # If the ensure state is out of sync, it will always be called
+            # first, so I don't need to worry about that.
             def sync(nostore = false)
                 ebase = @parent.class.name.to_s
-                if @is == :absent
-                    #@is = self.should
-                    tail = "created"
-
-                    # If we're creating it, then sync all of the other states
-                    # but tell them not to store (we'll store just once,
-                    # at the end).
-                    unless nostore
-                        @parent.eachstate { |state|
-                            next if state == self or state.name == :ensure
-                            state.sync(true)
-                        }
+
+                tail = nil
+                if self.class.name == :ensure
+                    # We're either creating or destroying the object
+                    if @is == :absent
+                        #@is = self.should
+                        tail = "created"
+
+                        # If we're creating it, then sync all of the other states
+                        # but tell them not to store (we'll store just once,
+                        # at the end).
+                        unless nostore
+                            @parent.eachstate { |state|
+                                next if state == self or state.name == :ensure
+                                state.sync(true)
+                            }
+                        end
+                    elsif self.should == :absent
+                        @parent.remove(true)
+                        tail = "deleted"
                     end
-                elsif self.should == :absent
-                    @parent.remove(true)
-                    tail = "deleted"
-                #elsif @is == @should
-                elsif self.insync?
-                    self.info "Already in sync: %s vs %s" %
-                        [@is.inspect, @should.inspect]
-                    return nil
                 else
-                    #@is = self.should
-                    # Mark that we've synced it, but don't copy the value, because
-                    # that will make the 'change' log inscrutable.
+                    # We don't do the work here, it gets done in 'store'
                     tail = "changed"
                 end
                 @synced = self.should
 
+                # This should really only be done once per run, rather than
+                # every time.  I guess we need some kind of 'flush' mechanism.
                 if nostore
                     self.retrieve
                 else
@@ -106,7 +130,7 @@ module Puppet
                 super
             end
 
-            # In addition to removing the instances in @objects, Cron has to remove
+            # In addition to removing the instances in @objects, we have to remove
             # per-user host tab information.
             def self.clear
                 @instances = []
@@ -126,8 +150,9 @@ module Puppet
             # Return the header placed at the top of each generated file, warning
             # users that modifying this file manually is probably a bad idea.
             def self.header
-%{# HEADER: This file was autogenerated at #{Time.now} by puppet.  While it
-# HEADER: can still be managed manually, it is definitely not recommended.\n}
+%{# HEADER: This file was autogenerated at #{Time.now}
+# HEADER: by puppet.  While it can still be managed manually, it
+# HEADER: is definitely not recommended.\n}
             end
 
             # Store a new instance of a host.  Called from Host#initialize.
@@ -160,20 +185,30 @@ module Puppet
                     # we've set up our naming stuff correctly everywhere.
 
                     # Mark found objects as present
-                    Puppet.debug "Found %s %s" % [self.name, obj.name]
                     obj.is = [:ensure, :present]
+                    hash.each { |param, value|
+                        if state = obj.state(param)
+                            state.is = value
+                        elsif val = obj[param]
+                            obj[param] = val
+                        else
+                            # There is a value on disk, but it should go away
+                            obj.is = [param, value]
+                            obj[param] = :absent
+                        end
+                    }
                 else
                     # create a new obj, since no existing one seems to
                     # match
-                    obj = self.create(
-                        :name => hash[:name]
-                    ) or return false
+                    obj = self.create(:name => hash[:name])
+
+                    # We can't just pass the hash in at object creation time,
+                    # because it sets the should value, not the is value.
                     hash.delete(:name)
+                    hash.each { |param, value|
+                        obj.is = [param, value]
+                    }
                 end
-
-                hash.each { |param, value|
-                    obj.is = [param, value]
-                }
             end
 
             # Retrieve the text for the file. Returns nil in the unlikely
@@ -205,14 +240,6 @@ module Puppet
                 else
                     @fileobj.write(self.to_file())
                 end
-
-                #self.each { |obj|
-                #    obj.each { |state|
-                #        obj.notice "Changing from %s to %s" %
-                #            [state.is.inspect, state.should.inspect]
-                #        state.is = state.should
-                #    }
-                #}
             end
 
             # Collect all Host instances convert them into literal text.
@@ -223,9 +250,6 @@ module Puppet
                         # Don't write out objects that should be absent
                         if obj.is_a?(self)
                             if obj.should(:ensure) == :absent
-                                #obj.warning "removing; is = %s, should = %s" %
-                                #    [obj.is(:ensure).inspect, obj.should(:ensure).inspect]
-                                #obj.is = [:ensure, :absent]
                                 true
                             end
                         end
@@ -239,7 +263,7 @@ module Puppet
 
                     return str
                 else
-                    Puppet.notice "No host instances"
+                    Puppet.notice "No %s instances" % self.name
                     return ""
                 end
             end
@@ -256,17 +280,9 @@ module Puppet
                 self.store
             end
 
-            # We just find any state and check whether it's marked absent
+            # hash2obj marks the 'ensure' state as present
             def exists?
-                name, state = @states.find { |name, state|
-                    state.is_a?(Puppet::State::ParsedParam)
-                }
-
-                if state.is == :absent
-                    return false
-                else
-                    return true
-                end
+                @states.include?(:ensure) and @states[:ensure].is == :present
             end
 
             def destroy
@@ -286,6 +302,24 @@ module Puppet
             def store
                 self.class.store()
             end
+
+            def value(name)
+                unless name.is_a? Symbol
+                    name = name.intern
+                end
+                if @states.include? name
+                    val = @states[name].value
+                    if val == :absent
+                        return nil
+                    else
+                        return val
+                    end
+                elsif @parameters.include? name
+                    return @parameters[name].value
+                else
+                    return nil
+                end
+            end
         end
     end
 end
@@ -293,4 +327,4 @@ end
 require 'puppet/type/parsedtype/host'
 require 'puppet/type/parsedtype/port'
 
-# $Id: parsedtype.rb 898 2006-02-13 17:13:09Z luke $
+# $Id: parsedtype.rb 915 2006-02-15 21:56:54Z luke $

data/lib/puppet/type/parsedtype/host.rb

@@ -5,6 +5,7 @@ require 'puppet/type/state'
 
 module Puppet
     newtype(:host, Puppet::Type::ParsedType) do
+
         newstate(:ip) do
             desc "The host's IP address."
         end
@@ -73,12 +74,6 @@ module Puppet
         @fields = [:ip, :name, :alias]
 
         @filetype = Puppet::FileType.filetype(:flat)
-#        case Facter["operatingsystem"].value
-#        when "Solaris":
-#            @filetype = Puppet::FileType::SunOS
-#        else
-#            @filetype = Puppet::CronType::Default
-#        end
 
         # Parse a host file
         #
@@ -117,8 +112,6 @@ module Puppet
                         hash.delete(:alias)
                     end
 
-                    Puppet.notice "sending %s" % hash.inspect
-
                     hash2obj(hash)
 
                     hash.clear
@@ -129,10 +122,10 @@ module Puppet
 
         # Convert the current object into a host-style string.
         def to_record
-            str = "%s\t%s" % [self.state(:ip).should, self[:name]]
+            str = "%s\t%s" % [self.state(:ip).value, self[:name]]
 
-            if state = self.state(:alias)
-                str += "\t%s" % state.should.join("\t")
+            if value = self.value(:alias)
+                str += "\t%s" % value.join("\t")
             end
 
             str
@@ -140,4 +133,4 @@ module Puppet
     end
 end
 
-# $Id: host.rb 831 2006-01-16 20:01:20Z luke $
+# $Id: host.rb 910 2006-02-15 07:20:36Z luke $

data/lib/puppet/type/parsedtype/port.rb

@@ -28,12 +28,22 @@ module Puppet
             # We actually want to return the whole array here, not just the first
             # value.
             def should
-                @should
+                if defined? @should
+                    if @should[0] == :absent
+                        return :absent
+                    else
+                        return @should
+                    end
+                else
+                    return nil
+                end
             end
 
             validate do |value|
-                unless value == "udp" or value == "tcp"
-                    raise Puppet::Error, "Protocols can be either 'udp' or 'tcp'"
+                valids = ["udp", "tcp", "ddp", :absent]
+                unless valids.include? value
+                    raise Puppet::Error,
+                        "Protocols can be either 'udp' or 'tcp', not %s" % value
                 end
             end
         end
@@ -44,13 +54,16 @@ module Puppet
 
         newstate(:description) do
             desc "The port description."
+            isoptional
         end
 
         newstate(:alias) do
-            desc "Any aliases the port might have.  Multiple values must be specified
-                as an array.  Note that this state has the same name as one of the
-                metaparams; using this state to set aliases will make those aliases
-                available in your Puppet scripts and also on disk."
+            desc "Any aliases the port might have.  Multiple values must be
+                specified as an array.  Note that this state has the same name as
+                one of the metaparams; using this state to set aliases will make
+                those aliases available in your Puppet scripts and also on disk."
+
+            isoptional
 
             # We have to override the feeding mechanism; it might be nil or 
             # white-space separated
@@ -71,18 +84,32 @@ module Puppet
             # We actually want to return the whole array here, not just the first
             # value.
             def should
-                @should
+                if defined? @should
+                    if @should[0] == :absent
+                        return :absent
+                    else
+                        return @should
+                    end
+                else
+                    return nil
+                end
             end
 
             validate do |value|
-                if value =~ /\s/
-                    raise Puppet::Error, "Aliases cannot have whitespace in them"
+                if value.is_a? String and value =~ /\s/
+                    raise Puppet::Error,
+                        "Aliases cannot have whitespace in them: %s" %
+                        value.inspect
                 end
             end
 
             munge do |value|
-                # Add the :alias metaparam in addition to the state
-                @parent.newmetaparam(@parent.class.metaparamclass(:alias), value)
+                unless value == "absent" or value == :absent
+                    # Add the :alias metaparam in addition to the state
+                    @parent.newmetaparam(
+                        @parent.class.metaparamclass(:alias), value
+                    )
+                end
                 value
             end
         end
@@ -101,12 +128,6 @@ module Puppet
         @fields = [:ip, :name, :alias]
 
         @filetype = Puppet::FileType.filetype(:flat)
-#        case Facter["operatingsystem"].value
-#        when "Solaris":
-#            @filetype = Puppet::FileType::SunOS
-#        else
-#            @filetype = Puppet::CronType::Default
-#        end
 
         # Parse a services file
         #
@@ -122,10 +143,6 @@ module Puppet
                     # add comments and blank lines to the list as they are
                     @instances << line 
                 else
-                    #if match = /^(\S+)\s+(\d+)\/(\w+)/.match(line)
-                    #    Puppet.warning "%s %s %s" % [$1, $2, $3]
-                    #    next
-                    #if line.sub(/^(\S+)\s+(\d+)\/(\w+)\s*(\S*)$/.match(line)
                     if line.sub!(/^(\S+)\s+(\d+)\/(\w+)\s*/, '')
                         hash[:name] = $1
                         hash[:number] = $2
@@ -134,6 +151,9 @@ module Puppet
                         unless line == ""
                             line.sub!(/^([^#]+)\s*/) do |value|
                                 aliases = $1
+
+                                # Remove any trailing whitespace
+                                aliases.strip!
                                 unless aliases =~ /^\s*$/
                                     hash[:alias] = aliases
                                 end
@@ -175,6 +195,9 @@ module Puppet
             unless @states.include?(:protocols)
                 return false
             end
+
+            # This method is only called from parsing, so we only worry
+            # about 'is' values.
             proto = self.state(:protocols).is
 
             if proto.nil? or proto == :absent
@@ -192,9 +215,7 @@ module Puppet
                 unless proto.include?(hash[:protocols])
                     # We are missing their proto
                     proto << hash[:protocols]
-                    #Puppet.info "new proto is %s" % proto.inspect
                     @states[:protocols].is = proto
-                    #Puppet.info "new value is %s" % @states[:protocols].is.inspect
                 end
             end
 
@@ -206,20 +227,20 @@ module Puppet
             return true
         end
 
-        # Convert the current object into a host-style string.
+        # Convert the current object into one or more services entry.
         def to_record
-            self.state(:protocols).should.collect { |proto|
-                str = "%s\t%s/%s" % [self[:name], self.state(:number).should,
+            self.state(:protocols).value.collect { |proto|
+                str = "%s\t%s/%s" % [self[:name], self.value(:number),
                     proto]
 
-                if state = self.state(:alias)
-                    str += "\t%s" % state.should.join(" ")
+                if value = self.value(:alias) and value != :absent
+                    str += "\t%s" % value.join(" ")
                 else
                     str += "\t"
                 end
 
-                if state = self.state(:description)
-                    str += "\t# %s" % state.should
+                if value = self.value(:description) and value != :absent
+                    str += "\t# %s" % value
                 else
                     str += "\t"
                 end
@@ -229,4 +250,4 @@ module Puppet
     end
 end
 
-# $Id: port.rb 831 2006-01-16 20:01:20Z luke $
+# $Id: port.rb 915 2006-02-15 21:56:54Z luke $