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

data/lib/puppet/module_tool/applications/installer.rb

@@ -303,7 +303,7 @@ module Puppet::ModuleTool
           @environment.modules_by_path[options[:target_dir]].each do |mod|
             if mod.has_metadata?
               metadata = {
-                :name    => mod.forge_name.tr('/', '-'),
+                :name    => mod.forge_name.gsub('/', '-'),
                 :version => mod.version
               }
               next if release[:module] == metadata[:name]

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -52,7 +52,7 @@ module Puppet::ModuleTool
 
       def find_installed_module
         @environment.modules_by_path.values.flatten.each do |mod|
-          mod_name = (mod.forge_name || mod.name).tr('/', '-')
+          mod_name = (mod.forge_name || mod.name).gsub('/', '-')
           if mod_name == @name
             @unfiltered << {
               :name    => mod_name,
@@ -101,7 +101,7 @@ module Puppet::ModuleTool
           if mod.has_metadata? && !changes.empty?
             raise LocalChangesError,
               :action            => :uninstall,
-              :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
+              :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
               :requested_version => @options[:version],
               :installed_version => mod.version
           end
@@ -109,7 +109,7 @@ module Puppet::ModuleTool
 
         if !@options[:force] && !mod.required_by.empty?
           raise ModuleIsRequiredError,
-            :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
+            :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
             :required_by       => mod.required_by,
             :requested_version => @options[:version],
             :installed_version => mod.version

data/lib/puppet/module_tool/metadata.rb

@@ -102,7 +102,7 @@ module Puppet::ModuleTool
 
       contents = data.keys.map do |k|
         value = (Puppet::Util::Json.dump(data[k], :pretty => true) rescue data[k].to_json)
-        %Q("#{k}": #{value})
+        %Q("#{k.to_s}": #{value})
       end
 
       "{\n" + contents.join(",\n").gsub(/^/, '  ') + "\n}\n"

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -8,12 +8,12 @@ module Puppet::ModuleTool::Shared
     @installed  = Hash.new { |h,k| h[k] = [] }
 
     @environment.modules_by_path.values.flatten.each do |mod|
-      mod_name = (mod.forge_name || mod.name).tr('/', '-')
+      mod_name = (mod.forge_name || mod.name).gsub('/', '-')
       @installed[mod_name] << mod
       d = @local["#{mod_name}@#{mod.version}"]
       (mod.dependencies || []).each do |hash|
         name, conditions = hash['name'], hash['version_requirement']
-        name = name.tr('/', '-')
+        name = name.gsub('/', '-')
         d[name] = conditions
         @conditions[name] << {
           :module => mod_name,
@@ -34,7 +34,7 @@ module Puppet::ModuleTool::Shared
     info = forge.remote_dependency_info(author, modname, @options[:version])
     info.each do |pair|
       mod_name, releases = pair
-      mod_name = mod_name.tr('/', '-')
+      mod_name = mod_name.gsub('/', '-')
       releases.each do |rel|
         semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
@@ -42,7 +42,7 @@ module Puppet::ModuleTool::Shared
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
         d = @remote["#{mod_name}@#{rel['version']}"]
         (rel['dependencies'] || []).each do |name, conditions|
-          d[name.tr('/', '-')] = conditions
+          d[name.gsub('/', '-')] = conditions
         end
       end
     end

data/lib/puppet/module_tool/tar/mini.rb

@@ -1,17 +1,7 @@
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|
-      # puppet doesn't have a hard dependency on minitar, so we
-      # can't be certain which version is installed. If it's 0.9
-      # or above then we can prevent minitar from fsync'ing each
-      # extracted file and directory, otherwise fallback to the
-      # old behavior
-      args = [reader, destdir, find_valid_files(reader)]
-      spec = Gem::Specification.find_by_name('minitar')
-      if spec && spec.version >= Gem::Version.new('0.9')
-        args << {:fsync => false}
-      end
-      Archive::Tar::Minitar.unpack(*args) do |action, name, stats|
+      Archive::Tar::Minitar.unpack(reader, destdir, find_valid_files(reader)) do |action, name, stats|
         case action
         when :dir
           validate_entry(destdir, name)
@@ -93,7 +83,7 @@ class Puppet::ModuleTool::Tar::Mini
   def find_valid_files(tarfile)
     Archive::Tar::Minitar.open(tarfile).collect do |entry|
       flag = entry.typeflag
-      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).cover?(flag.to_i)
+      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
         entry.full_name
       else
         Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -120,17 +120,6 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     [indirection, method, key, params]
   end
 
-  def self.request_to_uri(request)
-    uri, body = request_to_uri_and_body(request)
-    "#{uri}?#{body}"
-  end
-
-  def self.request_to_uri_and_body(request)
-    url_prefix = IndirectionType.url_prefix_for(request.indirection_name.to_s)
-    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
-    ["#{url_prefix}/#{indirection}/#{Puppet::Util.uri_encode(request.key)}", "environment=#{request.environment.name}&#{request.query_string}"]
-  end
-
   private
 
   # Execute our find.
@@ -264,10 +253,20 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     method
   end
 
+  def self.request_to_uri(request)
+    uri, body = request_to_uri_and_body(request)
+    "#{uri}?#{body}"
+  end
+
+  def self.request_to_uri_and_body(request)
+    url_prefix = IndirectionType.url_prefix_for(request.indirection_name.to_s)
+    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
+    ["#{url_prefix}/#{indirection}/#{Puppet::Util.uri_encode(request.key)}", "environment=#{request.environment.name}&#{request.query_string}"]
+  end
+
   def self.pluralize(indirection)
     return(indirection == "status" ? "statuses" : indirection + "s")
   end
-  private_class_method :pluralize
 
   def plurality(indirection)
     # NOTE These specific hooks for paths are ridiculous, but it's a *many*-line

data/lib/puppet/network/http/connection.rb

@@ -325,17 +325,19 @@ module Puppet::Network::HTTP
     rescue => exception
       elapsed = (Time.now - start).to_f.round(3)
       uri = [@site.addr, request.path.split('?')[0]].join('/')
+      eclass = exception.class
+
+      err = case exception
+            when EOFError
+              eclass.new(_('request %{uri} interrupted after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
+            when Timeout::Error
+              eclass.new(_('request %{uri} timed out after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
+            else
+              eclass.new(_('request %{uri} failed: %{msg}') % {uri: uri, msg: exception.message})
+            end
 
-      case exception
-      when EOFError
-        Puppet.log_exception(exception, _('request %{uri} interrupted after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
-      when Timeout::Error
-        Puppet.log_exception(exception, _('request %{uri} timed out after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
-      else
-        Puppet.log_exception(exception, _('request %{uri} failed: %{msg}') % {uri: uri, msg: exception.message})
-      end
-
-      raise exception
+      err.set_backtrace(exception.backtrace) unless exception.backtrace.empty?
+      raise err
     end
 
     def with_connection(site, &block)

data/lib/puppet/network/http/factory.rb

@@ -25,7 +25,17 @@ class Puppet::Network::HTTP::Factory
   def create_connection(site)
     Puppet.debug("Creating new connection for #{site}")
 
-    http = Puppet::Util::HttpProxy.proxy(URI(site.addr))
+    args = [site.host, site.port]
+
+    unless Puppet::Util::HttpProxy.no_proxy?(site)
+      if Puppet[:http_proxy_host] == "none"
+        args << nil << nil
+      else
+        args << Puppet[:http_proxy_host] << Puppet[:http_proxy_port]
+      end
+    end
+
+    http = Net::HTTP.new(*args)
     http.use_ssl = site.use_ssl?
     http.read_timeout = Puppet[:http_read_timeout]
     http.open_timeout = Puppet[:http_connect_timeout]

data/lib/puppet/network/http/pool.rb

@@ -89,8 +89,6 @@ class Puppet::Network::HTTP::Pool < Puppet::Network::HTTP::BasePool
   #
   # @api private
   def setsockopts(netio)
-    return unless netio
-
     socket = netio.io
     socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
   end

data/lib/puppet/network/http/site.rb

@@ -15,7 +15,7 @@ class Puppet::Network::HTTP::Site
   end
 
   def addr
-    "#{@scheme}://#{@host}:#{@port}"
+    "#{@scheme}://#{@host}:#{@port.to_s}"
   end
   alias to_s addr
 

data/lib/puppet/network/resolver.rb

@@ -50,7 +50,7 @@ module Puppet::Network
       case service_name
         when :puppet then service = '_x-puppet'
         when :file   then service = '_x-puppet-fileserver'
-        else              service = "_x-puppet-#{service_name}"
+        else              service = "_x-puppet-#{service_name.to_s}"
       end
       record_name = "#{service}._tcp.#{domain}"
 
@@ -72,7 +72,7 @@ module Puppet::Network
       else
         each_priority(records) do |recs|
           while next_rr = recs.delete(find_weighted_server(recs))
-            Puppet.debug "Yielding next server of #{next_rr.target}:#{next_rr.port}"
+            Puppet.debug "Yielding next server of #{next_rr.target.to_s}:#{next_rr.port}"
             yield next_rr.target.to_s, next_rr.port
           end
         end

data/lib/puppet/node/environment.rb

@@ -490,7 +490,8 @@ class Puppet::Node::Environment
     [self.class, name, full_modulepath, manifest].hash
   end
 
-  # not private so it can be called in tests
+  private
+
   def self.extralibs()
     if Puppet::Util.get_env('PUPPETLIB')
       split_path(Puppet::Util.get_env('PUPPETLIB'))
@@ -499,15 +500,12 @@ class Puppet::Node::Environment
     end
   end
 
-  # not private so it can be called in initialize
   def self.expand_dirs(dirs)
     dirs.collect do |dir|
       Puppet::FileSystem.expand_path(dir)
     end
   end
 
-  private
-
   # Reparse the manifests for the given environment
   #
   # There are two sources that can be used for the initial parse:

data/lib/puppet/pal/pal_impl.rb

@@ -462,8 +462,8 @@ module Pal
           end
         end
 
-      rescue Puppet::Error
-        # already logged and handled by the compiler, including Puppet::ParseErrorWithIssue
+      rescue Puppet::ParseErrorWithIssue, Puppet::Error
+        # already logged and handled by the compiler for these two cases
         raise
 
       rescue => detail

data/lib/puppet/parser/ast.rb

@@ -11,7 +11,7 @@ class Puppet::Parser::AST
   attr_accessor :parent, :scope, :file, :line, :pos
 
   def inspect
-    "( #{self.class} #{self} #{@children.inspect} )"
+    "( #{self.class} #{self.to_s} #{@children.inspect} )"
   end
 
   # Evaluate the current object.  Just a stub method, since the subclass

data/lib/puppet/parser/ast/resourceparam.rb

@@ -26,6 +26,6 @@ class Puppet::Parser::AST::ResourceParam < Puppet::Parser::AST::Branch
   end
 
   def to_s
-    "#{@param} => #{@value}"
+    "#{@param} => #{@value.to_s}"
   end
 end

data/lib/puppet/parser/functions.rb

@@ -24,7 +24,7 @@ module Puppet::Parser::Functions
     Puppet::Util::Log.levels.each do |level|
       newfunction(level,
                   :environment => root_env,
-                  :doc => "Log a message on the server at level #{level}.") do |vals|
+                  :doc => "Log a message on the server at level #{level.to_s}.") do |vals|
         send(level, vals.join(" "))
       end
     end

data/lib/puppet/parser/functions/epp.rb

@@ -7,12 +7,12 @@ result as a String.
 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
+- See the [template](/puppet/latest/reference/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 [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/parser/functions/fail.rb

@@ -1,4 +1,11 @@
-Puppet::Parser::Functions::newfunction(:fail, :arity => -1, :doc => "Fail with a parse error.") do |vals|
+Puppet::Parser::Functions::newfunction(
+    :fail,
+    :arity => -1,
+    :doc   => <<DOC
+Fail with a parse error. Any parameters will be stringified,
+concatenated, and passed to the exception-handler.
+DOC
+) do |vals|
     vals = vals.collect { |s| s.to_s }.join(" ") if vals.is_a? Array
     raise Puppet::ParseError, vals.to_s
 end

data/lib/puppet/parser/functions/inline_epp.rb

@@ -6,12 +6,12 @@ text result as a String.
 
 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
+- See the [template](/puppet/latest/reference/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 [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
@@ -29,7 +29,7 @@ parameter tag without default values. Puppet produces an error if the
 `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.
 
@@ -45,7 +45,7 @@ END
 ~~~
 
 - Since 3.5
-- Requires [future parser](https://puppet.com/docs/puppet/3.8/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
+- Requires [future parser](/puppet/3.8/reference/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
 
   Puppet::Parser::Functions::Error.is4x('inline_epp')
 end

data/lib/puppet/parser/scope.rb

@@ -67,8 +67,8 @@ class Puppet::Parser::Scope
       false
     end
 
-    def add_entries_to(target = {}, include_undef = false)
-      @parent.add_entries_to(target, include_undef) unless @parent.nil?
+    def add_entries_to(target = {})
+      @parent.add_entries_to(target) unless @parent.nil?
       # do not include match data ($0-$n)
       target
     end
@@ -106,10 +106,10 @@ class Puppet::Parser::Scope
       @symbols.include?(name)
     end
 
-    def add_entries_to(target = {}, include_undef = false)
+    def add_entries_to(target = {})
       super
       @symbols.each do |k, v|
-        if (v == :undef || v.nil?) && !include_undef
+        if v == :undef || v.nil?
           target.delete(k)
         else
           target[ k ] = v
@@ -161,7 +161,7 @@ class Puppet::Parser::Scope
       raise Puppet::ParseError, _("Numerical variables cannot be deleted: Attempt to delete: $%{name}") % { name: name }
     end
 
-    def add_entries_to(target = {}, include_undef = false)
+    def add_entries_to(target = {})
       # do not include match data ($0-$n)
       super
     end
@@ -661,9 +661,8 @@ class Puppet::Parser::Scope
   # Returns a Hash containing all variables and their values, optionally (and
   # by default) including the values defined in parent. Local values
   # shadow parent values. Ephemeral scopes for match results ($0 - $n) are not included.
-  # Optionally include the variables that are explicitly set to `undef`.
   #
-  def to_hash(recursive = true, include_undef = false)
+  def to_hash(recursive = true)
     if recursive and has_enclosing_scope?
       target = enclosing_scope.to_hash(recursive)
       if !(inherited = inherited_scope).nil?
@@ -674,7 +673,7 @@ class Puppet::Parser::Scope
     end
 
     # add all local scopes
-    @ephemeral.last.add_entries_to(target, include_undef)
+    @ephemeral.last.add_entries_to(target)
     target
   end
 

data/lib/puppet/pops/evaluator/collectors/catalog_collector.rb

@@ -24,6 +24,6 @@ class Puppet::Pops::Evaluator::Collectors::CatalogCollector < Puppet::Pops::Eval
   end
 
   def to_s
-    "Catalog-Collector[#{@type}]"
+    "Catalog-Collector[#{@type.to_s}]"
   end
 end

data/lib/puppet/pops/evaluator/collectors/exported_collector.rb

@@ -64,6 +64,6 @@ class Puppet::Pops::Evaluator::Collectors::ExportedCollector < Puppet::Pops::Eva
   end
 
   def to_s
-    "Exported-Collector[#{@type}]"
+    "Exported-Collector[#{@type.to_s}]"
   end
 end

data/lib/puppet/pops/evaluator/external_syntax_support.rb

@@ -35,11 +35,10 @@ module Puppet::Pops::Evaluator::ExternalSyntaxSupport
   def lookup_keys_for_syntax(syntax)
     segments = syntax.split(/\+/)
     result = []
-    loop do
+    begin
       result << segments.join("+")
       segments.shift
-      break if segments.empty?
-    end
+    end until segments.empty?
     result
   end