puppet 6.4.5-x64-mingw32 → 6.5.0-x64-mingw32

data/lib/puppet/face/plugin.rb

@@ -41,15 +41,8 @@ Puppet::Face.define(:plugin, '0.0.1') do
     when_invoked do |options|
       remote_environment_for_plugins = Puppet::Node::Environment.remote(Puppet[:environment])
 
-      pool = Puppet::Network::HTTP::Pool.new(Puppet[:http_keepalive_timeout])
-      Puppet.override(:http_pool => pool) do
-        begin
-          handler = Puppet::Configurer::PluginHandler.new()
-          handler.download_plugins(remote_environment_for_plugins)
-        ensure
-          pool.close
-        end
-      end
+      handler = Puppet::Configurer::PluginHandler.new()
+      handler.download_plugins(remote_environment_for_plugins)
     end
 
     when_rendering :console do |value|

data/lib/puppet/file_serving/http_metadata.rb

@@ -40,7 +40,7 @@ class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
     [ @checksum_type, :md5, :sha256, :sha384, :sha512, :sha224, :mtime ].each do |type|
       @checksum_type = type
       @checksum = @checksums[type]
-      break if @checksum
+      return if @checksum
     end
   end
 end

data/lib/puppet/file_system.rb

@@ -92,6 +92,14 @@ module Puppet::FileSystem
     @impl.path_string(@impl.basename(assert_path(path)))
   end
 
+  # @return [Integer] the size of the file
+  #
+  # @api public
+  #
+  def self.size(path)
+    @impl.size(assert_path(path))
+  end
+
   # Allows exclusive updates to a file to be made by excluding concurrent
   # access using flock. This means that if the file is on a filesystem that
   # does not support flock, this method will provide no protection.
@@ -206,10 +214,12 @@ module Puppet::FileSystem
 
   # Touches the file. On most systems this updates the mtime of the file.
   #
+  # @param mtime [Time] The last modified time or nil to use the current time
+  #
   # @api public
   #
-  def self.touch(path)
-    @impl.touch(assert_path(path))
+  def self.touch(path, mtime: nil)
+    @impl.touch(assert_path(path), mtime: mtime)
   end
 
   # Creates directories for all parts of the given path.

data/lib/puppet/file_system/file_impl.rb

@@ -54,14 +54,17 @@ class Puppet::FileSystem::FileImpl
     while !written
       ::File.open(path, options, mode) do |rf|
         if rf.flock(::File::LOCK_EX|::File::LOCK_NB)
+          Puppet.debug(_("Locked '%{path}'") % { path: path })
           yield rf
           written = true
+          Puppet.debug(_("Unlocked '%{path}'") % { path: path })
         else
+          Puppet.debug("Failed to lock '%s' retrying in %.2f milliseconds" % [path, wait * 1000])
           sleep wait
           timeout -= wait
           wait *= 2
           if timeout < 0
-            raise Timeout::Error, _("Timeout waiting for exclusive lock on %{path}") % { path: @path }
+            raise Timeout::Error, _("Timeout waiting for exclusive lock on %{path}") % { path: path }
           end
         end
       end
@@ -108,8 +111,8 @@ class Puppet::FileSystem::FileImpl
     path.writable?
   end
 
-  def touch(path)
-    ::FileUtils.touch(path)
+  def touch(path, mtime: nil)
+    ::FileUtils.touch(path, mtime: mtime)
   end
 
   def mkpath(path)

data/lib/puppet/file_system/memory_file.rb

@@ -61,6 +61,6 @@ class Puppet::FileSystem::MemoryFile
   end
 
   def inspect
-    "<Puppet::FileSystem::MemoryFile:#{self}>"
+    "<Puppet::FileSystem::MemoryFile:#{to_s}>"
   end
 end

data/lib/puppet/file_system/posix.rb

@@ -14,12 +14,11 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
       bsize = stream_blksize(this, stream)
       sa = "".force_encoding('ASCII-8BIT')
       sb = "".force_encoding('ASCII-8BIT')
-      loop do
+      begin
         this.read(bsize, sa)
         stream.read(bsize, sb)
         return true if sa.empty? && sb.empty?
-        break if sa != sb
-      end
+      end while sa == sb
       false
     end
   end

data/lib/puppet/forge.rb

@@ -58,7 +58,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     matches = []
     uri = "/v3/modules?query=#{term}"
     if Puppet[:module_groups]
-      uri += "&module_groups=#{Puppet[:module_groups].tr('+', ' ')}"
+      uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
     end
 
     while uri
@@ -94,7 +94,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     name = input.tr('/', '-')
     uri = "/v3/releases?module=#{name}&sort_by=version&exclude_fields=#{MODULE_RELEASE_EXCLUSIONS}"
     if Puppet[:module_groups]
-      uri += "&module_groups=#{Puppet[:module_groups].tr('+', ' ')}"
+      uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
     end
     releases = []
 
@@ -239,6 +239,6 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   def decode_uri(uri)
     return if uri.nil?
 
-    URI.decode(uri.tr('+', ' '))
+    URI.decode(uri.gsub('+', ' '))
   end
 end

data/lib/puppet/functions.rb

@@ -624,7 +624,8 @@ module Puppet::Functions
       # Get location to use in case of error - this produces ruby filename and where call to 'type' occurred
       # but strips off the rest of the internal "where" as it is not meaningful to user.
       #
-      rb_location = caller(1, 1).first
+      rb_location = caller[0]
+
       begin
         result = parser.parse_string("type #{assignment_string}", nil)
       rescue StandardError => e

data/lib/puppet/functions/camelcase.rb

@@ -23,8 +23,8 @@
 #
 # @example Camelcase of strings in an Array
 # ```puppet
-# ['abc_def', 'bcd_xyz'].camelcase()
-# camelcase(['abc_def', 'bcd_xyz'])
+# ['abc_def', 'bcd_xyz'].capitalize()
+# capitalize(['abc_def', 'bcd_xyz'])
 # ```
 # Would both result in `['AbcDef', 'BcdXyz']`
 #

data/lib/puppet/functions/epp.rb

@@ -6,12 +6,12 @@
 # The first argument to this function should be a `<MODULE NAME>/<TEMPLATE FILE>`
 # reference, which loads `<TEMPLATE FILE>` from `<MODULE NAME>`'s `templates`
 # directory. In most cases, the last argument is optional; if used, it should be a
-# [hash](https://puppet.com/docs/puppet/latest/lang_data_hash.html) that contains parameters to
+# [hash](/puppet/latest/reference/lang_data_hash.html) that contains parameters to
 # pass to the template.
 #
-# - See the [template](https://puppet.com/docs/puppet/latest/lang_template.html)
-# documentation for general template usage information.
-# - See the [EPP syntax](https://puppet.com/docs/puppet/latest/lang_template_epp.html)
+# - See the [template](/puppet/latest/reference/lang_template.html) documentation
+# for general template usage information.
+# - See the [EPP syntax](/puppet/latest/reference/lang_template_epp.html)
 # documentation for examples of EPP.
 #
 # For example, to call the apache module's `templates/vhost/_docroot.epp`

data/lib/puppet/functions/find_file.rb

@@ -1,19 +1,19 @@
 # Finds an existing file from a module and returns its path.
 #
-# This function accepts an argument that is a String as a `<MODULE NAME>/<FILE>`
-# reference, which searches for `<FILE>` relative to a module's `files`
+# The argument to this function should be a String as a `<MODULE NAME>/<FILE>`
+# reference, which will search for `<FILE>` relative to a module's `files`
 # directory. (For example, the reference `mysql/mysqltuner.pl` will search for the
 # file `<MODULES DIRECTORY>/mysql/files/mysqltuner.pl`.)
 #
 # This function can also accept:
+# 
+# * An absolute String path, which will check for the existence of a file from anywhere on disk.
+# * Multiple String arguments, which will return the path of the **first** file
+#   found, skipping non existing files.
+# * An array of string paths, which will return the path of the **first** file
+#   found from the given paths in the array, skipping non existing files.
 #
-# * An absolute String path, which checks for the existence of a file from anywhere on disk.
-# * Multiple String arguments, which returns the path of the **first** file
-#   found, skipping nonexistent files.
-# * An array of string paths, which returns the path of the **first** file
-#   found from the given paths in the array, skipping nonexistent files.
-#
-# The function returns `undef` if none of the given paths were found.
+# The function returns `undef` if none of the given paths were found
 #
 # @since 4.8.0
 #

data/lib/puppet/functions/inline_epp.rb

@@ -5,12 +5,12 @@
 #
 # The first argument to this function should be a string containing an EPP
 # template. In most cases, the last argument is optional; if used, it should be a
-# [hash](https://puppet.com/docs/puppet/latest/lang_data_hash.html) that contains parameters to
+# [hash](/puppet/latest/reference/lang_data_hash.html) that contains parameters to
 # pass to the template.
 #
-# - See the [template](https://puppet.com/docs/puppet/latest/lang_template.html)
-# documentation for general template usage information.
-# - See the [EPP syntax](https://puppet.com/docs/puppet/latest/lang_template_epp.html)
+# - See the [template](/puppet/latest/reference/lang_template.html) documentation
+# for general template usage information.
+# - See the [EPP syntax](/puppet/latest/reference/lang_template_epp.html)
 # documentation for examples of EPP.
 #
 # For example, to evaluate an inline EPP template and pass it the `docroot` and
@@ -28,7 +28,7 @@
 # `inline_epp` function fails to pass any required parameter.
 #
 # An inline EPP template should be written as a single-quoted string or
-# [heredoc](https://puppet.com/docs/puppet/latest/lang_data_string.html#heredocs).
+# [heredoc](/puppet/latest/reference/lang_data_string.html#heredocs).
 # A double-quoted string is subject to expression interpolation before the string
 # is parsed as an EPP template.
 #

data/lib/puppet/functions/regsubst.rb

@@ -27,16 +27,14 @@
 # @return [Array[String], String] The result of the substitution. Result type is the same as for the target parameter.
 #
 # @example Get the third octet from the node's IP address:
-#
-# ```puppet
-# $i3 = regsubst($ipaddress,'^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$','\\3')
-# ```
+#   ```puppet
+#   $i3 = regsubst($ipaddress,'^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$','\\3')
+#   ```
 #
 # @example Put angle brackets around each octet in the node's IP address:
-#
-# ```puppet
-# $x = regsubst($ipaddress, /([0-9]+)/, '<\\1>', 'G')
-# ```
+#   ```puppet
+#   $x = regsubst($ipaddress, /([0-9]+)/, '<\\1>', 'G')
+#   ```
 #
 Puppet::Functions.create_function(:regsubst) do
   dispatch :regsubst_string do

data/lib/puppet/gettext/module_translations.rb

@@ -11,7 +11,7 @@ module Puppet::ModuleTranslations
     modules.each do |mod|
       next unless mod.forge_name && mod.has_translations?(Puppet::GettextConfig.current_locale)
 
-      module_name = mod.forge_name.tr('/', '-')
+      module_name = mod.forge_name.gsub('/', '-')
       if Puppet::GettextConfig.load_translations(module_name, mod.locale_directory, :po)
         Puppet.debug "Loaded translations for #{module_name}."
       elsif Puppet::GettextConfig.gettext_loaded?

data/lib/puppet/graph/rb_tree_map.rb

@@ -213,8 +213,8 @@ class Puppet::Graph::RbTreeMap
           :color => @color,
         }
       }
-      h[:left] = left.to_hash if @left
-      h[:right] = right.to_hash if @right
+      h.merge!(:left => left.to_hash) if @left
+      h.merge!(:right => right.to_hash) if @right
       h
     end
 

data/lib/puppet/graph/simple_graph.rb

@@ -133,12 +133,11 @@ class Puppet::Graph::SimpleGraph
         else
           if s[:lowlink][vertex] == s[:index][vertex] then
             this_scc = []
-            loop do
+            begin
               top = s[:stack].pop
               s[:seen][top] = false
               this_scc << top
-              break if top == vertex
-            end
+            end until top == vertex
             s[:scc] << this_scc
           end
           recur.pop               # done with this node, finally.
@@ -438,7 +437,7 @@ class Puppet::Graph::SimpleGraph
   # rdot.rb. If an edge or vertex label is a kind of Hash then the keys
   # which match +dot+ properties will be used as well.
   def to_dot_graph(params = {})
-    params['name'] ||= self.class.name.tr(':','_')
+    params['name'] ||= self.class.name.gsub(/:/,'_')
     fontsize   = params['fontsize'] ? params['fontsize'] : '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge

data/lib/puppet/indirector/catalog/compiler.rb

@@ -395,28 +395,22 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
     # And then add the server name and IP
     {"servername" => "fqdn",
-      "serverip"  => "ipaddress",
-      "serverip6" => "ipaddress6"
+      "serverip" => "ipaddress"
     }.each do |var, fact|
-      value = Facter.value(fact)
-      if !value.nil?
+      if value = Facter.value(fact)
         @server_facts[var] = value
+      else
+        Puppet.warning _("Could not retrieve fact %{fact}") % { fact: fact }
       end
     end
 
     if @server_facts["servername"].nil?
       host = Facter.value(:hostname)
-      if host.nil?
-        Puppet.warning _("Could not retrieve fact servername")
-      elsif domain = Facter.value(:domain)
+      if domain = Facter.value(:domain)
         @server_facts["servername"] = [host, domain].join(".")
       else
         @server_facts["servername"] = host
       end
     end
-
-    if @server_facts["serverip"].nil? && @server_facts["serverip6"].nil?
-      Puppet.warning _("Could not retrieve either serverip or serverip6 fact")
-    end
   end
 end

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -15,7 +15,7 @@ module Puppet::FileBucketFile
       request.options[:bucket_path] ||= Puppet[:bucketdir]
       # If filebucket mode is 'list'
       if request.options[:list_all]
-        return nil unless ::File.exist?(request.options[:bucket_path])
+        return nil unless ::File.exists?(request.options[:bucket_path])
         return list(request)
       end
       checksum, files_original_path = request_to_checksum_and_path(request)

data/lib/puppet/indirector/hiera.rb

@@ -69,8 +69,6 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
     end
   end
 
-  public
-
   def self.hiera_config
     hiera_config = Puppet.settings[:hiera_config]
     config = {}

data/lib/puppet/indirector/resource/ral.rb

@@ -25,7 +25,9 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
       res.to_resource
     end.find_all do |res|
       conditions.all? {|property, value| res.to_resource[property].to_s == value.to_s}
-    end.sort_by(&:title)
+    end.sort do |a,b|
+      a.title <=> b.title
+    end
   end
 
   def save( request )

data/lib/puppet/indirector/resource/validator.rb

@@ -1,7 +1,7 @@
 module Puppet::Resource::Validator
   def validate_key(request)
     type, title = request.key.split('/', 2)
-    unless type.casecmp(request.instance.type).zero? and title == request.instance.title
+    unless type.downcase == request.instance.type.downcase and title == request.instance.title
       raise Puppet::Indirector::ValidationError, _("Resource instance does not match request key")
     end
   end

data/lib/puppet/interface.rb

@@ -96,7 +96,7 @@ class Puppet::Interface
         if Puppet::Interface::FaceCollection[name, :current]
           raise Puppet::Error, "Could not find version #{version} of #{name}"
         else
-          raise Puppet::Error, "Could not find Puppet Face #{name}"
+          raise Puppet::Error, "Could not find Puppet Face #{name.to_s}"
         end
       end
 
@@ -234,5 +234,4 @@ class Puppet::Interface
     define_method(name, proc)
     instance_method(name)
   end
-  private_class_method :__add_method
 end

data/lib/puppet/loaders.rb

@@ -9,6 +9,7 @@ module Puppet
       require 'puppet/pops/loader/gem_support'
       require 'puppet/pops/loader/module_loaders'
       require 'puppet/pops/loader/dependency_loader'
+      require 'puppet/pops/loader/null_loader'
       require 'puppet/pops/loader/static_loader'
       require 'puppet/pops/loader/runtime3_type_loader'
       require 'puppet/pops/loader/ruby_function_instantiator'

data/lib/puppet/metatype/manager.rb

@@ -121,7 +121,7 @@ module Manager
 
     # Now set up autoload any providers that might exist for this type.
 
-    klass.providerloader = Puppet::Util::Autoload.new(klass, "puppet/provider/#{klass.name}")
+    klass.providerloader = Puppet::Util::Autoload.new(klass, "puppet/provider/#{klass.name.to_s}")
 
     # We have to load everything so that we can figure out the default provider.
     klass.providerloader.loadall(Puppet.lookup(:current_environment))

data/lib/puppet/module.rb

@@ -203,7 +203,7 @@ class Puppet::Module
     @metadata = data = read_metadata
     return if data.empty?
 
-    @forge_name = data['name'].tr('-', '/') if data['name']
+    @forge_name = data['name'].gsub('-', '/') if data['name']
 
     [:source, :author, :version, :license, :dependencies].each do |attr|
       value = data[attr.to_s]

data/lib/puppet/module/task.rb

@@ -76,23 +76,11 @@ class Puppet::Module
     # Find task's required lib files and retrieve paths for both 'files' and 'implementation:files' metadata keys
     def self.find_extra_files(metadata, envname = nil)
       return [] if metadata.nil?
-      
-      files = metadata.fetch('files', [])
-      unless files.is_a?(Array)
-        msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: files}
-        raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
-      end
-      impl_files = metadata.fetch('implementations', []).flat_map do |impl| 
-        file_array = impl.fetch('files', [])
-        unless file_array.is_a?(Array)
-          msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: file_array}
-          raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
-        end
-        file_array
-      end
 
-      combined_files = files + impl_files
-      combined_files.uniq.flat_map do |file|
+      files = metadata.fetch('files', []) +
+        metadata.fetch('implementations', []).flat_map { |impl| impl.fetch('files', []) }
+
+      files.uniq.flat_map do |file|
         module_name, mount, endpath = file.split("/", 3)
         # If there's a mount directory with no trailing slash this will be nil
         # We want it to be empty to construct a path
@@ -154,10 +142,6 @@ class Puppet::Module
         end
 
         implementations = metadata['implementations'].map do |impl|
-          unless impl['requirements'].is_a?(Array) || impl['requirements'].nil?
-            msg = _("Task metadata for task %{name} does not specify requirements as an array" % { name: name })
-            raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
-          end
           path = executables.find { |real_impl| File.basename(real_impl) == impl['name'] }
           unless path
             msg = _("Task metadata for task %{name} specifies missing implementation %{implementation}" % { name: name, implementation: impl['name'] })