Layout/AssignmentIndentation

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,25 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: IndentationWidth.
-Layout/AssignmentIndentation:
-  Exclude:
-    - 'lib/puppet/application/apply.rb'
-    - 'lib/puppet/ffi/windows/constants.rb'
-    - 'lib/puppet/indirector/request.rb'
-    - 'lib/puppet/parser/e4_parser_adapter.rb'
-    - 'lib/puppet/pops/evaluator/evaluator_impl.rb'
-    - 'lib/puppet/pops/model/model_tree_dumper.rb'
-    - 'lib/puppet/pops/parser/lexer_support.rb'
-    - 'lib/puppet/pops/types/type_parser.rb'
-    - 'lib/puppet/resource/type.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/settings/environment_conf.rb'
-    - 'lib/puppet/type/resources.rb'
-    - 'lib/puppet/util.rb'
-    - 'lib/puppet/util/windows/daemon.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Layout/ClosingParenthesisIndentation:
   Enabled: false

lib/puppet/application/apply.rb

@@ -234,12 +234,12 @@ def main
         # rule and gets logged.
         #
         catalog =
-        begin
-          Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
-        rescue Puppet::Error
-          # already logged and handled by the compiler, including Puppet::ParseErrorWithIssue
-          exit(1)
-        end
+          begin
+            Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
+          rescue Puppet::Error
+            # already logged and handled by the compiler, including Puppet::ParseErrorWithIssue
+            exit(1)
+          end
 
         # Resolve all deferred values and replace them / mutate the catalog
         Puppet::Pops::Evaluator::DeferredResolver.resolve_and_replace(node.facts, catalog, apply_environment, Puppet[:preprocess_deferred])

lib/puppet/ffi/windows/constants.rb

@@ -47,25 +47,25 @@ module Constants
     FILE_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF
 
     FILE_GENERIC_READ =
-       STANDARD_RIGHTS_READ |
-       FILE_READ_DATA |
-       FILE_READ_ATTRIBUTES |
-       FILE_READ_EA |
-       SYNCHRONIZE
+      STANDARD_RIGHTS_READ |
+      FILE_READ_DATA |
+      FILE_READ_ATTRIBUTES |
+      FILE_READ_EA |
+      SYNCHRONIZE
 
     FILE_GENERIC_WRITE =
-       STANDARD_RIGHTS_WRITE |
-       FILE_WRITE_DATA |
-       FILE_WRITE_ATTRIBUTES |
-       FILE_WRITE_EA |
-       FILE_APPEND_DATA |
-       SYNCHRONIZE
+      STANDARD_RIGHTS_WRITE |
+      FILE_WRITE_DATA |
+      FILE_WRITE_ATTRIBUTES |
+      FILE_WRITE_EA |
+      FILE_APPEND_DATA |
+      SYNCHRONIZE
 
     FILE_GENERIC_EXECUTE =
-       STANDARD_RIGHTS_EXECUTE |
-       FILE_READ_ATTRIBUTES |
-       FILE_EXECUTE |
-       SYNCHRONIZE
+      STANDARD_RIGHTS_EXECUTE |
+      FILE_READ_ATTRIBUTES |
+      FILE_EXECUTE |
+      SYNCHRONIZE
 
     REPLACEFILE_WRITE_THROUGH         = 0x1
     REPLACEFILE_IGNORE_MERGE_ERRORS   = 0x2

lib/puppet/indirector/request.rb

@@ -36,11 +36,11 @@ def environment
 
   def environment=(env)
     @environment =
-    if env.is_a?(Puppet::Node::Environment)
-      env
-    else
-      Puppet.lookup(:environments).get!(env)
-    end
+      if env.is_a?(Puppet::Node::Environment)
+        env
+      else
+        Puppet.lookup(:environments).get!(env)
+      end
   end
 
   # LAK:NOTE This is a messy interface to the cache, and it's only

lib/puppet/parser/e4_parser_adapter.rb

@@ -23,14 +23,14 @@ def parse(string = nil)
     self.string= string if string
     parser = Pops::Parser::EvaluatingParser.singleton
     model =
-    if @use == :string
-      # Parse with a source_file to set in created AST objects (it was either given, or it may be unknown
-      # if caller did not set a file and the present a string.
-      #
-      parser.parse_string(@string, @file || "unknown-source-location")
-    else
-      parser.parse_file(@file)
-    end
+      if @use == :string
+        # Parse with a source_file to set in created AST objects (it was either given, or it may be unknown
+        # if caller did not set a file and the present a string.
+        #
+        parser.parse_string(@string, @file || "unknown-source-location")
+      else
+        parser.parse_file(@file)
+      end
 
     # the parse_result may be
     # * empty / nil (no input)
@@ -41,12 +41,12 @@ def parse(string = nil)
     Pops::Model::AstTransformer.new(@file).merge_location(args, model)
 
     ast_code =
-    if model.is_a? Pops::Model::Program
-      AST::PopsBridge::Program.new(model, args)
-    else
-      args[:value] = model
-      AST::PopsBridge::Expression.new(args)
-    end
+      if model.is_a? Pops::Model::Program
+        AST::PopsBridge::Program.new(model, args)
+      else
+        args[:value] = model
+        AST::PopsBridge::Expression.new(args)
+      end
 
     # Create the "main" class for the content - this content will get merged with all other "main" content
     AST::Hostclass.new('', :code => ast_code)

lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -766,45 +766,45 @@ def eval_ResourceExpression(o, scope)
 
     # Get the type name
     type_name =
-    if (tmp_name = o.type_name).is_a?(Model::QualifiedName)
-      tmp_name.value # already validated as a name
-    else
-      type_name_acceptable =
-      case o.type_name
-      when Model::QualifiedReference
-        true
-      when Model::AccessExpression
-        o.type_name.left_expr.is_a?(Model::QualifiedReference)
-      end
-
-      evaluated_name = evaluate(tmp_name, scope)
-      unless type_name_acceptable
-        actual = type_calculator.generalize(type_calculator.infer(evaluated_name)).to_s
-        fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual => actual})
-      end
+      if (tmp_name = o.type_name).is_a?(Model::QualifiedName)
+        tmp_name.value # already validated as a name
+      else
+        type_name_acceptable =
+          case o.type_name
+          when Model::QualifiedReference
+            true
+          when Model::AccessExpression
+            o.type_name.left_expr.is_a?(Model::QualifiedReference)
+          end
 
-      # must be a CatalogEntry subtype
-      case evaluated_name
-      when Types::PClassType
-        unless evaluated_name.class_name.nil?
-          fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual=> evaluated_name.to_s})
+        evaluated_name = evaluate(tmp_name, scope)
+        unless type_name_acceptable
+          actual = type_calculator.generalize(type_calculator.infer(evaluated_name)).to_s
+          fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual => actual})
         end
-        'class'
 
-      when Types::PResourceType
-        unless evaluated_name.title().nil?
-          fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual=> evaluated_name.to_s})
-        end
-        evaluated_name.type_name # assume validated
+        # must be a CatalogEntry subtype
+        case evaluated_name
+        when Types::PClassType
+          unless evaluated_name.class_name.nil?
+            fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual=> evaluated_name.to_s})
+          end
+          'class'
+
+        when Types::PResourceType
+          unless evaluated_name.title().nil?
+            fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual=> evaluated_name.to_s})
+          end
+          evaluated_name.type_name # assume validated
 
-      when Types::PTypeReferenceType
-        fail(Issues::UNKNOWN_RESOURCE_TYPE, o.type_string, {:type_name => evaluated_name.to_s})
+        when Types::PTypeReferenceType
+          fail(Issues::UNKNOWN_RESOURCE_TYPE, o.type_string, {:type_name => evaluated_name.to_s})
 
-      else
-        actual = type_calculator.generalize(type_calculator.infer(evaluated_name)).to_s
-        fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual=>actual})
+        else
+          actual = type_calculator.generalize(type_calculator.infer(evaluated_name)).to_s
+          fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_name, {:actual=>actual})
+        end
       end
-    end
 
     # This is a runtime check - the model is valid, but will have runtime issues when evaluated
     # and storeconfigs is not set.
@@ -919,12 +919,12 @@ def eval_AttributesOperation(o, scope)
   def eval_ResourceDefaultsExpression(o, scope)
     type = evaluate(o.type_ref, scope)
     type_name =
-    if type.is_a?(Types::PResourceType) && !type.type_name.nil? && type.title.nil?
-      type.type_name # assume it is a valid name
-    else
-      actual = type_calculator.generalize(type_calculator.infer(type))
-      fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_ref, {:actual => actual})
-    end
+      if type.is_a?(Types::PResourceType) && !type.type_name.nil? && type.title.nil?
+        type.type_name # assume it is a valid name
+      else
+        actual = type_calculator.generalize(type_calculator.infer(type))
+        fail(Issues::ILLEGAL_RESOURCE_TYPE, o.type_ref, {:actual => actual})
+      end
     evaluated_parameters = o.operations.map {|op| evaluate(op, scope) }
     create_resource_defaults(o, scope, type_name, evaluated_parameters)
     # Produce the type

lib/puppet/pops/model/model_tree_dumper.rb

@@ -321,19 +321,19 @@ def dump_IfExpression o
     result = ["if", do_dump(o.test), :indent, :break,
               ["then", :indent, do_dump(o.then_expr), :dedent]]
     result +=
-    [:break,
-     ["else", :indent, do_dump(o.else_expr), :dedent],
-     :dedent] unless is_nop? o.else_expr
+      [:break,
+       ["else", :indent, do_dump(o.else_expr), :dedent],
+       :dedent] unless is_nop? o.else_expr
     result
   end
 
   def dump_UnlessExpression o
     result = ["unless", do_dump(o.test), :indent, :break,
               ["then", :indent, do_dump(o.then_expr), :dedent]]
     result +=
-    [:break,
-     ["else", :indent, do_dump(o.else_expr), :dedent],
-     :dedent] unless is_nop? o.else_expr
+      [:break,
+       ["else", :indent, do_dump(o.else_expr), :dedent],
+       :dedent] unless is_nop? o.else_expr
     result
   end
 

lib/puppet/pops/parser/lexer_support.rb

@@ -167,35 +167,35 @@ def to_s
 
   def assert_not_bom(content)
     name, size =
-    case bom = get_bom(content)
+      case bom = get_bom(content)
 
-    when BOM_UTF_32_1, BOM_UTF_32_2
-      ['UTF-32', 4]
+      when BOM_UTF_32_1, BOM_UTF_32_2
+        ['UTF-32', 4]
 
-    when BOM_GB_18030
-      ['GB-18030', 4]
+      when BOM_GB_18030
+        ['GB-18030', 4]
 
-    when BOM_UTF_EBCDIC
-      ['UTF-EBCDIC', 4]
+      when BOM_UTF_EBCDIC
+        ['UTF-EBCDIC', 4]
 
-    when BOM_SCSU
-      ['SCSU', 3]
+      when BOM_SCSU
+        ['SCSU', 3]
 
-    when BOM_UTF_8
-      ['UTF-8', 3]
+      when BOM_UTF_8
+        ['UTF-8', 3]
 
-    when BOM_UTF_1
-      ['UTF-1', 3]
+      when BOM_UTF_1
+        ['UTF-1', 3]
 
-    when BOM_BOCU
-      ['BOCU', 3]
+      when BOM_BOCU
+        ['BOCU', 3]
 
-    when BOM_UTF_16_1, BOM_UTF_16_2
-      ['UTF-16', 2]
+      when BOM_UTF_16_1, BOM_UTF_16_2
+        ['UTF-16', 2]
 
-    else
-      return
-    end
+      else
+        return
+      end
 
     lex_error_without_pos(
       Puppet::Pops::Issues::ILLEGAL_BOM,

lib/puppet/pops/types/type_parser.rb

@@ -542,21 +542,21 @@ def interpret_AccessExpression(ast, context)
 
     when 'string'
       size_type =
-      case parameters.size
-      when 1
-        if parameters[0].is_a?(PIntegerType)
-          parameters[0]
-        else
+        case parameters.size
+        when 1
+          if parameters[0].is_a?(PIntegerType)
+            parameters[0]
+          else
+            assert_range_parameter(ast, parameters[0])
+            TypeFactory.range(parameters[0], :default)
+          end
+        when 2
           assert_range_parameter(ast, parameters[0])
-          TypeFactory.range(parameters[0], :default)
+          assert_range_parameter(ast, parameters[1])
+          TypeFactory.range(parameters[0], parameters[1])
+        else
+          raise_invalid_parameters_error('String', '1 to 2', parameters.size)
         end
-      when 2
-        assert_range_parameter(ast, parameters[0])
-        assert_range_parameter(ast, parameters[1])
-        TypeFactory.range(parameters[0], parameters[1])
-      else
-        raise_invalid_parameters_error('String', '1 to 2', parameters.size)
-      end
       TypeFactory.string(size_type)
 
     when 'sensitive'

lib/puppet/resource/type.rb

@@ -153,14 +153,14 @@ def merge(other)
   # values.
   def ensure_in_catalog(scope, parameters=nil)
     resource_type =
-    case type
-    when :definition
-      raise ArgumentError, _('Cannot create resources for defined resource types')
-    when :hostclass
-      :class
-    when :node
-      :node
-    end
+      case type
+      when :definition
+        raise ArgumentError, _('Cannot create resources for defined resource types')
+      when :hostclass
+        :class
+      when :node
+        :node
+      end
 
     # Do nothing if the resource already exists; this makes sure we don't
     # get multiple copies of the class resource, which helps provide the