puppet 3.2.4 → 3.3.0.rc2

data/lib/puppet/type/component.rb

@@ -29,8 +29,6 @@ Puppet::Type.newtype(:component) do
   def initialize(*args)
     @extra_parameters = {}
     super
-
-    catalog.alias(self, ref) if catalog and ! catalog.resource(ref)
   end
 
   # Component paths are special because they function as containers.

data/lib/puppet/type/cron.rb

@@ -243,15 +243,26 @@ Puppet::Type.newtype(:cron) do
   newproperty(:special) do
     desc "A special value such as 'reboot' or 'annually'.
        Only available on supported systems such as Vixie Cron.
-       Overrides more specific time of day/week settings."
+       Overrides more specific time of day/week settings.
+       Set to 'absent' to make puppet revert to a plain numeric schedule."
 
     def specials
-      %w{reboot yearly annually monthly weekly daily midnight hourly}
+      %w{reboot yearly annually monthly weekly daily midnight hourly absent} +
+        [ :absent ]
     end
 
     validate do |value|
       raise ArgumentError, "Invalid special schedule #{value.inspect}" unless specials.include?(value)
     end
+
+    def munge(value)
+      # Support value absent so that a schedule can be
+      # forced to change to numeric.
+      if value == "absent" or value == :absent
+        return :absent
+      end
+      value
+    end
   end
 
   newproperty(:minute, :parent => CronParam) do

data/lib/puppet/type/exec.rb

@@ -79,11 +79,6 @@ module Puppet
 
       # Actually execute the command.
       def sync
-        olddir = nil
-
-        # We need a dir to change to, even if it's just the cwd
-        dir = self.resource[:cwd] || Dir.pwd
-
         event = :executed_command
         tries = self.resource[:tries]
         try_sleep = self.resource[:try_sleep]
@@ -161,7 +156,10 @@ module Puppet
         use this then any error output is not currently captured.  This
         is because of a bug within Ruby.  If you are using Puppet to
         create this user, the exec will automatically require the user,
-        as long as it is specified by name."
+        as long as it is specified by name.
+
+        Please note that the $HOME environment variable is not automatically set
+        when using this attribute."
 
       # Most validation is handled by the SUIDManager class.
       validate do |user|
@@ -232,7 +230,7 @@ module Puppet
         value = value.shift if value.is_a?(Array)
         begin
           value = Float(value)
-        rescue ArgumentError => e
+        rescue ArgumentError
           raise ArgumentError, "The timeout must be a number."
         end
         [value, 0.0].max

data/lib/puppet/type/file.rb

@@ -5,6 +5,7 @@ require 'uri'
 require 'fileutils'
 require 'enumerator'
 require 'pathname'
+require 'puppet/parameter/boolean'
 require 'puppet/util/diff'
 require 'puppet/util/checksums'
 require 'puppet/util/backups'
@@ -53,7 +54,7 @@ Puppet::Type.newtype(:file) do
     end
 
     munge do |value|
-      ::File.expand_path(value)
+      ::File.join(::File.split(::File.expand_path(value)))
     end
   end
 
@@ -160,26 +161,22 @@ Puppet::Type.newtype(:file) do
     end
   end
 
-  newparam(:replace, :boolean => true) do
+  newparam(:replace, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Whether to replace a file or symlink that already exists on the local system but
       whose content doesn't match what the `source` or `content` attribute
       specifies.  Setting this to false allows file resources to initialize files
       without overwriting future changes.  Note that this only affects content;
       Puppet will still manage ownership and permissions. Defaults to `true`."
-    newvalues(:true, :false)
-    aliasvalue(:yes, :true)
-    aliasvalue(:no, :false)
     defaultto :true
   end
 
-  newparam(:force, :boolean => true) do
+  newparam(:force, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Perform the file operation even if it will destroy one or more directories.
       You must use `force` in order to:
 
       * `purge` subdirectories
       * Replace directories with files or links
       * Remove a directory when `ensure => absent`"
-    newvalues(:true, :false)
     defaultto false
   end
 
@@ -210,7 +207,7 @@ Puppet::Type.newtype(:file) do
     defaultto :manage
   end
 
-  newparam(:purge, :boolean => true) do
+  newparam(:purge, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Whether unmanaged files should be purged. This option only makes
       sense when managing directories with `recurse => true`.
 
@@ -225,8 +222,6 @@ Puppet::Type.newtype(:file) do
       but if you do not, this will destroy data."
 
     defaultto :false
-
-    newvalues(:true, :false)
   end
 
   newparam(:sourceselect) do
@@ -242,7 +237,7 @@ Puppet::Type.newtype(:file) do
     newvalues(:first, :all)
   end
 
-  newparam(:show_diff, :boolean => true) do
+  newparam(:show_diff, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Whether to display differences when the file changes, defaulting to
         true.  This parameter is useful for files that may contain passwords or
         other secret data, which might otherwise be included in Puppet reports or
@@ -250,8 +245,6 @@ Puppet::Type.newtype(:file) do
         is false, then no diffs will be shown even if this parameter is true."
 
     defaultto :true
-
-    newvalues(:true, :false)
   end
 
   # Autorequire the nearest ancestor directory found in the catalog.
@@ -380,12 +373,6 @@ Puppet::Type.newtype(:file) do
     return [] unless self.recurse?
 
     recurse
-    #recurse.reject do |resource|
-    #    catalog.resource(:file, resource[:path])
-    #end.each do |child|
-    #    catalog.add_resource child
-    #    catalog.relationship_graph.add_edge self, child
-    #end
   end
 
   def ancestors
@@ -475,16 +462,6 @@ Puppet::Type.newtype(:file) do
     end
   end
 
-  # Should we be purging?
-  def purge?
-    @parameters.include?(:purge) and (self[:purge] == :true or self[:purge] == "true")
-  end
-
-  # Should we be showing diffs?
-  def show_diff?
-    @parameters.include?(:show_diff) and (self[:show_diff] == :true or self[:show_diff] == "true")
-  end
-
   # Recursively generate a list of file resources, which will
   # be used to copy remote files, manage local files, and/or make links
   # to map to another directory.
@@ -773,7 +750,7 @@ Puppet::Type.newtype(:file) do
 
   # @return [Boolean] If the current file can be backed up and needs to be backed up.
   def can_backup?(type)
-    if type == "directory" and self[:force] == :false
+    if type == "directory" and not force?
       # (#18110) Directories cannot be removed without :force, so it doesn't
       # make sense to back them up.
       false
@@ -785,7 +762,7 @@ Puppet::Type.newtype(:file) do
   # @return [Boolean] True if the directory was removed
   # @api private
   def remove_directory(wanted_type)
-    if self[:force] == :true
+    if force?
       debug "Removing existing directory for replacement with #{wanted_type}"
       FileUtils.rmtree(self[:path])
       stat_needed
@@ -842,7 +819,7 @@ Puppet::Type.newtype(:file) do
   def write_temporary_file?
     # unfortunately we don't know the source file size before fetching it
     # so let's assume the file won't be empty
-    (c = property(:content) and c.length) || (s = @parameters[:source] and 1)
+    (c = property(:content) and c.length) || @parameters[:source]
   end
 
   # There are some cases where all of the work does not get done on

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

@@ -75,7 +75,7 @@ module Puppet
     def checksum_type
       if source = resource.parameter(:source)
         result = source.checksum
-      else checksum = resource.parameter(:checksum)
+      else
         result = resource[:checksum]
       end
       if result =~ /^\{(\w+)\}.+/
@@ -100,6 +100,9 @@ module Puppet
       if resource.should_be_file?
         return false if is == :absent
       else
+        if resource[:ensure] == :present and resource[:content] and s = resource.stat
+          resource.warning "Ensure set to :present but file type is #{s.ftype} so no content will be synced"
+        end
         return true
       end
 

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

@@ -1,6 +1,8 @@
 module Puppet
   Puppet::Type.type(:file).newproperty(:ctime) do
-    desc "A read-only state to check the file ctime."
+    desc %q{A read-only state to check the file ctime. On most modern \*nix-like
+      systems, this is the time of the most recent change to the owner, group,
+      permissions, or content of the file.}
 
     def retrieve
       current_value = :absent

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

@@ -47,7 +47,7 @@ module Puppet
         property.sync
       else
         @resource.write(:ensure)
-        mode = @resource.should(:mode)
+        @resource.should(:mode)
       end
     end
 

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

@@ -80,7 +80,6 @@ module Puppet
     # If we're a directory, we need to be executable for all cases
     # that are readable.  This should probably be selectable, but eh.
     def dirmask(value)
-      orig = value
       if FileTest.directory?(resource[:path]) and value =~ /^\d+$/ then
         value = value.to_i(8)
         value |= 0100 if value & 0400 != 0

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

@@ -1,6 +1,7 @@
 module Puppet
   Puppet::Type.type(:file).newproperty(:mtime) do
-    desc "A read-only state to check the file mtime."
+    desc %q{A read-only state to check the file mtime. On \*nix-like systems, this
+      is the time of the most recent change to the content of the file.}
 
     def retrieve
       current_value = :absent

data/lib/puppet/type/group.rb

@@ -1,6 +1,7 @@
 require 'etc'
 require 'facter'
 require 'puppet/property/keyvalue'
+require 'puppet/parameter/boolean'
 
 module Puppet
   newtype(:group) do
@@ -104,11 +105,9 @@ module Puppet
       isnamevar
     end
 
-    newparam(:allowdupe, :boolean => true) do
+    newparam(:allowdupe, :boolean => true, :parent => Puppet::Parameter::Boolean) do
       desc "Whether to allow duplicate GIDs. Defaults to `false`."
 
-      newvalues(:true, :false)
-
       defaultto false
     end
 
@@ -142,18 +141,17 @@ module Puppet
       defaultto :minimum
     end
 
-    newparam(:system, :boolean => true) do
+    newparam(:system, :boolean => true, :parent => Puppet::Parameter::Boolean) do
       desc "Whether the group is a system group with lower GID."
 
-      newvalues(:true, :false)
-
       defaultto false
     end
 
-    newparam(:forcelocal, :boolean => true, :required_features => :libuser ) do
+    newparam(:forcelocal, :boolean => true,
+             :required_features => :libuser,
+             :parent => Puppet::Parameter::Boolean) do
       desc "Forces the mangement of local accounts when accounts are also
             being managed by some other NSS"
-      newvalues(:true, :false)
       defaultto false
     end
 
@@ -163,7 +161,7 @@ module Puppet
     #
     # (see Puppet::Settings#service_group_available?)
     #
-    # @returns [Boolean] if the group exists on the system
+    # @return [Boolean] if the group exists on the system
     # @api private
     def exists?
       provider.exists?

data/lib/puppet/type/host.rb

@@ -71,8 +71,7 @@ module Puppet
       isnamevar
 
       validate do |value|
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-        x = value.split('.').each do |hostpart|
+        value.split('.').each do |hostpart|
           unless hostpart =~ /^([\d\w]+|[\d\w][\d\w\-]+[\d\w])$/
             raise Puppet::Error, "Invalid host name"
           end

data/lib/puppet/type/mcx.rb

@@ -73,7 +73,6 @@ MCX settings refer to, the MCX resource will autorequire that user, group, or co
 
   def setup_autorequire(type)
     # value returns a Symbol
-    name = value(:name)
     ds_type = value(:ds_type)
     ds_name = value(:ds_name)
     if ds_type == type

data/lib/puppet/type/mount.rb

@@ -118,6 +118,10 @@ module Puppet
         device is supporting by the mount, including network
         devices or devices specified by UUID rather than device
         path, depending on the operating system."
+
+      validate do |value|
+        raise Puppet::Error, "device must not contain whitespace: #{value}" if value =~ /\s/
+      end
     end
 
     # Solaris specifies two devices, not just one.
@@ -128,10 +132,11 @@ module Puppet
 
       # Default to the device but with "dsk" replaced with "rdsk".
       defaultto do
-        if Facter["osfamily"].value == "Solaris"
-          device = @resource.value(:device)
-          if device =~ %r{/dsk/}
+        if Facter.value(:osfamily) == "Solaris"
+          if device = resource[:device] and device =~ %r{/dsk/}
             device.sub(%r{/dsk/}, "/rdsk/")
+          elsif fstype = resource[:fstype] and fstype == 'nfs'
+            '-'
           else
             nil
           end
@@ -139,36 +144,56 @@ module Puppet
           nil
         end
       end
+
+      validate do |value|
+        raise Puppet::Error, "blockdevice must not contain whitespace: #{value}" if value =~ /\s/
+      end
     end
 
     newproperty(:fstype) do
       desc "The mount type.  Valid values depend on the
         operating system.  This is a required option."
+
+      validate do |value|
+        raise Puppet::Error, "fstype must not contain whitespace: #{value}" if value =~ /\s/
+      end
     end
 
     newproperty(:options) do
       desc "Mount options for the mounts, as they would
         appear in the fstab."
+
+      validate do |value|
+        raise Puppet::Error, "option must not contain whitespace: #{value}" if value =~ /\s/
+      end
     end
 
     newproperty(:pass) do
       desc "The pass in which the mount is checked."
 
       defaultto {
-        0 if @resource.managed?
+        if @resource.managed?
+          if Facter.value(:osfamily) == 'Solaris'
+            '-'
+          else
+            0
+          end
+        end
       }
     end
 
     newproperty(:atboot) do
       desc "Whether to mount the mount at boot.  Not all platforms
         support this."
+
+      newvalues :yes, :no
     end
 
     newproperty(:dump) do
       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"
+      if Facter.value(:operatingsystem) == "FreeBSD"
         newvalue(%r{(0|1|2)})
       else
         newvalue(%r{(0|1)})
@@ -197,6 +222,14 @@ module Puppet
       desc "The mount path for the mount."
 
       isnamevar
+
+      validate do |value|
+        raise Puppet::Error, "name must not contain whitespace: #{value}" if value =~ /\s/
+      end
+
+      munge do |value|
+        value.gsub(/^(.+?)\/*$/, '\1')
+      end
     end
 
     newparam(:remounts) do
@@ -222,7 +255,6 @@ module Puppet
 
     def value(name)
       name = name.intern
-      ret = nil
       if property = @parameters[name]
         return property.value
       end

data/lib/puppet/type/package.rb

@@ -294,8 +294,8 @@ module Puppet
     end
 
     newparam(:flavor) do
-      desc "Newer versions of OpenBSD support 'flavors', which are
-        further specifications for which type of package you want."
+      desc "OpenBSD supports 'flavors', which are further specifications for
+        which type of package you want."
     end
 
     newparam(:install_options, :parent => Puppet::Parameter::PackageOptions, :required_features => :install_options) do