Layout/SpaceBeforeComma

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

Author: mhashizume

.rubocop_todo.yml

@@ -22,22 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Layout/SpaceBeforeComma:
-  Exclude:
-    - 'lib/puppet/application/lookup.rb'
-    - 'lib/puppet/external/dot.rb'
-    - 'lib/puppet/face/parser.rb'
-    - 'lib/puppet/indirector/file_bucket_file/file.rb'
-    - 'lib/puppet/parser/compiler.rb'
-    - 'lib/puppet/parser/script_compiler.rb'
-    - 'lib/puppet/pops/lookup/global_data_provider.rb'
-    - 'lib/puppet/pops/parser/lexer2.rb'
-    - 'lib/puppet/provider/package/windows.rb'
-    - 'lib/puppet/provider/package/windows/exe_package.rb'
-    - 'lib/puppet/util/windows/monkey_patches/process.rb'
-    - 'lib/puppet/util/windows/user.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceBeforeFirstArg:

lib/puppet/application/lookup.rb

@@ -364,7 +364,7 @@ def generate_scope
       if TRUSTED_INFORMATION_FACTS.any? { |key| given_facts.key? key }
         unless TRUSTED_INFORMATION_FACTS.all? { |key| given_facts.key? key }
           raise _("When overriding any of the %{trusted_facts_list} facts with %{fact_file} "\
-                  "given via the --facts flag, they must all be overridden.") % { fact_file: fact_file , trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',')}
+                  "given via the --facts flag, they must all be overridden.") % { fact_file: fact_file, trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',')}
         end
       end
     end

lib/puppet/external/dot.rb

@@ -46,7 +46,7 @@ def change_tab(t)
     'shape',       # default: ellipse; node shape; see Section 2.1 and Appendix E
     'shapefile',   # external EPSF or SVG custom shape file
     'sides',       # default: 4; number of sides for shape=polygon
-    'skew' ,       # default: 0.0; skewing of node for shape=polygon
+    'skew',        # default: 0.0; skewing of node for shape=polygon
     'style',       # graphics options, e.g. bold, dotted, filled; cf. Section 2.3
     'toplabel',    # auxiliary label for nodes of shape M*
     'URL',         # URL associated with node (format-dependent)

lib/puppet/face/parser.rb

@@ -213,7 +213,7 @@ def validate_manifest(manifest = nil)
     env = Puppet.lookup(:current_environment)
     loaders = Puppet::Pops::Loaders.new(env)
 
-    Puppet.override( {:loaders => loaders } , _('For puppet parser validate')) do
+    Puppet.override( {:loaders => loaders }, _('For puppet parser validate')) do
       begin
         validation_environment = manifest ? env.override_with(:manifest => manifest) : env
         validation_environment.check_for_reparse

lib/puppet/indirector/file_bucket_file/file.rb

@@ -69,7 +69,7 @@ def list(request)
           filestat = Time.parse(item.stat.mtime.to_s)
           if from <= filestat and filestat <= to
             filenames.each do |filename|
-              bucket[filename] += [[ item.stat.mtime , item.parent.basename ]]
+              bucket[filename] += [[ item.stat.mtime, item.parent.basename ]]
             end
           end
         end

lib/puppet/parser/compiler.rb

@@ -116,13 +116,13 @@ def add_catalog_validators
   def_delegator :@catalog, :classes, :classlist
 
   def with_context_overrides(description = '', &block)
-    Puppet.override( @context_overrides , description, &block)
+    Puppet.override( @context_overrides, description, &block)
   end
 
   # Compiler our catalog.  This mostly revolves around finding and evaluating classes.
   # This is the main entry into our catalog.
   def compile
-    Puppet.override( @context_overrides , _("For compiling %{node}") % { node: node.name }) do
+    Puppet.override( @context_overrides, _("For compiling %{node}") % { node: node.name }) do
       @catalog.environment_instance = environment
 
       # Set the client's parameters into the top scope.
@@ -531,7 +531,7 @@ def initvars
     # It cannot survive the initvars method, and is later reinstated
     # as part of compiling...
     #
-    Puppet.override( @context_overrides , _("For initializing compiler")) do
+    Puppet.override( @context_overrides, _("For initializing compiler")) do
       # THE MAGIC STARTS HERE ! This triggers parsing, loading etc.
       @catalog.version = environment.known_resource_types.version
       @loaders.pre_load

lib/puppet/parser/script_compiler.rb

@@ -31,7 +31,7 @@ class Puppet::Parser::ScriptCompiler
   attr_reader :node_name
 
   def with_context_overrides(description = '', &block)
-    Puppet.override( @context_overrides , description, &block)
+    Puppet.override( @context_overrides, description, &block)
   end
 
   # Evaluates the configured setup for a script + code in an environment with modules
@@ -41,7 +41,7 @@ def compile
     Puppet[:strict] = :error
 
     # TRANSLATORS, "For running script" is not user facing
-    Puppet.override( @context_overrides , "For running script") do
+    Puppet.override( @context_overrides, "For running script") do
       # TRANSLATORS "main" is a function name and should not be translated
       result = Puppet::Util::Profiler.profile(_("Script: Evaluated main"), [:script, :evaluate_main]) { evaluate_main }
       if block_given?

lib/puppet/pops/lookup/global_data_provider.rb

@@ -21,7 +21,7 @@ def unchecked_key_lookup(key, lookup_invocation, merge)
           # Confine to global scope unless an environment data provider has been defined (same as for hiera_xxx functions)
           adapter = lookup_invocation.lookup_adapter
           hiera_invocation.set_global_only unless adapter.global_only? || adapter.has_environment_data_provider?(lookup_invocation)
-          hiera_invocation.lookup(key, lookup_invocation.module_name) { unchecked_key_lookup(key , hiera_invocation, merge) }
+          hiera_invocation.lookup(key, lookup_invocation.module_name) { unchecked_key_lookup(key, hiera_invocation, merge) }
         end
       end
 

lib/puppet/pops/parser/lexer2.rb

@@ -72,6 +72,7 @@ class Lexer2
   TOKEN_TIMES        = [:TIMES,        '*',   1].freeze
   TOKEN_MODULO       = [:MODULO,       '%',   1].freeze
 
+  # rubocop:disable Layout/SpaceBeforeComma
   TOKEN_NOT          = [:NOT,          '!',   1].freeze
   TOKEN_DOT          = [:DOT,          '.',   1].freeze
   TOKEN_PIPE         = [:PIPE,         '|',   1].freeze
@@ -82,6 +83,7 @@ class Lexer2
   TOKEN_SEMIC        = [:SEMIC,        ';',   1].freeze
   TOKEN_QMARK        = [:QMARK,        '?',   1].freeze
   TOKEN_TILDE        = [:TILDE,        '~',   1].freeze # lexed but not an operator in Puppet
+  # rubocop:enable Layout/SpaceBeforeComma
 
   TOKEN_REGEXP       = [:REGEXP,       nil,   0].freeze
 

lib/puppet/provider/package/windows.rb

@@ -42,7 +42,7 @@ def self.post_resource_eval
       begin
         Puppet::FileSystem.unlink(path)
       rescue => detail
-        raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path , detail: detail.message}, detail)
+        raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path, detail: detail.message}, detail)
       end
     end if @paths
   end