puppet 3.0.2 → 3.1.0.rc1

data/lib/puppet/provider/augeas/augeas.rb

@@ -38,6 +38,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
     "setm" => [ :path, :string, :string ],
     "rm" => [ :path ],
     "clear" => [ :path ],
+    "clearm" => [ :path, :string ],
     "mv" => [ :path, :path ],
     "insert" => [ :string, :string, :path ],
     "get" => [ :path, :comparator, :string ],
@@ -431,9 +432,13 @@ Puppet::Type.type(:augeas).provide(:augeas) do
             rv = aug.set(cmd_array[0], cmd_array[1])
             fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (!rv)
           when "setm"
-            debug("sending command '#{command}' with params #{cmd_array.inspect}")
-            rv = aug.setm(cmd_array[0], cmd_array[1], cmd_array[2])
-            fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (rv == -1)
+            if aug.respond_to?(command)
+              debug("sending command '#{command}' with params #{cmd_array.inspect}")
+              rv = aug.setm(cmd_array[0], cmd_array[1], cmd_array[2])
+              fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (rv == -1)
+            else
+              fail("command '#{command}' not supported in installed version of ruby-augeas")
+            end
           when "rm", "remove"
             debug("sending command '#{command}' with params #{cmd_array.inspect}")
             rv = aug.rm(cmd_array[0])
@@ -442,6 +447,15 @@ Puppet::Type.type(:augeas).provide(:augeas) do
             debug("sending command '#{command}' with params #{cmd_array.inspect}")
             rv = aug.clear(cmd_array[0])
             fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (!rv)
+          when "clearm"
+            # Check command exists ... doesn't currently in ruby-augeas 0.4.1
+            if aug.respond_to?(command)
+              debug("sending command '#{command}' with params #{cmd_array.inspect}")
+              rv = aug.clearm(cmd_array[0], cmd_array[1])
+              fail("Error sending command '#{command}' with params #{cmd_array.inspect}") if (!rv)
+            else
+              fail("command '#{command}' not supported in installed version of ruby-augeas")
+            end
           when "insert", "ins"
             label = cmd_array[0]
             where = cmd_array[1]

data/lib/puppet/provider/confiner.rb

@@ -1,15 +1,44 @@
 require 'puppet/provider/confine_collection'
 
+# The Confiner module contains methods for managing a Provider's confinement (suitability under given
+# conditions). The intent is to include this module in an object where confinement management is wanted.
+# It lazily adds an instance variable `@confine_collection` to the object where it is included.
+#
 module Puppet::Provider::Confiner
+  # Confines a provider to be suitable only under the given conditions.
+  # The hash describes a confine using mapping from symbols to values or predicate code.
+  #
+  # * _fact_name_ => value of fact (or array of facts)
+  # * `:exists` => the path to an existing file
+  # * `:true` => a predicate code block returning true
+  # * `:false` => a predicate code block returning false
+  # * `:feature` => name of system feature that must be present
+  #
+  # @example
+  #   confine :operatingsystem => [:redhat, :fedora]
+  #   confine :true { ... }
+  #
+  # @param hash [Hash<{Symbol => Object}>] hash of confines
+  # @return [void]
+  # @api public
+  #
   def confine(hash)
     confine_collection.confine(hash)
   end
 
+  # @return [Puppet::Provider::ConfineCollection] the collection of confines
+  # @api private
+  #
   def confine_collection
     @confine_collection ||= Puppet::Provider::ConfineCollection.new(self.to_s)
   end
 
-  # Check whether this implementation is suitable for our platform.
+  # Checks whether this implementation is suitable for the current platform (or returns a summary
+  # of all confines if short == false).
+  # @return [Boolean. Hash] Returns whether the confines are all valid (if short == true), or a hash of all confines
+  #   if short == false. 
+  # @api public
+  #
   def suitable?(short = true)
     return(short ? confine_collection.valid? : confine_collection.summary)
   end

data/lib/puppet/provider/group/pw.rb

@@ -1,12 +1,12 @@
 require 'puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService::PW do
-  desc "Group management via `pw` on FreeBSD."
+  desc "Group management via `pw` on FreeBSD and DragonFly BSD."
 
   commands :pw => "pw"
   has_features :manages_members
 
-  defaultfor :operatingsystem => :freebsd
+  defaultfor :operatingsystem => [:freebsd, :dragonfly]
 
   options :members, :flag => "-M", :method => :mem
 

data/lib/puppet/provider/package/pip.rb

@@ -64,7 +64,6 @@ Puppet::Type.type(:package).provide :pip,
   def install
     args = %w{install -q}
     if @resource[:source]
-      args << "-e"
       if String === @resource[:ensure]
         args << "#{@resource[:source]}@#{@resource[:ensure]}#egg=#{
           @resource[:name]}"

data/lib/puppet/provider/package/pkgin.rb

@@ -5,6 +5,8 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
 
   commands :pkgin => "pkgin"
 
+  defaultfor :operatingsystem => :dragonfly
+
   has_feature :installable, :uninstallable
 
   def self.parse_pkgin_line(package, force_status=nil)

data/lib/puppet/provider/service/bsd.rb

@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
 
   EOT
 
-  confine :operatingsystem => [:freebsd, :netbsd, :openbsd]
+  confine :operatingsystem => [:freebsd, :netbsd, :openbsd, :dragonfly]
 
   def rcconf_dir
     '/etc/rc.conf.d'

data/lib/puppet/provider/service/freebsd.rb

@@ -1,9 +1,9 @@
 Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
-  desc "Provider for FreeBSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
+  desc "Provider for FreeBSD and DragonFly BSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
 
-  confine :operatingsystem => [:freebsd]
-  defaultfor :operatingsystem => [:freebsd]
+  confine :operatingsystem => [:freebsd, :dragonfly]
+  defaultfor :operatingsystem => [:freebsd, :dragonfly]
 
   def rcconf()        '/etc/rc.conf' end
   def rcconf_local()  '/etc/rc.conf.local' end
@@ -13,6 +13,10 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     superclass.defpath
   end
 
+  def error(msg)
+    raise Puppet::Error, msg
+  end
+
   # Executing an init script with the 'rcvar' argument returns
   # the service name, rcvar name and whether it's enabled/disabled
   def rcvar
@@ -37,7 +41,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rcvar_name
     name = self.rcvar[1]
     self.error("No rcvar name found in rcvar") if name.nil?
-    name = name.gsub!(/(.*)_enable=(.*)/, '\1')
+    name = name.gsub!(/(.*)(_enable)?=(.*)/, '\1')
     self.error("rcvar name is empty") if name.nil?
     self.debug("rcvar name is #{name}")
     name
@@ -47,7 +51,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rcvar_value
     value = self.rcvar[1]
     self.error("No rcvar value found in rcvar") if value.nil?
-    value = value.gsub!(/(.*)_enable="?(\w+)"?/, '\2')
+    value = value.gsub!(/(.*)(_enable)?="?(\w+)"?/, '\3')
     self.error("rcvar value is empty") if value.nil?
     self.debug("rcvar value is #{value}")
     value
@@ -69,7 +73,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
       if File.exists?(filename)
         s = File.read(filename)
-        if s.gsub!(/(#{rcvar}_enable)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
+        if s.gsub!(/(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
           File.open(filename, File::WRONLY) { |f| f << s }
           self.debug("Replaced in #{filename}")
           success = true

data/lib/puppet/provider/service/init.rb

@@ -5,7 +5,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   def self.defpath
     case Facter.value(:operatingsystem)
-    when "FreeBSD"
+    when "FreeBSD", "DragonFly"
       ["/etc/rc.d", "/usr/local/etc/rc.d"]
     when "HP-UX"
       "/sbin/init.d"

data/lib/puppet/provider/service/service.rb

@@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :service do
   def texecute(type, command, fof = true)
     begin
       # #565: Services generally produce no output, so squelch them.
-      execute(command, :failonfail => fof, :squelch => true)
+      execute(command, :failonfail => fof, :override_locale => false, :squelch => true)
     rescue Puppet::ExecutionFailure => detail
       @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
     end

data/lib/puppet/provider/user/pw.rb

@@ -2,12 +2,12 @@ require 'puppet/provider/nameservice/pw'
 require 'open3'
 
 Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::PW do
-  desc "User management via `pw` on FreeBSD."
+  desc "User management via `pw` on FreeBSD and DragonFly BSD."
 
   commands :pw => "pw"
   has_features :manages_homedir, :allows_duplicates, :manages_passwords, :manages_expiry
 
-  defaultfor :operatingsystem => :freebsd
+  defaultfor :operatingsystem => [:freebsd, :dragonfly]
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos

data/lib/puppet/provider/user/useradd.rb

@@ -34,7 +34,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     cmd = []
     if @resource.managehome?
       cmd << "-m"
-    elsif %w{Fedora RedHat CentOS OEL OVS}.include?(Facter.value(:operatingsystem))
+    elsif Facter.value(:osfamily) == 'RedHat'
       cmd << "-M"
     end
     cmd
@@ -80,7 +80,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     cmd += check_system_users
     cmd << @resource[:name]
   end
-  
+
   def deletecmd
     cmd = [command(:delete)]
     cmd += @resource.managehome? ? ['-r'] : []
@@ -124,4 +124,3 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     :absent
   end
 end
-

data/lib/puppet/reference/configuration.rb

@@ -53,6 +53,12 @@ config.header = <<EOT
 * Multiple values should be specified as comma-separated lists; multiple
   directories should be separated with the system path separator (usually
   a colon).
+* Settings that represent time intervals should be specified in duration format:
+  an integer immediately followed by one of the units 'y' (years of 365 days),
+  'd' (days), 'h' (hours), 'm' (minutes), or 's' (seconds). The unit cannot be
+  combined with other units, and defaults to seconds when omitted. Examples are
+  '3600' which is equivalent to '1h' (one hour), and '1825d' which is equivalent
+  to '5y' (5 years).
 * Settings that take a single file or directory can optionally set the owner,
   group, and mode for their value: `rundir = $vardir/run { owner = puppet,
   group = puppet, mode = 644 }`

data/lib/puppet/reports.rb

@@ -1,6 +1,32 @@
 require 'puppet/util/instance_loader'
 
-# A simple mechanism for loading and returning reports.
+# This class is an implementation of a simple mechanism for loading and returning reports.
+# The intent is that a user registers a report by calling {register_report} and providing a code
+# block that performs setup, and defines a method called `process`. The setup, and the `process` method
+# are called in the context where `self` is an instance of {Puppet::Transaction::Report} which provides the actual
+# data for the report via its methods.
+#
+# @example Minimal scaffolding for a report...
+#   Puppet::Reports::.register_report(:myreport) do
+#     # do setup here
+#     def process
+#       if self.status == 'failed'
+#         msg = "failed puppet run for #{self.host} #{self.status}"
+#         . . . 
+#       else
+#         . . .
+#       end
+#     end 
+#   end
+#
+# Required configuration:
+# --
+# * A .rb file that defines a new report should be placed in the master's directory `lib/puppet/reports`
+# * The `puppet.conf` file must have `report = true` in the `[agent]` section
+# 
+# @see Puppet::Transaction::Report
+# @api public
+#
 class Puppet::Reports
   extend Puppet::Util::ClassGen
   extend Puppet::Util::InstanceLoader
@@ -9,10 +35,22 @@ class Puppet::Reports
   instance_load :report, 'puppet/reports'
 
   class << self
+    # @api private
     attr_reader :hooks
   end
 
-  # Add a new report type.
+  # Adds a new report type.
+  # The block should contain setup, and define a method with the name `process`. The `process` method is
+  # called when the report is executed; the `process` method has access to report data via methods available
+  # in its context where `self` is an instance of {Puppet::Transaction::Report}.
+  # 
+  # For an example, see the overview of this class.
+  #
+  # @param name [Symbol] the name of the report (do not use whitespace in the name).
+  # @param options [Hash] a hash of options
+  # @option options [Boolean] :useyaml whether yaml should be used or not
+  # @todo Uncertain what the options :useyaml really does; "whether yaml should be used or not", used where/how?
+  # 
   def self.register_report(name, options = {}, &block)
     name = name.intern
 
@@ -25,7 +63,8 @@ class Puppet::Reports
     end
   end
 
-  # Collect the docs for all of our reports.
+  # Collects the docs for all reports.
+  # @api private
   def self.reportdocs
     docs = ""
 
@@ -41,7 +80,8 @@ class Puppet::Reports
     docs
   end
 
-  # List each of the reports.
+  # Lists each of the reports.
+  # @api private
   def self.reports
     instance_loader(:report).loadall
     loaded_instances(:report)

data/lib/puppet/reports/tagmail.rb

@@ -35,7 +35,7 @@ Puppet::Reports.register_report(:tagmail) do
 
     If you are using anti-spam controls such as grey-listing on your mail
     server, you should whitelist the sending email address (controlled by
-    `reportform` configuration option) to ensure your email is not discarded as spam.
+    `reportfrom` configuration option) to ensure your email is not discarded as spam.
     "
 
   # Find all matching messages.

data/lib/puppet/resource.rb

@@ -90,6 +90,34 @@ class Puppet::Resource
     end
   end
 
+  def self.canonicalize_type(type)
+    type, _ = get_type_and_title type, ""
+    type
+  end
+
+  def self.get_type_and_title(type, title)
+    type, title = extract_type_and_title(type, title)
+    [munge_type_name(type), title]
+  end
+
+  def self.extract_type_and_title(argtype, argtitle)
+    if    (argtitle || argtype) =~ /^([^\[\]]+)\[(.+)\]$/m then [ $1,                 $2            ]
+    elsif argtitle                                         then [ argtype,            argtitle      ]
+    elsif argtype.is_a?(Puppet::Type)                      then [ argtype.class.name, argtype.title ]
+    elsif argtype.is_a?(Hash)                              then
+      raise ArgumentError, "Puppet::Resource.new does not take a hash as the first argument. "+
+        "Did you mean (#{(argtype[:type] || argtype["type"]).inspect}, #{(argtype[:title] || argtype["title"]).inspect }) ?"
+    else raise ArgumentError, "No title provided and #{argtype.inspect} is not a valid resource reference"
+    end
+  end
+
+  def self.munge_type_name(value)
+    return :main if value == :main
+    return "Class" if value == "" or value.nil? or value.to_s.downcase == "component"
+
+    value.to_s.split("::").collect { |s| s.capitalize }.join("::")
+  end
+
   def yaml_property_munge(x)
     case x
     when Hash
@@ -194,13 +222,12 @@ class Puppet::Resource
       send(attr.to_s + "=", value)
     end
 
-    @type, @title = extract_type_and_title(type, title)
+    @type, @title = self.class.get_type_and_title(type, title)
 
-    @type = munge_type_name(@type)
 
     if self.class?
       @title = :main if @title == ""
-      @title = munge_type_name(@title)
+      @title = self.class.munge_type_name(@title)
     end
 
     if params = attributes[:parameters]
@@ -339,10 +366,14 @@ class Puppet::Resource
     missing_arguments.collect do |param, default|
       external_value = lookup_external_default_for(param, scope)
 
-      if external_value.nil? && default.nil?
-        next
-      elsif external_value.nil?
-        value = default.safeevaluate(scope)
+      if external_value.nil?
+        next if default.nil?
+
+        value = if default.respond_to? :safeevaluate
+                  default.safeevaluate(scope)
+                else
+                  default
+                end
       else
         value = external_value
       end
@@ -421,24 +452,6 @@ class Puppet::Resource
     end
   end
 
-  def extract_type_and_title(argtype, argtitle)
-    if    (argtitle || argtype) =~ /^([^\[\]]+)\[(.+)\]$/m then [ $1,                 $2            ]
-    elsif argtitle                                         then [ argtype,            argtitle      ]
-    elsif argtype.is_a?(Puppet::Type)                      then [ argtype.class.name, argtype.title ]
-    elsif argtype.is_a?(Hash)                              then
-      raise ArgumentError, "Puppet::Resource.new does not take a hash as the first argument. "+
-        "Did you mean (#{(argtype[:type] || argtype["type"]).inspect}, #{(argtype[:title] || argtype["title"]).inspect }) ?"
-    else raise ArgumentError, "No title provided and #{argtype.inspect} is not a valid resource reference"
-    end
-  end
-
-  def munge_type_name(value)
-    return :main if value == :main
-    return "Class" if value == "" or value.nil? or value.to_s.downcase == "component"
-
-    value.to_s.split("::").collect { |s| s.capitalize }.join("::")
-  end
-
   def parse_title
     h = {}
     type = resource_type

data/lib/puppet/resource/type.rb

@@ -27,7 +27,7 @@ class Puppet::Resource::Type
   }
   RESOURCE_EXTERNAL_NAMES_TO_KINDS = RESOURCE_KINDS_TO_EXTERNAL_NAMES.invert
 
-  attr_accessor :file, :line, :doc, :code, :ruby_code, :parent, :resource_type_collection
+  attr_accessor :file, :line, :doc, :code, :parent, :resource_type_collection
   attr_reader :namespace, :arguments, :behaves_like, :module_name
 
   # This should probably be renamed to 'kind' eventually, in accordance with the changes
@@ -135,7 +135,11 @@ class Puppet::Resource::Type
 
     code.safeevaluate(scope) if code
 
-    evaluate_ruby_code(resource, scope) if ruby_code
+    evaluate_ruby_code(scope) unless ruby_code.empty?
+  end
+
+  def ruby_code
+    @ruby_code ||= []
   end
 
   def initialize(type, name, options = {})
@@ -182,6 +186,10 @@ class Puppet::Resource::Type
       self.doc += other.doc
     end
 
+    other.ruby_code.each do |c|
+      self.ruby_code << c
+    end
+
     # This might just be an empty, stub class.
     return unless other.code
 
@@ -260,10 +268,10 @@ class Puppet::Resource::Type
 
   # MQR TODO:
   #
-  # The change(s) introduced by the fix for #4270 are mostly silly & should be 
+  # The change(s) introduced by the fix for #4270 are mostly silly & should be
   # removed, though we didn't realize it at the time.  If it can be established/
   # ensured that nodes never call parent_type and that resource_types are always
-  # (as they should be) members of exactly one resource_type_collection the 
+  # (as they should be) members of exactly one resource_type_collection the
   # following method could / should be replaced with:
   #
   # def parent_type
@@ -361,8 +369,8 @@ class Puppet::Resource::Type
     parent_scope(resource.scope, klass)
   end
 
-  def evaluate_ruby_code(resource, scope)
-    Puppet::DSL::ResourceAPI.new(resource, scope, ruby_code).evaluate
+  def evaluate_ruby_code(scope)
+    ruby_code.each { |c| c.evaluate(scope, scope.known_resource_types) }
   end
 
   # Split an fq name into a namespace and name