Layout/SpaceAroundKeyword

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,21 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Layout/SpaceAroundKeyword:
-  Exclude:
-    - 'lib/puppet/functions/max.rb'
-    - 'lib/puppet/functions/min.rb'
-    - 'lib/puppet/pops/evaluator/evaluator_impl.rb'
-    - 'lib/puppet/pops/lookup/global_data_provider.rb'
-    - 'lib/puppet/pops/lookup/hiera_config.rb'
-    - 'lib/puppet/pops/parser/slurp_support.rb'
-    - 'lib/puppet/pops/types/p_object_type.rb'
-    - 'lib/puppet/pops/types/type_calculator.rb'
-    - 'lib/puppet/pops/validation/checker4_0.rb'
-    - 'lib/puppet/util/diff.rb'
-    - 'lib/puppet/util/windows/daemon.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Layout/SpaceAroundMethodCallOperator:
   Exclude:

lib/puppet/functions/max.rb

@@ -145,7 +145,7 @@ def on_numeric(*args)
   def on_string(*args)
     assert_arg_count(args)
 
-    args.max do|a, b|
+    args.max do |a, b|
       if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
                          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))

lib/puppet/functions/min.rb

@@ -144,7 +144,7 @@ def on_numeric(*args)
   def on_string(*args)
     assert_arg_count(args)
 
-    args.min do|a, b|
+    args.min do |a, b|
       if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
                          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))

lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -810,7 +810,7 @@ def eval_ResourceExpression(o, scope)
 
     # This is a runtime check - the model is valid, but will have runtime issues when evaluated
     # and storeconfigs is not set.
-    if(o.exported)
+    if (o.exported)
       optionally_fail(Issues::RT_NO_STORECONFIGS_EXPORT, o);
     end
 

lib/puppet/pops/lookup/global_data_provider.rb

@@ -13,7 +13,7 @@ def place
 
   def unchecked_key_lookup(key, lookup_invocation, merge)
     config = config(lookup_invocation)
-    if(config.version == 3)
+    if (config.version == 3)
       # Hiera version 3 needs access to special scope variables
       scope = lookup_invocation.scope
       unless scope.is_a?(Hiera::Scope)

lib/puppet/pops/lookup/hiera_config.rb

@@ -105,7 +105,7 @@ def self.config_exist?(config_root)
   end
 
   def self.symkeys_to_string(struct)
-    case(struct)
+    case (struct)
     when Hash
       map = {}
       struct.each_pair {|k, v| map[ k.is_a?(Symbol) ? k.to_s : k] = symkeys_to_string(v) }
@@ -690,7 +690,7 @@ def create_configured_data_providers(lookup_invocation, parent_data_provider, us
 
       options = he[KEY_OPTIONS] || defaults[KEY_OPTIONS]
       options = options.nil? ? EMPTY_HASH : interpolate(options, lookup_invocation, false)
-      if(function_kind == KEY_V3_BACKEND)
+      if (function_kind == KEY_V3_BACKEND)
         v3options = { :datadir => entry_datadir.to_s }
         options.each_pair { |k, v| v3options[k.to_sym] = v }
         data_providers[name] =

lib/puppet/pops/parser/slurp_support.rb

@@ -76,7 +76,7 @@ def slurp(scanner, pattern, escapes, ignore_invalid_escapes)
     # If later a \u is found it is warned not to be a unicode escape
     if escapes.include?('u')
       # gsub must be repeated to cater for adjacent escapes
-      while(str.gsub!(/((?:[^\\]|^)(?:[\\]{2})*)\\u(?:([\da-fA-F]{4})|\{([\da-fA-F]{1,6})\})/m) { $1 + [($2 || $3).hex].pack("U") })
+      while (str.gsub!(/((?:[^\\]|^)(?:[\\]{2})*)\\u(?:([\da-fA-F]{4})|\{([\da-fA-F]{1,6})\})/m) { $1 + [($2 || $3).hex].pack("U") })
         # empty block. Everything happens in the gsub block
       end
     end

lib/puppet/pops/types/p_object_type.rb

@@ -261,7 +261,7 @@ def invoke(receiver, scope, args, &block)
     # @api private
     def create_dispatch(instance)
       # TODO: Assumes Ruby implementation for now
-      if(callable_type.is_a?(PVariantType))
+      if (callable_type.is_a?(PVariantType))
         callable_type.types.map do |ct|
           Functions::Dispatch.new(ct, RubyGenerator.protect_reserved_name(name), [], false, ct.block_type.nil? ? nil : 'block')
         end

lib/puppet/pops/types/type_calculator.rb

@@ -386,7 +386,7 @@ def common_type(t1, t2)
     end
 
     if t1.is_a?(PStringType) && (t2.is_a?(PStringType) || t2.is_a?(PEnumType))
-      if(t2.is_a?(PEnumType))
+      if (t2.is_a?(PEnumType))
         return t1.value.nil? ? PEnumType::DEFAULT : PEnumType.new(t2.values | [t1.value])
       end
 
@@ -465,7 +465,7 @@ def common_type(t1, t2)
       c2 = ClassLoader.provide_from_type(t2)
       if c1 && c2
         c2_superclasses = superclasses(c2)
-        superclasses(c1).each do|c1_super|
+        superclasses(c1).each do |c1_super|
           c2_superclasses.each do |c2_super|
             if c1_super == c2_super
               return PRuntimeType.new(:ruby, c1_super.name)

lib/puppet/pops/validation/checker4_0.rb

@@ -560,7 +560,7 @@ def internal_check_top_construct_in_module(prog)
     body = prog.body
     return if prog.body.is_a?(Model::Nop) # Ignore empty or comment-only files
 
-    if(body.is_a?(Model::BlockExpression))
+    if (body.is_a?(Model::BlockExpression))
       body.statements.each { |s| acceptor.accept(Issues::ILLEGAL_TOP_CONSTRUCT_LOCATION, s) unless valid_top_construct?(s) }
     else
       acceptor.accept(Issues::ILLEGAL_TOP_CONSTRUCT_LOCATION, body) unless valid_top_construct?(body)