Merge pull request #9185 from mhashizume/PUP-11768/main/argument-alig…

…nment

Layout/ArgumentAlignment

.rubocop.yml

@@ -17,6 +17,11 @@ AllCops:
     - 'lib/puppet/vendor/**/*'
     - 'lib/puppet/pops/parser/eparser.rb'
 
+# This cop would completely reformat defaults, so we skip it for now.
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'lib/puppet/defaults.rb'
+
 # puppet uses symbol booleans in types and providers to work around long standing
 # bugs when trying to manage falsey pararameters and properties
 Lint/BooleanSymbol:

.rubocop_todo.yml

@@ -36,12 +36,6 @@ Layout/AccessModifierIndentation:
     - '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_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_element, with_fixed_indentation

lib/hiera/scope.rb

@@ -45,7 +45,7 @@ def safe_lookupvar(key)
         # do nothing
       when :warning
         Puppet.warn_once(Puppet::Parser::Scope::UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: key },
-        _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
+                         _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
       when :error
         raise ArgumentError, _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason }
       end

lib/puppet/face/config.rb

@@ -110,8 +110,8 @@ def warn_default_section(section_name)
 
   def report_section_and_environment(section_name, environment_name)
       $stderr.puts colorize(:hyellow,
-        _("Resolving settings from section '%{section_name}' in environment '%{environment_name}'") %
-          { section_name: section_name, environment_name: environment_name })
+                            _("Resolving settings from section '%{section_name}' in environment '%{environment_name}'") %
+                              { section_name: section_name, environment_name: environment_name })
   end
 
   action(:set) do

lib/puppet/face/module/list.rb

@@ -90,7 +90,7 @@
           modules_by_num_requires = modules.sort_by {|m| m.required_by.size}
           @seen = {}
           tree = list_build_tree(modules_by_num_requires, [], nil,
-            :label_unmet => true, :path => path, :label_invalid => false)
+                                 :label_unmet => true, :path => path, :label_invalid => false)
         else
           tree = []
           modules.sort_by { |mod| mod.forge_name or mod.name  }.each do |mod|
@@ -229,7 +229,7 @@ def list_build_tree(list, ancestors=[], parent=nil, params={})
           node[:dependencies] << { :text => str }
         end
         node[:dependencies] += list_build_tree(mod.dependencies_as_modules,
-          ancestors + [mod], mod, params)
+                                               ancestors + [mod], mod, params)
       end
 
       node