puppet 0.25.4 → 0.25.5

data/lib/puppet/transaction.rb

@@ -152,14 +152,6 @@ class Transaction
         }.uniq
     end
 
-    # Do any necessary cleanup.  If we don't get rid of the graphs, the
-    # contained resources might never get cleaned up.
-    def cleanup
-        if defined? @generated
-            catalog.remove_resource(*@generated)
-        end
-    end
-
     # Copy an important relationships from the parent to the newly-generated
     # child resource.
     def make_parent_child_relationship(resource, children)
@@ -215,14 +207,18 @@ class Transaction
         # Collect the targets of any subscriptions to those events.  We pass
         # the parent resource in so it will override the source in the events,
         # since eval_generated children can't have direct relationships.
-        relationship_graph.matching_edges(events, resource).each do |orig_edge|
-            # We have to dup the label here, else we modify the original edge label,
-            # which affects whether a given event will match on the next run, which is,
-            # of course, bad.
-            edge = orig_edge.class.new(orig_edge.source, orig_edge.target, orig_edge.label)
-            edge.event = events.collect { |e| e.name }
-            set_trigger(edge)
+        duration = thinmark do
+            b = relationship_graph.matching_edges(events, resource)
+            b.each do |orig_edge|
+                # We have to dup the label here, else we modify the original edge label,
+                # which affects whether a given event will match on the next run, which is,
+                # of course, bad.
+                edge = orig_edge.class.new(orig_edge.source, orig_edge.target, orig_edge.label)
+                edge.event = events.collect { |e| e.name }
+                set_trigger(edge)
+            end
         end
+        Puppet.debug("Time for triggering #{events.size} events to edges: #{duration}") if events.size > 0 and duration > 0
 
         # And return the events for collection
         events

data/lib/puppet/type/augeas.rb

@@ -71,6 +71,7 @@ Puppet::Type.newtype(:augeas) do
                get [AUGEAS_PATH] [COMPARATOR] [STRING]
                match [MATCH_PATH] size [COMPARATOR] [INT]
                match [MATCH_PATH] include [STRING]
+               match [MATCH_PATH] not_include [STRING]
                match [MATCH_PATH] == [AN_ARRAY]
                match [MATCH_PATH] != [AN_ARRAY]
 
@@ -144,7 +145,7 @@ Puppet::Type.newtype(:augeas) do
         end
 
         # if the onlyif resource is provided, then the value is parsed.
-        # a return value of 0 will stop exection becuase it matches the
+        # a return value of 0 will stop exection because it matches the
         # default value.
         def retrieve
             if @resource.provider.need_to_run?()

data/lib/puppet/type/exec.rb

@@ -52,7 +52,7 @@ module Puppet
             in the short term, it is highly recommended to migrate work from ``exec``
             to native Puppet types as quickly as possible.  If you find that
             you are doing a lot of work with ``exec``, please at least notify
-            us at Reductive Labs what you are doing, and hopefully we can work with
+            us at Puppet Labs what you are doing, and hopefully we can work with
             you to get a native resource type for the work you are doing."
 
         require 'open3'

data/lib/puppet/type/file.rb

@@ -22,7 +22,7 @@ module Puppet
 
             If you find that you are often copying files in from a central
             location, rather than using native resources, please contact
-            Reductive Labs and we can hopefully work with you to develop a
+            Puppet Labs and we can hopefully work with you to develop a
             native resource to support what you are doing."
 
         newparam(:path) do
@@ -592,7 +592,14 @@ module Puppet
         end
 
         def perform_recursion(path)
-            Puppet::FileServing::Metadata.search(path, :links => self[:links], :recurse => (self[:recurse] == :remote ? true : self[:recurse]), :recurselimit => self[:recurselimit], :ignore => self[:ignore])
+            params = {
+                :links => self[:links],
+                :recurse => (self[:recurse] == :remote ? true : self[:recurse]),
+                :recurselimit => self[:recurselimit],
+                :ignore => self[:ignore]
+            }
+            params[:checksum_type] = self[:checksum] if self[:checksum] == :none
+            Puppet::FileServing::Metadata.search(path, params)
         end
 
         # Remove any existing data.  This is only used when dealing with

data/lib/puppet/type/file/checksum.rb

@@ -23,7 +23,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do
 
     @unmanaged = true
 
-    @validtypes = %w{md5 md5lite timestamp mtime time}
+    @validtypes = %w{md5 md5lite timestamp mtime time none}
 
     def self.validtype?(type)
         @validtypes.include?(type)
@@ -52,6 +52,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do
             cache(type, sum)
             return type
         else
+            return :none if value.nil? or value.to_s == "" or value.to_s == "none"
             if FileTest.directory?(@resource[:path])
                 return :time
             elsif @resource[:source] and value.to_s != "md5"

data/lib/puppet/type/file/source.rb

@@ -24,7 +24,7 @@ module Puppet
 
                 class sendmail {
                     file { \"/etc/mail/sendmail.cf\":
-                        source => \"puppet://server/module/sendmail.cf\"
+                        source => \"puppet://server/modules/module_name/sendmail.cf\"
                     }
                 }
 
@@ -51,9 +51,9 @@ module Puppet
 
                 file { \"/path/to/my/file\":
                     source => [
-                        \"/nfs/files/file.$host\",
-                        \"/nfs/files/file.$operatingsystem\",
-                        \"/nfs/files/file\"
+                        \"/modules/nfs/files/file.$host\",
+                        \"/modules/nfs/files/file.$operatingsystem\",
+                        \"/modules/nfs/files/file\"
                     ]
                 }
 

data/lib/puppet/type/maillist.rb

@@ -9,6 +9,16 @@ module Puppet
             newvalue(:purged) do
                 provider.purge
             end
+
+            def change_to_s(current_value, newvalue)
+              return "Purged #{resource}" if newvalue == :purged
+              super
+            end
+
+            def insync?(is)
+                return true if is == :absent && should == :purged
+                super
+            end
         end
 
         newparam(:name, :namevar => true) do

data/lib/puppet/type/mount.rb

@@ -140,8 +140,9 @@ module Puppet
         end
 
         newproperty(:dump) do
-            desc "Whether to dump the mount.  Not all platforms
-+                support this. Valid values are ``1`` or ``0``. or ``2`` on FreeBSD, Default is ``0``." 
+            desc "Whether to dump the mount.  Not all platform support this. 
+                Valid values are ``1`` or ``0``. or ``2`` on FreeBSD, Default is ``0``." 
+            
             if Facter["operatingsystem"].value == "FreeBSD" 
                 newvalue(%r{(0|1|2)})
             else
@@ -193,7 +194,8 @@ module Puppet
             newvalues(:true, :false)
             defaultto do
                 case Facter.value(:operatingsystem)
-                when "FreeBSD"; false
+                when "FreeBSD", "Darwin"
+                    false
                 else
                     true
                 end

data/lib/puppet/type/tidy.rb

@@ -19,6 +19,28 @@ Puppet::Type.newtype(:tidy) do
         isnamevar
     end
 
+    newparam(:recurse) do
+        desc "If target is a directory, recursively descend
+            into the directory looking for files to tidy."
+
+        newvalues(:true, :false, :inf, /^[0-9]+$/)
+
+        # Replace the validation so that we allow numbers in
+        # addition to string representations of them.
+        validate { |arg| }
+        munge do |value|
+            newval = super(value)
+            case newval
+            when :true, :inf; true
+            when :false; false
+            when Integer, Fixnum, Bignum; value
+            when /^\d+$/; Integer(value)
+            else
+                raise ArgumentError, "Invalid recurse value %s" % value.inspect
+            end
+        end
+    end
+
     newparam(:matches) do
         desc "One or more (shell type) file glob patterns, which restrict
             the list of files to be tidied to those whose basenames match
@@ -29,22 +51,28 @@ Puppet::Type.newtype(:tidy) do
 
                     tidy { \"/tmp\":
                         age => \"1w\",
-                        recurse => false,
+                        recurse => 1,
                         matches => [ \"[0-9]pub*.tmp\", \"*.temp\", \"tmpfile?\" ]
                     }
 
             This removes files from \/tmp if they are one week old or older,
             are not in a subdirectory and match one of the shell globs given.
 
-            Note that the patterns are matched against the
-            basename of each file -- that is, your glob patterns should not
-            have any '/' characters in them, since you are only specifying
-            against the last bit of the file."
+            Note that the patterns are matched against the basename of each 
+            file -- that is, your glob patterns should not have any '/' 
+            characters in them, since you are only specifying against the last 
+            bit of the file.
+            
+            Finally, note that you must now specify a non-zero/non-false value 
+            for recurse if matches is used, as matches only apply to files found
+            by recursion (there's no reason to use static patterns match against 
+            a statically determined path).  Requiering explicit recursion clears
+            up a common source of confusion."
 
         # Make sure we convert to an array.
         munge do |value|
-            value = [value] unless value.is_a?(Array)
-            value
+            fail "Tidy can't use matches with recurse 0, false, or undef" if "#{@resource[:recurse]}" =~ /^(0|false|)$/
+            [value].flatten
         end
 
         # Does a given path match our glob patterns, if any?  Return true
@@ -139,7 +167,7 @@ Puppet::Type.newtype(:tidy) do
         end
 
         def tidy?(path, stat)
-            if stat.size > value
+            if stat.size >= value
                 return true
             else
                 return false
@@ -170,28 +198,6 @@ Puppet::Type.newtype(:tidy) do
         defaultto :atime
     end
 
-    newparam(:recurse) do
-        desc "If target is a directory, recursively descend
-            into the directory looking for files to tidy."
-
-        newvalues(:true, :false, :inf, /^[0-9]+$/)
-
-        # Replace the validation so that we allow numbers in
-        # addition to string representations of them.
-        validate { |arg| }
-        munge do |value|
-            newval = super(value)
-            case newval
-            when :true, :inf; true
-            when :false; false
-            when Integer, Fixnum, Bignum; value
-            when /^\d+$/; Integer(value)
-            else
-                raise ArgumentError, "Invalid recurse value %s" % value.inspect
-            end
-        end
-    end
-
     newparam(:rmdirs, :boolean => true) do
         desc "Tidy directories in addition to files; that is, remove
             directories whose age is older than the specified criteria.

data/lib/puppet/util/autoload.rb

@@ -156,7 +156,7 @@ class Puppet::Util::Autoload
         end
     end
 
-    def search_directories
-        [module_directories, Puppet[:libdir], $:].flatten
+    def search_directories(dummy_argument=:work_arround_for_ruby_GC_bug)
+        [module_directories, Puppet[:libdir].split(File::PATH_SEPARATOR), $:].flatten
     end
 end

data/lib/puppet/util/checksums.rb

@@ -68,6 +68,11 @@ module Puppet::Util::Checksums
         File.stat(filename).send(:ctime)
     end
 
+    # Return a "no checksum"
+    def none_file(filename)
+        ""
+    end
+
     private
 
     # Perform an incremental checksum on a file.

data/lib/puppet/util/monkey_patches.rb

@@ -1,3 +1,5 @@
+Process.maxgroups = 1024
+
 module RDoc 
     def self.caller(skip=nil)
         in_gem_wrapper = false
@@ -6,3 +8,39 @@ module RDoc
         }
     end
 end
+
+
+require "yaml"
+require "puppet/util/zaml.rb"
+class Symbol
+    def to_zaml(z)
+        z.emit("!ruby/sym ")
+        to_s.to_zaml(z)
+    end
+end
+
+[Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
+    cls.class_eval do
+        def to_yaml
+            ZAML.dump(self)
+        end
+    end
+}
+
+def YAML.dump(*args)
+    ZAML.dump(*args)
+end
+
+#
+# Workaround for bug in MRI 1.8.7, see
+#     http://redmine.ruby-lang.org/issues/show/2708
+# for details
+#
+if RUBY_VERSION == '1.8.7'
+    class NilClass
+        def closed?
+            true
+        end
+    end
+end
+

data/lib/puppet/util/nagios_maker.rb

@@ -55,7 +55,7 @@ module Puppet::Util::NagiosMaker
             You can purge Nagios resources using the ``resources`` type, but *only*
             in the default file locations.  This is an architectural limitation.
 
-            .. _naginator: http://projects.reductivelabs.com/projects/naginator
+            .. _naginator: http://projects.puppetlabs.com/projects/naginator
         "
     end
 end

data/lib/puppet/util/settings.rb

@@ -67,7 +67,7 @@ class Puppet::Util::Settings
             unsafe_clear(exceptcli)
         end
     end
-    
+
     # Remove all set values, potentially skipping cli values.
     def unsafe_clear(exceptcli = false)
         @values.each do |name, values|
@@ -147,6 +147,7 @@ class Puppet::Util::Settings
         @cache.clear
         value = munge_value(value) if value
         str = opt.sub(/^--/,'')
+
         bool = true
         newstr = str.sub(/^no-/, '')
         if newstr != str
@@ -155,13 +156,22 @@ class Puppet::Util::Settings
         end
         str = str.intern
 
-        if value == "" or value.nil?
-            value = bool
+        if @config[str].is_a?(Puppet::Util::Settings::BooleanSetting)
+            if value == "" or value.nil?
+                value = bool
+            end
         end
 
         set_value(str, value, :cli)
     end
 
+    def without_noop
+        old_noop = value(:noop,:cli) and set_value(:noop, false, :cli) if valid?(:noop)
+        yield
+    ensure
+        set_value(:noop, old_noop, :cli) if valid?(:noop)
+    end
+
     def include?(name)
         name = name.intern if name.is_a? String
         @config.include?(name)
@@ -675,7 +685,7 @@ Generated on #{Time.now}.
             end
             throw :foundval, nil
         end
-        
+
         # If we didn't get a value, use the default
         val = @config[param].default if val.nil?
 

data/lib/puppet/util/suidmanager.rb

@@ -1,4 +1,3 @@
-require 'facter'
 require 'puppet/util/warnings'
 require 'forwardable'
 
@@ -6,14 +5,39 @@ module Puppet::Util::SUIDManager
     include Puppet::Util::Warnings
     extend Forwardable
 
+    # Note groups= is handled specially due to a bug in OS X 10.6
     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
-                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
+                               :uid=, :uid, :gid=, :gid, :groups ]
 
     to_delegate_to_process.each do |method|
         def_delegator Process, method
         module_function method
     end
 
+    def osx_maj_ver
+        return @osx_maj_ver unless @osx_maj_ver.nil?
+        require 'facter'
+        # 'kernel' is available without explicitly loading all facts
+        if Facter.value('kernel') != 'Darwin'
+          @osx_maj_ver = false
+          return @osx_maj_ver
+        end
+        # But 'macosx_productversion_major' requires it.
+        Facter.loadfacts
+        @osx_maj_ver = Facter.value('macosx_productversion_major')
+        return @osx_maj_ver
+    end
+    module_function :osx_maj_ver
+    
+    def groups=(grouplist)
+        if osx_maj_ver == '10.6'
+            return true
+        else
+            return Process.groups = grouplist
+        end
+    end
+    module_function :groups=
+
     if Facter['kernel'].value == 'Darwin'
         # Cannot change real UID on Darwin so we set euid
         alias :uid :euid