bolt 0.17.1 → 0.17.2

data/vendored/puppet/lib/puppet/resource/type.rb

@@ -258,7 +258,7 @@ class Puppet::Resource::Type
     end
 
     if ['Class', 'Node'].include? resource.type
-      scope.catalog.tag(*resource.tags)
+      scope.catalog.merge_tags_from(resource)
     end
   end
 

data/vendored/puppet/lib/puppet/settings.rb

@@ -1296,31 +1296,43 @@ Generated on #{Time.now}.
     # @api public
     def interpolate(name)
       setting = @defaults[name]
+      return nil unless setting
 
-      if setting
-        val = lookup(name)
-        # if we interpolate code, all hell breaks loose.
-        if name == :code
-          val
-        else
-          # Convert it if necessary
-          begin
-            val = convert(val, name)
-          rescue InterpolationError => err
-            # This happens because we don't have access to the param name when the
-            # exception is originally raised, but we want it in the message
-            raise InterpolationError, _("Error converting value for param '%{name}': %{detail}") % { name: name, detail: err }, err.backtrace
-          end
+      lookup_and_convert(name) do |val|
+        setting.munge(val)
+      end
+    end
 
-          setting.munge(val)
-        end
-      else
-        nil
+    def print(name)
+      setting = @defaults[name]
+      return nil unless setting
+
+      lookup_and_convert(name) do |val|
+        setting.print(val)
       end
     end
 
     private
 
+    def lookup_and_convert(name, &block)
+      val = lookup(name)
+      # if we interpolate code, all hell breaks loose.
+      if name == :code
+        val
+      else
+        # Convert it if necessary
+        begin
+          val = convert(val, name)
+        rescue InterpolationError => err
+          # This happens because we don't have access to the param name when the
+          # exception is originally raised, but we want it in the message
+          raise InterpolationError, _("Error converting value for param '%{name}': %{detail}") % { name: name, detail: err }, err.backtrace
+        end
+
+        yield val
+      end
+    end
+
     def convert(value, setting_name)
       case value
       when nil
@@ -1397,7 +1409,7 @@ Generated on #{Time.now}.
         @values[name] = old_value
         raise e
       end
-     end
+    end
 
     def inspect
       %Q{<#{self.class}:#{self.object_id} @name="#{@name}" @values="#{@values}">}

data/vendored/puppet/lib/puppet/settings/base_setting.rb

@@ -157,6 +157,11 @@ class Puppet::Settings::BaseSetting
     value
   end
 
+  # Print the value for the user in a config compatible format
+  def print(value)
+    munge(value)
+  end
+
   def set_meta(meta)
     Puppet.notice("#{name} does not support meta data. Ignoring.")
   end

data/vendored/puppet/lib/puppet/settings/config_file.rb

@@ -131,7 +131,7 @@ private
     value = string.sub(/\{\s*([^}]+)\s*\}/) do
       params = $1
       params.split(/\s*,\s*/).each do |str|
-        if str =~ /^\s*(\w+)\s*=\s*([\w\d]+)\s*$/
+        if str =~ /^\s*(\w+)\s*=\s*([\w]+)\s*$/
           param, value = $1.intern, $2
           result[param] = value
           unless [:owner, :mode, :group].include?(param)

data/vendored/puppet/lib/puppet/settings/ttl_setting.rb

@@ -25,6 +25,11 @@ class Puppet::Settings::TTLSetting < Puppet::Settings::BaseSetting
     self.class.munge(value, @name)
   end
 
+  def print(value)
+    val = munge(value)
+    val == Float::INFINITY ? 'unlimited' : val
+  end
+
   # Convert the value to Numeric, parsing numeric string with units if necessary.
   def self.munge(value, param_name)
     case

data/vendored/puppet/lib/puppet/ssl/certificate_factory.rb

@@ -54,8 +54,6 @@ module Puppet::SSL::CertificateFactory
     return cert
   end
 
-  private
-
   # Add X509v3 extensions to the given certificate.
   #
   # @param cert [OpenSSL::X509::Certificate] The certificate to add the
@@ -114,6 +112,7 @@ module Puppet::SSL::CertificateFactory
       generate_extension(ef, oid, *val)
     end
   end
+  private_class_method :add_extensions_to
 
   # Woot! We're a CA.
   def self.build_ca_extensions
@@ -216,4 +215,5 @@ module Puppet::SSL::CertificateFactory
       OpenSSL::X509::Extension.new(oid, OpenSSL::ASN1::UTF8String.new(val).to_der, crit)
     end
   end
+  private_class_method :generate_extension
 end

data/vendored/puppet/lib/puppet/ssl/certificate_request.rb

@@ -238,8 +238,6 @@ DOC
     end
   end
 
-  private
-
   PRIVATE_EXTENSIONS = [
     'subjectAltName', '2.5.29.17',
   ]

data/vendored/puppet/lib/puppet/transaction/additional_resource_generator.rb

@@ -86,7 +86,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
     # tags such as the type name to support implicit filtering as well as
     # explicit. Note that resource#tags returns a duplicate of the resource's
     # tags.
-    sentinel.tag(*resource.tags)
+    sentinel.merge_tags_from(resource)
     priority = @prioritizer.generate_priority_contained_in(resource, sentinel)
     @relationship_graph.add_vertex(sentinel, priority)
 
@@ -131,7 +131,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
 
   def add_resource(res, parent_resource, priority=nil)
     if @catalog.resource(res.ref).nil?
-      res.tag(*parent_resource.tags)
+      res.merge_tags_from(parent_resource)
       if parent_resource.depthfirst?
         @catalog.add_resource_before(parent_resource, res)
       else

data/vendored/puppet/lib/puppet/transaction/event.rb

@@ -12,7 +12,7 @@ class Puppet::Transaction::Event
   include Puppet::Network::FormatSupport
 
   ATTRIBUTES = [:name, :resource, :property, :previous_value, :desired_value, :historical_value, :status, :message, :file, :line, :source_description, :audited, :invalidate_refreshes, :redacted, :corrective_change]
-  attr_accessor *ATTRIBUTES
+  attr_accessor(*ATTRIBUTES)
   attr_accessor :time
   attr_reader :default_log_level
 

data/vendored/puppet/lib/puppet/transaction/report.rb

@@ -218,7 +218,7 @@ class Puppet::Transaction::Report
     @external_times ||= {}
     @host = Puppet[:node_name_value]
     @time = Time.now
-    @report_format = 8
+    @report_format = 9
     @puppet_version = Puppet.version
     @configuration_version = configuration_version
     @transaction_uuid = transaction_uuid

data/vendored/puppet/lib/puppet/type.rb

@@ -391,7 +391,7 @@ class Type
     @key_attributes_cache ||= key_attribute_parameters.collect { |p| p.name }
   end
 
-  # Returns a mapping from the title string to setting of attribute value(s).
+  # Returns a mapping from the title string to setting of attribute values.
   # This default implementation provides a mapping of title to the one and only _namevar_ present
   # in the type's definition.
   # @note Advanced: some logic requires this mapping to be done differently, using a different
@@ -1474,7 +1474,7 @@ class Type
       @subclasses << sub
     end
 
-    # @return [Array<Puppet::Resource>] turns attribute value(s) into list of resources
+    # @return [Array<Puppet::Resource>] turns attribute values into list of resources
     def munge(references)
       references = [references] unless references.is_a?(Array)
       references.collect do |ref|
@@ -1582,7 +1582,7 @@ class Type
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
-      * The required resource(s) will be applied **before** this resource.
+      * The required resources will be applied **before** this resource.
 
       This is one of the four relationship metaparameters, along with
       `before`, `notify`, and `subscribe`. For more context, including the
@@ -1596,7 +1596,7 @@ class Type
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
-      * The subscribed resource(s) will be applied _before_ this resource.
+      * The subscribed resources will be applied _before_ this resource.
       * If Puppet makes changes to any of the subscribed resources, it will cause
         this resource to _refresh._ (Refresh behavior varies by resource
         type: services will restart, mounts will unmount and re-mount, etc. Not
@@ -1614,7 +1614,7 @@ class Type
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
-      * This resource will be applied _before_ the dependent resource(s).
+      * This resource will be applied _before_ the dependent resources.
 
       This is one of the four relationship metaparameters, along with
       `require`, `notify`, and `subscribe`. For more context, including the
@@ -1628,7 +1628,7 @@ class Type
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
-      * This resource will be applied _before_ the notified resource(s).
+      * This resource will be applied _before_ the notified resources.
       * If Puppet makes changes to this resource, it will cause all of the
         notified resources to _refresh._ (Refresh behavior varies by resource
         type: services will restart, mounts will unmount and re-mount, etc. Not
@@ -1700,7 +1700,7 @@ The value of this parameter must be a reference to a capability resource,
 or an array of such references. Each capability resource referenced here
 must have been exported by another resource in the same environment.
 
-The referenced capability resource(s) will be looked up, added to the
+The referenced capability resources will be looked up, added to the
 current node catalog, and processed following the underlying consumes
 clause.
 
@@ -2232,8 +2232,6 @@ end
 
   # class methods dealing with Type management
 
-  public
-
   # The Type class attribute accessors
   class << self
     # @return [String] the name of the resource type; e.g., "File"
@@ -2343,8 +2341,6 @@ end
   # instance methods related to instance intrinsics
   # e.g., initialize and name
 
-  public
-
   # @return [Hash] hash of parameters originally defined
   # @api private
   attr_reader :original_parameters
@@ -2388,7 +2384,7 @@ end
       end
     end
 
-    @tags = resource.tags
+    merge_tags_from(resource)
 
     @original_parameters = resource.to_hash
 
@@ -2632,7 +2628,7 @@ end
   #
   def to_resource
     resource = self.retrieve_resource
-    resource.tag(*self.tags)
+    resource.merge_tags_from(self)
 
     @parameters.each do |name, param|
       # Avoid adding each instance name twice

data/vendored/puppet/lib/puppet/type/augeas.rb

@@ -150,13 +150,13 @@ Puppet::Type.newtype(:augeas) do
   end
 
   newparam(:lens) do
-    desc "Use a specific lens, e.g. `Hosts.lns`. When this parameter is set, you
+    desc "Use a specific lens, such as `Hosts.lns`. When this parameter is set, you
       must also set the `incl` parameter to indicate which file to load.
       The Augeas documentation includes [a list of available lenses](http://augeas.net/stock_lenses.html)."
   end
 
   newparam(:incl) do
-    desc "Load only a specific file, e.g. `/etc/hosts`. This can greatly speed
+    desc "Load only a specific file, such as `/etc/hosts`. This can greatly speed
       up the execution the resource. When this parameter is set, you must also
       set the `lens` parameter to indicate which lens to use."
   end

data/vendored/puppet/lib/puppet/type/cron.rb

@@ -278,9 +278,11 @@ Puppet::Type.newtype(:cron) do
       %w{sunday monday tuesday wednesday thursday friday saturday}
     end
     self.boundaries = [0, 7]
-    desc "The weekday on which to run the command.
-      Optional; if specified, must be between 0 and 7, inclusive, with
-      0 (or 7) being Sunday, or must be the name of the day (e.g., Tuesday)."
+    desc "The weekday on which to run the command. Optional; if specified,
+      must be either:
+
+      -   A number between 0 and 7, inclusive, with 0 or 7 being Sunday
+      -   The name of the day, such as 'Tuesday'."
   end
 
   newproperty(:month, :parent => CronParam) do
@@ -293,8 +295,11 @@ Puppet::Type.newtype(:cron) do
         august september october november december}
     end
     self.boundaries = [1, 12]
-    desc "The month of the year.  Optional; if specified
-      must be between 1 and 12 or the month name (e.g., December)."
+    desc "The month of the year. Optional; if specified,
+      must be either:
+
+      -   A number between 1 and 12, inclusive, with 1 being January
+      -   The name of the month, such as 'December'."
   end
 
   newproperty(:monthday, :parent => CronParam) do
@@ -317,7 +322,7 @@ Puppet::Type.newtype(:cron) do
       but will not associate them with a specific job.
 
       Settings should be specified exactly as they should appear in
-      the crontab, e.g., `PATH=/bin:/usr/bin:/usr/sbin`."
+      the crontab, like `PATH=/bin:/usr/bin:/usr/sbin`."
 
     validate do |value|
       unless value =~ /^\s*(\w+)\s*=\s*(.*)\s*$/ or value == :absent or value == "absent"

data/vendored/puppet/lib/puppet/type/exec.rb

@@ -257,7 +257,7 @@ module Puppet
 
     newparam(:environment) do
       desc "An array of any additional environment variables you want to set for a
-        command. e.g.: `[ 'HOME=/root', 'MAIL=root@example.com']`
+        command, such as `[ 'HOME=/root', 'MAIL=root@example.com']`.
         Note that if you use this to set PATH, it will override the `path`
         attribute. Multiple environment variables should be specified as an
         array."

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

@@ -74,7 +74,7 @@ Puppet::Type.newtype(:file) do
       (`File { backup => main }`), so it can affect all file resources.
 
       * If set to `false`, file content won't be backed up.
-      * If set to a string beginning with `.` (e.g., `.puppet-bak`), Puppet will
+      * If set to a string beginning with `.`, such as `.puppet-bak`, Puppet will
         use copy the file in the same directory with that value as the extension
         of the backup. (A value of `true` is a synonym for `.puppet-bak`.)
       * If set to any other string, Puppet will try to back up to a filebucket
@@ -187,8 +187,7 @@ Puppet::Type.newtype(:file) do
       Setting `recurselimit => 2` will manage the direct contents of the
       directory, as well as the contents of the _first_ level of subdirectories.
 
-      And so on --- 3 will manage the contents of the second level of
-      subdirectories, etc."
+      This pattern continues for each incremental value of `recurselimit`."
 
     newvalues(/^[0-9]+$/)
 
@@ -225,9 +224,9 @@ Puppet::Type.newtype(:file) do
   newparam(:ignore) do
     desc "A parameter which omits action on files matching
       specified patterns during recursion.  Uses Ruby's builtin globbing
-      engine, so shell metacharacters are fully supported, e.g. `[a-z]*`.
+      engine, so shell metacharacters such as `[a-z]*` are fully supported.
       Matches that would descend into the directory structure are ignored,
-      e.g., `*/*`."
+      such as `*/*`."
 
     validate do |value|
       unless value.is_a?(Array) or value.is_a?(String) or value == false

data/vendored/puppet/lib/puppet/type/host.rb

@@ -80,7 +80,7 @@ module Puppet
 
       validate do |value|
         value.split('.').each do |hostpart|
-          unless hostpart =~ /^([\d\w]+|[\d\w][\d\w\-]+[\d\w])$/
+          unless hostpart =~ /^([\w]+|[\w][\w\-]+[\w])$/
             raise Puppet::Error, _("Invalid host name")
           end
         end

data/vendored/puppet/lib/puppet/type/k5login.rb

@@ -1,6 +1,7 @@
 # Plug-in type for handling k5login files
 require 'puppet/util'
 require 'puppet/util/selinux'
+require 'puppet/type/file/selcontext'
 
 Puppet::Type.newtype(:k5login) do
   @doc = "Manage the `.k5login` file for a user.  Specify the full path to
@@ -33,7 +34,7 @@ Puppet::Type.newtype(:k5login) do
   end
 
   # To manage the selinux user of the file
-  newproperty(:seluser) do
+  newproperty(:seluser, :parent => Puppet::SELFileContext) do
     desc "What the SELinux user component of the context of the file should be.
       Any valid SELinux user component is accepted.  For example `user_u`.
       If not specified it defaults to the value returned by matchpathcon for
@@ -44,7 +45,7 @@ Puppet::Type.newtype(:k5login) do
   end
 
   # To manage the selinux role of the file
-  newproperty(:selrole) do
+  newproperty(:selrole, :parent => Puppet::SELFileContext) do
     desc "What the SELinux role component of the context of the file should be.
       Any valid SELinux role component is accepted.  For example `role_r`.
       If not specified it defaults to the value returned by matchpathcon for
@@ -55,7 +56,7 @@ Puppet::Type.newtype(:k5login) do
   end
 
   # To manage the selinux type of the file
-  newproperty(:seltype) do
+  newproperty(:seltype, :parent => Puppet::SELFileContext) do
     desc "What the SELinux type component of the context of the file should be.
       Any valid SELinux type component is accepted.  For example `tmp_t`.
       If not specified it defaults to the value returned by matchpathcon for
@@ -67,7 +68,7 @@ Puppet::Type.newtype(:k5login) do
   end
 
   # To manage the selinux range of the file
-  newproperty(:selrange) do
+  newproperty(:selrange, :parent => Puppet::SELFileContext) do
     desc "What the SELinux range component of the context of the file should be.
       Any valid SELinux range component is accepted.  For example `s0` or
       `SystemHigh`.  If not specified it defaults to the value returned by
@@ -78,6 +79,31 @@ Puppet::Type.newtype(:k5login) do
     defaultto { "s0" }
   end
 
+  # Stat our file.
+  #
+  # We use the initial value :needs_stat to ensure we only stat the file once,
+  # but can also keep track of a failed stat (@stat == nil). This also allows
+  # us to re-stat on demand by setting @stat = :needs_stat.
+  def stat
+    return @stat unless @stat == :needs_stat
+
+    @stat = begin
+      Puppet::FileSystem.stat(self[:path])
+    rescue Errno::ENOENT
+      nil
+    rescue Errno::ENOTDIR
+      nil
+    rescue Errno::EACCES
+      warning _("Could not stat; permission denied")
+      nil
+    end
+  end
+
+  def initialize(args)
+    @stat = :needs_stat
+    super
+  end
+
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 
   provide(:k5login) do
@@ -129,56 +155,6 @@ Puppet::Type.newtype(:k5login) do
       File.chmod(Integer("0#{value}"), @resource[:name])
     end
 
-    # Set the file seluser
-    def seluser
-      if selinux_support?
-        context = get_selinux_current_context(@resource[:name])
-        return parse_selinux_context(:seluser, context)
-      end
-    end
-
-    def seluser=(value)
-      set_selinux_context(@resource[:name], value, :seluser)
-    end
-
-    # Set the file selrole
-    def selrole
-      if selinux_support?
-        context = get_selinux_current_context(@resource[:name])
-        return parse_selinux_context(:selrole, context)
-      end
-    end
-
-    # Set the file seltype
-    def selrole=(value)
-      set_selinux_context(@resource[:name], value, :selrole)
-    end
-
-    # Set the file seltype
-    def seltype
-      if selinux_support?
-        context = get_selinux_current_context(@resource[:name])
-        return parse_selinux_context(:seltype, context)
-      end
-    end
-
-    # Set the file selrange
-    def seltype=(value)
-      set_selinux_context(@resource[:name], value, :seltype)
-    end
-
-    # Set the file selrange
-    def selrange
-      if selinux_support?
-        context = get_selinux_current_context(@resource[:name])
-        return parse_selinux_context(:selrange, context)
-      end
-    end
-
-    def selrange=(value)
-      set_selinux_context(@resource[:name], value, :selrange)
-    end
-
     private
     def write(value)
       Puppet::Util.replace_file(@resource[:name], 0644) do |f|