puppet 5.5.17-x64-mingw32 → 5.5.18-x64-mingw32

data/lib/puppet/forge.rb

@@ -59,7 +59,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     matches = []
     uri = "/v3/modules?query=#{term}"
     if Puppet[:module_groups]
-      uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
+      uri += "&module_groups=#{Puppet[:module_groups].tr('+', ' ')}"
     end
 
     while uri
@@ -95,7 +95,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].gsub('+', ' ')}"
+      uri += "&module_groups=#{Puppet[:module_groups].tr('+', ' ')}"
     end
     releases = []
 
@@ -240,6 +240,6 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   def decode_uri(uri)
     return if uri.nil?
 
-    URI.decode(uri.gsub('+', ' '))
+    URI.decode(uri.tr('+', ' '))
   end
 end

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](/puppet/latest/reference/lang_data_hash.html) that contains parameters to
+# [hash](https://puppet.com/docs/puppet/latest/lang_data_hash.html) that contains parameters to
 # pass to the template.
 #
-# - 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)
+# - 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)
 # documentation for examples of EPP.
 #
 # For example, to call the apache module's `templates/vhost/_docroot.epp`

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](/puppet/latest/reference/lang_data_hash.html) that contains parameters to
+# [hash](https://puppet.com/docs/puppet/latest/lang_data_hash.html) that contains parameters to
 # pass to the template.
 #
-# - 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)
+# - 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)
 # 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](/puppet/latest/reference/lang_data_string.html#heredocs).
+# [heredoc](https://puppet.com/docs/puppet/latest/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/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.gsub('/', '-')
+      module_name = mod.forge_name.tr('/', '-')
       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.merge!(:left => left.to_hash) if @left
-      h.merge!(:right => right.to_hash) if @right
+      h[:left] = left.to_hash if @left
+      h[:right] = right.to_hash if @right
       h
     end
 

data/lib/puppet/graph/simple_graph.rb

@@ -133,11 +133,12 @@ class Puppet::Graph::SimpleGraph
         else
           if s[:lowlink][vertex] == s[:index][vertex] then
             this_scc = []
-            begin
+            loop do
               top = s[:stack].pop
               s[:seen][top] = false
               this_scc << top
-            end until top == vertex
+              break if top == vertex
+            end
             s[:scc] << this_scc
           end
           recur.pop               # done with this node, finally.
@@ -436,8 +437,8 @@ class Puppet::Graph::SimpleGraph
   # undirected Graph.  _params_ can contain any graph property specified in
   # 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.gsub(/:/,'_')
+  def to_dot_graph(params = {})
+    params['name'] ||= self.class.name.tr(':','_')
     fontsize   = params['fontsize'] ? params['fontsize'] : '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
@@ -462,7 +463,7 @@ class Puppet::Graph::SimpleGraph
   end
 
   # Output the dot format as a string
-  def to_dot (params={}) to_dot_graph(params).to_s; end
+  def to_dot(params={}) to_dot_graph(params).to_s; end
 
   # Produce the graph files if requested.
   def write_graph(name)

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.exists?(request.options[:bucket_path])
+        return nil unless ::File.exist?(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,6 +69,8 @@ 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,9 +25,7 @@ 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 do |a,b|
-      a.title <=> b.title
-    end
+    end.sort_by(&:title)
   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.downcase == request.instance.type.downcase and title == request.instance.title
+    unless type.casecmp(request.instance.type).zero? 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.to_s}"
+          raise Puppet::Error, "Could not find Puppet Face #{name}"
         end
       end
 
@@ -234,4 +234,5 @@ class Puppet::Interface
     define_method(name, proc)
     instance_method(name)
   end
+  private_class_method :__add_method
 end

data/lib/puppet/loaders.rb

@@ -9,7 +9,6 @@ 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

@@ -123,7 +123,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.to_s}")
+    klass.providerloader = Puppet::Util::Autoload.new(klass, "puppet/provider/#{klass.name}")
 
     # 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

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

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

@@ -103,7 +103,7 @@ module Puppet::ModuleTool
           end
 
           # make dir tree, copy files, and add symlinks to the symlinks list
-          dest = "#{build_path}/#{rel.to_s}"
+          dest = "#{build_path}/#{rel}"
           if File.directory? path
             FileUtils.mkdir dest, :mode => File.stat(path).mode
           elsif Puppet::FileSystem.symlink? path

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

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

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

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

data/lib/puppet/module_tool/metadata.rb

@@ -103,7 +103,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.to_s}": #{value})
+        %Q("#{k}": #{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).gsub('/', '-')
+      mod_name = (mod.forge_name || mod.name).tr('/', '-')
       @installed[mod_name] << mod
       d = @local["#{mod_name}@#{mod.version}"]
       (mod.dependencies || []).each do |hash|
         name, conditions = hash['name'], hash['version_requirement']
-        name = name.gsub('/', '-')
+        name = name.tr('/', '-')
         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.gsub('/', '-')
+      mod_name = mod_name.tr('/', '-')
       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.gsub('/', '-')] = conditions
+          d[name.tr('/', '-')] = conditions
         end
       end
     end

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

@@ -93,7 +93,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).include?(flag.to_i)
+      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).cover?(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

@@ -114,6 +114,17 @@ 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.
@@ -246,20 +257,10 @@ 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

@@ -311,19 +311,17 @@ 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
 
-      err.set_backtrace(exception.backtrace) unless exception.backtrace.empty?
-      raise err
+      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
     end
 
     def with_connection(site, &block)

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

@@ -90,6 +90,8 @@ class Puppet::Network::HTTP::Pool
   #
   # @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/rack/rest.rb

@@ -52,7 +52,7 @@ class Puppet::Network::HTTP::RackREST
   # Retrieve all headers from the http request, as a map.
   def headers(request)
     headers = request.env.select {|k,v| k.start_with? 'HTTP_'}.inject({}) do |m, (k,v)|
-      m[k.sub(/^HTTP_/, '').gsub('_','-').downcase] = v
+      m[k.sub(/^HTTP_/, '').tr('_','-').downcase] = v
       m
     end
     headers['content-type'] = request.content_type
@@ -113,7 +113,7 @@ class Puppet::Network::HTTP::RackREST
         # in contrast to the environment variable, the client cert is passed in
         # as single string, therefore restore the certificate to a valid pem
         # encoded certificate
-        cert.gsub!(/ /, "\n")
+        cert.tr!(' ', "\n")
         cert.gsub!(/BEGIN\nCERT/, "BEGIN CERT")
         cert.gsub!(/END\nCERT/, "END CERT")
         cert = Puppet::SSL::Certificate.from_instance(OpenSSL::X509::Certificate.new(cert))

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

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

data/lib/puppet/network/resolver.rb

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