(CONT-811) Correct Style/TrailingCommaInHashLiteral

Author: GSPatton

lib/puppet-lint/bin.rb

@@ -144,7 +144,7 @@ def report_sarif(problems, base_path, base_path_uri)
           'ruleIndex' => rule_index,
           'message' => { 'text' => message[:message] },
           'locations' => [{ 'physicalLocation' => { 'artifactLocation' => { 'uri' => relative_path, 'uriBaseId' => 'ROOTPATH' },
-                                                    'region' => { 'startLine' => message[:line], 'startColumn' => message[:column] } } }],
+                                                    'region' => { 'startLine' => message[:line], 'startColumn' => message[:column] } } }]
         }
         results << result
       end

lib/puppet-lint/checkplugin.rb

@@ -182,7 +182,7 @@ def default_info
       check: self.class.const_get(:NAME),
       fullpath: fullpath,
       path: path,
-      filename: filename,
+      filename: filename
     }
   end
 

lib/puppet-lint/checks.rb

@@ -39,7 +39,7 @@ def load_data(path, content)
         column: e.column,
         fullpath: PuppetLint::Data.fullpath,
         path: PuppetLint::Data.path,
-        filename: PuppetLint::Data.filename,
+        filename: PuppetLint::Data.filename
       }
       PuppetLint::Data.tokens = []
     end
@@ -80,7 +80,7 @@ def run(fileinfo, data)
       filename: File.basename(fileinfo),
       path: fileinfo,
       line: e.token.line,
-      column: e.token.column,
+      column: e.token.column
     }
 
     @problems

lib/puppet-lint/data.rb

@@ -197,7 +197,7 @@ def resource_indexes
             end: marker,
             tokens: tokens[start_idx..marker],
             type: find_resource_type_token(start_idx),
-            param_tokens: find_resource_param_tokens(tokens[start_idx..marker]),
+            param_tokens: find_resource_param_tokens(tokens[start_idx..marker])
           }
         end
         result
@@ -326,7 +326,7 @@ def definition_indexes(type)
                 param_tokens: param_tokens(tokens[i..(i + j + 1)]),
                 type: type,
                 name_token: token.next_code_token,
-                inherited_token: inherited_class,
+                inherited_token: inherited_class
               }
               break
             end
@@ -378,7 +378,7 @@ def function_indexes
           functions << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         functions
@@ -414,7 +414,7 @@ def array_indexes
           arrays << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         arrays
@@ -452,7 +452,7 @@ def hash_indexes
           hashes << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         hashes
@@ -486,7 +486,7 @@ def defaults_indexes
           defaults << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         defaults

lib/puppet-lint/lexer.rb

@@ -73,7 +73,7 @@ def heredoc_queue
     'function' => true,
     'type' => true,
     'attr' => true,
-    'private' => true,
+    'private' => true
   }.freeze
 
   # Internal: A Hash whose keys are Strings representing reserved keywords in
@@ -85,7 +85,7 @@ def heredoc_queue
     'application' => true,
     'consumes' => true,
     'produces' => true,
-    'site' => true,
+    'site' => true
   }.freeze
 
   # Internal: A Hash whose keys are Symbols representing token types which
@@ -101,7 +101,7 @@ def heredoc_queue
     IF: true,
     ELSIF: true,
     LPAREN: true,
-    EQUALS: true,
+    EQUALS: true
   }.freeze
 
   # Internal: some commonly used regular expressions
@@ -179,7 +179,7 @@ def heredoc_queue
     COMMENT: true,
     MLCOMMENT: true,
     SLASH_COMMENT: true,
-    INDENT: true,
+    INDENT: true
   }.freeze
 
   # Internal: Access the internal token storage.

lib/puppet-lint/plugins/legacy_facts/legacy_facts.rb

@@ -100,7 +100,7 @@
   'uptime_seconds' => "facts['system_uptime']['seconds']",
   'uuid' => "facts['dmi']['product']['uuid']",
   'xendomains' => "facts['xen']['domains']",
-  'zonename' => "facts['solaris_zones']['current']",
+  'zonename' => "facts['solaris_zones']['current']"
 }.freeze
 
 # A list of valid hash key token types
@@ -143,7 +143,7 @@ def check
         line: token.line,
         column: token.column,
         token: token,
-        fact_name: fact_name,
+        fact_name: fact_name
       }
     end
   end

lib/puppet-lint/plugins/top_scope_facts/top_scope_facts.rb

@@ -28,7 +28,7 @@ def check
         message: 'top scope fact instead of facts hash',
         line: token.line,
         column: token.column,
-        token: token,
+        token: token
       }
     end
   end

lib/puppet-lint/report/codeclimate.rb

@@ -30,9 +30,9 @@ def self.write_report_file(problems, report_file)
               path: message[:path],
               lines: {
                 begin: message[:line],
-                end: message[:line],
+                end: message[:line]
               }
-            },
+            }
           }
 
           issue[:fingerprint] = Digest::MD5.hexdigest(Marshal.dump(issue))

spec/spec_helper.rb

@@ -24,7 +24,7 @@ class HaveProblem
     def initialize(method, message)
       @expected_problem = {
         kind: method.to_s.delete_prefix('contain_').to_sym,
-        message: message,
+        message: message
       }
       @description = ["contain a #{@expected_problem[:kind]}"]
     end

spec/spec_helper_acceptance_local.rb

@@ -17,7 +17,7 @@ def puppet_lint(args = [])
   {
     stdout: stdout.chomp,
     stderr: stderr.chomp,
-    exit_code: status.exitstatus,
+    exit_code: status.exitstatus
   }
 end