Layout/HashAlignment

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,14 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 Layout/HeredocIndentation:
   Enabled: false

ext/windows/service/daemon.rb

@@ -146,9 +146,9 @@ def report_windows_event(type,id,message)
       eventlog = nil
       eventlog = Puppet::Util::Windows::EventLog.open("Puppet")
       eventlog.report_event(
-        :event_type  => type,   # EVENTLOG_ERROR_TYPE, etc
-        :event_id    => id,     # 0x01 or 0x02, 0x03 etc.
-        :data        => message # "the message"
+        :event_type => type, # EVENTLOG_ERROR_TYPE, etc
+        :event_id => id, # 0x01 or 0x02, 0x03 etc.
+        :data => message # "the message"
       )
     rescue Exception
       # Ignore all errors

lib/puppet/application.rb

@@ -504,8 +504,8 @@ def configure_indirector_routes
   def log_runtime_environment(extra_info=nil)
     runtime_info = {
       'puppet_version' => Puppet.version,
-      'ruby_version'   => RUBY_VERSION,
-      'run_mode'       => self.class.run_mode.name
+      'ruby_version' => RUBY_VERSION,
+      'run_mode' => self.class.run_mode.name
     }
     unless Puppet::Util::Platform.jruby_fips?
       runtime_info['openssl_version'] = "'#{OpenSSL::OPENSSL_VERSION}'"

lib/puppet/application/agent.rb

@@ -13,9 +13,9 @@ class Puppet::Application::Agent < Puppet::Application
   def app_defaults
     super.merge({
                   :catalog_terminus => :rest,
-      :catalog_cache_terminus => :json,
-      :node_terminus => :rest,
-      :facts_terminus => :facter,
+                  :catalog_cache_terminus => :json,
+                  :node_terminus => :rest,
+                  :facts_terminus => :facter,
                 })
   end
 

lib/puppet/application/apply.rb

@@ -173,7 +173,7 @@ def help
   def app_defaults
     super.merge({
                   :default_file_terminus => :file_server,
-      :write_catalog_summary => false
+                  :write_catalog_summary => false
                 })
   end
 

lib/puppet/application/device.rb

@@ -13,9 +13,9 @@ class Puppet::Application::Device < Puppet::Application
   def app_defaults
     super.merge({
                   :catalog_terminus => :rest,
-      :catalog_cache_terminus => :json,
-      :node_terminus => :rest,
-      :facts_terminus => :network_device,
+                  :catalog_cache_terminus => :json,
+                  :node_terminus => :rest,
+                  :facts_terminus => :network_device,
                 })
   end
 

lib/puppet/application/lookup.rb

@@ -293,8 +293,8 @@ def main
 
       if merge == 'deep'
         merge_options = {'strategy' => 'deep',
-          'sort_merged_arrays' => !options[:sort_merged_arrays].nil?,
-          'merge_hash_arrays' => !options[:merge_hash_arrays].nil?}
+                         '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]

lib/puppet/application/ssl.rb

@@ -286,7 +286,7 @@ def clean(certname)
 
     paths = {
       'private key' => Puppet[:hostprivkey],
-      'public key'  => Puppet[:hostpubkey],
+      'public key' => Puppet[:hostpubkey],
       'certificate request' => Puppet[:hostcsr],
       'certificate' => Puppet[:hostcert],
       'private key password file' => Puppet[:passfile]

lib/puppet/configurer.rb

@@ -670,7 +670,7 @@ 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)
 
@@ -714,7 +714,7 @@ def retrieve_catalog_from_cache(query_options)
         Puppet[:node_name_value],
         query_options.merge(
           :ignore_terminus => true,
-          :environment     => Puppet::Node::Environment.remote(@environment)
+          :environment => Puppet::Node::Environment.remote(@environment)
         )
       )
     end
@@ -730,12 +730,12 @@ def retrieve_new_catalog(facts, query_options)
       result = Puppet::Resource::Catalog.indirection.find(
         Puppet[:node_name_value],
         query_options.merge(
-          :ignore_cache      => true,
+          :ignore_cache => true,
           # don't update cache until after environment converges
           :ignore_cache_save => true,
-          :environment       => Puppet::Node::Environment.remote(@environment),
+          :environment => Puppet::Node::Environment.remote(@environment),
           :check_environment => true,
-          :fail_on_404       => true,
+          :fail_on_404 => true,
           :facts_for_catalog => facts
         )
       )

lib/puppet/data_binding.rb

@@ -8,7 +8,7 @@ class Puppet::DataBinding
   extend Puppet::Indirector
 
   indirects(:data_binding, :terminus_setting => :data_binding_terminus,
-    :doc => "Where to find external data bindings.")
+                           :doc => "Where to find external data bindings.")
 
   class LookupError < Puppet::PreformattedError; end