Layout/IndentationConsistency

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,12 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, indented_internal_methods
-Layout/IndentationConsistency:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: IndentationWidth, EnforcedStyle.
 # SupportedStyles: spaces, tabs

lib/puppet/application/resource.rb

@@ -149,16 +149,16 @@ def main
 
       resources = find_or_save_resources(type, name, params)
 
-    if options[:to_yaml]
-      data = resources.map do |resource|
-        resource.prune_parameters(:parameters_to_include => @extra_params).to_hiera_hash
-      end.inject(:merge!)
-      text = YAML.dump(type.downcase => data)
-    else
-      text = resources.map do |resource|
-        resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)
-      end.join("\n")
-    end
+      if options[:to_yaml]
+        data = resources.map do |resource|
+          resource.prune_parameters(:parameters_to_include => @extra_params).to_hiera_hash
+        end.inject(:merge!)
+        text = YAML.dump(type.downcase => data)
+      else
+        text = resources.map do |resource|
+          resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)
+        end.join("\n")
+      end
 
       options[:edit] ?
         handle_editing(text) :

lib/puppet/external/dot.rb

@@ -212,13 +212,13 @@ def to_s(t = '')
           }.join( "| \\\n" ) + " \\\n" +
           t + $tab + '"' + "\n"
 
-        t + "#{@name} [\n" +
-        @options.to_a.collect{ |i|
-          i[1] && i[0] != 'label' ?
-            t + $tab + "#{i[0]} = #{i[1]}" : nil
-        }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
-        label +
-        t + "]\n"
+      t + "#{@name} [\n" +
+      @options.to_a.collect{ |i|
+        i[1] && i[0] != 'label' ?
+          t + $tab + "#{i[0]} = #{i[1]}" : nil
+      }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
+      label +
+      t + "]\n"
     end
 
     private

lib/puppet/ffi/windows/structs.rb

@@ -258,7 +258,7 @@ class OSVERSIONINFO < FFI::Struct
       )
     end
 
-	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
+	   MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
 
     # SYMLINK_REPARSE_DATA_BUFFER
     # https://msdn.microsoft.com/en-us/library/cc232006.aspx

lib/puppet/functions/getvar.rb

@@ -47,7 +47,7 @@
 Puppet::Functions.create_function(:getvar, Puppet::Functions::InternalFunction) do
   dispatch :get_from_navigation do
     scope_param
-     param 'Pattern[/\A(?:::)?(?:[a-z]\w*::)*[a-z_]\w*(?:\.|\Z)/]', :get_string
+    param 'Pattern[/\A(?:::)?(?:[a-z]\w*::)*[a-z_]\w*(?:\.|\Z)/]', :get_string
     optional_param 'Any', :default_value
     optional_block_param 'Callable[1,1]', :block
   end

lib/puppet/network/http/api/indirected_routes.rb

@@ -246,11 +246,11 @@ def indirection_method(http_method, indirection)
     raise Puppet::Network::HTTP::Error::HTTPMethodNotAllowedError.new(
       _("No support for http method %{http_method}") % { http_method: http_method }) unless METHOD_MAP[http_method]
 
-      method = METHOD_MAP[http_method][plurality(indirection)]
-      unless method
-        raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
-          _("No support for plurality %{indirection} for %{http_method} operations") % { indirection: plurality(indirection), http_method: http_method })
-      end
+    method = METHOD_MAP[http_method][plurality(indirection)]
+    unless method
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        _("No support for plurality %{indirection} for %{http_method} operations") % { indirection: plurality(indirection), http_method: http_method })
+    end
 
     method
   end

lib/puppet/parser/functions/inline_template.rb

@@ -13,15 +13,15 @@
 
   require 'erb'
 
-    vals.collect do |string|
-      # Use a wrapper, so the template can't get access to the full
-      # Scope object.
+  vals.collect do |string|
+    # Use a wrapper, so the template can't get access to the full
+    # Scope object.
 
-      wrapper = Puppet::Parser::TemplateWrapper.new(self)
-      begin
-        wrapper.result(string)
-      rescue => detail
-        raise Puppet::ParseError, _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
-      end
-    end.join("")
+    wrapper = Puppet::Parser::TemplateWrapper.new(self)
+    begin
+      wrapper.result(string)
+    rescue => detail
+      raise Puppet::ParseError, _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
+    end
+  end.join("")
 end