puppet 8.4.0-universal-darwin → 8.5.0-universal-darwin

data/lib/puppet/graph/simple_graph.rb

@@ -125,7 +125,7 @@ class Puppet::Graph::SimpleGraph
       when :children then
         if frame[:children].length > 0 then
           child = frame[:children].shift
-          if ! s[:index][child] then
+          if !s[:index][child] then
             # Never seen, need to recurse.
             frame[:step] = :after_recursion
             frame[:child] = child
@@ -171,7 +171,7 @@ class Puppet::Graph::SimpleGraph
 
     # we usually have a disconnected graph, must walk all possible roots
     vertices.each do |vertex|
-      if ! state[:index][vertex] then
+      if !state[:index][vertex] then
         tarjan vertex, state
       end
     end
@@ -205,7 +205,7 @@ class Puppet::Graph::SimpleGraph
     # Calculate our filtered outbound vertex lists...
     adj = {}
     cycle.each do |vertex|
-      adj[vertex] = adjacent(vertex).select{|s| cycle.member? s}
+      adj[vertex] = adjacent(vertex).select { |s| cycle.member? s }
     end
 
     found = []
@@ -236,7 +236,7 @@ class Puppet::Graph::SimpleGraph
 
     cycles.each do |cycle|
       paths = paths_in_cycle(cycle)
-      message += paths.map{ |path| '(' + path.join(' => ') + ')'}.join('\n') + '\n'
+      message += paths.map { |path| '(' + path.join(' => ') + ')' }.join('\n') + '\n'
     end
 
     if Puppet[:graph] then
@@ -283,7 +283,7 @@ class Puppet::Graph::SimpleGraph
 
     @upstream_from.clear
     @downstream_from.clear
-    (@in_to[v].values+@out_from[v].values).flatten.each { |e| remove_edge!(e) }
+    (@in_to[v].values + @out_from[v].values).flatten.each { |e| remove_edge!(e) }
     @in_to.delete(v)
     @out_from.delete(v)
   end
@@ -300,8 +300,8 @@ class Puppet::Graph::SimpleGraph
 
   # Add a new edge.  The graph user has to create the edge instance,
   # since they have to specify what kind of edge it is.
-  def add_edge(e,*a)
-    return add_relationship(e,*a) unless a.empty?
+  def add_edge(e, *a)
+    return add_relationship(e, *a) unless a.empty?
 
     e = Puppet::Relationship.from_data_hash(e) if e.is_a?(Hash)
     @upstream_from.clear
@@ -334,15 +334,15 @@ class Puppet::Graph::SimpleGraph
   end
 
   def each_edge
-    @in_to.each { |_t,ns| ns.each { |_s,es| es.each { |e| yield e }}}
+    @in_to.each { |_t, ns| ns.each { |_s, es| es.each { |e| yield e } } }
   end
 
   # Remove an edge from our graph.
   def remove_edge!(e)
-    if edge?(e.source,e.target)
+    if edge?(e.source, e.target)
       @upstream_from.clear
       @downstream_from.clear
-      @in_to   [e.target].delete e.source if (@in_to   [e.target][e.source] -= [e]).empty?
+      @in_to[e.target].delete e.source if (@in_to[e.target][e.source] -= [e]).empty?
       @out_from[e.source].delete e.target if (@out_from[e.source][e.target] -= [e]).empty?
     end
   end
@@ -378,7 +378,7 @@ class Puppet::Graph::SimpleGraph
   # A different way of walking a tree, and a much faster way than the
   # one that comes with GRATR.
   def tree_from_vertex(start, direction = :out)
-    predecessor={}
+    predecessor = {}
     walk(start, direction) do |parent, child|
       predecessor[child] = parent
     end
@@ -428,14 +428,14 @@ class Puppet::Graph::SimpleGraph
   # This implementation is not particularly efficient; it's used in testing where clarity
   #   is more important than last-mile efficiency.
   #
-  def path_between(f,t)
-    if f==t
+  def path_between(f, t)
+    if f == t
       []
     elsif direct_dependents_of(f).include?(t)
-      [edges_between(f,t)]
+      [edges_between(f, t)]
     elsif dependents(f).include?(t)
       m = (dependents(f) & direct_dependencies_of(t)).first
-      path_between(f,m) + path_between(m,t)
+      path_between(f, m) + path_between(m, t)
     else
       nil
     end
@@ -448,25 +448,25 @@ 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.tr(':', '_')
     fontsize   = params['fontsize'] ? params['fontsize'] : '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
     vertices.each do |v|
       name = v.ref
-      params = {'name' => stringify(name),
-                'fontsize' => fontsize,
-                'label' => name}
+      params = { 'name' => stringify(name),
+                 'fontsize' => fontsize,
+                 'label' => name }
       v_label = v.ref
-      params.merge!(v_label) if v_label and v_label.kind_of? Hash
+      params.merge!(v_label) if v_label and v_label.is_a? Hash
       graph << DOT::DOTNode.new(params)
     end
     edges.each do |e|
-      params = {'from' => stringify(e.source.ref),
-                'to' => stringify(e.target.ref),
-                'fontsize' => fontsize }
+      params = { 'from' => stringify(e.source.ref),
+                 'to' => stringify(e.target.ref),
+                 'fontsize' => fontsize }
       e_label = e.ref
-      params.merge!(e_label) if e_label and e_label.kind_of? Hash
+      params.merge!(e_label) if e_label and e_label.is_a? Hash
       graph << edge_klass.new(params)
     end
     graph
@@ -477,7 +477,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/http/client.rb

@@ -154,18 +154,18 @@ class Puppet::HTTP::Client
       end
     end
   rescue Net::OpenTimeout => e
-    raise_error(_("Request to %{uri} timed out connect operation after %{elapsed} seconds") % {uri: uri, elapsed: elapsed(start)}, e, connected)
+    raise_error(_("Request to %{uri} timed out connect operation after %{elapsed} seconds") % { uri: uri, elapsed: elapsed(start) }, e, connected)
   rescue Net::ReadTimeout => e
-    raise_error(_("Request to %{uri} timed out read operation after %{elapsed} seconds") % {uri: uri, elapsed: elapsed(start)}, e, connected)
+    raise_error(_("Request to %{uri} timed out read operation after %{elapsed} seconds") % { uri: uri, elapsed: elapsed(start) }, e, connected)
   rescue EOFError => e
-    raise_error(_("Request to %{uri} interrupted after %{elapsed} seconds") % {uri: uri, elapsed: elapsed(start)}, e, connected)
+    raise_error(_("Request to %{uri} interrupted after %{elapsed} seconds") % { uri: uri, elapsed: elapsed(start) }, e, connected)
   rescue Puppet::SSL::SSLError
     raise
   rescue Puppet::HTTP::HTTPError
     raise
   rescue => e
     raise_error(_("Request to %{uri} failed after %{elapsed} seconds: %{message}") %
-                {uri: uri, elapsed: elapsed(start), message: e.message}, e, connected)
+                { uri: uri, elapsed: elapsed(start), message: e.message }, e, connected)
   end
 
   # These options apply to all HTTP request methods

data/lib/puppet/http/dns.rb

@@ -98,7 +98,7 @@ module Puppet::HTTP
       # We generate a random number 5, and iterate through the records, adding
       # the current record's weight to the accumulator until the weight of the
       # current record plus previous records is greater than the random number.
-      total_weight = records.inject(0) { |sum,record|
+      total_weight = records.inject(0) { |sum, record|
         sum + weight(record)
       }
       current_weight = 0
@@ -146,10 +146,9 @@ module Puppet::HTTP
     # @yields [[Resolv::DNS::Resource::IN::SRV]] a group of records of
     #         the same priority
     def each_priority(records)
-      pri_hash = records.inject({}) do |groups, element|
+      pri_hash = records.each_with_object({}) do |element, groups|
         groups[element.priority] ||= []
         groups[element.priority] << element
-        groups
       end
 
       pri_hash.keys.sort.each do |key|

data/lib/puppet/http/errors.rb

@@ -36,7 +36,7 @@ module Puppet::HTTP
   # @api public
   class TooManyRedirects < HTTPError
     def initialize(addr)
-      super(_("Too many HTTP redirections for %{addr}") % { addr: addr})
+      super(_("Too many HTTP redirections for %{addr}") % { addr: addr })
     end
   end
 
@@ -44,7 +44,7 @@ module Puppet::HTTP
   # @api public
   class TooManyRetryAfters < HTTPError
     def initialize(addr)
-      super(_("Too many HTTP retries for %{addr}") % { addr: addr})
+      super(_("Too many HTTP retries for %{addr}") % { addr: addr })
     end
   end
 end

data/lib/puppet/http/factory.rb

@@ -17,7 +17,7 @@ class Puppet::HTTP::Factory
 
   def initialize
     # PUP-1411, make sure that openssl is initialized before we try to connect
-    if ! @@openssl_initialized
+    if !@@openssl_initialized
       OpenSSL::SSL::SSLContext.new
       @@openssl_initialized = true
     end

data/lib/puppet/http/proxy.rb

@@ -18,7 +18,7 @@ module Puppet::HTTP::Proxy
 
   def self.http_proxy_env
     # Returns a URI object if proxy is set, or nil
-    proxy_env = ENV["http_proxy"] || ENV["HTTP_PROXY"]
+    proxy_env = ENV.fetch("http_proxy", nil) || ENV.fetch("HTTP_PROXY", nil)
     begin
       return URI.parse(proxy_env) if proxy_env
     rescue URI::InvalidURIError
@@ -124,7 +124,7 @@ module Puppet::HTTP::Proxy
   end
 
   def self.no_proxy
-    no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"]
+    no_proxy_env = ENV.fetch("no_proxy", nil) || ENV.fetch("NO_PROXY", nil)
 
     if no_proxy_env
       return no_proxy_env

data/lib/puppet/http/redirector.rb

@@ -78,6 +78,6 @@ class Puppet::HTTP::Redirector
 
     URI.parse(location)
   rescue URI::InvalidURIError => e
-    raise Puppet::HTTP::ProtocolError.new(_("Location URI is invalid: %{detail}") % { detail: e.message}, e)
+    raise Puppet::HTTP::ProtocolError.new(_("Location URI is invalid: %{detail}") % { detail: e.message }, e)
   end
 end

data/lib/puppet/http/resolver/server_list.rb

@@ -16,7 +16,7 @@ class Puppet::HTTP::Resolver::ServerList < Puppet::HTTP::Resolver
   #   used to resolve. If a service is not included in this array, this resolver
   #   will return nil.
   #
-  def initialize(client, server_list_setting:, default_port:, services: )
+  def initialize(client, server_list_setting:, default_port:, services:)
     @client = client
     @server_list_setting = server_list_setting
     @default_port = default_port
@@ -71,10 +71,10 @@ class Puppet::HTTP::Resolver::ServerList < Puppet::HTTP::Resolver
         end
       rescue Puppet::HTTP::HTTPError => detail
         if index < @server_list_setting.value.length - 1
-          Puppet.warning(_("Unable to connect to server from server_list setting: %{detail}") % {detail: detail} +
+          Puppet.warning(_("Unable to connect to server from server_list setting: %{detail}") % { detail: detail } +
                              ' ' + _("Trying with next server from server_list."))
         else
-          Puppet.log_exception(detail, _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail})
+          Puppet.log_exception(detail, _("Unable to connect to server from server_list setting: %{detail}") % { detail: detail })
         end
       end
     end

data/lib/puppet/http/response_converter.rb

@@ -9,7 +9,7 @@ module Puppet::HTTP::ResponseConverter
 
     # Copied from Net::HTTPResponse because it is private there.
     clazz = Net::HTTPResponse::CODE_TO_OBJ[str_code] or
-      Net::HTTPResponse::CODE_CLASS_TO_OBJ[str_code[0,1]] or
+      Net::HTTPResponse::CODE_CLASS_TO_OBJ[str_code[0, 1]] or
       Net::HTTPUnknownResponse
     result = clazz.new(nil, str_code, nil)
     result.body = response.body
@@ -17,10 +17,9 @@ module Puppet::HTTP::ResponseConverter
     # an instance of Net::HttpResponse from outside of the library and have
     # the body be readable, unless you do stupid things like this.
     result.instance_variable_set(:@read, true)
-    response.each_header do |k,v|
+    response.each_header do |k, v|
       result[k] = v
     end
     result
   end
 end
-

data/lib/puppet/http/service/ca.rb

@@ -44,7 +44,7 @@ class Puppet::HTTP::Service::Ca < Puppet::HTTP::Service
     response = @client.get(
       with_base_url("/certificate/#{name}"),
       headers: headers,
-      options: {ssl_context: ssl_context}
+      options: { ssl_context: ssl_context }
     )
 
     process_response(response)
@@ -70,7 +70,7 @@ class Puppet::HTTP::Service::Ca < Puppet::HTTP::Service
     response = @client.get(
       with_base_url("/certificate_revocation_list/ca"),
       headers: headers,
-      options: {ssl_context: ssl_context}
+      options: { ssl_context: ssl_context }
     )
 
     process_response(response)
@@ -121,7 +121,7 @@ class Puppet::HTTP::Service::Ca < Puppet::HTTP::Service
       with_base_url('/certificate_renewal'),
       '', # Puppet::HTTP::Client.post requires a body, the API endpoint does not
       headers: headers,
-      options: {ssl_context: ssl_context}
+      options: { ssl_context: ssl_context }
     )
 
     raise ArgumentError.new(_('SSL context must contain a client certificate.')) unless ssl_context.client_cert

data/lib/puppet/http/service/compiler.rb

@@ -149,7 +149,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   #    report submission.
   # @param [String] job_id The id of the orchestrator job that triggered this run.
   # @param [Hash] options A hash of options beyond direct input to catalogs. Options:
-  #    - prefer_requested_environment Whether to always override a node's classified 
+  #    - prefer_requested_environment Whether to always override a node's classified
   #      environment with the one supplied in the request. If this is true and no environment
   #      is supplied, fall back to the classified environment, or finally, 'production'.
   #    - capture_logs Whether to return the errors and warnings that occurred during
@@ -195,7 +195,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
     rescue => err
       raise Puppet::HTTP::SerializationError.new("Failed to deserialize catalog from puppetserver response: #{err.message}", err)
     end
-    
+
     logs = response_body['logs'] || []
     [response, catalog, logs]
   end

data/lib/puppet/http/service/file_server.rb

@@ -100,7 +100,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   #
   # @api public
   #
-  def get_file_metadatas(path: nil, environment:, recurse: :false, recurselimit: nil, max_files: nil, ignore: nil, links: :manage, checksum_type: Puppet[:digest_algorithm], source_permissions: :ignore) # rubocop:disable Lint/BooleanSymbol
+  def get_file_metadatas(environment:, path: nil, recurse: :false, recurselimit: nil, max_files: nil, ignore: nil, links: :manage, checksum_type: Puppet[:digest_algorithm], source_permissions: :ignore) # rubocop:disable Lint/BooleanSymbol
     validate_path(path)
 
     headers = add_puppet_headers('Accept' => get_mime_types(Puppet::FileServing::Metadata).join(', '))

data/lib/puppet/http/service/puppetserver.rb

@@ -36,7 +36,7 @@ class Puppet::HTTP::Service::Puppetserver < Puppet::HTTP::Service
       response = @client.get(
         with_base_url(request_path),
         headers: add_puppet_headers({}),
-        options: {ssl_context: ssl_context}
+        options: { ssl_context: ssl_context }
       )
 
       process_response(response)

data/lib/puppet/http/service.rb

@@ -92,7 +92,7 @@ class Puppet::HTTP::Service
   #
   # @api public
   def connect(ssl_context: nil)
-    @client.connect(@url, options: {ssl_context: ssl_context})
+    @client.connect(@url, options: { ssl_context: ssl_context })
   end
 
   protected
@@ -107,12 +107,10 @@ class Puppet::HTTP::Service
     Puppet[:http_extra_headers].each do |name, value|
       if modified_headers.keys.find { |key| key.casecmp(name) == 0 }
         Puppet.warning(_('Ignoring extra header "%{name}" as it was previously set.') % { name: name })
+      elsif value.nil? || value.empty?
+        Puppet.warning(_('Ignoring extra header "%{name}" as it has no value.') % { name: name })
       else
-        if value.nil? || value.empty?
-          Puppet.warning(_('Ignoring extra header "%{name}" as it has no value.') % { name: name })
-        else
-          modified_headers[name] = value
-        end
+        modified_headers[name] = value
       end
     end
     modified_headers
@@ -121,8 +119,7 @@ class Puppet::HTTP::Service
   def build_url(api, server, port)
     URI::HTTPS.build(host: server,
                      port: port,
-                     path: api
-                    ).freeze
+                     path: api).freeze
   end
 
   def get_mime_types(model)
@@ -134,7 +131,7 @@ class Puppet::HTTP::Service
     header = response['Content-Type']
     raise Puppet::HTTP::ProtocolError.new(_("No content type in http response; cannot parse")) unless header
 
-    header.gsub!(/\s*;.*$/,'') # strip any charset
+    header.gsub!(/\s*;.*$/, '') # strip any charset
 
     formatter = Puppet::Network::FormatHandler.mime(header)
     raise Puppet::HTTP::ProtocolError.new("Content-Type is unsupported") if EXCLUDED_FORMATS.include?(formatter.name)

data/lib/puppet/http/session.rb

@@ -62,7 +62,7 @@ class Puppet::HTTP::Session
     return cached if cached
 
     canceled = false
-    canceled_handler = lambda { |cancel| canceled = cancel }
+    canceled_handler = ->(cancel) { canceled = cancel }
 
     @resolvers.each do |resolver|
       Puppet.debug("Resolving service '#{name}' using #{resolver.class}")

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

@@ -68,7 +68,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         # name and modulepath to be the same. When using versioned environment dirs the
         # same "environment" can have different modulepaths so simply compare names here.
         if node.environment.name != request.environment.name
-          Puppet.warning _("Requested environment '%{request_env}' did not match server specified environment '%{server_env}'") % {request_env: request.environment.name, server_env: node.environment.name}
+          Puppet.warning _("Requested environment '%{request_env}' did not match server specified environment '%{server_env}'") % { request_env: request.environment.name, server_env: node.environment.name }
           return Puppet::Resource::Catalog.new(node.name, node.environment)
         end
       end
@@ -116,11 +116,12 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # @return [Puppet::Node::Facts] facts object deserialized from supplied string
   # @api private
   def convert_wire_facts(facts, format)
-    if format == 'pson'
+    case format
+    when 'pson'
       # We unescape here because the corresponding code in Puppet::Configurer::FactHandler encodes with Puppet::Util.uri_query_encode
       # PSON is deprecated, but continue to accept from older agents
       return Puppet::Node::Facts.convert_from('pson', CGI.unescape(facts))
-    elsif format == 'application/json'
+    when 'application/json'
       return Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
     else
       raise ArgumentError, _("Unsupported facts format")
@@ -138,7 +139,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # If no match is found, return nil.
   def common_checksum_type(agent_checksum_type)
     if agent_checksum_type
-      agent_checksum_types = agent_checksum_type.split('.').map {|type| type.to_sym}
+      agent_checksum_types = agent_checksum_type.split('.').map { |type| type.to_sym }
       checksum_type = agent_checksum_types.drop_while do |type|
         not known_checksum_types.include? type
       end.first
@@ -168,7 +169,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     when sources.empty?
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
       return Puppet::Util::Profiler.profile(_("Not inlining resource without sources"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :no_sources]) { false }
-    when (not (sources.all? {|source| source =~ /^puppet:/}))
+    when (not (sources.all? { |source| source =~ /^puppet:/ }))
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
       return Puppet::Util::Profiler.profile(_("Not inlining unsupported source scheme"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :unsupported_scheme]) { false }
     else
@@ -237,10 +238,10 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
           list_of_data = Puppet::FileServing::Metadata.indirection.search(source, options)
           if list_of_data
-            basedir_meta = list_of_data.find {|meta| meta.relative_path == '.'}
+            basedir_meta = list_of_data.find { |meta| meta.relative_path == '.' }
             devfail "FileServing::Metadata search should always return the root search path" if basedir_meta.nil?
 
-            if ! inlineable_metadata?(basedir_meta, source, environment_path)
+            if !inlineable_metadata?(basedir_meta, source, environment_path)
               # If any source is not in the environment path, skip inlining this resource.
               log_file_outside_environment
               sources_in_environment = false
@@ -322,15 +323,13 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         benchmark_str = _("Compiled static catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
         profile_str   = _("Compiled static catalog for %{node}") % { node: node.name }
       end
+    elsif node.environment
+      escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
+      benchmark_str = _("Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
+      profile_str   = _("Compiled catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
     else
-      if node.environment
-        escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
-        benchmark_str = _("Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
-        profile_str   = _("Compiled catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
-      else
-        benchmark_str = _("Compiled catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
-        profile_str   = _("Compiled catalog for %{node}") % { node: node.name }
-      end
+      benchmark_str = _("Compiled catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
+      profile_str   = _("Compiled catalog for %{node}") % { node: node.name }
     end
     config = nil
 
@@ -440,10 +439,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     @server_facts["serverversion"] = Puppet.version.to_s
 
     # And then add the server name and IP
-    {"servername" => "networking.fqdn",
-     "serverip" => "networking.ip",
-     "serverip6" => "networking.ip6"
-    }.each do |var, fact|
+    { "servername" => "networking.fqdn",
+      "serverip" => "networking.ip",
+      "serverip6" => "networking.ip6" }.each do |var, fact|
       value = Puppet.runtime[:facter].value(fact)
       if !value.nil?
         @server_facts[var] = value

data/lib/puppet/indirector/data_binding/hiera.rb

@@ -6,4 +6,3 @@ require 'hiera/scope'
 class Puppet::DataBinding::Hiera < Puppet::Indirector::Hiera
   desc "Retrieve data using Hiera."
 end
-

data/lib/puppet/indirector/exec.rb

@@ -35,6 +35,6 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
 
   # Proxy the execution, so it's easier to test.
   def execute(command, arguments)
-    Puppet::Util::Execution.execute(command,arguments)
+    Puppet::Util::Execution.execute(command, arguments)
   end
 end

data/lib/puppet/indirector/face.rb

@@ -59,7 +59,7 @@ class Puppet::Indirector::Face < Puppet::Face
   action :destroy do
     summary _("Delete an object.")
     arguments _("<key>")
-    when_invoked {|key, _options| call_indirection_method :destroy, key, {} }
+    when_invoked { |key, _options| call_indirection_method :destroy, key, {} }
   end
 
   action :find do
@@ -84,13 +84,13 @@ class Puppet::Indirector::Face < Puppet::Face
       currently accept data from STDIN, save actions cannot currently be invoked
       from the command line.
     EOT
-    when_invoked {|key, _options| call_indirection_method :save, key, {} }
+    when_invoked { |key, _options| call_indirection_method :save, key, {} }
   end
 
   action :search do
     summary _("Search for an object or retrieve multiple objects.")
     arguments _("<query>")
-    when_invoked {|key, _options| call_indirection_method :search, key, {} }
+    when_invoked { |key, _options| call_indirection_method :search, key, {} }
   end
 
   # Print the configuration for the current terminus class

data/lib/puppet/indirector/fact_search.rb

@@ -59,4 +59,4 @@ module Puppet::Indirector::FactSearch
       value1 != value2
     end
   end
-end
+end

data/lib/puppet/indirector/facts/json.rb

@@ -9,7 +9,7 @@ class Puppet::Node::Facts::Json < Puppet::Indirector::JSON
     return deserialized facts from disk."
 
   include Puppet::Indirector::FactSearch
-  
+
   def search(request)
     node_names = []
     Dir.glob(json_dir_path).each do |file|

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

@@ -60,7 +60,7 @@ module Puppet::FileBucketFile
         raise Puppet::Error, _("Error while parsing 'fromdate'")
       end
       # Setting hash's default value to [], needed by the following loop
-      bucket = Hash.new {[]}
+      bucket = Hash.new { [] }
       msg = ''.dup
       # Get all files with mtime between 'from' and 'to'
       Pathname.new(request.options[:bucket_path]).find { |item|
@@ -69,7 +69,7 @@ module Puppet::FileBucketFile
           filestat = Time.parse(item.stat.mtime.to_s)
           if from <= filestat and filestat <= to
             filenames.each do |filename|
-              bucket[filename] += [[ item.stat.mtime , item.parent.basename ]]
+              bucket[filename] += [[item.stat.mtime, item.parent.basename]]
             end
           end
         end
@@ -82,7 +82,7 @@ module Puppet::FileBucketFile
         end
       }
       # Build the output message. Sorted by names then by dates
-      bucket.sort.each { |filename,contents|
+      bucket.sort.each { |filename, contents|
         contents.each { |mtime, chksum|
           date = mtime.strftime("%F %T")
           msg += "#{chksum} #{date} #{filename}\n"
@@ -181,7 +181,7 @@ module Puppet::FileBucketFile
               # TRANSLATORS "FileBucket" should not be translated
               Puppet.err(_("Unable to verify existing FileBucket backup at '%{path}'.") % { path: contents_file.to_path })
               raise Puppet::FileBucket::BucketError, _("Existing backup and new file have different content but same checksum, %{value}. Verify existing backup and remove if incorrect.") %
-                { value: bucket_file.checksum }
+                                                     { value: bucket_file.checksum }
             else
               # PUP-1334 If the contents_file exists but does not match its
               # checksum, our backup has been corrupted. Warn about overwriting
@@ -234,7 +234,7 @@ module Puppet::FileBucketFile
     # @api private
     def verify_identical_file(contents_file, bucket_file)
       (bucket_file.to_binary.bytesize == Puppet::FileSystem.size(contents_file)) &&
-        (bucket_file.stream() {|s| Puppet::FileSystem.compare_stream(contents_file, s) })
+        (bucket_file.stream() { |s| Puppet::FileSystem.compare_stream(contents_file, s) })
     end
 
     # @param contents_file [Pathname] Opaque file path to intended backup

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

@@ -52,4 +52,3 @@ module Puppet::FileBucketFile
     end
   end
 end
-

data/lib/puppet/indirector/file_metadata/http.rb

@@ -15,7 +15,7 @@ class Puppet::Indirector::FileMetadata::Http < Puppet::Indirector::GenericHttp
     # See URL encoding comment in Puppet::Type::File::ParamSource#chunk_file_from_source
     uri = URI(request.uri)
     client = Puppet.runtime[:http]
-    head = client.head(uri, options: {include_system_store: true})
+    head = client.head(uri, options: { include_system_store: true })
 
     return create_httpmetadata(head, checksum_type) if head.success?
 
@@ -37,7 +37,7 @@ class Puppet::Indirector::FileMetadata::Http < Puppet::Indirector::GenericHttp
   private
 
   def partial_get(client, uri)
-    client.get(uri, headers: {'Range' => 'bytes=0-0'}, options: {include_system_store: true})
+    client.get(uri, headers: { 'Range' => 'bytes=0-0' }, options: { include_system_store: true })
   end
 
   def create_httpmetadata(http_request, checksum_type)

data/lib/puppet/indirector/hiera.rb

@@ -9,7 +9,7 @@ require 'hiera/scope'
 # Use `Puppet::DataBinding.indirection.terminus(:hiera)` instead.
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
-    if ! Puppet.features.hiera?
+    if !Puppet.features.hiera?
       # TRANSLATORS "Hiera" is the name of a code library and should not be translated
       raise _("Hiera terminus not supported without hiera library")
     end
@@ -64,7 +64,7 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
       if strategy == 'deep'
         result = { :behavior => :deeper }
         # Remaining entries must have symbolic keys
-        merge.each_pair { |k,v| result[k.to_sym] = v unless k == 'strategy' }
+        merge.each_pair { |k, v| result[k.to_sym] = v unless k == 'strategy' }
         result
       else
         convert_merge(strategy)
@@ -99,4 +99,3 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
     self.class.hiera
   end
 end
-