Merge pull request #54 from puppetlabs/maint-rubocop_updates

(MAINT) Rubocop updates

Author: david22swan

lib/puppet-lint.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Naming/FileName
+
 # encoding: utf-8
 
 require 'set'
@@ -12,6 +14,7 @@
 require 'puppet-lint/monkeypatches'
 
 class PuppetLint::NoCodeError < StandardError; end
+
 class PuppetLint::NoFix < StandardError; end
 
 # Parser Syntax Errors
@@ -20,6 +23,7 @@ class PuppetLint::SyntaxError < StandardError
 
   def initialize(token)
     @token = token
+    super
   end
 end
 
@@ -59,7 +63,7 @@ class PuppetLint
   # Public: Initialise a new PuppetLint object.
   def initialize
     @code = nil
-    @statistics = { :error => 0, :warning => 0, :fixed => 0, :ignored => 0 }
+    @statistics = { error: 0, warning: 0, fixed: 0, ignored: 0 }
     @manifest = ''
   end
 

lib/puppet-lint/bin.rb

@@ -104,11 +104,11 @@ def run
         puts JSON.pretty_generate(all_problems)
       end
 
-      return return_val
+      return_val
     rescue PuppetLint::NoCodeError
       puts 'puppet-lint: no file specified or specified file does not exist'
       puts "puppet-lint: try 'puppet-lint --help' for more information"
-      return 1
+      1
     end
   end
 
@@ -133,7 +133,7 @@ def report_sarif(problems, base_path, base_path_uri)
           new_rule = { 'id' => message[:check] }
           new_rule['fullDescription'] = { 'text' => message[:description] } unless message[:description].nil?
           new_rule['fullDescription'] = { 'text' => 'Check for any syntax error and record an error of each instance found.' } if new_rule['fullDescription'].nil? && message[:check] == :syntax
-          new_rule['defaultConfiguration'] = { 'level' => message[:KIND].downcase } if %w[error warning].include?(message[:KIND].downcase)
+          new_rule['defaultConfiguration'] = { 'level' => message[:KIND].downcase } if ['error', 'warning'].include?(message[:KIND].downcase)
           new_rule['helpUri'] = message[:help_uri] unless message[:help_uri].nil?
           rules << new_rule
         end
@@ -142,7 +142,8 @@ def report_sarif(problems, base_path, base_path_uri)
           'ruleId' => message[:check],
           'ruleIndex' => rule_index,
           'message' => { 'text' => message[:message] },
-          'locations' => [{ 'physicalLocation' => { 'artifactLocation' => { 'uri' => relative_path, 'uriBaseId' => 'ROOTPATH' }, 'region' => { 'startLine' => message[:line], 'startColumn' => message[:column] } } }],
+          'locations' => [{ 'physicalLocation' => { 'artifactLocation' => { 'uri' => relative_path, 'uriBaseId' => 'ROOTPATH' },
+'region' => { 'startLine' => message[:line], 'startColumn' => message[:column] } } }],
         }
         results << result
       end

lib/puppet-lint/checkplugin.rb

@@ -41,7 +41,7 @@ def fix_problems
       begin
         fix(problem)
         problem[:kind] = :fixed
-      rescue PuppetLint::NoFix # rubocop:disable Lint/HandleExceptions
+      rescue PuppetLint::NoFix
         # noop
       end
     end
@@ -179,10 +179,10 @@ def manifest_lines
   # Returns a Hash of default problem information.
   def default_info
     @default_info ||= {
-      :check      => self.class.const_get('NAME'),
-      :fullpath   => fullpath,
-      :path       => path,
-      :filename   => filename,
+      check: self.class.const_get('NAME'),
+      fullpath: fullpath,
+      path: path,
+      filename: filename,
     }
   end
 

lib/puppet-lint/checks.rb

@@ -32,14 +32,14 @@ def load_data(path, content)
                 end
 
       problems << {
-        :kind     => :error,
-        :check    => :syntax,
-        :message  => message,
-        :line     => e.line_no,
-        :column   => e.column,
-        :fullpath => PuppetLint::Data.fullpath,
-        :path     => PuppetLint::Data.path,
-        :filename => PuppetLint::Data.filename,
+        kind: :error,
+        check: :syntax,
+        message: message,
+        line: e.line_no,
+        column: e.column,
+        fullpath: PuppetLint::Data.fullpath,
+        path: PuppetLint::Data.path,
+        filename: PuppetLint::Data.filename,
       }
       PuppetLint::Data.tokens = []
     end
@@ -73,14 +73,14 @@ def run(fileinfo, data)
     @problems
   rescue PuppetLint::SyntaxError => e
     @problems << {
-      :kind     => :error,
-      :check    => :syntax,
-      :message  => 'Syntax error',
-      :fullpath => File.expand_path(fileinfo, ENV['PWD']),
-      :filename => File.basename(fileinfo),
-      :path     => fileinfo,
-      :line     => e.token.line,
-      :column   => e.token.column,
+      kind: :error,
+      check: :syntax,
+      message: 'Syntax error',
+      fullpath: File.expand_path(fileinfo, ENV['PWD']),
+      filename: File.basename(fileinfo),
+      path: fileinfo,
+      line: e.token.line,
+      column: e.token.column,
     }
 
     @problems