puppet 3.2.4 → 3.3.0.rc2

data/lib/puppet/type/resources.rb

@@ -1,4 +1,5 @@
 require 'puppet'
+require 'puppet/parameter/boolean'
 
 Puppet::Type.newtype(:resources) do
   @doc = "This is a metatype that can manage other resource types.  Any
@@ -17,15 +18,15 @@ Puppet::Type.newtype(:resources) do
     munge { |v| v.to_s }
   end
 
-  newparam(:purge, :boolean => true) do
+  newparam(:purge, :boolean => true, :parent => Puppet::Parameter::Boolean) 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)
+    defaultto :false
 
     validate do |value|
-      if [:true, true, "true"].include?(value)
+      if munge(value)
         unless @resource.resource_type.respond_to?(:instances)
           raise ArgumentError, "Purging resources of type #{@resource[:name]} is not supported, since they cannot be queried from the system"
         end
@@ -76,7 +77,7 @@ Puppet::Type.newtype(:resources) do
 
   def able_to_ensure_absent?(resource)
       resource[:ensure] = :absent
-  rescue ArgumentError, Puppet::Error => detail
+  rescue ArgumentError, Puppet::Error
       err "The 'ensure' attribute on #{self[:name]} resources does not accept 'absent' as a value"
       false
   end

data/lib/puppet/type/schedule.rb

@@ -130,7 +130,7 @@ module Puppet
       def match?(previous, now)
         # The lowest-level array is of the hour, minute, second triad
         # then it's an array of two of those, to present the limits
-        # then it's array of those ranges
+        # then it's an array of those ranges
         @value = [@value] unless @value[0][0].is_a?(Array)
 
         @value.each do |value|
@@ -304,9 +304,6 @@ module Puppet
           # than the unit of time, we match.  We divide the scale
           # by the repeat, so that we'll repeat that often within
           # the scale.
-          diff = (now.to_i - previous.to_i)
-          comparison = (scale / @resource[:repeat])
-
           return (now.to_i - previous.to_i) >= (scale / @resource[:repeat])
         end
       end

data/lib/puppet/type/selmodule.rb

@@ -1,5 +1,5 @@
 #
-# Simple module for manageing SELinux policy modules
+# Simple module for managing SELinux policy modules
 #
 
 Puppet::Type.newtype(:selmodule) do

data/lib/puppet/type/service.rb

@@ -142,9 +142,7 @@ module Puppet
 
       munge do |value|
         value = [value] unless value.is_a?(Array)
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-        # It affects stand-alone blocks, too.
-        paths = value.flatten.collect { |p| x = p.split(File::PATH_SEPARATOR) }.flatten
+        value.flatten.collect { |p| p.split(File::PATH_SEPARATOR) }.flatten
       end
 
       defaultto { provider.class.defpath if provider.class.respond_to?(:defpath) }

data/lib/puppet/type/tidy.rb

@@ -1,3 +1,5 @@
+require 'puppet/parameter/boolean'
+
 Puppet::Type.newtype(:tidy) do
   require 'puppet/file_serving/fileset'
   require 'puppet/file_bucket/dipper'
@@ -185,13 +187,11 @@ Puppet::Type.newtype(:tidy) do
     defaultto :atime
   end
 
-  newparam(:rmdirs, :boolean => true) do
+  newparam(:rmdirs, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Tidy directories in addition to files; that is, remove
       directories whose age is older than the specified criteria.
       This will only remove empty directories, so all contained
       files must also be tidied before a directory gets removed."
-
-    newvalues :true, :false
   end
 
   # Erase PFile's validate method

data/lib/puppet/type/user.rb

@@ -1,5 +1,6 @@
 require 'etc'
 require 'facter'
+require 'puppet/parameter/boolean'
 require 'puppet/property/list'
 require 'puppet/property/ordered_list'
 require 'puppet/property/keyvalue'
@@ -283,35 +284,29 @@ module Puppet
       defaultto :minimum
     end
 
-    newparam(:system, :boolean => true) do
+    newparam(:system, :boolean => true, :parent => Puppet::Parameter::Boolean) do
       desc "Whether the user is a system user, according to the OS's criteria;
       on most platforms, a UID less than or equal to 500 indicates a system
       user. Defaults to `false`."
 
-      newvalues(:true, :false)
-
       defaultto false
     end
 
-    newparam(:allowdupe, :boolean => true) do
+    newparam(:allowdupe, :boolean => true, :parent => Puppet::Parameter::Boolean) do
       desc "Whether to allow duplicate UIDs. Defaults to `false`."
 
-      newvalues(:true, :false)
-
       defaultto false
     end
 
-    newparam(:managehome, :boolean => true) do
+    newparam(:managehome, :boolean => true, :parent => Puppet::Parameter::Boolean) do
       desc "Whether to manage the home directory when managing the user.
         This will create the home directory when `ensure => present`, and
         delete the home directory when `ensure => absent`. Defaults to `false`."
 
-      newvalues(:true, :false)
-
       defaultto false
 
       validate do |val|
-        if val.to_s == "true"
+        if munge(val)
           raise ArgumentError, "User provider #{provider.class.name} can not manage home directories" if provider and not provider.class.manages_homedir?
         end
       end
@@ -370,7 +365,7 @@ module Puppet
     #
     # (see Puppet::Settings#service_user_available?)
     #
-    # @returns [Boolean] if the user exists on the system
+    # @return [Boolean] if the user exists on the system
     # @api private
     def exists?
       provider.exists?
@@ -559,10 +554,11 @@ module Puppet
       end
     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
   end

data/lib/puppet/type/yumrepo.rb

@@ -1,5 +1,3 @@
-# Description of yum repositories
-
 require 'puppet/util/inifile'
 
 module Puppet
@@ -232,7 +230,7 @@ module Puppet
       desc "Whether this repository is enabled, as represented by a
         `0` or `1`. #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
-      newvalue(%r{(0|1)}) { }
+      newvalue(/^(0|1)$/) { }
     end
 
     newproperty(:gpgcheck, :parent => Puppet::IniProperty) do
@@ -240,7 +238,7 @@ module Puppet
         from this repository, as represented by a `0` or `1`.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
-      newvalue(%r{(0|1)}) { }
+      newvalue(/^(0|1)$/) { }
     end
 
     newproperty(:gpgkey, :parent => Puppet::IniProperty) do
@@ -280,7 +278,7 @@ module Puppet
       desc "Whether yum will allow the use of package groups for this
         repository, as represented by a `0` or `1`. #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
-      newvalue(%r{(0|1)}) { }
+      newvalue(/^(0|1)$/) { }
     end
 
     newproperty(:failovermethod, :parent => Puppet::IniProperty) do
@@ -294,7 +292,7 @@ module Puppet
       desc "Whether HTTP/1.1 keepalive should be used with this repository, as
         represented by a `0` or `1`. #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
-      newvalue(%r{(0|1)}) { }
+      newvalue(/^(0|1)$/) { }
     end
 
      newproperty(:http_caching, :parent => Puppet::IniProperty) do
@@ -322,7 +320,7 @@ module Puppet
         that the `protectbase` plugin is installed and enabled.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
-      newvalue(%r{(0|1)}) { }
+      newvalue(/^(0|1)$/) { }
     end
 
     newproperty(:priority, :parent => Puppet::IniProperty) do
@@ -358,6 +356,12 @@ module Puppet
       newvalue(/.*/) { }
     end
 
+    newproperty(:s3_enabled, :parent => Puppet::IniProperty) do
+      desc "Access the repo via S3. #{ABSENT_DOC}"
+      newvalue(:absent) { self.should = :absent }
+      newvalue(/^(0|1)$/) { }
+    end
+
     newproperty(:sslcacert, :parent => Puppet::IniProperty) do
       desc "Path to the directory containing the databases of the
         certificate authorities yum should use to verify SSL certificates.\n#{ABSENT_DOC}"

data/lib/puppet/util.rb

@@ -11,6 +11,8 @@ require 'tempfile'
 require 'pathname'
 require 'ostruct'
 require 'puppet/util/platform'
+require 'puppet/util/symbolic_file_mode'
+require 'securerandom'
 
 module Puppet
 module Util
@@ -22,6 +24,8 @@ module Util
   require 'puppet/util/posix'
   extend Puppet::Util::POSIX
 
+  extend Puppet::Util::SymbolicFileMode
+
   @@sync_objects = {}.extend MonitorMixin
 
 
@@ -174,7 +178,6 @@ module Util
 
     # Only benchmark if our log level is high enough
     if level != :none and Puppet::Util::Log.sendlevel?(level)
-      result = nil
       seconds = Benchmark.realtime {
         yield
       }
@@ -396,15 +399,19 @@ module Util
   #
   # The default_mode is the mode to use when the target file doesn't already
   # exist; if the file is present we copy the existing mode/owner/group values
-  # across.
+  # across. The default_mode can be expressed as an octal integer, a numeric string (ie '0664')
+  # or a symbolic file mode.
   def replace_file(file, default_mode, &block)
     raise Puppet::DevError, "replace_file requires a block" unless block_given?
 
+    unless valid_symbolic_mode?(default_mode)
+      raise Puppet::DevError, "replace_file default_mode: #{default_mode} is invalid"
+    end
+    mode = symbolic_mode_to_int(normalize_symbolic_mode(default_mode))
+
     file     = Pathname(file)
     tempfile = Tempfile.new(file.basename.to_s, file.dirname.to_s)
 
-    file_exists = file.exist?
-
     # Set properties of the temporary file before we write the content, because
     # Tempfile doesn't promise to be safe from reading by other people, just
     # that it avoids races around creating the file.
@@ -415,7 +422,7 @@ module Util
     # secure" tempfile permissions instead.  Magic happens later.
     unless Puppet.features.microsoft_windows?
       # Grab the current file mode, and fall back to the defaults.
-      stat = file.lstat rescue OpenStruct.new(:mode => default_mode,
+      stat = file.lstat rescue OpenStruct.new(:mode => mode,
                                               :uid  => Process.euid,
                                               :gid  => Process.egid)
 
@@ -456,7 +463,7 @@ module Util
         # Yes, the arguments are reversed compared to the rename in the rest
         # of the world.
         Puppet::Util::Windows::File.replace_file(file, tempfile.path)
-      rescue Puppet::Util::Windows::Error => e
+      rescue Puppet::Util::Windows::Error
         # This might race, but there are enough possible cases that there
         # isn't a good, solid "better" way to do this, and the next call
         # should fail in the same way anyhow.
@@ -475,7 +482,7 @@ module Util
         end
 
         # Set the permissions to what we want.
-        Puppet::Util::Windows::Security.set_mode(default_mode, file.to_s)
+        Puppet::Util::Windows::Security.set_mode(mode, file.to_s)
 
         # ...and finally retry the operation.
         retry

data/lib/puppet/util/autoload.rb

@@ -85,7 +85,6 @@ class Puppet::Util::Autoload
     # returns nil if no file is found
     def get_file(name, env=nil)
       name = name + '.rb' unless name =~ /\.rb$/
-      dirname, base = File.split(name)
       path = search_directories(env).find { |dir| File.exist?(File.join(dir, name)) }
       path and File.join(path, name)
     end

data/lib/puppet/util/backups.rb

@@ -19,7 +19,7 @@ module Puppet::Util::Backups
 
   def perform_backup_with_bucket(fileobj)
     file = (fileobj.class == String) ? fileobj : fileobj.name
-    case File.stat(file).ftype
+    case File.lstat(file).ftype
     when "directory"
       # we don't need to backup directories when recurse is on
       return true if self[:recurse]
@@ -40,8 +40,6 @@ module Puppet::Util::Backups
     begin
       bfile = file + backup
 
-      # Ruby 1.8.1 requires the 'preserve' addition, but
-      # later versions do not appear to require it.
       # N.B. cp_r works on both files and directories
       FileUtils.cp_r(file, bfile, :preserve => true)
       return true

data/lib/puppet/util/classgen.rb

@@ -36,7 +36,7 @@ module Puppet::Util::ClassGen
 
   # Creates a new module.
   # @param name [String] the name of the generated module
-  # @param optinos [Hash] hash with options
+  # @param options [Hash] hash with options
   # @option options [Array<Class>] :array if specified, the generated class is appended to this array
   # @option options [Hash<{String => Object}>] :attributes a hash that is applied to the generated class
   #   by calling setter methods corresponding to this hash's keys/value pairs. This is done before the given

data/lib/puppet/util/command_line/puppet_option_parser.rb

@@ -11,7 +11,7 @@ module Puppet
       # This is a command line option parser.  It is intended to have an API that is very similar to
       #  the ruby stdlib 'OptionParser' API, for ease of integration into our existing code... however,
       #  However, we've removed the OptionParser-based implementation and are only maintaining the
-      #  it's impilemented based on the third-party "trollop" library.  This was done because there
+      #  it's implemented based on the third-party "trollop" library.  This was done because there
       #  are places where the stdlib OptionParser is not flexible enough to meet our needs.
 
       class PuppetOptionParser
@@ -22,8 +22,6 @@ module Puppet
 
           @parser = Trollop::Parser.new do
             banner usage_msg
-            create_default_short_options = false
-            handle_help_and_version = false
           end
 
         end

data/lib/puppet/util/command_line/trollop.rb

@@ -454,7 +454,7 @@ class Parser
         # chronic is not available
       end
       time ? Date.new(time.year, time.month, time.day) : Date.parse(param)
-    rescue ArgumentError => e
+    rescue ArgumentError
       raise CommandlineError, "option '#{arg}' needs a date"
     end
   end

data/lib/puppet/util/constant_inflector.rb

@@ -11,8 +11,7 @@ module Puppet
   module Util
     module ConstantInflector
       def file2constant(file)
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-        x = file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize }
+        file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize }
       end
       module_function :file2constant
 

data/lib/puppet/util/errors.rb

@@ -22,6 +22,7 @@ module Puppet::Util::Errors
   def adderrorcontext(error, other = nil)
     error.line ||= self.line if error.respond_to?(:line=) and self.respond_to?(:line) and self.line
     error.file ||= self.file if error.respond_to?(:file=) and self.respond_to?(:file) and self.file
+    error.original ||= other if error.respond_to?(:original=)
 
     error.set_backtrace(other.backtrace) if other and other.respond_to?(:backtrace)
 

data/lib/puppet/util/file_watcher.rb

@@ -0,0 +1,28 @@
+class Puppet::Util::FileWatcher
+  include Enumerable
+
+  def each(&blk)
+    @files.keys.each(&blk)
+  end
+
+  def initialize
+    @files = {}
+  end
+
+  def changed?
+    @files.values.any?(&:changed?)
+  end
+
+  def watch(filename)
+    return if watching?(filename)
+    @files[filename] = Puppet::Util::WatchedFile.new(filename)
+  end
+
+  def watching?(filename)
+    @files.has_key?(filename)
+  end
+
+  def clear
+    @files.clear
+  end
+end

data/lib/puppet/util/fileparsing.rb

@@ -161,7 +161,6 @@ module Puppet::Util::FileParsing
       # In this case, we try to match the whole line and then use the
       # match captures to get our fields.
       if match = regex.match(line)
-        fields = []
         ret = {}
         record.fields.zip(match.captures).each do |field, value|
           if value == record.absent
@@ -216,8 +215,7 @@ module Puppet::Util::FileParsing
   # Split text into separate lines using the record separator.
   def lines(text)
     # Remove any trailing separators, and then split based on them
-    # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-    x = text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator)
+    text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator)
   end
 
   # Split a bunch of text into lines and then parse them individually.

data/lib/puppet/util/filetype.rb

@@ -203,7 +203,6 @@ class Puppet::Util::FileType
     # Only add the -u flag when the @path is different.  Fedora apparently
     # does not think I should be allowed to set the @path to my own user name
     def cmdbase
-      cmd = nil
       if @uid == Puppet::Util::SUIDManager.uid || Facter.value(:operatingsystem) == "HP-UX"
         return "crontab"
       else

data/lib/puppet/util/http_proxy.rb

@@ -0,0 +1,38 @@
+module Puppet::Util::HttpProxy
+
+  def self.http_proxy_env
+    # Returns a URI object if proxy is set, or nil
+    proxy_env = ENV["http_proxy"] || ENV["HTTP_PROXY"]
+    begin
+      return URI.parse(proxy_env) if proxy_env
+    rescue URI::InvalidURIError
+      return nil
+    end
+    return nil
+  end
+
+  def self.http_proxy_host
+    env = self.http_proxy_env
+
+    if env and env.host then
+      return env.host
+    end
+
+    if Puppet.settings[:http_proxy_host] == 'none'
+      return nil
+    end
+
+    return Puppet.settings[:http_proxy_host]
+  end
+
+  def self.http_proxy_port
+    env = self.http_proxy_env
+
+    if env and env.port then
+      return env.port
+    end
+
+    return Puppet.settings[:http_proxy_port]
+  end
+
+end