puppet-lint 3.4.0 → 4.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a0c2f244210e801942850dca7d3286d28fa16aeff0d68c43101f00e3c6a549
-  data.tar.gz: f6e1fdee24709edc0a690a7470c665c0952cba65f904ac8cfbe01e968578a886
+  metadata.gz: 434d2ed87adc1be458686f91bd8463abb7e677437f120944c47db58cfb56fa3c
+  data.tar.gz: f37a50155b77bac0570244abdbc6e2c02650b62a0adfe38d0b3e5f23bd44aeeb
 SHA512:
-  metadata.gz: c1d1c760b0be0758b1c788c8f322b90f6cc3ea5ceabac3cf5052b00728178ef94fb99be0da4d49060edbbbe3dc18a8d243144ab112ae69e0a1351d832a42dddb
-  data.tar.gz: 597dbe95bb35aa5379df4cf2a3117bb6880228079b5e6fcf884680d057d1ce4c544267333da5d39fea85137afdd0cf6de6502df584aebf9175be6854e4e2f79a
+  metadata.gz: ca94a402ba348e31914b04d9412d2ecf799be67f9d7c9646d0e4d1b748600ee8251c27166b4e4cb11540bb55c0dfcbfcfa27087e9105160a7e38f8f8b90f7237
+  data.tar.gz: 42eb871e6adf2d611139a1e907eae815d8a55a4e8d7a6a62e200da8fed4f12b4347ecaeb19475d1766bab09fcd7f721d3a6c2a50ec5510a14bb39735d875cb5a

data/lib/puppet-lint/bin.rb

@@ -49,7 +49,7 @@ class PuppetLint::Bin
 
     begin
       path = @args[0]
-      full_path = File.expand_path(path, ENV['PWD'])
+      full_path = File.expand_path(path, ENV.fetch('PWD', nil))
       full_base_path = if File.directory?(full_path)
                          full_path
                        else
@@ -79,19 +79,17 @@ class PuppetLint::Bin
 
       path.each do |f|
         next if ignore_paths.any? { |p| File.fnmatch(p, f) }
+
         l = PuppetLint.new
         l.file = f
         l.run
         all_problems << l.print_problems
 
-        if l.errors? || (l.warnings? && PuppetLint.configuration.fail_on_warnings)
-          return_val = 1
-        end
+        return_val = 1 if l.errors? || (l.warnings? && PuppetLint.configuration.fail_on_warnings)
 
         next unless PuppetLint.configuration.fix && l.problems.none? { |r| r[:check] == :syntax }
-        File.open(f, 'wb') do |fd|
-          fd.write(l.manifest)
-        end
+
+        File.binwrite(f, l.manifest)
       end
 
       if PuppetLint.configuration.sarif
@@ -105,9 +103,7 @@ class PuppetLint::Bin
         puts JSON.pretty_generate(all_problems)
       end
 
-      if PuppetLint.configuration.codeclimate_report_file
-        PuppetLint::Report::CodeClimateReporter.write_report_file(all_problems, PuppetLint.configuration.codeclimate_report_file)
-      end
+      PuppetLint::Report::CodeClimateReporter.write_report_file(all_problems, PuppetLint.configuration.codeclimate_report_file) if PuppetLint.configuration.codeclimate_report_file
 
       return_val
     rescue PuppetLint::NoCodeError
@@ -148,7 +144,7 @@ class PuppetLint::Bin
           '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

data/lib/puppet-lint/checkplugin.rb

@@ -179,10 +179,10 @@ class PuppetLint::CheckPlugin
   # Returns a Hash of default problem information.
   def default_info
     @default_info ||= {
-      check: self.class.const_get('NAME'),
+      check: self.class.const_get(:NAME),
       fullpath: fullpath,
       path: path,
-      filename: filename,
+      filename: filename
     }
   end
 
@@ -202,14 +202,10 @@ class PuppetLint::CheckPlugin
     problem[:kind] = kind
     problem.merge!(default_info) { |_key, v1, _v2| v1 }
 
-    unless [:warning, :error, :fixed].include?(kind)
-      raise ArgumentError, 'unknown value passed for kind'
-    end
+    raise ArgumentError, 'unknown value passed for kind' unless [:warning, :error, :fixed].include?(kind)
 
     [:message, :line, :column, :check].each do |attr|
-      unless problem.key?(attr)
-        raise ArgumentError, "problem hash must contain #{attr.inspect}"
-      end
+      raise ArgumentError, "problem hash must contain #{attr.inspect}" unless problem.key?(attr)
     end
 
     @problems << problem

data/lib/puppet-lint/checks.rb

@@ -39,7 +39,7 @@ class PuppetLint::Checks
         column: e.column,
         fullpath: PuppetLint::Data.fullpath,
         path: PuppetLint::Data.path,
-        filename: PuppetLint::Data.filename,
+        filename: PuppetLint::Data.filename
       }
       PuppetLint::Data.tokens = []
     end
@@ -76,15 +76,15 @@ class PuppetLint::Checks
       kind: :error,
       check: :syntax,
       message: 'Syntax error',
-      fullpath: File.expand_path(fileinfo, ENV['PWD']),
+      fullpath: File.expand_path(fileinfo, ENV.fetch('PWD', nil)),
       filename: File.basename(fileinfo),
       path: fileinfo,
       line: e.token.line,
-      column: e.token.column,
+      column: e.token.column
     }
 
     @problems
-  rescue => e
+  rescue StandardError => e
     $stdout.puts <<-END.gsub(%r{^ {6}}, '')
       Whoops! It looks like puppet-lint has encountered an error that it doesn't
       know how to handle. Please open an issue at https://github.com/puppetlabs/puppet-lint
@@ -120,10 +120,8 @@ class PuppetLint::Checks
   #
   # Returns an Array of String check names.
   def enabled_checks
-    @enabled_checks ||= begin
-      PuppetLint.configuration.checks.select do |check|
-        PuppetLint.configuration.send("#{check}_enabled?")
-      end
+    @enabled_checks ||= PuppetLint.configuration.checks.select do |check|
+      PuppetLint.configuration.send("#{check}_enabled?")
     end
   end
 
@@ -131,6 +129,6 @@ class PuppetLint::Checks
   #
   # Returns the manifest as a String.
   def manifest
-    PuppetLint::Data.tokens.map(&:to_manifest).join('')
+    PuppetLint::Data.tokens.map(&:to_manifest).join
   end
 end

data/lib/puppet-lint/configuration.rb

@@ -18,7 +18,7 @@ class PuppetLint::Configuration
     #
     # Returns true if the check is enabled, otherwise return false.
     define_method("#{check}_enabled?") do
-      settings["#{check}_disabled"] == true ? false : true
+      settings["#{check}_disabled"] != true
     end
 
     # Public: Disable the named check.
@@ -153,6 +153,6 @@ class PuppetLint::Configuration
     self.show_ignored = false
     self.ignore_paths = ['vendor/**/*.pp']
     self.github_actions = ENV.key?('GITHUB_ACTION')
-    self.codeclimate_report_file = ENV['CODECLIMATE_REPORT_FILE']
+    self.codeclimate_report_file = ENV.fetch('CODECLIMATE_REPORT_FILE', nil)
   end
 end

data/lib/puppet-lint/data.rb

@@ -72,7 +72,7 @@ class PuppetLint::Data
 
       unless formatting_tokens.include?(token.type)
         current_token.next_token.prev_code_token = token unless current_token.next_token.nil?
-        next_nf_idx = tokens[index..-1].index { |r| !formatting_tokens.include?(r.type) }
+        next_nf_idx = tokens[index..].index { |r| !formatting_tokens.include?(r.type) }
         unless next_nf_idx.nil?
           next_nf_token = tokens[index + next_nf_idx]
           token.next_code_token = next_nf_token
@@ -92,9 +92,7 @@ class PuppetLint::Data
       end
 
       current_token.next_token = token
-      unless formatting_tokens.include?(token.type)
-        current_token.next_code_token = token
-      end
+      current_token.next_code_token = token unless formatting_tokens.include?(token.type)
 
       tokens.insert(index, token)
     end
@@ -123,7 +121,7 @@ class PuppetLint::Data
         @fullpath = nil
         @filename = nil
       else
-        @fullpath = File.expand_path(val, ENV['PWD'])
+        @fullpath = File.expand_path(val, ENV.fetch('PWD', nil))
         @filename = File.basename(val)
       end
     end
@@ -184,12 +182,14 @@ class PuppetLint::Data
           next unless colon_token.next_code_token && colon_token.next_code_token.type != :LBRACE
           next if classref?(colon_token)
 
-          rel_start_idx = tokens[marker..-1].index(colon_token)
+          rel_start_idx = tokens[marker..].index(colon_token)
           break if rel_start_idx.nil?
+
           start_idx = rel_start_idx + marker
           end_token = colon_token.next_token_of([:SEMIC, :RBRACE])
-          rel_end_idx = tokens[start_idx..-1].index(end_token)
+          rel_end_idx = tokens[start_idx..].index(end_token)
           raise PuppetLint::SyntaxError, colon_token if rel_end_idx.nil?
+
           marker = rel_end_idx + start_idx
 
           result << {
@@ -197,7 +197,7 @@ class PuppetLint::Data
             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
@@ -237,9 +237,7 @@ class PuppetLint::Data
 
         break unless resource_tokens.include?(iter_token)
 
-        if iter_token && iter_token.next_code_token.type == :FARROW
-          param_tokens << iter_token
-        end
+        param_tokens << iter_token if iter_token && iter_token.next_code_token.type == :FARROW
       end
 
       param_tokens
@@ -306,7 +304,7 @@ class PuppetLint::Data
         paren_depth = 0
         in_params = false
         inherited_class = nil
-        tokens[i + 1..-1].each_with_index do |definition_token, j|
+        tokens[i + 1..].each_with_index do |definition_token, j|
           case definition_token.type
           when :INHERITS
             inherited_class = definition_token.next_code_token
@@ -320,19 +318,17 @@ class PuppetLint::Data
             brace_depth += 1
           when :RBRACE
             brace_depth -= 1
-            if brace_depth.zero? && !in_params
-              if token.next_code_token.type != :LBRACE
-                result << {
-                  start: i,
-                  end: i + j + 1,
-                  tokens: tokens[i..(i + j + 1)],
-                  param_tokens: param_tokens(tokens[i..(i + j + 1)]),
-                  type: type,
-                  name_token: token.next_code_token,
-                  inherited_token: inherited_class,
-                }
-                break
-              end
+            if brace_depth.zero? && !in_params && (token.next_code_token.type != :LBRACE)
+              result << {
+                start: i,
+                end: i + j + 1,
+                tokens: tokens[i..(i + j + 1)],
+                param_tokens: param_tokens(tokens[i..(i + j + 1)]),
+                type: type,
+                name_token: token.next_code_token,
+                inherited_token: inherited_class
+              }
+              break
             end
           end
         end
@@ -367,7 +363,7 @@ class PuppetLint::Data
           level = 0
           real_idx = 0
           in_paren = false
-          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+          tokens[token_idx + 1..].each_with_index do |cur_token, cur_token_idx|
             break if level.zero? && in_paren
             break if level.zero? && cur_token.type == :NEWLINE
 
@@ -382,7 +378,7 @@ class PuppetLint::Data
           functions << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         functions
@@ -406,7 +402,7 @@ class PuppetLint::Data
           next unless token.type == :LBRACK
 
           real_idx = 0
-          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+          tokens[token_idx + 1..].each_with_index do |cur_token, cur_token_idx|
             real_idx = token_idx + 1 + cur_token_idx
             break if cur_token.type == :RBRACK
           end
@@ -418,7 +414,7 @@ class PuppetLint::Data
           arrays << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         arrays
@@ -445,18 +441,18 @@ class PuppetLint::Data
 
           level = 0
           real_idx = 0
-          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+          tokens[token_idx + 1..].each_with_index do |cur_token, cur_token_idx|
             real_idx = token_idx + 1 + cur_token_idx
 
             level += 1 if cur_token.type == :LBRACE
             level -= 1 if cur_token.type == :RBRACE
-            break if level < 0
+            break if level.negative?
           end
 
           hashes << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         hashes
@@ -482,7 +478,7 @@ class PuppetLint::Data
 
           real_idx = 0
 
-          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+          tokens[token_idx + 1..].each_with_index do |cur_token, cur_token_idx|
             real_idx = token_idx + 1 + cur_token_idx
             break if cur_token.type == :RBRACE
           end
@@ -490,7 +486,7 @@ class PuppetLint::Data
           defaults << {
             start: token_idx,
             end: real_idx,
-            tokens: tokens[token_idx..real_idx],
+            tokens: tokens[token_idx..real_idx]
           }
         end
         defaults
@@ -564,7 +560,7 @@ class PuppetLint::Data
         comment_token_types.include?(token.type)
       end
       control_comment_tokens = comment_tokens.select do |token|
-        token.value.strip =~ %r{\Alint\:(ignore\:[\w\d]+|endignore)}
+        token.value.strip =~ %r{\Alint:(ignore:[\w\d]+|endignore)}
       end
 
       stack = []
@@ -574,12 +570,12 @@ class PuppetLint::Data
 
         comment_words = token.value.strip.split(%r{\s+})
         comment_words.each_with_index do |word, i|
-          if %r{\Alint\:(ignore|endignore)}.match?(word)
+          if %r{\Alint:(ignore|endignore)}.match?(word)
             comment_data << word
           else
             # Once we reach the first non-controlcomment word, assume the rest
             # of the words are the reason.
-            reason = comment_words[i..-1]
+            reason = comment_words[i..]
             break
           end
         end
@@ -604,7 +600,7 @@ class PuppetLint::Data
             if top_override.nil?
               # TODO: refactor to provide a way to expose problems from
               # PuppetLint::Data via the normal problem reporting mechanism.
-              $stderr.puts "WARNING: lint:endignore comment with no opening lint:ignore:<check> comment found on line #{token.line}"
+              warn "WARNING: lint:endignore comment with no opening lint:ignore:<check> comment found on line #{token.line}"
             else
               top_override.each do |start|
                 next if start.nil?
@@ -620,7 +616,7 @@ class PuppetLint::Data
       end
 
       stack.each do |control|
-        $stderr.puts "WARNING: lint:ignore:#{control[0][2]} comment on line #{control[0][0]} with no closing lint:endignore comment"
+        warn "WARNING: lint:ignore:#{control[0][2]} comment on line #{control[0][0]} with no closing lint:endignore comment"
       end
     end
   end

data/lib/puppet-lint/lexer/string_slurper.rb

@@ -1,11 +1,10 @@
 require 'strscan'
 
+# rubocop:disable Style/ClassAndModuleChildren
 class PuppetLint::Lexer
   # Internal: A class for slurping strings from a Puppet manifest.
   class StringSlurper
-    attr_accessor :scanner
-    attr_accessor :results
-    attr_accessor :interp_stack
+    attr_accessor :scanner, :results, :interp_stack
 
     START_INTERP_PATTERN = %r{\$\{}.freeze
     END_INTERP_PATTERN = %r{\}}.freeze

data/lib/puppet-lint/lexer/token.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/ClassAndModuleChildren
 class PuppetLint::Lexer
   # Public: Stores a fragment of the manifest and the information about its
   # location in the manifest.
@@ -175,12 +176,10 @@ class PuppetLint::Lexer
 
       token_iter = send("#{direction}_token".to_sym)
       until token_iter.nil?
-        if to_find.include?(token_iter.type)
-          return token_iter if opts[:value].nil? || token_iter.value == opts[:value]
-        end
+        return token_iter if to_find.include?(token_iter.type) && (opts[:value].nil? || token_iter.value == opts[:value])
 
-        opening_token = direction == :next ? 'L' : 'R'
-        closing_token = direction == :next ? 'R' : 'L'
+        opening_token = (direction == :next) ? 'L' : 'R'
+        closing_token = (direction == :next) ? 'R' : 'L'
 
         if opts[:skip_blocks]
           case token_iter.type
@@ -194,6 +193,7 @@ class PuppetLint::Lexer
         end
 
         return nil if token_iter.nil?
+
         token_iter = token_iter.send("#{direction}_token".to_sym)
       end
       nil
@@ -202,6 +202,7 @@ class PuppetLint::Lexer
     def interpolated_variable?
       return false if type == :TYPE && value != 'type'
       return true if type == :NAME
+
       PuppetLint::Lexer::KEYWORDS.include?(type.to_s.downcase)
     end
   end

data/lib/puppet-lint/lexer.rb

@@ -1,6 +1,3 @@
-# encoding: utf-8
-
-require 'pp'
 require 'strscan'
 require 'set'
 require 'puppet-lint/lexer/token'
@@ -56,27 +53,27 @@ class PuppetLint::Lexer
   # From https://github.com/puppetlabs/puppet/blob/master/lib/puppet/pops/parser/lexer2.rb#L116-L137
   # or thereabouts
   KEYWORDS = {
-    'case'     => true,
-    'class'    => true,
-    'default'  => true,
-    'define'   => true,
-    'import'   => true,
-    'if'       => true,
-    'elsif'    => true,
-    'else'     => true,
+    'case' => true,
+    'class' => true,
+    'default' => true,
+    'define' => true,
+    'import' => true,
+    'if' => true,
+    'elsif' => true,
+    'else' => true,
     'inherits' => true,
-    'node'     => true,
-    'and'      => true,
-    'or'       => true,
-    'undef'    => true,
-    'false'    => true,
-    'true'     => true,
-    'in'       => true,
-    'unless'   => true,
+    'node' => true,
+    'and' => true,
+    'or' => true,
+    'undef' => true,
+    'false' => true,
+    'true' => true,
+    'in' => true,
+    'unless' => true,
     'function' => true,
-    'type'     => true,
-    'attr'     => true,
-    'private'  => true,
+    'type' => true,
+    'attr' => true,
+    'private' => true
   }.freeze
 
   # Internal: A Hash whose keys are Strings representing reserved keywords in
@@ -86,9 +83,9 @@ class PuppetLint::Lexer
   # Currently unused
   APP_MANAGEMENT_TOKENS = {
     'application' => true,
-    'consumes'    => true,
-    'produces'    => true,
-    'site'        => true,
+    'consumes' => true,
+    'produces' => true,
+    'site' => true
   }.freeze
 
   # Internal: A Hash whose keys are Symbols representing token types which
@@ -104,7 +101,7 @@ class PuppetLint::Lexer
     IF: true,
     ELSIF: true,
     LPAREN: true,
-    EQUALS: true,
+    EQUALS: true
   }.freeze
 
   # Internal: some commonly used regular expressions
@@ -112,7 +109,7 @@ class PuppetLint::Lexer
   # \v == vertical tab
   # \f == form feed
   # \p{Zs} == ASCII + Unicode non-linebreaking whitespace
-  WHITESPACE_RE = RUBY_VERSION == '1.8.7' ? %r{[\t\v\f ]} : %r{[\t\v\f\p{Zs}]}
+  WHITESPACE_RE = (RUBY_VERSION == '1.8.7') ? %r{[\t\v\f ]} : %r{[\t\v\f\p{Zs}]}
 
   LINE_END_RE = %r{(?:\r\n|\r|\n)}.freeze
 
@@ -182,7 +179,7 @@ class PuppetLint::Lexer
     COMMENT: true,
     MLCOMMENT: true,
     SLASH_COMMENT: true,
-    INDENT: true,
+    INDENT: true
   }.freeze
 
   # Internal: Access the internal token storage.
@@ -203,7 +200,7 @@ class PuppetLint::Lexer
     i = 0
 
     while i < code.size
-      chunk = code[i..-1]
+      chunk = code[i..]
 
       found = false
 
@@ -233,12 +230,12 @@ class PuppetLint::Lexer
         tokens << new_token(:VARIABLE, var_name, opts)
 
       elsif %r{\A'.*?'}m.match?(chunk)
-        str_content = StringScanner.new(code[i + 1..-1]).scan_until(%r{(\A|[^\\])(\\\\)*'}m)
+        str_content = StringScanner.new(code[i + 1..]).scan_until(%r{(\A|[^\\])(\\\\)*'}m)
         length = str_content.size + 1
         tokens << new_token(:SSTRING, str_content[0..-2])
 
       elsif chunk.start_with?('"')
-        slurper = PuppetLint::Lexer::StringSlurper.new(code[i + 1..-1])
+        slurper = PuppetLint::Lexer::StringSlurper.new(code[i + 1..])
         begin
           string_segments = slurper.parse
           process_string_segments(string_segments)
@@ -271,7 +268,7 @@ class PuppetLint::Lexer
         tokens << new_token(:MLCOMMENT, mlcomment, raw: mlcomment_raw)
 
       elsif chunk.match(%r{\A/.*?/}m) && possible_regex?
-        str_content = StringScanner.new(code[i + 1..-1]).scan_until(%r{(\A|[^\\])(\\\\)*/}m)
+        str_content = StringScanner.new(code[i + 1..]).scan_until(%r{(\A|[^\\])(\\\\)*/}m)
         length = str_content.size + 1
         tokens << new_token(:REGEX, str_content[0..-2])
 
@@ -286,7 +283,7 @@ class PuppetLint::Lexer
           length += indent.size
         else
           heredoc_tag = heredoc_queue.shift
-          slurper = PuppetLint::Lexer::StringSlurper.new(code[i + length..-1])
+          slurper = PuppetLint::Lexer::StringSlurper.new(code[i + length..])
           heredoc_segments = slurper.parse_heredoc(heredoc_tag)
           process_heredoc_segments(heredoc_segments)
           length += slurper.consumed_chars
@@ -298,7 +295,7 @@ class PuppetLint::Lexer
 
         unless heredoc_queue.empty?
           heredoc_tag = heredoc_queue.shift
-          slurper = PuppetLint::Lexer::StringSlurper.new(code[i + length..-1])
+          slurper = PuppetLint::Lexer::StringSlurper.new(code[i + length..])
           heredoc_segments = slurper.parse_heredoc(heredoc_tag)
           process_heredoc_segments(heredoc_segments)
           length += slurper.consumed_chars
@@ -419,11 +416,11 @@ class PuppetLint::Lexer
         lexer = PuppetLint::Lexer.new
         lexer.tokenise(segment[1])
         lexer.tokens.each_with_index do |t, i|
-          type = i.zero? && t.interpolated_variable? ? :VARIABLE : t.type
+          type = (i.zero? && t.interpolated_variable?) ? :VARIABLE : t.type
           tokens << new_token(type, t.value, raw: t.raw)
         end
       when :UNENC_VAR
-        tokens << new_token(:UNENC_VARIABLE, segment[1].gsub(%r{\A\$}, ''))
+        tokens << new_token(:UNENC_VARIABLE, segment[1].delete_prefix('$'))
       else
         tokens << new_token(:DQMID, segment[1])
       end
@@ -451,11 +448,11 @@ class PuppetLint::Lexer
         lexer = PuppetLint::Lexer.new
         lexer.tokenise(segment[1])
         lexer.tokens.each_with_index do |t, i|
-          type = i.zero? && t.interpolated_variable? ? :VARIABLE : t.type
+          type = (i.zero? && t.interpolated_variable?) ? :VARIABLE : t.type
           tokens << new_token(type, t.value, raw: t.raw)
         end
       when :UNENC_VAR
-        tokens << new_token(:UNENC_VARIABLE, segment[1].gsub(%r{\A\$}, ''))
+        tokens << new_token(:UNENC_VARIABLE, segment[1].delete_prefix('$'))
       else
         tokens << new_token(:HEREDOC_MID, segment[1])
       end

data/lib/puppet-lint/monkeypatches.rb

@@ -1,9 +1,9 @@
 begin
   '%{test}' % { test: 'replaced' } == 'replaced'
-rescue
+rescue StandardError
   # monkeypatch String#% into Ruby 1.8.7
   class String
-    Percent = instance_method('%') unless defined?(Percent)
+    Percent = instance_method(:%) unless defined?(Percent)
 
     def %(*a, &b)
       a.flatten!
@@ -18,7 +18,7 @@ rescue
       if a.empty?
         string
       else
-        Percent.bind(string).call(a, &b)
+        Percent.bind_call(string, a, &b)
       end
     end
 
@@ -28,7 +28,7 @@ rescue
         vars.each do |var, value|
           var = var.to_s
           var.gsub!(%r{[^a-zA-Z0-9_]}, '')
-          changed = gsub!(%r{\%\{#{var}\}}, value.to_s)
+          changed = gsub!(%r{%\{#{var}\}}, value.to_s)
         end
         break unless changed
       end

data/lib/puppet-lint/optparser.rb

@@ -143,7 +143,7 @@ class PuppetLint::OptParser
 
     unless args.include?('--no-config')
       opt_parser.load('/etc/puppet-lint.rc')
-      if ENV.key?('HOME') && File.readable?(ENV['HOME'])
+      if File.readable?(Dir.home)
         home_dotfile_path = File.expand_path('~/.puppet-lint.rc')
         opt_parser.load(home_dotfile_path) if File.readable?(home_dotfile_path)
       end

data/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb

@@ -35,6 +35,7 @@ PuppetLint.new_check(:arrow_on_right_operand_line) do
 
     # Remove trailing whitespace after left operand (if it exists)
     return unless left_operand_token.next_token.type == :WHITESPACE
+
     trailing_whitespace_token = left_operand_token.next_token
     remove_token(trailing_whitespace_token) if [:NEWLINE, :WHITESPACE].include?(trailing_whitespace_token.next_token.type)
   end

data/lib/puppet-lint/plugins/check_classes/autoloader_layout.rb

@@ -12,14 +12,12 @@ PuppetLint.new_check(:autoloader_layout) do
       split_title = title_token.value.split('::')
       mod = split_title.first
       expected_path = if split_title.length > 1
-                        "/#{mod}/manifests/#{split_title[1..-1].join('/')}.pp"
+                        "/#{mod}/manifests/#{split_title[1..].join('/')}.pp"
                       else
                         "/#{title_token.value}/manifests/init.pp"
                       end
 
-      if PuppetLint.configuration.relative
-        expected_path = expected_path.gsub(%r{^/}, '').split('/')[1..-1].join('/')
-      end
+      expected_path = expected_path.gsub(%r{^/}, '').split('/')[1..].join('/') if PuppetLint.configuration.relative
 
       next if fullpath.end_with?(expected_path)