Layout/SpaceInsideHashLiteralBraces

This commit enables the Rubocop Layout/SpaceInsideHashLiteralBraces cop
and addresses all offenses.

Author: mhashizume

.rubocop_todo.yml

@@ -22,13 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, compact, no_space

lib/puppet/agent.rb

@@ -99,13 +99,13 @@ def run(client_options = {})
               nil
             else
               Puppet.info _("Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish.")
-              Puppet.info _("Will try again in %{time} seconds.") % {time: Puppet[:waitforlock]}
+              Puppet.info _("Will try again in %{time} seconds.") % { time: Puppet[:waitforlock] }
               sleep Puppet[:waitforlock]
               retry
             end
           rescue RunTimeoutError => detail
             Puppet.log_exception(detail, _("Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated.") %
-              {client_class: client_class, runtimeout: Puppet[:runtimeout]})
+              { client_class: client_class, runtimeout: Puppet[:runtimeout] })
             nil
           rescue StandardError => detail
             Puppet.log_exception(detail, _("Could not run %{client_class}: %{detail}") % { client_class: client_class, detail: detail })

lib/puppet/application/agent.rb

@@ -426,13 +426,13 @@ def fingerprint
       end
     end
   rescue => e
-    Puppet.log_exception(e, _("Failed to generate fingerprint: %{message}") % {message: e.message})
+    Puppet.log_exception(e, _("Failed to generate fingerprint: %{message}") % { message: e.message })
     exit(1)
   end
 
   def onetime(daemon)
     begin
-      exitstatus = daemon.agent.run({:job_id => options[:job_id], :start_time => options[:start_time], :waitforcert => options[:waitforcert]})
+      exitstatus = daemon.agent.run({ :job_id => options[:job_id], :start_time => options[:start_time], :waitforcert => options[:waitforcert] })
     rescue => detail
       Puppet.log_exception(detail)
     end

lib/puppet/application/apply.rb

@@ -213,7 +213,7 @@ def main
     # rubocop:enable Layout/ExtraSpacing
 
     # TRANSLATORS "puppet apply" is a program command and should not be translated
-    Puppet.override({:current_environment => apply_environment, :loaders => create_loaders(apply_environment)}, _("For puppet apply")) do
+    Puppet.override({ :current_environment => apply_environment, :loaders => create_loaders(apply_environment) }, _("For puppet apply")) do
       configure_node_facts(node, facts)
 
       # Allow users to load the classes that puppet agent creates.
@@ -340,7 +340,7 @@ def read_catalog(text)
     configured_environment = get_configured_environment(node)
 
     # TRANSLATORS "puppet apply" is a program command and should not be translated
-    Puppet.override({:current_environment => configured_environment}, _("For puppet apply")) do
+    Puppet.override({ :current_environment => configured_environment }, _("For puppet apply")) do
       configure_node_facts(node, facts)
 
       # NOTE: Does not set rich_data = true automatically (which would ensure always reading catalog with rich data

lib/puppet/application/doc.rb

@@ -8,7 +8,7 @@ class Puppet::Application::Doc < Puppet::Application
   attr_accessor :unknown_args, :manifest
 
   def preinit
-    {:references => [], :mode => :text, :format => :to_markdown }.each do |name, value|
+    { :references => [], :mode => :text, :format => :to_markdown }.each do |name, value|
       options[name] = value
     end
     @unknown_args = []
@@ -117,7 +117,7 @@ module - see https://github.com/puppetlabs/puppetlabs-strings for more informati
   end
 
   def handle_unknown( opt, arg )
-    @unknown_args << {:opt => opt, :arg => arg }
+    @unknown_args << { :opt => opt, :arg => arg }
     true
   end
 

lib/puppet/application/lookup.rb

@@ -288,16 +288,16 @@ def main
       end
 
       if merge == 'deep'
-        merge_options = {'strategy' => 'deep',
-                         'sort_merged_arrays' => !options[:sort_merged_arrays].nil?,
-                         'merge_hash_arrays' => !options[:merge_hash_arrays].nil?}
+        merge_options = { 'strategy' => 'deep',
+                          'sort_merged_arrays' => !options[:sort_merged_arrays].nil?,
+                          'merge_hash_arrays' => !options[:merge_hash_arrays].nil? }
 
         if options[:prefix]
           merge_options['knockout_prefix'] = options[:prefix]
         end
 
       else
-        merge_options = {'strategy' => merge}
+        merge_options = { 'strategy' => merge }
       end
     end
 
@@ -364,7 +364,7 @@ def generate_scope
       if TRUSTED_INFORMATION_FACTS.any? { |key| given_facts.key? key }
         unless TRUSTED_INFORMATION_FACTS.all? { |key| given_facts.key? key }
           raise _("When overriding any of the %{trusted_facts_list} facts with %{fact_file} "\
-                  "given via the --facts flag, they must all be overridden.") % { fact_file: fact_file, trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',')}
+                  "given via the --facts flag, they must all be overridden.") % { fact_file: fact_file, trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',') }
         end
       end
     end
@@ -421,7 +421,7 @@ def retrieve_node_facts(node, given_facts)
     facts.add_extra_values(given_facts) if given_facts
 
     if facts.values.empty?
-      raise _("No facts available for target node: %{node}") % { node: node}
+      raise _("No facts available for target node: %{node}") % { node: node }
     end
 
     facts

lib/puppet/application/script.rb

@@ -169,7 +169,7 @@ def main
     node.environment = apply_environment
 
     # TRANSLATION, the string "For puppet script" is not user facing
-    Puppet.override({:current_environment => apply_environment}, "For puppet script") do
+    Puppet.override({ :current_environment => apply_environment }, "For puppet script") do
       # Merge in the facts.
       node.merge(facts.values) if facts
 

lib/puppet/application/ssl.rb

@@ -149,7 +149,7 @@ def main
     when 'clean'
       possible_extra_args = command_line.args.drop(1)
       unless possible_extra_args.empty?
-        raise Puppet::Error, _(<<~END) % { args: possible_extra_args.join(' ')}
+        raise Puppet::Error, _(<<~END) % { args: possible_extra_args.join(' ') }
           Extra arguments detected: %{args}
           Did you mean to run:
             puppetserver ca clean --certname <name>

lib/puppet/application_support.rb

@@ -37,7 +37,7 @@ def self.push_application_context(run_mode, environment_mode = :local)
       configured_environment = configured_environment.override_from_commandline(Puppet.settings)
 
       # Setup a new context using the app's configuration
-      Puppet.push_context({:current_environment => configured_environment},
+      Puppet.push_context({ :current_environment => configured_environment },
                           "Update current environment from application's configuration")
     end
 

lib/puppet/configurer.rb

@@ -186,7 +186,7 @@ def check_payload_size(payload)
     return if max_size.zero?
 
     warn_fact_payload_size(payload, max_size) if payload > max_size
-    Puppet.debug _("The size of the payload is %{payload}") % {payload: payload}
+    Puppet.debug _("The size of the payload is %{payload}") % { payload: payload }
   end
 
   def parse_fact_name_and_value_limits(object, path = [])
@@ -216,7 +216,7 @@ def check_facts_limits(facts)
 
     parse_fact_name_and_value_limits(facts)
     check_total_number_limit(@number_of_facts)
-    Puppet.debug _("The total number of facts registered is %{number_of_facts}") % {number_of_facts: @number_of_facts}
+    Puppet.debug _("The total number of facts registered is %{number_of_facts}") % { number_of_facts: @number_of_facts }
   end
 
   def get_facts(options)
@@ -273,7 +273,7 @@ def prepare_and_retrieve_catalog(cached_catalog, facts, options, query_options)
   end
 
   def prepare_and_retrieve_catalog_from_cache(options = {})
-    result = retrieve_catalog_from_cache({:transaction_uuid => @transaction_uuid, :static_catalog => @static_catalog})
+    result = retrieve_catalog_from_cache({ :transaction_uuid => @transaction_uuid, :static_catalog => @static_catalog })
     Puppet.info _("Using cached catalog from environment '%{catalog_env}'") % { catalog_env: result.environment } if result
     result
   end
@@ -560,7 +560,7 @@ def find_functional_server
                    { host: e.response.url.host, port: e.response.url.port, code: e.response.code, reason: e.response.reason })
     rescue => detail
       # TRANSLATORS 'server_list' is the name of a setting and should not be translated
-      Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail}
+      Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % { detail: detail }
     end
     [nil, nil]
   end