puppet 0.24.9 → 0.25.0

data/lib/puppet/type/augeas.rb

@@ -71,8 +71,8 @@ Puppet::Type.newtype(:augeas) do
                get [AUGEAS_PATH] [COMPARATOR] [STRING]
                match [MATCH_PATH] size [COMPARATOR] [INT]
                match [MATCH_PATH] include [STRING]
-               match [MATCH_PATH] eq [AN_ARRAY]
-               match [MATCH_PATH] noteq [AN_ARRAY]               
+               match [MATCH_PATH] == [AN_ARRAY]
+               match [MATCH_PATH] != [AN_ARRAY]
 
              where::
 
@@ -99,6 +99,7 @@ Puppet::Type.newtype(:augeas) do
                                  Inserts an empty node LABEL either [WHERE={before|after}] PATH.
           insert [LABEL] [WHERE] [PATH]
                                  Synonym for ins
+
         If the parameter 'context' is set that value is prepended to PATH"
     end
 

data/lib/puppet/type/component.rb

@@ -1,127 +1,52 @@
 
-# the object allowing us to build complex structures
-# this thing contains everything else, including itself
-
 require 'puppet'
 require 'puppet/type'
 require 'puppet/transaction'
-require 'puppet/pgraph'
 
 Puppet::Type.newtype(:component) do
     include Enumerable
-    attr_accessor :children
 
     newparam(:name) do
         desc "The name of the component.  Generally optional."
         isnamevar
     end
 
-    newparam(:type) do
-        desc "The type that this component maps to.  Generally some kind of
-            class from the language."
-
-        defaultto "component"
-    end
-
-    # Remove a child from the component.
-    def delete(child)
-        if @children.include?(child)
-            @children.delete(child)
-            return true
-        else
-            return super
-        end
-    end
-
-    # Recurse deeply through the tree, but only yield types, not properties.
-    def delve(&block)
-        self.each do |obj|
-            if obj.is_a?(self.class)
-                obj.delve(&block)
-            end
-        end
-        block.call(self)
-    end
-
-    # Return each child in turn.
-    def each
-        @children.each { |child| yield child }
-    end
-
-    # Do all of the polishing off, mostly doing autorequires and making
-    # dependencies.  This will get run once on the top-level component,
-    # and it will do everything necessary.
-    def finalize
-        started = {}
-        finished = {}
-        
-        # First do all of the finish work, which mostly involves
-        self.delve do |object|
-            # Make sure we don't get into loops
-            if started.has_key?(object)
-                debug "Already finished %s" % object.title
-                next
-            else
-                started[object] = true
-            end
-            unless finished.has_key?(object)
-                object.finish
-                finished[object] = true
-            end
-        end
-
-        @finalized = true
+    # Override how parameters are handled so that we support the extra
+    # parameters that are used with defined resource types.
+    def [](param)
+        return super if self.class.validattr?(param)
+        @extra_parameters[param.to_sym]
     end
 
-    def finalized?
-        if defined? @finalized
-            return @finalized
-        else
-            return false
-        end
+    # Override how parameters are handled so that we support the extra
+    # parameters that are used with defined resource types.
+    def []=(param, value)
+        return super if self.class.validattr?(param)
+        @extra_parameters[param.to_sym] = value
     end
 
     # Initialize a new component
     def initialize(*args)
-        @children = []
+        @extra_parameters = {}
         super
 
-        @reference = Puppet::ResourceReference.new(:component, @title)
-
-        unless self.class[@reference.to_s]
-            self.class.alias(@reference.to_s, self)
+        if catalog and ! catalog.resource(ref)
+            catalog.alias(self, ref)
         end
     end
 
-    def initvars
-        super
-        @children = []
-    end
-
-    # Add a hook for testing for recursion.
-    def parentof?(child)
-        if super(child)
-            return true
-        elsif @children.include?(child)
-            debug "child is already in children array"
-            return true
-        else
-            return false
-        end
-    end
-    
     # Component paths are special because they function as containers.
     def pathbuilder
-        if @reference.type == "Class"
+        if reference.type == "Class"
             # 'main' is the top class, so we want to see '//' instead of
             # its name.
-            if @reference.title == "main"
+            if reference.title == "main"
                 myname = ""
             else
-                myname = @reference.title
+                myname = reference.title
             end
         else
-            myname = @reference.to_s
+            myname = reference.to_s
         end
         if p = self.parent
             return [p.pathbuilder, myname]
@@ -131,12 +56,16 @@ Puppet::Type.newtype(:component) do
     end
 
     def ref
-        @reference.to_s
+        reference.to_s
     end
 
     # We want our title to just be the whole reference, rather than @title.
     def title
-        @reference.to_s
+        ref
+    end
+
+    def title=(str)
+        @reference = Puppet::Resource::Reference.new(str)
     end
 
     def refresh
@@ -149,6 +78,10 @@ Puppet::Type.newtype(:component) do
     end
 
     def to_s
-        @reference.to_s
+        reference.to_s
     end
+
+    private
+
+    attr_reader :reference
 end

data/lib/puppet/type/computer.rb

@@ -1,5 +1,5 @@
 Puppet::Type.newtype(:computer) do
-    
+
     @doc = "Computer object management using DirectoryService
       on OS X.
 
@@ -15,12 +15,12 @@ Puppet::Type.newtype(:computer) do
 
       This type primarily exists to create localhost Computer objects that MCX
       policy can then be attached to."
-    
+
     # ensurable
-    
+
     # We autorequire the computer object in case it is being managed at the
     # file level by Puppet.
-    
+
     autorequire(:file) do
         if self[:name]
             "/var/db/dslocal/nodes/Default/computers/#{self[:name]}.plist"
@@ -28,7 +28,7 @@ Puppet::Type.newtype(:computer) do
             nil
         end
     end
-    
+
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
         desc "Control the existences of this computer record. Set this attribute to
             ``present`` to ensure the computer record exists.  Set it to ``absent``
@@ -41,22 +41,22 @@ Puppet::Type.newtype(:computer) do
             provider.delete
         end
     end
-    
+
     newparam(:name) do
         desc "The authoritative 'short' name of the computer record."
         isnamevar
     end
-    
+
     newparam(:realname) do
         desc "The 'long' name of the computer record."
     end
-        
+
     newproperty(:en_address) do
         desc "The MAC address of the primary network interface. Must match en0."
     end
-    
+
     newproperty(:ip_address) do
         desc "The IP Address of the Computer object."
     end
-    
+
 end

data/lib/puppet/type/cron.rb

@@ -3,20 +3,20 @@ require 'facter'
 require 'puppet/util/filetype'
 
 Puppet::Type.newtype(:cron) do
-    @doc = "Installs and manages cron jobs.  All fields except the command 
+    @doc = "Installs and manages cron jobs.  All fields except the command
         and the user are optional, although specifying no periodic
         fields would result in the command being executed every
         minute.  While the name of the cron job is not part of the actual
         job, it is used by Puppet to store and retrieve it.
-        
+
         If you specify a cron job that matches an existing job in every way
         except name, then the jobs will be considered equivalent and the
         new name will be permanently associated with that job.  Once this
         association is made and synced to disk, you can then manage the job
         normally (e.g., change the schedule of the job).
-        
+
         Example::
-            
+
             cron { logrotate:
                 command => \"/usr/sbin/logrotate\",
                 user => root,
@@ -89,7 +89,7 @@ Puppet::Type.newtype(:cron) do
         # or the first three letters of the word.
         def alphacheck(value, ary)
             tmp = value.downcase
-            
+
             # If they specified a shortened version of the name, then see
             # if we can lengthen it (e.g., mon => monday).
             if tmp.length == 3
@@ -173,6 +173,11 @@ Puppet::Type.newtype(:cron) do
                 return value
             end
 
+            # Allow ranges + */2
+            if value =~ /^[0-9]+-[0-9]+\/[0-9]+$/
+                return value
+            end
+
             if value == "*"
                 return value
             end
@@ -211,16 +216,16 @@ Puppet::Type.newtype(:cron) do
             best to always provide a fully qualified command.  The user's
             profile is not sourced when the command is run, so if the
             user's environment is desired it should be sourced manually.
-            
+
             All cron parameters support ``absent`` as a value; this will
             remove any existing values for that field."
 
-        def retrieve 
+        def retrieve
           return_value = super
           if return_value && return_value.is_a?(Array)
             return_value = return_value[0]
           end
-            
+
           return return_value
         end
 
@@ -268,10 +273,10 @@ Puppet::Type.newtype(:cron) do
         def alpha
             %w{sunday monday tuesday wednesday thursday friday saturday}
         end
-        self.boundaries = [0, 6]
+        self.boundaries = [0, 7]
         desc "The weekday on which to run the command.
-            Optional; if specified, must be between 0 and 6, inclusive, with
-            0 being Sunday, or must be the name of the day (e.g., Tuesday)."
+            Optional; if specified, must be between 0 and 7, inclusive, with
+            0 (or 7) being Sunday, or must be the name of the day (e.g., Tuesday)."
     end
 
     newproperty(:month, :parent => CronParam) do
@@ -302,7 +307,7 @@ Puppet::Type.newtype(:cron) do
             job.  If you already have cron jobs with environment settings,
             then Puppet will keep those settings in the same place in the file,
             but will not associate them with a specific job.
-            
+
             Settings should be specified exactly as they should appear in
             the crontab, e.g., ``PATH=/bin:/usr/bin:/usr/sbin``."
 
@@ -322,7 +327,7 @@ Puppet::Type.newtype(:cron) do
         end
 
         def is_to_s(newvalue)
-            if newvalue 
+            if newvalue
                 if newvalue.is_a?(Array)
                     newvalue.join(",")
                 else
@@ -363,7 +368,7 @@ Puppet::Type.newtype(:cron) do
         desc "The user to run the command as.  This user must
             be allowed to run cron jobs, which is not currently checked by
             Puppet.
-            
+
             The user defaults to whomever Puppet is running as."
 
         defaultto { Etc.getpwuid(Process.uid).name || "root" }

data/lib/puppet/type/exec.rb

@@ -46,7 +46,7 @@ module Puppet
             Note that if an ``exec`` receives an event from another resource,
             it will get executed again (or execute the command specified in
             ``refresh``, if there is one).
-            
+
             There is a strong tendency to use ``exec`` to do whatever work Puppet
             can't already do; while this is obviously acceptable (and unavoidable)
             in the short term, it is highly recommended to migrate work from ``exec``
@@ -70,7 +70,7 @@ module Puppet
             @checks.keys
         end
 
-        newproperty(:returns) do |property|
+        newproperty(:returns, :array_matching => :all) do |property|
             include Puppet::Util::Execution
             munge do |value|
                 value.to_s
@@ -79,8 +79,9 @@ module Puppet
             defaultto "0"
 
             attr_reader :output
-            desc "The expected return code.  An error will be returned if the
-                executed command returns something else.  Defaults to 0."
+            desc "The expected return code(s).  An error will be returned if the
+                executed command returns something else.  Defaults to 0. Can be
+                specified as an array of acceptable return codes or a single value."
 
             # Make output a bit prettier
             def change_to_s(currentvalue, newvalue)
@@ -114,8 +115,8 @@ module Puppet
                 end
 
                 if log = @resource[:logoutput]
-                    case log 
-                    when :true 
+                    case log
+                    when :true
                         log = @resource[:loglevel]
                     when :on_failure
                         if status.exitstatus.to_s != self.should.to_s
@@ -131,9 +132,9 @@ module Puppet
                     end
                 end
 
-                if status.exitstatus.to_s != self.should.to_s
-                    self.fail("%s returned %s instead of %s" %
-                        [self.resource[:command], status.exitstatus, self.should.to_s])
+                unless self.should.include?(status.exitstatus.to_s)
+                    self.fail("%s returned %s instead of one of [%s]" %
+                        [self.resource[:command], status.exitstatus, self.should.join(",")])
                 end
 
                 return event
@@ -200,7 +201,7 @@ module Puppet
                 if dir.is_a?(Array)
                     dir = dir[0]
                 end
-                
+
                 dir
             end
         end
@@ -249,13 +250,13 @@ module Puppet
                 end
             end
         end
-        
+
         newparam(:timeout) do
             desc "The maximum time the command should take.  If the command takes
                 longer than the timeout, the command is considered to have failed
                 and will be stopped.  Use any negative number to disable the timeout.
                 The time is specified in seconds."
-            
+
             munge do |value|
                 value = value.shift if value.is_a?(Array)
                 if value.is_a?(String)
@@ -267,7 +268,7 @@ module Puppet
                     value
                 end
             end
-            
+
             defaultto 300
         end
 
@@ -276,7 +277,7 @@ module Puppet
                 refresh mechanism for when a dependent object is changed.  It only
                 makes sense to use this option when this command depends on some
                 other object; it is useful for triggering an action::
-                    
+
                     # Pull down the main aliases file
                     file { \"/etc/aliases\":
                         source => \"puppet://server/module/aliases\"
@@ -288,7 +289,7 @@ module Puppet
                         subscribe => File[\"/etc/aliases\"],
                         refreshonly => true
                     }
-                
+
                 Note that only ``subscribe`` and ``notify`` can trigger actions, not ``require``,
                 so it only makes sense to use ``refreshonly`` with ``subscribe`` or ``notify``."
 
@@ -306,7 +307,7 @@ module Puppet
             end
         end
 
-        newcheck(:creates) do 
+        newcheck(:creates) do
             desc "A file that this command creates.  If this
                 parameter is provided, then the command will only be run
                 if the specified file does not exist::
@@ -316,10 +317,10 @@ module Puppet
                         creates => \"/var/tmp/myfile\",
                         path => [\"/usr/bin\", \"/usr/sbin\"]
                     }
-                
+
                 "
 
-            # FIXME if they try to set this and fail, then we should probably 
+            # FIXME if they try to set this and fail, then we should probably
             # fail the entire exec, right?
             validate do |files|
                 files = [files] unless files.is_a? Array
@@ -343,7 +344,7 @@ module Puppet
         newcheck(:unless) do
             desc "If this parameter is set, then this ``exec`` will run unless
                 the command returns 0.  For example::
-                    
+
                     exec { \"/bin/echo root >> /usr/lib/cron/cron.allow\":
                         path => \"/usr/bin:/usr/sbin:/bin\",
                         unless => \"grep root /usr/lib/cron/cron.allow 2>/dev/null\"
@@ -380,7 +381,7 @@ module Puppet
         newcheck(:onlyif) do
             desc "If this parameter is set, then this ``exec`` will only run if
                 the command returns 0.  For example::
-                    
+
                     exec { \"logrotate\":
                         path => \"/usr/bin:/usr/sbin:/bin\",
                         onlyif => \"test `du /var/log/messages | cut -f1` -gt 100000\"