puppet 5.0.0 → 6.0.0

data/lib/puppet/util/log/destinations.rb

@@ -109,7 +109,7 @@ Puppet::Util::Log.newdesttype :file do
   def handle(msg)
     if @json > 0
       @json > 1 ? @file.puts(',') : @json = 2
-      JSON.dump(msg.to_structured_hash, @file)
+      @file.puts(Puppet::Util::Json.dump(msg.to_structured_hash))
     else
       @file.puts("#{msg.time} #{msg.source} (#{msg.level}): #{msg}")
     end
@@ -125,7 +125,6 @@ Puppet::Util::Log.newdesttype :logstash_event do
     # logstash_event format is documented at
     # https://logstash.jira.com/browse/LOGSTASH-675
 
-    data = {}
     data = msg.to_hash
     data['version'] = 1
     data['@timestamp'] = data['time']
@@ -136,7 +135,7 @@ Puppet::Util::Log.newdesttype :logstash_event do
 
   def handle(msg)
     message = format(msg)
-    $stdout.puts message.to_json
+    $stdout.puts Puppet::Util::Json.dump(message)
   end
 end
 
@@ -217,9 +216,10 @@ Puppet::Util::Log.newdesttype :eventlog do
   Puppet::Util::Log::DestEventlog::EVENTLOG_ERROR_TYPE       = 0x0001
   Puppet::Util::Log::DestEventlog::EVENTLOG_WARNING_TYPE     = 0x0002
   Puppet::Util::Log::DestEventlog::EVENTLOG_INFORMATION_TYPE = 0x0004
+  Puppet::Util::Log::DestEventlog::EVENTLOG_CHARACTER_LIMIT  = 31838
 
   def self.suitable?(obj)
-    Puppet.features.microsoft_windows?
+    Puppet::Util::Platform.windows?
   end
 
   def initialize
@@ -233,6 +233,15 @@ Puppet::Util::Log.newdesttype :eventlog do
   def handle(msg)
     native_type, native_id = to_native(msg.level)
 
+    stringified_msg = msg.message.to_s
+    if stringified_msg.length > self.class::EVENTLOG_CHARACTER_LIMIT
+      warning = "...Message exceeds character length limit, truncating."
+      truncated_message_length = self.class::EVENTLOG_CHARACTER_LIMIT - warning.length
+      stringified_truncated_msg = stringified_msg[0..truncated_message_length]
+      stringified_truncated_msg << warning
+      msg.message = stringified_truncated_msg
+    end
+
     @eventlog.report_event(
       :event_type  => native_type,
       :event_id    => native_id,

data/lib/puppet/util/log.rb

@@ -63,7 +63,8 @@ class Puppet::Util::Log
     destinations.keys.each { |dest|
       close(dest)
     }
-    raise Puppet::DevError.new("Log.close_all failed to close #{@destinations.keys.inspect}") if !@destinations.empty?
+    #TRANSLATORS "Log.close_all" is a method name and should not be translated
+    raise Puppet::DevError.new(_("Log.close_all failed to close %{destinations}") % { destinations: @destinations.keys.inspect }) if !@destinations.empty?
   end
 
   # Flush any log destinations that support such operations.
@@ -82,8 +83,8 @@ class Puppet::Util::Log
   # Create a new log message.  The primary role of this method is to
   # avoid creating log messages below the loglevel.
   def Log.create(hash)
-    raise Puppet::DevError, "Logs require a level" unless hash.include?(:level)
-    raise Puppet::DevError, "Invalid log level #{hash[:level]}" unless @levels.index(hash[:level])
+    raise Puppet::DevError, _("Logs require a level") unless hash.include?(:level)
+    raise Puppet::DevError, _("Invalid log level %{level}") % { level: hash[:level] } unless @levels.index(hash[:level])
     @levels.index(hash[:level]) >= @loglevel ? Puppet::Util::Log.new(hash) : nil
   end
 
@@ -105,7 +106,7 @@ class Puppet::Util::Log
   def Log.level=(level)
     level = level.intern unless level.is_a?(Symbol)
 
-    raise Puppet::DevError, "Invalid loglevel #{level}" unless @levels.include?(level)
+    raise Puppet::DevError, _("Invalid loglevel %{level}") % { level: level } unless @levels.include?(level)
 
     @loglevel = @levels.index(level)
 
@@ -124,7 +125,7 @@ class Puppet::Util::Log
       return
     end
 
-    name, type = @desttypes.find do |name, klass|
+    _, type = @desttypes.find do |name, klass|
       klass.match?(dest)
     end
 
@@ -132,7 +133,7 @@ class Puppet::Util::Log
       return
     end
 
-    raise Puppet::DevError, "Unknown destination type #{dest}" unless type
+    raise Puppet::DevError, _("Unknown destination type %{dest}") % { dest: dest} unless type
 
     begin
       if type.instance_method(:initialize).arity == 1
@@ -163,6 +164,17 @@ class Puppet::Util::Log
     end
   end
 
+  def Log.coerce_string(str)
+    return Puppet::Util::CharacterEncoding.convert_to_utf_8(str) if str.valid_encoding?
+
+    # We only select the last 10 callers in the stack to avoid being spammy
+    message = _("Received a Log attribute with invalid encoding:%{log_message}") %
+        { log_message: Puppet::Util::CharacterEncoding.convert_to_utf_8(str.dump)}
+    message += '\n' + _("Backtrace:\n%{backtrace}") % { backtrace: caller[0..10].join("\n") }
+    message
+  end
+  private_class_method :coerce_string
+
   # Route the actual message. FIXME There are lots of things this method
   # should do, like caching and a bit more.  It's worth noting that there's
   # a potential for a loop here, if the machine somehow gets the destination set as
@@ -170,16 +182,8 @@ class Puppet::Util::Log
   def Log.newmessage(msg)
     return if @levels.index(msg.level) < @loglevel
 
-    if msg.message.valid_encoding?
-      message = Puppet::Util::CharacterEncoding.convert_to_utf_8(msg.message)
-    else
-      message = _("Received a log message with invalid encoding:")
-      message << Puppet::Util::CharacterEncoding.convert_to_utf_8(msg.message.dump) << "\n"
-      # We only select the last 10 callers in the stack to avoid being spammy
-      message << _("Backtrace:") << "\n" << caller[0..10].join("\n")
-    end
-
-    msg.message = message
+    msg.message = coerce_string(msg.message)
+    msg.source = coerce_string(msg.source)
 
     queuemessage(msg) if @destinations.length == 0
 
@@ -352,15 +356,18 @@ class Puppet::Util::Log
   end
 
   def message=(msg)
-    raise ArgumentError, "Puppet::Util::Log requires a message" unless msg
+    #TRANSLATORS 'Puppet::Util::Log' refers to a Puppet source code class
+    raise ArgumentError, _("Puppet::Util::Log requires a message") unless msg
     @message = msg.to_s
   end
 
   def level=(level)
-    raise ArgumentError, "Puppet::Util::Log requires a log level" unless level
-    raise ArgumentError, "Puppet::Util::Log requires a symbol or string" unless level.respond_to? "to_sym"
+    #TRANSLATORS 'Puppet::Util::Log' refers to a Puppet source code class
+    raise ArgumentError, _("Puppet::Util::Log requires a log level") unless level
+    #TRANSLATORS 'Puppet::Util::Log' refers to a Puppet source code class
+    raise ArgumentError, _("Puppet::Util::Log requires a symbol or string") unless level.respond_to? "to_sym"
     @level = level.to_sym
-    raise ArgumentError, "Invalid log level #{@level}" unless self.class.validlevel?(@level)
+    raise ArgumentError, _("Invalid log level %{level}") % { level: @level } unless self.class.validlevel?(@level)
 
     # Tag myself with my log level
     tag(level)
@@ -371,7 +378,7 @@ class Puppet::Util::Log
   def source=(source)
     if defined?(Puppet::Type) && source.is_a?(Puppet::Type)
       @source = source.path
-      source.tags.each { |t| tag(t) }
+      merge_tags_from(source)
       self.file = source.file
       self.line = source.line
     else
@@ -389,18 +396,8 @@ class Puppet::Util::Log
     # Issue based messages do not have details in the message. It
     # must be appended here
     unless issue_code.nil?
-      msg = _("Could not parse for environment %{env}: %{msg}") % { env: environment, msg: msg } unless environment.nil?
-      if file && line && pos
-        msg = _("%{msg} at %{file}:%{line}:%{pos}") % { msg: msg, file: file, line: line, pos: pos }
-      elsif file and line
-        msg = _("%{msg}  at %{file}:%{line}") % { msg: msg, file: file, line: line }
-      elsif line && pos
-        msg = _("%{msg}  at line %{line}:%{pos}") % { msg: msg, line: line, pos: pos }
-      elsif line
-        msg = _("%{msg}  at line %{line}") % { msg: msg, line: line }
-      elsif file
-        msg = _("%{msg}  in %{file}") % { msg: msg, file: file }
-      end
+      msg = _("Could not parse for environment %{environment}: %{msg}") % { environment: environment, msg: msg } unless environment.nil?
+      msg += Puppet::Util::Errors.error_location_with_space(file, line, pos)
       msg = _("%{msg} on node %{node}") % { msg: msg, node: node } unless node.nil?
       if @backtrace.is_a?(Array)
         msg += "\n"

data/lib/puppet/util/logging.rb

@@ -1,7 +1,6 @@
 # A module to make logging a bit easier.
 require 'puppet/util/log'
 require 'puppet/error'
-require 'puppet/util/multi_match.rb'
 
 require 'facter'
 
@@ -146,15 +145,12 @@ module Logging
     key = options[:key]
     file = options[:file]
     line = options[:line]
-    raise(Puppet::DevError, "Need either :file and :line, or :key") if (key.nil?) && (file.nil? || line.nil?)
+    #TRANSLATORS the literals ":file", ":line", and ":key" should not be translated
+    raise Puppet::DevError, _("Need either :file and :line, or :key") if (key.nil?) && (file.nil? || line.nil?)
 
     key ||= "#{file}:#{line}"
     issue_deprecation_warning(message, key, file, line, false)
   end
-  MM = MultiMatch
-  FILE_AND_LINE = MM::TUPLE
-  FILE_NO_LINE  = MM.new(MM::NOT_NIL, nil).freeze
-  NO_FILE_LINE  = MM.new(nil, MM::NOT_NIL).freeze
 
   # Logs a (non deprecation) warning once for a given key.
   #
@@ -162,29 +158,30 @@ module Logging
   #   kind must be one of the defined kinds for the Puppet[:disable_warnings] setting.
   # @param message [String] The message to log (logs via warning)
   # @param key [String] Key used to make this warning unique
-  # @param file [String,nil] the File related to the warning
-  # @param line [Integer,nil] the Line number related to the warning
+  # @param file [String,:default,nil] the File related to the warning
+  # @param line [Integer,:default,nil] the Line number related to the warning
   #   warning as unique
+  # @param level [Symbol] log level to use, defaults to :warning
   #
   # Either :file and :line and/or :key must be passed.
-  def warn_once(kind, key, message, file = nil, line = nil)
+  def warn_once(kind, key, message, file = nil, line = nil, level = :warning)
     return if Puppet[:disable_warnings].include?(kind)
     $unique_warnings ||= {}
     if $unique_warnings.length < 100 then
       if (! $unique_warnings.has_key?(key)) then
         $unique_warnings[key] = message
-        call_trace =
-        case MM.new(file, line)
-        when FILE_AND_LINE
-          _("\n   (at %{file}:%{line})") % { file: file, line: line }
-        when FILE_NO_LINE
-          _("\n   (in %{file})") % { file: file }
-        when NO_FILE_LINE
-          _("\n   (in unknown file, line %{line})") % { line: line }
-        else
-          _("\n   (file & line not available)")
-        end
-        warning("#{message}#{call_trace}")
+        call_trace = if file == :default and line == :default
+                       # Suppress the file and line number output
+                       ''
+                     else
+                       error_location_str = Puppet::Util::Errors.error_location(file, line)
+                       if error_location_str.empty?
+                         "\n   " + _('(file & line not available)')
+                       else
+                         "\n   %{error_location}" % { error_location: error_location_str }
+                       end
+                     end
+        send_log(level, "#{message}#{call_trace}")
       end
     end
   end
@@ -275,17 +272,17 @@ module Logging
   def issue_deprecation_warning(message, key, file, line, use_caller)
     return if Puppet[:disable_warnings].include?('deprecations')
     $deprecation_warnings ||= {}
-    if $deprecation_warnings.length < 100 then
+    if $deprecation_warnings.length < 100
       key ||= (offender = get_deprecation_offender)
-      if (! $deprecation_warnings.has_key?(key)) then
+      unless $deprecation_warnings.has_key?(key)
         $deprecation_warnings[key] = message
         # split out to allow translation
-        unknown = _('unknown')
-        call_trace = use_caller ?
-          (offender || get_deprecation_offender).join('; ') :
-          "#{file || unknown}:#{line || unknown}"
-        #TRANSLATORS error message with origin location
-        warning(_("%{message}\n   (at %{call_trace})") % { message: message, call_trace: call_trace })
+        call_trace = if use_caller
+                       _("(location: %{location})") % { location: (offender || get_deprecation_offender).join('; ') }
+                     else
+                       Puppet::Util::Errors.error_location_with_unknowns(file, line)
+                     end
+        warning("%{message}\n   %{call_trace}" % { message: message, call_trace: call_trace })
       end
     end
   end

data/lib/puppet/util/monkey_patches.rb

@@ -69,7 +69,7 @@ if Puppet::Util::Platform.windows?
         Puppet::Util::Windows::RootCerts.instance.to_a.uniq { |cert| cert.to_der }.each do |x509|
           begin
             add_cert(x509)
-          rescue OpenSSL::X509::StoreError => e
+          rescue OpenSSL::X509::StoreError
             warn "Failed to add #{x509.subject.to_s}"
           end
         end

data/lib/puppet/util/network_device/base.rb

@@ -12,7 +12,7 @@ class Puppet::Util::NetworkDevice::Base
 
     @autoloader = Puppet::Util::Autoload.new(self, "puppet/util/network_device/transport")
 
-    if @autoloader.load(@url.scheme)
+    if @autoloader.load(@url.scheme, Puppet.lookup(:current_environment))
       @transport = Puppet::Util::NetworkDevice::Transport.const_get(@url.scheme.capitalize).new(options[:debug])
       @transport.host = @url.host
       @transport.port = @url.port || case @url.scheme ; when "ssh" ; 22 ; when "telnet" ; 23 ; end

data/lib/puppet/util/network_device/config.rb

@@ -39,38 +39,44 @@ class Puppet::Util::NetworkDevice::Config
     begin
       devices = {}
       device = nil
-      File.open(@file) { |f|
-        count = 1
-        f.each { |line|
+      File.open(@file) do |f|
+        file_line_count = 1
+        f.each do |line|
           case line
           when /^\s*#/ # skip comments
-            count += 1
+            file_line_count += 1
             next
           when /^\s*$/  # skip blank lines
-            count += 1
+            file_line_count += 1
             next
           when /^\[([\w.-]+)\]\s*$/ # [device.fqdn]
             name = $1
             name.chomp!
-            raise Puppet::Error, _("Duplicate device found at line %{count}, already found at %{line}") % { count: count, line: device.line } if devices.include?(name)
+            if devices.include?(name)
+              file_error_location = Puppet::Util::Errors.error_location(nil, file_line_count)
+              device_error_location = Puppet::Util::Errors.error_location(nil, device.line)
+              raise Puppet::Error, _("Duplicate device found at %{file_error_location}, already found at %{device_error_location}") %
+                  { file_error_location: file_error_location, device_error_location: device_error_location }
+            end
             device = OpenStruct.new
             device.name = name
-            device.line = count
+            device.line = file_line_count
             device.options = { :debug => false }
             Puppet.debug "found device: #{device.name} at #{device.line}"
             devices[name] = device
           when /^\s*(type|url|debug)(\s+(.+)\s*)*$/
-            parse_directive(device, $1, $3, count)
+            parse_directive(device, $1, $3, file_line_count)
           else
-            raise Puppet::Error, _("Invalid line %{count}: %{line}") % { count: count, line: line }
+            error_location_str = Puppet::Util::Errors.error_location(nil, file_line_count)
+            raise Puppet::Error, _("Invalid entry at %{error_location}: %{file_text}") %
+                { error_location: error_location_str, file_text: line }
           end
-          count += 1
-        }
-      }
-    rescue Errno::EACCES => detail
+        end
+      end
+    rescue Errno::EACCES
       Puppet.err _("Configuration error: Cannot read %{file}; cannot serve") % { file: @file }
       #raise Puppet::Error, "Cannot read #{@config}"
-    rescue Errno::ENOENT => detail
+    rescue Errno::ENOENT
       Puppet.err _("Configuration error: '%{file}' does not exit; cannot serve") % { file: @file }
     end
 
@@ -91,7 +97,8 @@ class Puppet::Util::NetworkDevice::Config
     when "debug"
       device.options[:debug] = true
     else
-      raise Puppet::Error, _("Invalid argument '%{var}' at line %{count}") % { var: var, count: count }
+      error_location_str = Puppet::Util::Errors.error_location(nil, count)
+      raise Puppet::Error, _("Invalid argument '%{var}' at %{error_location}") % { var: var, error_location: error_location_str }
     end
   end
 

data/lib/puppet/util/platform.rb

@@ -1,6 +1,9 @@
 module Puppet
   module Util
     module Platform
+
+      FIPS_STATUS_FILE = "/proc/sys/crypto/fips_enabled".freeze
+
       def windows?
         # Ruby only sets File::ALT_SEPARATOR on Windows and the Ruby standard
         # library uses that to test what platform it's on. In some places we
@@ -17,6 +20,19 @@ module Puppet
         %w{/usr/sbin /sbin}
       end
       module_function :default_paths
+
+      @fips_enabled = !windows? &&
+                       File.exist?(FIPS_STATUS_FILE) &&  
+                       File.read(FIPS_STATUS_FILE, 1) == '1'
+
+      def fips_enabled?
+        @fips_enabled
+      end
+      module_function :fips_enabled?
+
+      def self.jruby?
+        RUBY_PLATFORM == 'java'
+      end
     end
   end
 end

data/lib/puppet/util/plist.rb

@@ -41,11 +41,13 @@ module Puppet::Util::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],
+          plist = Puppet::Util::Execution.execute(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', 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 })
+          message = _("Cannot read file %{file_path}; Puppet is skipping it.") % { file_path: file_path }
+          message += '\n' + _("Details: %{detail}") % { detail: detail }
+          Puppet.warning(message)
         end
       end
       return nil
@@ -122,11 +124,11 @@ module Puppet::Util::Plist
 
     def to_format(format)
       if format.to_sym == :xml
-        plist_format = CFPropertyList::List::FORMAT_XML
+        CFPropertyList::List::FORMAT_XML
       elsif format.to_sym == :binary
-        plist_format = CFPropertyList::List::FORMAT_BINARY
+        CFPropertyList::List::FORMAT_BINARY
       elsif format.to_sym == :plain
-        plist_format = CFPropertyList::List::FORMAT_PLAIN
+        CFPropertyList::List::FORMAT_PLAIN
       else
         raise FormatError.new "Unknown plist format #{format}"
       end

data/lib/puppet/util/posix.rb

@@ -17,7 +17,7 @@ module Puppet::Util::POSIX
   # method search_posix_field in the gid and uid methods if a sanity check
   # fails
   def get_posix_field(space, field, id)
-    raise Puppet::DevError, "Did not get id from caller" unless id
+    raise Puppet::DevError, _("Did not get id from caller") unless id
 
     if id.is_a?(Integer)
       if id > Puppet[:maximum_uid].to_i

data/lib/puppet/util/provider_features.rb

@@ -1,5 +1,4 @@
 # Provides feature definitions.
-require 'puppet/util/methodhelper'
 require 'puppet/util/docs'
 require 'puppet/util'
 # This module models provider features and handles checking whether the features
@@ -13,7 +12,6 @@ module Puppet::Util::ProviderFeatures
   # @todo Unclear what is api and what is private in this class
   class ProviderFeature
     include Puppet::Util
-    include Puppet::Util::MethodHelper
     include Puppet::Util::Docs
     attr_accessor :name, :docs, :methods
 
@@ -32,11 +30,10 @@ module Puppet::Util::ProviderFeatures
       end
     end
 
-    def initialize(name, docs, hash)
+    def initialize(name, docs, methods: nil)
       self.name = name.intern
       self.docs = docs
-      hash = symbolize_options(hash)
-      set_options(hash)
+      @methods = methods
     end
 
     private
@@ -63,7 +60,7 @@ module Puppet::Util::ProviderFeatures
   # @todo How methods that determine if the feature is present are specified.
   def feature(name, docs, hash = {})
     @features ||= {}
-    raise(Puppet::DevError, "Feature #{name} is already defined") if @features.include?(name)
+    raise Puppet::DevError, _("Feature %{name} is already defined") % { name: name } if @features.include?(name)
     begin
       obj = ProviderFeature.new(name, docs, hash)
       @features[obj.name] = obj

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

@@ -160,7 +160,7 @@ module Generators
         @allfiles << { "file" => file, "modules" => modules, "classes" => classes, "methods" => methods, "nodes" => nodes }
       end
 
-      # scan all classes to create the childs references
+      # scan all classes to create the child's references
       @allclasses.values.each do |klass|
         if superklass = klass.context.superclass
           if superklass = AllReferences[superklass] and (superklass.is_a?(HTMLPuppetClass) or superklass.is_a?(HTMLPuppetNode))
@@ -245,7 +245,7 @@ module Generators
       end
     end
 
-    def gen_composite_index(collection, template, filename)\
+    def gen_composite_index(collection, template, filename)
       return if Puppet::FileSystem.exist?(filename)
 
       template = TemplatePage.new(RDoc::Page::FR_INDEX_BODY, template)
@@ -896,7 +896,7 @@ module Generators
 
     def find_symbol(symbol, method=nil)
       res = @context.parent.find_symbol(symbol, method)
-      res &&= res.viewer
+      res && res.viewer
     end
 
   end

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

@@ -127,7 +127,7 @@ module RDoc::PuppetParserCore
     container, name  = get_class_or_module(container,name)
     mod = container.add_module(RDoc::PuppetModule, name)
     mod.record_location(@top_level)
-    mod.add_comment(comment, @input_file_name)
+    mod.add_comment(comment, @top_level)
 
     if @input_file_name =~ /\.rb$/
       parse_plugins(mod)

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

@@ -8,7 +8,7 @@ module RDoc
     include PuppetParserCore
 
     def create_rdoc_preprocess
-      preprocess = Markup::PreProcess.new(@input_file_name, @options.rdoc_include)
+      Markup::PreProcess.new(@input_file_name, @options.rdoc_include)
     end
   end
 end

data/lib/puppet/util/rdoc.rb

@@ -30,7 +30,7 @@ module Puppet::Util::RDoc
     # 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.
-    if Puppet.features.microsoft_windows? && RDoc::VERSION !~ /^[0-3]\./
+    if Puppet::Util::Platform.windows? && RDoc::VERSION !~ /^[0-3]\./
       options += [ "--root", Dir.pwd.gsub(/\\/, '/')]
     end
     options += files

data/lib/puppet/util/reference.rb

@@ -1,22 +1,15 @@
 require 'puppet/util/instance_loader'
-require 'puppet/util/methodhelper'
 require 'fileutils'
 
 # Manage Reference Documentation.
 class Puppet::Util::Reference
   include Puppet::Util
-  include Puppet::Util::MethodHelper
   include Puppet::Util::Docs
 
   extend Puppet::Util::InstanceLoader
 
   instance_load(:reference, 'puppet/reference')
 
-  def self.footer
-    #TRANSLATORS message accompanied by date of generation
-    "\n\n----------------\n\n*" + _("This page autogenerated on ") + "#{Time.now}*\n"
-  end
-
   def self.modes
     %w{pdf text}
   end
@@ -63,8 +56,8 @@ class Puppet::Util::Reference
 
   end
 
-  def self.references
-    instance_loader(:reference).loadall
+  def self.references(environment)
+    instance_loader(:reference).loadall(environment)
     loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
   end
 
@@ -83,9 +76,12 @@ class Puppet::Util::Reference
     self.dynamic
   end
 
-  def initialize(name, options = {}, &block)
+  def initialize(name, title: nil, depth: nil, dynamic: nil, doc: nil, &block)
     @name = name
-    set_options(options)
+    @title = title
+    @depth = depth
+    @dynamic = dynamic
+    @doc = doc
 
     meta_def(:generate, &block)
 
@@ -112,15 +108,12 @@ class Puppet::Util::Reference
   def to_markdown(withcontents = true)
     # First the header
     text = markdown_header(@title, 1)
-    #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 << _("\n\n**This page is autogenerated; any changes will get overwritten**\n\n")
 
     text << @header
 
     text << generate
 
-    text << self.class.footer if withcontents
-
     text
   end
 end

data/lib/puppet/util/rubygems.rb

@@ -21,7 +21,7 @@ module Puppet::Util::RubyGems
       # @api private
       def source
         if has_rubygems?
-          Gem::Specification.respond_to?(:latest_specs) ? Gems18Source : OldGemsSource
+          Gems18Source
         else
           NoGemsSource
         end
@@ -51,18 +51,6 @@ module Puppet::Util::RubyGems
     end
   end
 
-  # RubyGems < 1.8.0
-  # @api private
-  class OldGemsSource < Source
-    def directories
-      @paths ||= Gem.latest_load_paths
-    end
-
-    def clear_paths
-      Gem.clear_paths
-    end
-  end
-
   # @api private
   class NoGemsSource < Source
     def directories

data/lib/puppet/util/run_mode.rb

@@ -11,7 +11,7 @@ module Puppet
 
       def self.[](name)
         @run_modes ||= {}
-        if Puppet.features.microsoft_windows?
+        if Puppet::Util::Platform.windows?
           @run_modes[name] ||= WindowsRunMode.new(name)
         else
           @run_modes[name] ||= UnixRunMode.new(name)

data/lib/puppet/util/selinux.rb

@@ -240,7 +240,7 @@ module Puppet::Util::SELinux
     # while we try and figure out what file-system the target lives on.
     path = Pathname(path).cleanpath
     unless path.absolute?
-      raise Puppet::DevError, "got a relative path in SELinux find_fs: #{path}"
+      raise Puppet::DevError, _("got a relative path in SELinux find_fs: %{path}") % { path: path }
     end
 
     # Now, walk up the tree until we find a match for that path in the hash.