(PUP-11993) Style/TrailingCommaInArrayLiteral

This commit enables the Style/TrailingCommaInArrayLiteral cop and
fixes 16 autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -734,26 +734,6 @@ Style/SymbolArray:
 Style/TernaryParentheses:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
-  Exclude:
-    - 'ext/windows/service/daemon.rb'
-    - 'lib/puppet/functions.rb'
-    - 'lib/puppet/parser/compiler.rb'
-    - 'lib/puppet/pops/types/p_uri_type.rb'
-    - 'lib/puppet/pops/types/string_converter.rb'
-    - 'lib/puppet/pops/types/types.rb'
-    - 'lib/puppet/provider/package/windows/exe_package.rb'
-    - 'lib/puppet/provider/service/upstart.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/ssl/certificate_request.rb'
-    - 'lib/puppet/ssl/oids.rb'
-    - 'lib/puppet/transaction/persistence.rb'
-    - 'lib/puppet/util/at_fork/solaris.rb'
-    - 'lib/puppet/util/windows/registry.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma

ext/windows/service/daemon.rb

@@ -197,7 +197,7 @@ def load_env(base_dir)
     ENV['SSL_CERT_FILE'] = File.join(base_dir, 'puppet', 'ssl', 'cert.pem').tr('/', '\\')
     ENV['Path'] = [
       File.join(base_dir, 'puppet', 'bin'),
-      File.join(base_dir, 'bin'),
+      File.join(base_dir, 'bin')
     ].join(';').tr('/', '\\') + ';' + ENV.fetch('Path', nil)
 
     # ENV that uses forward slashes

lib/puppet/functions.rb

@@ -688,7 +688,7 @@ class Function3x < InternalFunction
       ['p0', 'p1'].freeze,
       ['p0', 'p1', 'p2'].freeze,
       ['p0', 'p1', 'p2', 'p3'].freeze,
-      ['p0', 'p1', 'p2', 'p3', 'p4'].freeze,
+      ['p0', 'p1', 'p2', 'p3', 'p4'].freeze
     ]
 
     # Creates an anonymous Function3x class that wraps a 3x function

lib/puppet/parser/compiler.rb

@@ -28,7 +28,7 @@ def self.compile(node, code_id = nil)
       errors.each { |e| Puppet.err(e) } if errors.size > 1
       errmsg = [
         _("Compilation has been halted because: %{error}") % { error: errors.first },
-        _("For more information, see https://puppet.com/docs/puppet/latest/environments_about.html"),
+        _("For more information, see https://puppet.com/docs/puppet/latest/environments_about.html")
       ]
       raise(Puppet::Error, errmsg.join(' '))
     end

lib/puppet/pops/types/p_uri_type.rb

@@ -46,7 +46,7 @@ class PURIType < PAnyType
                TypeFactory.type_type(PPatternType::DEFAULT),
                TypeFactory.type_type(PEnumType::DEFAULT),
                TypeFactory.type_type(PNotUndefType::DEFAULT),
-               TypeFactory.type_type(PUndefType::DEFAULT),
+               TypeFactory.type_type(PUndefType::DEFAULT)
              ]))
 
   TYPE_INTEGER_PARAM =
@@ -55,7 +55,7 @@ class PURIType < PAnyType
         .new([
                PIntegerType.new(0),
                TypeFactory.type_type(PNotUndefType::DEFAULT),
-               TypeFactory.type_type(PUndefType::DEFAULT),
+               TypeFactory.type_type(PUndefType::DEFAULT)
              ]))
 
   TYPE_URI_PARAM_HASH_TYPE = TypeFactory.struct(

lib/puppet/pops/types/string_converter.rb

@@ -89,7 +89,7 @@ class Format
 
     FMT_PATTERN_STR = '^%([\s\[+#0{<(|-]*)([1-9][0-9]*)?(?:\.([0-9]+))?([a-zA-Z])$'
     FMT_PATTERN = Regexp.compile(FMT_PATTERN_STR)
-    DELIMITERS  = ['[', '{', '(', '<', '|',]
+    DELIMITERS  = ['[', '{', '(', '<', '|']
     DELIMITER_MAP = {
       '[' => ['[', ']'],
       '{' => ['{', '}'],

lib/puppet/pops/types/types.rb

@@ -57,7 +57,7 @@ def self.create_ptype(loader, ir, parent_name, attributes_hash = EMPTY_HASH)
   def self.register_ptypes(loader, ir)
     types = [
       Annotation.register_ptype(loader, ir),
-      RubyMethod.register_ptype(loader, ir),
+      RubyMethod.register_ptype(loader, ir)
     ]
     Types.constants.each do |c|
       next if c == :PType || c == :PHostClassType

lib/puppet/provider/package/windows/exe_package.rb

@@ -16,7 +16,7 @@ class ExePackage < Puppet::Provider::Package::Windows::Package
       'Security Update',
       'Update Rollup',
       'Hotfix',
-      'WindowsInstaller',
+      'WindowsInstaller'
     ]
 
     def self.register(path)

lib/puppet/provider/service/upstart.rb

@@ -15,7 +15,7 @@
     Puppet.runtime[:facter].value('os.name') == 'Ubuntu',
     (Puppet.runtime[:facter].value('os.family') == 'RedHat' and Puppet.runtime[:facter].value('os.release.full') =~ /^6\./),
     (Puppet.runtime[:facter].value('os.name') == 'Amazon' and Puppet.runtime[:facter].value('os.release.major') =~ /\d{4}/),
-    Puppet.runtime[:facter].value('os.name') == 'LinuxMint',
+    Puppet.runtime[:facter].value('os.name') == 'LinuxMint'
   ]
 
   defaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"]

lib/puppet/settings.rb

@@ -852,7 +852,7 @@ def reuse
   def configsearchpath(environment = nil, run_mode = preferred_run_mode)
     searchpath = [
       SearchPathElement.new(:memory, :values),
-      SearchPathElement.new(:cli, :values),
+      SearchPathElement.new(:cli, :values)
     ]
     searchpath << SearchPathElement.new(environment.intern, :environment) if environment