Layout/SpaceAroundBlockParameters

mhashizume · mhashizume · commit 22e071a15524 · 2024-01-08T15:25:45.000-08:00
This commit enables the Rubocop Layout/SpaceAroundBlockParameters cop
and addresses all offenses.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -22,27 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyleInsidePipes.
-# SupportedStylesInsidePipes: space, no_space
-Layout/SpaceAroundBlockParameters:
-  Exclude:
-    - 'lib/puppet/functions/dig.rb'
-    - 'lib/puppet/functions/filter.rb'
-    - 'lib/puppet/node/environment.rb'
-    - 'lib/puppet/pal/pal_impl.rb'
-    - 'lib/puppet/pops/evaluator/compare_operator.rb'
-    - 'lib/puppet/pops/evaluator/evaluator_impl.rb'
-    - 'lib/puppet/pops/functions/dispatcher.rb'
-    - 'lib/puppet/pops/types/string_converter.rb'
-    - 'lib/puppet/provider/package/openbsd.rb'
-    - 'lib/puppet/provider/package/pkg.rb'
-    - 'lib/puppet/provider/package/yum.rb'
-    - 'lib/puppet/resource/catalog.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/util.rb'
-    - 'lib/puppet/util/docs.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
diff --git a/lib/puppet/functions/dig.rb b/lib/puppet/functions/dig.rb
@@ -37,7 +37,7 @@
 
   def dig(data, *args)
     walked_path = []
-    args.reduce(data) do | d, k |
+    args.reduce(data) do |d, k|
       return nil if d.nil? || k.nil?
 
       if !(d.is_a?(Array) || d.is_a?(Hash))
diff --git a/lib/puppet/functions/filter.rb b/lib/puppet/functions/filter.rb
@@ -123,7 +123,7 @@ def filter_Enumerable_2(enumerable)
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     if enum.hash_style?
       result = {}
-      enum.each {| k, v| result[k] = v if yield(k, v) }
+      enum.each {|k, v| result[k] = v if yield(k, v) }
       result
     else
       result = []
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
@@ -597,7 +597,7 @@ def perform_initial_import
       elsif File.directory?(file)
         # JRuby does not properly perform Dir.glob operations with wildcards, (see PUP-11788 and https://github.com/jruby/jruby/issues/7836).
         # We sort the results because Dir.glob order is inconsistent in Ruby < 3 (see PUP-10115).
-        parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*')).glob.select {|globbed_file| globbed_file.end_with?('.pp')}.sort.map do | file_to_parse |
+        parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*')).glob.select {|globbed_file| globbed_file.end_with?('.pp')}.sort.map do |file_to_parse|
           parser.file = file_to_parse
           parser.parse
         end
diff --git a/lib/puppet/pal/pal_impl.rb b/lib/puppet/pal/pal_impl.rb
@@ -480,7 +480,7 @@ def self.main(
         # TODO: The compiler instances should be available under non PAL use as well!
         # TRANSLATORS: Do not translate, symbolic name
         Puppet.override(overrides, "PAL::with_#{internal_compiler_class}_compiler") do
-          compiler.compile do | _compiler_yield |
+          compiler.compile do |_compiler_yield|
             # In case the variables passed to the compiler are PCore types defined in modules, they
             # need to be deserialized and added from within the this scope, so that loaders are
             # available during deserizlization.
diff --git a/lib/puppet/pops/evaluator/compare_operator.rb b/lib/puppet/pops/evaluator/compare_operator.rb
@@ -248,7 +248,7 @@ def match_Array(array, left, scope)
     return false unless left.is_a?(Array)
     return false unless left.length == array.length
 
-    array.each_with_index.all? { | pattern, index| match(left[index], pattern, scope) }
+    array.each_with_index.all? { |pattern, index| match(left[index], pattern, scope) }
   end
 
   def match_Hash(hash, left, scope)
diff --git a/lib/puppet/pops/evaluator/evaluator_impl.rb b/lib/puppet/pops/evaluator/evaluator_impl.rb
@@ -819,7 +819,7 @@ def eval_ResourceExpression(o, scope)
     body_to_params = {}
 
     # titles are evaluated before attribute operations
-    o.bodies.map do | body |
+    o.bodies.map do |body|
       titles = evaluate(body.title, scope)
 
       # Title may not be nil
@@ -879,7 +879,7 @@ def eval_ResourceExpression(o, scope)
     # evaluating the ResourceExpression.
     #
     defaults_hash = body_to_params[titles_to_body[:default]] || {}
-    o.bodies.map do | body |
+    o.bodies.map do |body|
       titles = body_to_titles[body]
       params = defaults_hash.merge(body_to_params[body] || {})
       create_resources(o, scope, virtual, exported, type_name, titles, params.values)
diff --git a/lib/puppet/pops/functions/dispatcher.rb b/lib/puppet/pops/functions/dispatcher.rb
@@ -62,7 +62,7 @@ def to_type()
     # make a copy to make sure it can be contained by someone else (even if it is not contained here, it
     # should be treated as immutable).
     #
-    callables = dispatchers.map { | dispatch | dispatch.type }
+    callables = dispatchers.map { |dispatch| dispatch.type }
 
     # multiple signatures, produce a Variant type of Callable1-n (must copy them)
     # single signature, produce single Callable
diff --git a/lib/puppet/pops/types/string_converter.rb b/lib/puppet/pops/types/string_converter.rb
@@ -535,7 +535,7 @@ def validate_input(fmt)
       raise ArgumentError, "expected a hash with type to format mappings, got instance of '#{fmt.class}'"
     end
 
-    fmt.reduce({}) do | result, entry|
+    fmt.reduce({}) do |result, entry|
       key, value = entry
       unless key.is_a?(Types::PAnyType)
         raise ArgumentError, "top level keys in the format hash must be data types, got instance of '#{key.class}'"
@@ -968,7 +968,7 @@ def string_PArrayType(val_type, val, format_map, indentation)
       # compute widest run in the array, skip nested arrays and hashes
       # then if size > width, set flag if a break on each element should be performed
       if format.alt? && format.width
-        widest = val.each_with_index.reduce([0]) do | memo, v_i |
+        widest = val.each_with_index.reduce([0]) do |memo, v_i|
           # array or hash breaks
           if is_a_or_h?(v_i[0])
             memo << 0
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
@@ -104,7 +104,7 @@ def latest
         return match[2]
       end
 
-      vcmp = version.split('.').map{|s|s.to_i} <=> match[2].split('.').map{|s|s.to_i}
+      vcmp = version.split('.').map{|s| s.to_i} <=> match[2].split('.').map{|s| s.to_i}
       if vcmp > 0
         # The locally installed package may actually be newer than what a mirror
         # has. Log it at debug, but ignore it otherwise.
diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb
@@ -154,7 +154,7 @@ def insync?(is)
       # unfortunately it doesn't consider downgrades 'available' (eg. with
       # installed foo@1.0, list -a foo@0.9 would fail).
       name = @resource[:name]
-      potential_matches = pkg(:list, '-Hvfa', "#{name}@#{should}").split("\n").map{|l|self.class.parse_line(l)}
+      potential_matches = pkg(:list, '-Hvfa', "#{name}@#{should}").split("\n").map{|l| self.class.parse_line(l)}
       n = potential_matches.length
       if n > 1
         warning(_("Implicit version %{should} has %{n} possible matches") % { should: should, n: n })
diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
@@ -380,7 +380,7 @@ def disableexcludes
   def scan_options(options, key)
     return [] unless options.is_a?(Enumerable)
 
-    values = options.map do | repo |
+    values = options.map do |repo|
       value = if repo.is_a?(String)
                 next unless repo.include?('=')
 
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
@@ -167,7 +167,7 @@ def create_resource_aliases(resource)
     # The alias setting logic checks, and does not error if the alias is set to an already set alias
     # for the same resource (i.e. it is ok if alias == title
     explicit_aliases = [resource[:alias]].flatten.compact
-    explicit_aliases.each {| given_alias | self.alias(resource, given_alias) }
+    explicit_aliases.each {|given_alias| self.alias(resource, given_alias) }
 
     # Skip creating uniqueness key alias and checking collisions for non-isomorphic resources.
     return unless resource.respond_to?(:isomorphic?) and resource.isomorphic?
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
@@ -1117,7 +1117,7 @@ def currentpropvalues
     # is the first property, which is important for skipping 'retrieve' on
     # all the properties if the resource is absent.
     ensure_state = false
-    return properties.inject({}) do | prophash, property|
+    return properties.inject({}) do |prophash, property|
       if property.name == :ensure
         ensure_state = property.retrieve
         prophash[property] = ensure_state
diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb
@@ -125,7 +125,7 @@ def scrub(text)
       text = text.gsub(/^#{indent}/, '')
     end
     # Clean trailing space
-    text.lines.map{|line|line.rstrip}.join("\n").rstrip
+    text.lines.map{|line| line.rstrip}.join("\n").rstrip
   end
 
   module_function :scrub

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ def to_type()`
`62`	`62`	`# make a copy to make sure it can be contained by someone else (even if it is not contained here, it`
`63`	`63`	`# should be treated as immutable).`
`64`	`64`	`#`
`65`		`- callables = dispatchers.map { \| dispatch \| dispatch.type }`
	`65`	`+ callables = dispatchers.map { \|dispatch\| dispatch.type }`
`66`	`66`
`67`	`67`	`# multiple signatures, produce a Variant type of Callable1-n (must copy them)`
`68`	`68`	`# single signature, produce single Callable`