puppet 4.1.0 → 5.0.0

data/lib/puppet/util/network_device.rb

@@ -7,7 +7,7 @@ class Puppet::Util::NetworkDevice
     require "puppet/util/network_device/#{device.provider}/device"
     @current = Puppet::Util::NetworkDevice.const_get(device.provider.capitalize).const_get(:Device).new(device.url, device.options)
   rescue => detail
-    raise detail, "Can't load #{device.provider} for #{device.name}: #{detail}", detail.backtrace
+    raise detail, _("Can't load %{provider} for %{device}: %{detail}") % { provider: device.provider, device: device.name, detail: detail }, detail.backtrace
   end
 
   # Should only be used in tests

data/lib/puppet/util/plist.rb

@@ -0,0 +1,153 @@
+require 'cfpropertylist' if Puppet.features.cfpropertylist?
+require 'puppet/util/execution'
+
+module Puppet::Util::Plist
+
+  class FormatError < RuntimeError; end
+
+  # So I don't have to prepend every method name with 'self.' Most of the
+  # methods are going to be Provider methods (as opposed to methods of the
+  # INSTANCE of the provider).
+  class << self
+    # Defines the magic number for binary plists
+    #
+    # @api private
+    def binary_plist_magic_number
+      "bplist00"
+    end
+
+    # Defines a default doctype string that should be at the top of most plist
+    # files. Useful if we need to modify an invalid doctype string in memory.
+    # In version 10.9 and lower of OS X the plist at
+    # /System/Library/LaunchDaemons/org.ntp.ntpd.plist had an invalid doctype
+    # string. This corrects for that.
+    def plist_xml_doctype
+      '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">'
+    end
+
+    # Read a plist file, whether its format is XML or in Apple's "binary1"
+    # format, using the CFPropertyList gem.
+    def read_plist_file(file_path)
+      # We can't really read the file until we know the source encoding in
+      # Ruby 1.9.x, so we use the magic number to detect it.
+      # NOTE: We used IO.read originally to be Ruby 1.8.x compatible.
+      if read_file_with_offset(file_path, binary_plist_magic_number.length) == binary_plist_magic_number
+        plist_obj = new_cfpropertylist(:file => file_path)
+        return convert_cfpropertylist_to_native_types(plist_obj)
+      else
+        plist_data = open_file_with_args(file_path, "r:UTF-8")
+        plist = parse_plist(plist_data, file_path)
+        return plist if plist
+
+        Puppet.debug "Plist #{file_path} ill-formatted, converting with plutil"
+        begin
+          plist = Puppet::Util::Execution.execute(['/usr/bin/plutil', '-convert', 'xml1', '-o', '/dev/stdout', file_path],
+                                                  {:failonfail => true, :combine => true})
+          return parse_plist(plist)
+        rescue Puppet::ExecutionFailure => detail
+          Puppet.warning(_("Cannot read file %{file_path}; Puppet is skipping it.\n") % { file_path: file_path } + _("Details: %{detail}") % { detail: detail })
+        end
+      end
+      return nil
+    end
+
+    # Read plist text using the CFPropertyList gem.
+    def parse_plist(plist_data, file_path = '')
+      bad_xml_doctype = /^.*<!DOCTYPE plist PUBLIC -\/\/Apple Computer.*$/
+      begin
+        if plist_data =~ bad_xml_doctype
+          plist_data.gsub!( bad_xml_doctype, plist_xml_doctype )
+          Puppet.debug("Had to fix plist with incorrect DOCTYPE declaration: #{file_path}")
+        end
+      rescue ArgumentError => e
+        Puppet.debug "Failed with #{e.class} on #{file_path}: #{e.inspect}"
+        return nil
+      end
+
+      begin
+        plist_obj = new_cfpropertylist(:data => plist_data)
+      # CFPropertyList library will raise NoMethodError for invalid data
+      rescue CFFormatError, NoMethodError => e
+        Puppet.debug "Failed with #{e.class} on #{file_path}: #{e.inspect}"
+        return nil
+      end
+      convert_cfpropertylist_to_native_types(plist_obj)
+    end
+
+    # Helper method to assist in reading a file. It's its own method for
+    # stubbing purposes
+    #
+    # @api private
+    #
+    # @param args [String] Extra file operation mode information to use
+    #   (defaults to read-only mode 'r')
+    #   This is the standard mechanism Ruby uses in the IO class, and therefore
+    #   encoding may be explicitly like fmode : encoding or fmode : "BOM|UTF-*"
+    #   for example, a:ASCII or w+:UTF-8
+    def open_file_with_args(file, args)
+      File.open(file, args).read
+    end
+
+    # Helper method to assist in generating a new CFPropertyList Plist. It's
+    # its own method for stubbing purposes
+    #
+    # @api private
+    def new_cfpropertylist(plist_opts)
+      CFPropertyList::List.new(plist_opts)
+    end
+
+    # Helper method to assist in converting a native CFPropertyList object to a
+    # native Ruby object (hash). It's its own method for stubbing purposes
+    #
+    # @api private
+    def convert_cfpropertylist_to_native_types(plist_obj)
+      CFPropertyList.native_types(plist_obj.value)
+    end
+
+    # Helper method to convert a string into a CFProperty::Blob, which is
+    # needed to properly handle binary strings
+    #
+    # @api private
+    def string_to_blob(str)
+      CFPropertyList::Blob.new(str)
+    end
+
+    # Helper method to assist in reading a file with an offset value. It's its
+    # own method for stubbing purposes
+    #
+    # @api private
+    def read_file_with_offset(file_path, offset)
+      IO.read(file_path, offset)
+    end
+
+    def to_format(format)
+      if format.to_sym == :xml
+        plist_format = CFPropertyList::List::FORMAT_XML
+      elsif format.to_sym == :binary
+        plist_format = CFPropertyList::List::FORMAT_BINARY
+      elsif format.to_sym == :plain
+        plist_format = CFPropertyList::List::FORMAT_PLAIN
+      else
+        raise FormatError.new "Unknown plist format #{format}"
+      end
+    end
+
+    # This method will write a plist file using a specified format (or XML
+    # by default)
+    def write_plist_file(plist, file_path, format = :xml)
+      begin
+        plist_to_save       = CFPropertyList::List.new
+        plist_to_save.value = CFPropertyList.guess(plist)
+        plist_to_save.save(file_path, to_format(format), :formatted => true)
+      rescue IOError => e
+        Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
+      end
+    end
+
+    def dump_plist(plist_data, format = :xml)
+      plist_to_save       = CFPropertyList::List.new
+      plist_to_save.value = CFPropertyList.guess(plist_data)
+      plist_to_save.to_str(to_format(format), :formatted => true)
+    end
+  end
+end

data/lib/puppet/util/posix.rb

@@ -21,7 +21,7 @@ module Puppet::Util::POSIX
 
     if id.is_a?(Integer)
       if id > Puppet[:maximum_uid].to_i
-        Puppet.err "Tried to get #{field} field for silly id #{id}"
+        Puppet.err _("Tried to get %{field} field for silly id %{id}") % { field: field, id: id }
         return nil
       end
       method = methodbyid(space)
@@ -46,7 +46,7 @@ module Puppet::Util::POSIX
     if id.is_a?(Integer)
       integer = true
       if id > Puppet[:maximum_uid].to_i
-        Puppet.err "Tried to get #{field} field for silly id #{id}"
+        Puppet.err _("Tried to get %{field} field for silly id %{id}") % { field: field, id: id }
         return nil
       end
     end
@@ -74,7 +74,7 @@ module Puppet::Util::POSIX
     when :gr, :group; return :gid
     when :pw, :user, :passwd; return :uid
     else
-      raise ArgumentError.new("Can only handle users and groups")
+      raise ArgumentError.new(_("Can only handle users and groups"))
     end
   end
 
@@ -84,7 +84,7 @@ module Puppet::Util::POSIX
     when :gr, :group; return :getgrgid
     when :pw, :user, :passwd; return :getpwuid
     else
-      raise ArgumentError.new("Can only handle users and groups")
+      raise ArgumentError.new(_("Can only handle users and groups"))
     end
   end
 
@@ -94,7 +94,7 @@ module Puppet::Util::POSIX
     when :gr, :group; return :getgrnam
     when :pw, :user, :passwd; return :getpwnam
     else
-      raise ArgumentError.new("Can only handle users and groups")
+      raise ArgumentError.new(_("Can only handle users and groups"))
     end
   end
 

data/lib/puppet/util/profiler/aggregate.rb

@@ -42,7 +42,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
   end
 
   def print_metrics(metrics_hash, prefix)
-    metrics_hash.sort_by {|k,v| v.time }.reverse.each do |k,v|
+    metrics_hash.sort_by {|k,v| v.time }.reverse_each do |k,v|
       @logger.call("#{prefix}#{k}: #{v.time} s (#{v.count} calls)")
       print_metrics(metrics_hash[k], "#{prefix}#{k} -> ")
     end

data/lib/puppet/util/profiler/around_profiler.rb

@@ -41,7 +41,7 @@ class Puppet::Util::Profiler::AroundProfiler
   # This outputs logs entries to the Puppet masters logging destination
   # providing the time it took, a message describing the profiled code
   # and a leaf location marking where the profile method was called
-  # in the profiled hierachy.
+  # in the profiled hierarchy.
   #
   # @param message [String] A description of the profiled event
   # @param metric_id [Array] A list of strings making up the ID of a metric to profile

data/lib/puppet/util/profiler/wall_clock.rb

@@ -12,7 +12,7 @@ class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
 
   def do_finish(context, description, metric_id)
     {:time => context.stop,
-     :msg => "took #{context} seconds"}
+     :msg => _("took %{context} seconds") % { context: context }}
   end
 
   class Timer

data/lib/puppet/util/profiler.rb

@@ -41,7 +41,7 @@ module Puppet::Util::Profiler
   # This outputs logs entries to the Puppet masters logging destination
   # providing the time it took, a message describing the profiled code
   # and a leaf location marking where the profile method was called
-  # in the profiled hierachy.
+  # in the profiled hierarchy.
   #
   # @param message [String] A description of the profiled event
   # @param metric_id [Array] A list of strings making up the ID of a metric to profile

data/lib/puppet/util/provider_features.rb

@@ -69,7 +69,7 @@ module Puppet::Util::ProviderFeatures
       @features[obj.name] = obj
     rescue ArgumentError => detail
       error = ArgumentError.new(
-        "Could not create feature #{name}: #{detail}"
+        _("Could not create feature %{name}: %{detail}") % { name: name, detail: detail }
       )
       error.set_backtrace(detail.backtrace)
       raise error

data/lib/puppet/util/psych_support.rb

@@ -1,5 +1,5 @@
 # This module should be included when a class can be serialized to yaml and
-# needs to handle the deserialization from Psych with more control. Psych normall
+# needs to handle the deserialization from Psych with more control. Psych normally
 # pokes values directly into an instance using `instance_variable_set` which completely
 # bypasses encapsulation.
 #
@@ -7,12 +7,8 @@
 # that is given a hash with attribute to value mappings.
 #
 module Puppet::Util::PsychSupport
-  # This method is called from the Psych Yaml deserializer.
-  # The serializer calls this instead of doing the initialization itself using
-  # `instance_variable_set`. The Status class requires this because it serializes its TagSet
-  # as an `Array` in order to optimize the size of the serialized result.
-  # When this array is later deserialized it must be reincarnated as a TagSet. The standard
-  # Psych way of doing this via poking values into instance variables cannot do this.
+  # This method is called from the Psych Yaml deserializer when it encounters a tag
+  # in the form !ruby/object:<class name>.
   #
   def init_with(psych_coder)
     # The PsychCoder has a hashmap of instance variable name (sans the @ symbol) to values
@@ -28,11 +24,7 @@ module Puppet::Util::PsychSupport
   # objects we manage have asymmetrical serialization and deserialization.
   #
   def encode_with(psych_encoder)
-    tag = Psych.dump_tags[self.class]
-    unless tag
-      klass = self.class == Object ? nil : self.class.name
-      tag   = ['!ruby/object', klass].compact.join(':')
-    end
+    tag = Psych.dump_tags[self.class] || "!ruby/object:#{self.class.name}"
     psych_encoder.represent_map(tag, to_data_hash)
   end
 end

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -225,7 +225,7 @@ module Generators
         'style_url'  => style_url('', @options.css),
       }
 
-      File.open(filename, "w") do |f|
+      Puppet::FileSystem.open(filename, nil, "w:UTF-8") do |f|
         template.write_html_on(f, values)
       end
     end
@@ -301,7 +301,7 @@ module Generators
       values["plugins"] = res4 if res4.size>0
       values["nodes"] = res5 if res5.size>0
 
-      File.open(filename, "w") do |f|
+      Puppet::FileSystem.open(filename, nil, "w:UTF-8") do |f|
         template.write_html_on(f, values)
       end
     end
@@ -383,7 +383,7 @@ module Generators
       resources.each do |r|
         res << {
           "name" => CGI.escapeHTML(r.name),
-          "aref" => CGI.escape(path_prefix)+"\#"+CGI.escape(r.aref)
+          "aref" => Puppet::Util.uri_encode(path_prefix)+"\#"+Puppet::Util.uri_query_encode(r.aref)
         }
       end
       res

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -104,7 +104,8 @@ module RDoc::PuppetParserCore
     comment = ""
     %w{README README.rdoc}.each do |rfile|
       readme = File.join(File.dirname(File.dirname(@input_file_name)), rfile)
-      comment = File.open(readme,"r") { |f| f.read } if FileTest.readable?(readme)
+      # module README should be UTF-8, not default system encoding
+      comment = File.open(readme,"r:UTF-8") { |f| f.read } if FileTest.readable?(readme)
     end
     look_for_directives_in(container, comment) unless comment.empty?
 

data/lib/puppet/util/rdoc.rb

@@ -2,7 +2,7 @@ require 'puppet/util'
 module Puppet::Util::RDoc
   module_function
 
-  # launch a rdoc documenation process
+  # launch a rdoc documentation process
   # with the files/dir passed in +files+
   def rdoc(outputdir, files, charset = nil)
 
@@ -26,7 +26,7 @@ module Puppet::Util::RDoc
 
     options << "--force-update"
     options += [ "--charset", charset] if charset
-    # Rdoc root default is Dir.pwd, but the win32-dir gem monkey patchs Dir.pwd
+    # Rdoc root default is Dir.pwd, but the win32-dir gem monkey patches Dir.pwd
     # replacing Ruby's normal / with \.  When RDoc generates relative paths it
     # uses relative_path_from that will generate errors when the slashes don't
     # properly match.  This is a workaround for that issue.
@@ -41,20 +41,20 @@ module Puppet::Util::RDoc
 
   # launch an output to console manifest doc
   def manifestdoc(files)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 
   # Outputs to the console the documentation
   # of a manifest
   def output(file, ast)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 
   def output_astnode_doc(ast)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 
   def output_resource_doc(code)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 end

data/lib/puppet/util/reference.rb

@@ -13,7 +13,8 @@ class Puppet::Util::Reference
   instance_load(:reference, 'puppet/reference')
 
   def self.footer
-    "\n\n----------------\n\n*This page autogenerated on #{Time.now}*\n"
+    #TRANSLATORS message accompanied by date of generation
+    "\n\n----------------\n\n*" + _("This page autogenerated on ") + "#{Time.now}*\n"
   end
 
   def self.modes
@@ -31,15 +32,15 @@ class Puppet::Util::Reference
     depth = 4
     # Use the minimum depth
     sections.each do |name|
-      section = reference(name) or raise "Could not find section #{name}"
+      section = reference(name) or raise _("Could not find section %{name}") % { name: name }
       depth = section.depth if section.depth < depth
     end
   end
 
   def self.pdf(text)
-    puts "creating pdf"
+    puts _("creating pdf")
     rst2latex = which('rst2latex') || which('rst2latex.py') ||
-      raise("Could not find rst2latex")
+      raise(_("Could not find rst2latex"))
 
     cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
     Puppet::Util.replace_file("/tmp/puppetdoc.txt") {|f| f.puts text }
@@ -49,7 +50,7 @@ class Puppet::Util::Reference
     Puppet::FileSystem.unlink('/tmp/puppetdoc.tex') rescue nil
     output = %x{#{cmd}}
     unless $CHILD_STATUS == 0
-      $stderr.puts "rst2latex failed"
+      $stderr.puts _("rst2latex failed")
       $stderr.puts output
       exit(1)
     end
@@ -89,7 +90,7 @@ class Puppet::Util::Reference
     meta_def(:generate, &block)
 
     # Now handle the defaults
-    @title ||= "#{@name.to_s.capitalize} Reference"
+    @title ||= _("%{name} Reference") % { name: @name.to_s.capitalize }
     @page ||= @title.gsub(/\s+/, '')
     @depth ||= 2
     @header ||= ""
@@ -111,7 +112,8 @@ class Puppet::Util::Reference
   def to_markdown(withcontents = true)
     # First the header
     text = markdown_header(@title, 1)
-    text << "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n"
+    #TRANSLATORS message accompanied by date of generation
+    text << _("\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on ") + "#{Time.now.to_s})*\n\n"
 
     text << @header
 

data/lib/puppet/util/resource_template.rb

@@ -40,11 +40,11 @@ class Puppet::Util::ResourceTemplate
 
   def evaluate
     set_resource_variables
-    ERB.new(File.read(@file), 0, "-").result(binding)
+    ERB.new(Puppet::FileSystem.read(@file, :encoding => 'utf-8'), 0, "-").result(binding)
   end
 
   def initialize(file, resource)
-    raise ArgumentError, "Template #{file} does not exist" unless Puppet::FileSystem.exist?(file)
+    raise ArgumentError, _("Template %{file} does not exist") % { file: file } unless Puppet::FileSystem.exist?(file)
     @file = file
     @resource = resource
   end

data/lib/puppet/util/retry_action.rb

@@ -28,10 +28,10 @@ module Puppet::Util::RetryAction
       yield
     rescue *retry_exceptions => e
       if failures >= retries
-        raise RetryException::RetriesExceeded, "#{retries} exceeded", e.backtrace
+        raise RetryException::RetriesExceeded, _("%{retries} exceeded") % { retries: retries }, e.backtrace
       end
 
-      Puppet.info("Caught exception #{e.class}:#{e} retrying")
+      Puppet.info(_("Caught exception %{klass}:%{error} retrying") % { klass: e.class, error: e })
 
       failures += 1
 

data/lib/puppet/util/rubygems.rb

@@ -39,7 +39,7 @@ module Puppet::Util::RubyGems
   # @api private
   class Gems18Source < Source
     def directories
-      # `require 'mygem'` will consider and potentally load
+      # `require 'mygem'` will consider and potentially load
       # prerelease gems, so we need to match that behavior.
       Gem::Specification.latest_specs(true).collect do |spec|
         File.join(spec.full_gem_path, 'lib')

data/lib/puppet/util/run_mode.rb

@@ -44,10 +44,10 @@ module Puppet
       # select the system or the user directory depending on the context of
       # this process.  The most common use is determining filesystem path
       # values for confdir and vardir.  The intended semantics are:
-      # {http://projects.puppetlabs.com/issues/16637 #16637} for Puppet 3.x
+      # {https://projects.puppetlabs.com/issues/16637 #16637} for Puppet 3.x
       #
       # @todo this code duplicates {Puppet::Settings#which\_configuration\_file}
-      #   as described in {http://projects.puppetlabs.com/issues/16637 #16637}
+      #   as described in {https://projects.puppetlabs.com/issues/16637 #16637}
       def which_dir( system, user )
         if Puppet.features.root?
           File.expand_path(system)

data/lib/puppet/util/selinux.rb

@@ -62,16 +62,22 @@ module Puppet::Util::SELinux
     if context.nil? or context == "unlabeled"
       return nil
     end
-    unless context =~ /^([^\s:]+):([^\s:]+):([^\s:]+)(?::([\sa-zA-Z0-9:,._-]+))?$/
-      raise Puppet::Error, "Invalid context to parse: #{context}"
+    components = /^([^\s:]+):([^\s:]+):([^\s:]+)(?::([\sa-zA-Z0-9:,._-]+))?$/.match(context)
+    unless components
+      raise Puppet::Error, _("Invalid context to parse: %{context}") % { context: context }
+    end
+    case component
+    when :seluser
+      components[1]
+    when :selrole
+      components[2]
+    when :seltype
+      components[3]
+    when :selrange
+      components[4]
+    else
+      raise Puppet::Error, _("Invalid SELinux parameter type")
     end
-    ret = {
-      :seluser => $1,
-      :selrole => $2,
-      :seltype => $3,
-      :selrange => $4,
-    }
-    ret[component]
   end
 
   # This updates the actual SELinux label on the file.  You can update
@@ -91,7 +97,7 @@ module Puppet::Util::SELinux
         # We can't set partial context components when no context exists
         # unless/until we can find a way to make Puppet call this method
         # once for all selinux file label attributes.
-        Puppet.warning "Can't set SELinux context on file unless the file already has some kind of context"
+        Puppet.warning _("Can't set SELinux context on file unless the file already has some kind of context")
         return nil
       end
       context = context.split(':')
@@ -105,7 +111,7 @@ module Puppet::Util::SELinux
         when :selrange
           context[3] = value
         else
-          raise ArgumentError, "set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange"
+          raise ArgumentError, _("set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange")
       end
       context = context.join(':')
     else
@@ -116,7 +122,7 @@ module Puppet::Util::SELinux
     if retval == 0
       return true
     else
-      Puppet.warning "Failed to set SELinux context #{context} on #{file}"
+      Puppet.warning _("Failed to set SELinux context %{context} on %{file}") % { context: context, file: file }
       return false
     end
   end
@@ -137,6 +143,42 @@ module Puppet::Util::SELinux
     nil
   end
 
+  ##
+  # selinux_category_to_label is an internal method that converts all
+  # selinux categories to their internal representation, avoiding
+  # potential issues when mcstransd is not functional.
+  #
+  # It is not marked private because it is needed by File's
+  # selcontext.rb, but it is not intended for use outside of Puppet's
+  # code.
+  #
+  # @param category [String] An selinux category, such as "s0" or "SystemLow"
+  #
+  # @return [String] the numeric category name, such as "s0"
+  def selinux_category_to_label(category)
+    # We don't cache this, but there's already a ton of duplicate work
+    # in the selinux handling code.
+
+    path = Selinux.selinux_translations_path
+    begin
+      File.open(path).each do |line|
+        line.strip!
+        next if line.empty?
+        next if line[0] == "#" # skip comments
+        line.gsub!(/[[:space:]]+/m, '')
+        mapping = line.split("=", 2)
+        if category == mapping[1]
+          return mapping[0]
+        end
+      end
+    rescue SystemCallError => ex
+      log_exception(ex)
+      raise Puppet::Error, _("Could not open SELinux category translation file %{path}.") % { context: context }
+    end
+
+    category
+  end
+
   ########################################################################
   # Internal helper methods from here on in, kids.  Don't fiddle.
   private

data/lib/puppet/util/skip_tags.rb

@@ -0,0 +1,9 @@
+require 'puppet/util/tagging'
+
+class Puppet::Util::SkipTags
+  include Puppet::Util::Tagging
+
+  def initialize(stags)
+    self.tags = stags unless defined?(@tags)
+  end
+end

data/lib/puppet/util/splayer.rb

@@ -0,0 +1,18 @@
+# Handle splay options (sleeping for a random interval before executing)
+module Puppet::Util::Splayer
+  # Have we splayed already?
+  def splayed?
+    !!@splayed
+  end
+
+  # Sleep when splay is enabled; else just return.
+  def splay(do_splay = Puppet[:splay])
+    return unless do_splay
+    return if splayed?
+
+    time = rand(Puppet[:splaylimit] + 1)
+    Puppet.info _("Sleeping for %{time} seconds (splay is enabled)") % { time: time }
+    sleep(time)
+    @splayed = true
+  end
+end

data/lib/puppet/util/storage.rb

@@ -50,25 +50,25 @@ class Puppet::Util::Storage
       return
     end
     unless File.file?(filename)
-      Puppet.warning("Checksumfile #{filename} is not a file, ignoring")
+      Puppet.warning(_("Checksumfile %{filename} is not a file, ignoring") % { filename: filename })
       return
     end
     Puppet::Util.benchmark(:debug, "Loaded state") do
       begin
         @@state = Puppet::Util::Yaml.load_file(filename)
       rescue Puppet::Util::Yaml::YamlLoadError => detail
-        Puppet.err "Checksumfile #{filename} is corrupt (#{detail}); replacing"
+        Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
 
         begin
           File.rename(filename, filename + ".bad")
         rescue
-          raise Puppet::Error, "Could not rename corrupt #{filename}; remove manually", detail.backtrace
+          raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
         end
       end
     end
 
     unless @@state.is_a?(Hash)
-      Puppet.err "State got corrupted"
+      Puppet.err _("State got corrupted")
       self.init
     end
   end
@@ -80,7 +80,7 @@ class Puppet::Util::Storage
   def self.store
     Puppet.debug "Storing state"
 
-    Puppet.info "Creating state file #{Puppet[:statefile]}" unless Puppet::FileSystem.exist?(Puppet[:statefile])
+    Puppet.info _("Creating state file %{file}") % { file: Puppet[:statefile] } unless Puppet::FileSystem.exist?(Puppet[:statefile])
 
     Puppet::Util.benchmark(:debug, "Stored state") do
       Puppet::Util::Yaml.dump(@@state, Puppet[:statefile])