Layout/AccessModifierIndentation

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,20 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  Exclude:
-    - 'lib/puppet/module_tool/install_directory.rb'
-    - 'lib/puppet/pops/evaluator/collector_transformer.rb'
-    - 'lib/puppet/provider/service/init.rb'
-    - 'lib/puppet/provider/service/upstart.rb'
-    - 'lib/puppet/settings/config_file.rb'
-    - 'lib/puppet/settings/file_setting.rb'
-    - 'lib/puppet/util/command_line/trollop.rb'
-    - 'lib/puppet/util/run_mode.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_element, with_fixed_indentation

lib/puppet/module_tool/install_directory.rb

@@ -26,7 +26,7 @@ def prepare(module_name, version)
         end
       end
 
-    private
+      private
 
       ERROR_MAPPINGS = {
         Errno::EACCES => PermissionDeniedCreateInstallDirectoryError,

lib/puppet/pops/evaluator/collector_transformer.rb

@@ -50,7 +50,7 @@ def transform(o, scope)
     newcoll
   end
 
-protected
+  protected
 
   def query(o, scope)
     @@query_visitor.visit_this_1(self, o, scope)

lib/puppet/provider/service/init.rb

@@ -183,7 +183,7 @@ def statuscmd
     (@resource[:hasstatus] == :true) && [initscript, :status]
   end
 
-private
+  private
 
   def self.is_init?(script = initscript)
     file = Puppet::FileSystem.pathname(script)

lib/puppet/provider/service/upstart.rb

@@ -192,7 +192,7 @@ def status
     end
   end
 
-private
+  private
   def is_upstart?(script = initscript)
     Puppet::FileSystem.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
   end

lib/puppet/settings/config_file.rb

@@ -78,7 +78,7 @@ def has_metadata?
   Meta = Struct.new(:owner, :group, :mode)
   NO_META = Meta.new(nil, nil, nil)
 
-private
+  private
 
   def unique_sections_in(ini, file, allowed_section_names)
     ini.section_lines.collect do |section|

lib/puppet/settings/file_setting.rb

@@ -48,7 +48,7 @@ def value
       end
     end
 
-  private
+    private
     def safe_to_use_settings_value?
       @settings[:mkusers] or @settings.send(@available_method)
     end

lib/puppet/util/command_line/trollop.rb

@@ -560,7 +560,7 @@ def die arg, msg
     exit(-1)
   end
 
-private
+  private
 
   ## yield successive arg, parameter pairs
   def each_arg args

lib/puppet/util/run_mode.rb

@@ -113,7 +113,7 @@ def log_dir
         which_dir(File.join(windows_common_base("puppet/var/log")), "~/.puppetlabs/var/log")
       end
 
-    private
+      private
 
       def windows_common_base(*extra)
         [ENV['ALLUSERSPROFILE'], "PuppetLabs"] + extra