Layout/MultilineHashBraceLayout

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,22 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineHashBraceLayout:
-  Exclude:
-    - 'lib/puppet/configurer.rb'
-    - 'lib/puppet/defaults.rb'
-    - 'lib/puppet/face/facts.rb'
-    - 'lib/puppet/file_serving/metadata.rb'
-    - 'lib/puppet/indirector/catalog/compiler.rb'
-    - 'lib/puppet/info_service/class_information_service.rb'
-    - 'lib/puppet/pops/evaluator/evaluator_impl.rb'
-    - 'lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb'
-    - 'lib/puppet/pops/parser/lexer_support.rb'
-    - 'lib/puppet/ssl/ssl_provider.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line

lib/puppet/configurer.rb

@@ -670,7 +670,8 @@ def resubmit_facts
 
     Puppet.info(_("Uploading facts for %{node} to %{server}") % {
       node: facts.name,
-      server: puppet.url.hostname})
+      server: puppet.url.hostname
+    })
 
     puppet.put_facts(facts.name, facts: facts, environment: Puppet.lookup(:current_environment).name.to_s)
 

lib/puppet/face/facts.rb

@@ -78,7 +78,8 @@
 
       Puppet.notice(_("Uploading facts for '%{node}' to '%{server}'") % {
         node: Puppet[:node_name_value],
-        server: puppet.url.hostname})
+        server: puppet.url.hostname
+      })
 
       puppet.put_facts(Puppet[:node_name_value], facts: facts, environment: Puppet.lookup(:current_environment).name.to_s)
       nil

lib/puppet/file_serving/metadata.rb

@@ -78,8 +78,7 @@ def initialize(stat, path, source_permissions)
 
     { :owner => 'S-1-5-32-544',
       :group => 'S-1-0-0',
-      :mode => 0644
-    }.each do |method, default_value|
+      :mode => 0644}.each do |method, default_value|
       define_method method do
         return default_value
       end

lib/puppet/indirector/catalog/compiler.rb

@@ -442,8 +442,7 @@ def set_server_facts
     # And then add the server name and IP
     {"servername" => "networking.fqdn",
      "serverip" => "networking.ip",
-     "serverip6" => "networking.ip6"
-    }.each do |var, fact|
+     "serverip6" => "networking.ip6"}.each do |var, fact|
       value = Puppet.runtime[:facter].value(fact)
       if !value.nil?
         @server_facts[var] = value

lib/puppet/info_service/class_information_service.rb

@@ -60,10 +60,8 @@ def parse_file(f)
       {:classes =>
         parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
           {:name => d.name,
-           :params => d.parameters.map {|p| extract_param(p) }
-          }
-        end
-      }
+           :params => d.parameters.map {|p| extract_param(p) }}
+        end}
     rescue StandardError => e
       {:error => e.message }
     end

lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -572,7 +572,8 @@ def eval_ComparisonExpression o, scope
              :operator => o.operator,
              :left_value => left,
              :right_value => right,
-             :detail => e.message}, e)
+             :detail => e.message
+           }, e)
     end
   end
 

lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb

@@ -49,7 +49,8 @@ def self.create(loader, typed_name, source_ref, ruby_code_string)
 
       unless func_info[:name] == "function_#{typed_name.name()}"
         raise ArgumentError, _("The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'") % { 
-          source_ref: source_ref, type_name: typed_name.name, created_name: func_info[:name] }
+          source_ref: source_ref, type_name: typed_name.name, created_name: func_info[:name]
+        }
       end
     end
 

lib/puppet/pops/parser/lexer_support.rb

@@ -198,8 +198,7 @@ def assert_not_bom(content)
     lex_error_without_pos(
       Puppet::Pops::Issues::ILLEGAL_BOM,
       { :format_name => name,
-        :bytes => "[#{bom.values[0,size].map {|b| "%X" % b}.join(" ")}]"
-      })
+        :bytes => "[#{bom.values[0,size].map {|b| "%X" % b}.join(" ")}]"})
   end
 
   def get_bom(content)

lib/puppet/ssl/ssl_provider.rb

@@ -335,7 +335,8 @@ def raise_cert_verify_error(store_context, current_cert)
         _("Invalid signature for CRL issued by '%{issuer}'") % { issuer: issuer(current_cert) }
       when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT
         _("The issuer '%{issuer}' of certificate '%{subject}' is missing") % {
-          issuer: issuer(current_cert), subject: subject(current_cert) }
+          issuer: issuer(current_cert), subject: subject(current_cert)
+        }
       when OpenSSL::X509::V_ERR_UNABLE_TO_GET_CRL
         _("The CRL issued by '%{issuer}' is missing") % { issuer: issuer(current_cert) }
       when OpenSSL::X509::V_ERR_CERT_REVOKED
@@ -344,7 +345,8 @@ def raise_cert_verify_error(store_context, current_cert)
         # error_string is labeled ASCII-8BIT, but is encoded based on Encoding.default_external
         err_utf8 = Puppet::Util::CharacterEncoding.convert_to_utf_8(store_context.error_string)
         _("Certificate '%{subject}' failed verification (%{err}): %{err_utf8}") % {
-          subject: subject(current_cert), err: store_context.error, err_utf8: err_utf8 }
+          subject: subject(current_cert), err: store_context.error, err_utf8: err_utf8
+        }
       end
 
     raise Puppet::SSL::CertVerifyError.new(message, store_context.error, current_cert)