puppet 0.24.9 → 0.25.0

data/lib/puppet/type/mailalias.rb

@@ -1,7 +1,7 @@
 module Puppet
     newtype(:mailalias) do
         @doc = "Creates an email alias in the local alias database."
-        
+
         ensurable
 
         newparam(:name, :namevar => true) do
@@ -35,7 +35,7 @@ module Puppet
 
         newproperty(:target) do
             desc "The file in which to store the aliases.  Only used by
-                those providers that write to disk (i.e., not NetInfo)."
+                those providers that write to disk."
 
             defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
                     @resource.class.defaultprovider.default_target

data/lib/puppet/type/maillist.rb

@@ -2,7 +2,7 @@ module Puppet
     newtype(:maillist) do
         @doc = "Manage email lists.  This resource type currently can only create
             and remove lists, it cannot reconfigure them."
-        
+
         ensurable do
             defaultvalues
 
@@ -46,7 +46,7 @@ module Puppet
                     if atype[name]
                         nil
                     else
-                        malias = Puppet::Type.type(:mailalias).create(:name => name, :recipient => recipient, :ensure => should)
+                        malias = Puppet::Type.type(:mailalias).new(:name => name, :recipient => recipient, :ensure => should)
                     end
                 end.compact
             end

data/lib/puppet/type/mcx.rb

@@ -2,8 +2,8 @@
 # Copyright (C) 2008 Jeffrey J McCune.
 
 # This program and entire repository is free software; you can
-# redistribute it and/or modify it under the terms of the GNU 
-# General Public License as published by the Free Software 
+# redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -61,7 +61,7 @@ to other machines.
         default naming convention is followed."
         isnamevar
     end
-    
+
     newparam(:ds_type) do
 
         desc "The DirectoryService type this MCX setting attaches to."

data/lib/puppet/type/mount.rb

@@ -2,15 +2,15 @@ module Puppet
     # We want the mount to refresh when it changes.
     newtype(:mount, :self_refresh => true) do
         @doc = "Manages mounted filesystems, including putting mount
-            information into the mount table. The actual behavior depends 
+            information into the mount table. The actual behavior depends
             on the value of the 'ensure' parameter.
-	    
+
             Note that if a ``mount`` receives an event from another resource,
             it will try to remount the filesystems if ``ensure`` is set to ``mounted``."
 
         feature :refreshable, "The provider can remount the filesystem.",
             :methods => [:remount]
-        
+
         # Use the normal parent class, because we actually want to
         # call code when sync() is called.
         newproperty(:ensure) do
@@ -44,7 +44,7 @@ module Puppet
             newvalue(:mounted, :event => :mount_mounted) do
                 # Create the mount point if it does not already exist.
                 current_value = self.retrieve
-                provider.create if current_value.nil? or current_value == :absent 
+                provider.create if current_value.nil? or current_value == :absent
 
                 syncothers()
 
@@ -54,7 +54,7 @@ module Puppet
 
             def retrieve
                 # We need to special case :mounted; if we're absent, we still
-                # want 
+                # want
                 curval = super()
                 if curval == :absent
                     return curval
@@ -141,9 +141,14 @@ module Puppet
 
         newproperty(:dump) do
             desc "Whether to dump the mount.  Not all platforms
-                support this. Valid values are ``1`` or ``0``. Default is ``0``."
++                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
+                newvalue(%r{(0|1)})
+            end
 
-             newvalue(%r{(0|1)})
+            newvalue(%r{(0|1)})
 
             defaultto {
                 if @resource.managed?
@@ -154,7 +159,7 @@ module Puppet
 
         newproperty(:target) do
             desc "The file in which to store the mount table.  Only used by
-                those providers that write to disk (i.e., not NetInfo)."
+                those providers that write to disk."
 
             defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
                     @resource.class.defaultprovider.default_target
@@ -179,16 +184,16 @@ module Puppet
                 super
             end
         end
-        
+
         newparam(:remounts) do
             desc "Whether the mount can be remounted  ``mount -o remount``.  If
                 this is false, then the filesystem will be unmounted and remounted
                 manually, which is prone to failure."
-            
+
             newvalues(:true, :false)
             defaultto do
                 case Facter.value(:operatingsystem)
-                when "FreeBSD": false
+                when "FreeBSD"; false
                 else
                     true
                 end

data/lib/puppet/type/notify.rb

@@ -10,9 +10,9 @@ module Puppet
             desc "The message to be sent to the log."
             def sync
                 case @resource["withpath"]
-                when :true:
+                when :true
                     send(@resource[:loglevel], self.should)
-                else  
+                else
                     Puppet.send(@resource[:loglevel], self.should)
                 end
                 return
@@ -29,11 +29,11 @@ module Puppet
             defaultto { @resource[:name] }
         end
 
-        newparam(:withpath) do 
+        newparam(:withpath) do
             desc "Whether to not to show the full object path."
             defaultto :false
 
-            newvalues(:true, :false) 
+            newvalues(:true, :false)
         end
 
         newparam(:name) do

data/lib/puppet/type/package.rb

@@ -55,7 +55,7 @@ module Puppet
             newvalue(:absent, :event => :package_removed) do
                 provider.uninstall
             end
-            
+
             newvalue(:purged, :event => :package_purged, :required_features => :purgeable) do
                 provider.purge
             end
@@ -115,7 +115,7 @@ module Puppet
                     when :latest
                         # Short-circuit packages that are not present
                         return false if is == :absent or is == :purged
- 
+
                         # Don't run 'latest' more than about every 5 minutes
                         if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5
                             #self.debug "Skipping latest check"
@@ -131,9 +131,9 @@ module Puppet
                         end
 
                         case is
-                        when @latest:
+                        when @latest
                             return true
-                        when :present:
+                        when :present
                             # This will only happen on retarded packaging systems
                             # that can't query versions.
                             return true
@@ -202,7 +202,7 @@ module Puppet
                     alias => openssh,
                     require => Package[openssl]
                 }
-            
+
             "
             isnamevar
         end
@@ -306,28 +306,6 @@ module Puppet
             @provider.get(:ensure) != :absent
         end
 
-        def initialize(params)
-            self.initvars
-            provider = nil
-            [:provider, "use"].each { |label|
-                if params.include?(label)
-                    provider = params[label]
-                    params.delete(label)
-                end
-            }
-            if provider
-                self[:provider] = provider
-            else
-                self.setdefaults(:provider)
-            end
-
-            super(params)
-
-            unless @parameters.include?(:provider)
-                raise Puppet::DevError, "No package provider set"
-            end
-        end
-
         def retrieve
             @provider.properties.inject({}) do |props, ary|
                 name, value = ary
@@ -337,6 +315,6 @@ module Puppet
                 props
             end
         end
-    end # Puppet.type(:package)
+    end # Puppet::Type.type(:package)
 end
 

data/lib/puppet/type/port.rb

@@ -98,7 +98,7 @@
 #
 #        newproperty(:target) do
 #            desc "The file in which to store service information.  Only used by
-#                those providers that write to disk (i.e., not NetInfo)."
+#                those providers that write to disk."
 #
 #            defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
 #                    @resource.class.defaultprovider.default_target

data/lib/puppet/type/resources.rb

@@ -8,27 +8,27 @@ Puppet::Type.newtype(:resources) do
         metaparams specified here will be passed on to any generated resources,
         so you can purge umanaged resources but set ``noop`` to true so the
         purging is only logged and does not actually happen."
-    
-    
+
+
     newparam(:name) do
         desc "The name of the type to be managed."
-        
+
         validate do |name|
             unless Puppet::Type.type(name)
                 raise ArgumentError, "Could not find resource type '%s'" % name
             end
         end
-        
+
         munge { |v| v.to_s }
     end
-    
+
     newparam(:purge, :boolean => true) do
         desc "Purge unmanaged resources.  This will delete any resource
             that is not specified in your configuration
             and is not required by any specified resources."
-            
+
         newvalues(:true, :false)
-        
+
         validate do |value|
             if [:true, true, "true"].include?(value)
                 unless @resource.resource_type.respond_to?(:instances)
@@ -40,14 +40,14 @@ Puppet::Type.newtype(:resources) do
             end
         end
     end
-    
+
     newparam(:unless_system_user) do
         desc "This keeps system users from being purged.  By default, it
             does not purge users whose UIDs are less than or equal to 500, but you can specify
             a different UID as the inclusive limit."
-        
+
         newvalues(:true, :false, /^\d+$/)
-        
+
         munge do |value|
             case value
             when /^\d+/
@@ -56,12 +56,12 @@ Puppet::Type.newtype(:resources) do
                 500
             when :false, false
                 false
-            when Integer: value
+            when Integer; value
             else
                 raise ArgumentError, "Invalid value %s" % value.inspect
             end
         end
-        
+
         defaultto {
             if @resource[:name] == "user"
                 500
@@ -70,7 +70,7 @@ Puppet::Type.newtype(:resources) do
             end
         }
     end
-    
+
     def check(resource)
         unless defined? @checkmethod
             @checkmethod = "%s_check" % self[:name]
@@ -84,13 +84,13 @@ Puppet::Type.newtype(:resources) do
             return true
         end
     end
-    
+
     # Generate any new resources we need to manage.  This is pretty hackish
     # right now, because it only supports purging.
     def generate
         return [] unless self.purge?
         hascheck = false
-        method = 
+        method =
         resource_type.instances.find_all do |resource|
             ! resource.managed?
         end.find_all do |resource|
@@ -113,7 +113,7 @@ Puppet::Type.newtype(:resources) do
             resource.purging
         end
     end
-    
+
     def resource_type
         unless defined? @resource_type
             unless type = Puppet::Type.type(self[:name])
@@ -123,16 +123,16 @@ Puppet::Type.newtype(:resources) do
         end
         @resource_type
     end
-    
+
     # Make sure we don't purge users below a certain uid, if the check
     # is enabled.
     def user_check(resource)
         return true unless self[:name] == "user"
         return true unless self[:unless_system_user]
-        
+
         resource[:check] = :uid
         current_values = resource.retrieve
-        
+
         if system_users().include?(resource[:name])
             return false
         end

data/lib/puppet/type/schedule.rb

@@ -4,7 +4,7 @@ module Puppet
             about how schedules are currently implemented in Puppet is that they
             can only be used to stop a resource from being applied, they never
             guarantee that it is applied.
-            
+
             Every time Puppet applies its configuration, it will collect the
             list of resources whose schedule does not eliminate them from
             running right then, but there is currently no system in place to
@@ -12,12 +12,12 @@ module Puppet
             specify a very  restrictive schedule and Puppet happens to run at a
             time within that schedule, then the resources will get applied;
             otherwise, that work may never get done.
-            
+
             Thus, it behooves you to use wider scheduling (e.g., over a couple of
             hours) combined with periods and repetitions.  For instance, if you
             wanted to restrict certain resources to only running once, between
             the hours of two and 4 AM, then you would use this schedule::
-                
+
                 schedule { maint:
                     range => \"2 - 4\",
                     period => daily,
@@ -29,7 +29,7 @@ module Puppet
             get applied again between 2 and 4 because they will have already
             run once that day, and they won't get applied outside that schedule
             because they will be outside the scheduled range.
-            
+
             Puppet automatically creates a schedule for each valid period with the
             same name as that period (e.g., hourly and daily).  Additionally,
             a schedule named *puppet* is created and used as the default,
@@ -46,7 +46,7 @@ module Puppet
         newparam(:name) do
             desc "The name of the schedule.  This name is used to retrieve the
                 schedule when assigning it to an object::
-                    
+
                     schedule { daily:
                         period => daily,
                         range => [2, 4]
@@ -55,7 +55,7 @@ module Puppet
                     exec { \"/usr/bin/apt-get update\":
                         schedule => daily
                     }
-                
+
                 "
             isnamevar
         end
@@ -70,7 +70,7 @@ module Puppet
                     schedule { maintenance:
                         range => \"1:30 - 4:30\"
                     }
-                
+
                 This is mostly useful for restricting certain resources to being
                 applied in maintenance windows or during off-peak hours."
 
@@ -169,7 +169,7 @@ module Puppet
                         ary = limits[1].to_a
                         ary[3] += 1
                         limits[1] = Time.local(*ary)
-                            
+
                         #self.devfail("Lower limit is above higher limit: %s" %
                         #    limits.inspect
                         #)
@@ -224,7 +224,7 @@ module Puppet
                 internal factors might prevent it from actually running that
                 often (e.g., long-running Puppet runs will squash conflictingly
                 scheduled runs).
-                
+
                 See the ``periodmatch`` attribute for tuning whether to match
                 times by their distance apart or by their specific value."
 
@@ -241,7 +241,9 @@ module Puppet
                 :daily => :day,
                 :monthly => :month,
                 :weekly => proc do |prev, now|
-                    prev.strftime("%U") != now.strftime("%U")
+                    # Run the resource if the previous day was after this weekday (e.g., prev is wed, current is tue)
+                    # or if it's been more than a week since we ran
+                    prev.wday > now.wday or (now - prev) > (24 * 3600 * 7)
                 end
             }
 
@@ -314,24 +316,20 @@ module Puppet
         end
 
         def self.mkdefaultschedules
-            return [] if self["puppet"]
-
             result = []
             Puppet.debug "Creating default schedules"
-            result << self.create(
+            result << self.new(
                 :name => "puppet",
                 :period => :hourly,
                 :repeat => "2"
             )
 
             # And then one for every period
-            @parameters.find { |p| p.name == :period }.values.each { |value|
-                unless self[value.to_s]
-                    result << self.create(
-                        :name => value.to_s,
-                        :period => value
-                    )
-                end
+            @parameters.find { |p| p.name == :period }.value_collection.values.each { |value|
+                result << self.new(
+                    :name => value.to_s,
+                    :period => value
+                )
             }
 
             result