puppet-lint 3.4.0 → 4.0.0.rc.1

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

@@ -5,7 +5,7 @@
 PuppetLint.new_check(:class_inherits_from_params_class) do
   def check
     class_indexes.each do |class_idx|
-      next unless class_idx[:inherited_token] && class_idx[:inherited_token]&.value&.end_with?('::params')
+      next unless class_idx[:inherited_token]&.value&.end_with?('::params')
 
       notify(
         :warning,
@@ -18,4 +18,4 @@ PuppetLint.new_check(:class_inherits_from_params_class) do
     end
   end
 end
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send(:disable_class_inherits_from_params_class)

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

@@ -20,4 +20,4 @@ PuppetLint.new_check(:code_on_top_scope) do
     end
   end
 end
-PuppetLint.configuration.send('disable_code_on_top_scope')
+PuppetLint.configuration.send(:disable_code_on_top_scope)

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

@@ -2,18 +2,18 @@
 # defined inside another class.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#nested-classes-or-defined-types
+CLASS_DEFINE_TOKENS = Set[:CLASS, :DEFINE]
 PuppetLint.new_check(:nested_classes_or_defines) do
-  TOKENS = Set[:CLASS, :DEFINE]
-
   def check
     class_indexes.each do |class_idx|
       # Skip the first token so that we don't pick up the first :CLASS
-      class_tokens = class_idx[:tokens][1..-1]
+      class_tokens = class_idx[:tokens][1..]
 
       class_tokens.each do |token|
-        next unless TOKENS.include?(token.type)
+        next unless CLASS_DEFINE_TOKENS.include?(token.type)
         next if token.next_code_token.type == :LBRACE
-        type = token.type == :CLASS ? 'class' : 'defined type'
+
+        type = (token.type == :CLASS) ? 'class' : 'defined type'
 
         notify(
           :warning,

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

@@ -11,13 +11,14 @@ PuppetLint.new_check(:parameter_order) do
       paren_stack = []
       hash_or_array_stack = []
       class_idx[:param_tokens].each_with_index do |token, i|
-        if token.type == :LPAREN
+        case token.type
+        when :LPAREN
           paren_stack.push(true)
-        elsif token.type == :RPAREN
+        when :RPAREN
           paren_stack.pop
-        elsif token.type == :LBRACE || token.type == :LBRACK
+        when :LBRACE, :LBRACK
           hash_or_array_stack.push(true)
-        elsif token.type == :RBRACE || token.type == :RBRACK
+        when :RBRACE, :RBRACK
           hash_or_array_stack.pop
         end
 
@@ -34,8 +35,8 @@ PuppetLint.new_check(:parameter_order) do
           message: msg,
           line: token.line,
           column: token.column,
-          description: 'Test the manifest tokens for any parameterised classes or defined types that take '\
-            'parameters and record a warning if there are any optional parameters listed before required parameters.',
+          description: 'Test the manifest tokens for any parameterised classes or defined types that take ' \
+                       'parameters and record a warning if there are any optional parameters listed before required parameters.',
           help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#display-order-of-parameters',
         )
       end
@@ -58,9 +59,7 @@ PuppetLint.new_check(:parameter_order) do
     data_type = token.prev_token_of(:TYPE, skip_blocks: true)
     return false if data_type && data_type.value == 'Optional'
 
-    if token.next_code_token.nil? || [:COMMA, :RPAREN].include?(token.next_code_token.type)
-      return !(token.prev_code_token && token.prev_code_token.type == :EQUALS)
-    end
+    return !(token.prev_code_token && token.prev_code_token.type == :EQUALS) if token.next_code_token.nil? || [:COMMA, :RPAREN].include?(token.next_code_token.type)
 
     false
   end

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

@@ -5,35 +5,35 @@
 # not.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#namespacing-variables
-PuppetLint.new_check(:variable_scope) do
-  DEFAULT_SCOPE_VARS = Set[
-    'name',
-    'title',
-    'module_name',
-    'environment',
-    'clientcert',
-    'clientversion',
-    'servername',
-    'serverip',
-    'serverversion',
-    'caller_module_name',
-    'alias',
-    'audit',
-    'before',
-    'loglevel',
-    'noop',
-    'notify',
-    'require',
-    'schedule',
-    'stage',
-    'subscribe',
-    'tag',
-    'facts',
-    'trusted',
-    'server_facts',
-  ]
-  POST_VAR_TOKENS = Set[:COMMA, :EQUALS, :RPAREN]
+DEFAULT_SCOPE_VARS = Set[
+  'name',
+  'title',
+  'module_name',
+  'environment',
+  'clientcert',
+  'clientversion',
+  'servername',
+  'serverip',
+  'serverversion',
+  'caller_module_name',
+  'alias',
+  'audit',
+  'before',
+  'loglevel',
+  'noop',
+  'notify',
+  'require',
+  'schedule',
+  'stage',
+  'subscribe',
+  'tag',
+  'facts',
+  'trusted',
+  'server_facts',
+]
+POST_VAR_TOKENS = Set[:COMMA, :EQUALS, :RPAREN]
 
+PuppetLint.new_check(:variable_scope) do
   def check
     variables_in_scope = DEFAULT_SCOPE_VARS.clone
 
@@ -93,7 +93,7 @@ PuppetLint.new_check(:variable_scope) do
             end_token = nil
             brace_depth = 0
 
-            tokens[start_idx..-1].each do |sub_token|
+            tokens[start_idx..].each do |sub_token|
               case sub_token.type
               when :LBRACE
                 brace_depth += 1
@@ -117,9 +117,7 @@ PuppetLint.new_check(:variable_scope) do
 
       msg = 'top-scope variable being used without an explicit namespace'
       referenced_variables.each do |token|
-        unless future_parser_scopes[token.line].nil?
-          next if future_parser_scopes[token.line].include?(token.value.gsub(%r{\[.+\]\Z}, ''))
-        end
+        next if !future_parser_scopes[token.line].nil? && future_parser_scopes[token.line].include?(token.value.gsub(%r{\[.+\]\Z}, ''))
 
         next if token.value.include?('::')
         next if %r{^(facts|trusted)\[.+\]}.match?(token.value)
@@ -132,8 +130,8 @@ PuppetLint.new_check(:variable_scope) do
           line: token.line,
           column: token.column,
           description: 'Test the manifest tokens for any variables that are referenced in the manifest. ' \
-                          'If the variables are not fully qualified or one of the variables automatically created in the scope, ' \
-                          'check that they have been defined in the local scope and record a warning for each variable that has not.',
+                       'If the variables are not fully qualified or one of the variables automatically created in the scope, ' \
+                       'check that they have been defined in the local scope and record a warning for each variable that has not.',
           help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#namespacing-variables',
         )
       end

data/lib/puppet-lint/plugins/check_conditionals/case_without_default.rb

@@ -10,7 +10,7 @@ PuppetLint.new_check(:case_without_default) do
       next unless tokens[token_idx].type == :CASE
 
       depth = 0
-      tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
+      tokens[(token_idx + 1)..].each_index do |case_token_idx|
         idx = case_token_idx + token_idx + 1
         if tokens[idx].type == :LBRACE
           depth += 1
@@ -27,7 +27,7 @@ PuppetLint.new_check(:case_without_default) do
     case_indexes.each_with_index do |kase, kase_index|
       case_tokens = tokens[kase[:start]..kase[:end]]
 
-      case_indexes[(kase_index + 1)..-1].each do |successor_kase|
+      case_indexes[(kase_index + 1)..].each do |successor_kase|
         case_tokens -= tokens[successor_kase[:start]..successor_kase[:end]]
       end
 

data/lib/puppet-lint/plugins/check_documentation/documentation.rb

@@ -3,10 +3,10 @@
 # record a warning for each instance found.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#public-and-private
-PuppetLint.new_check(:documentation) do
-  COMMENT_TOKENS = Set[:COMMENT, :MLCOMMENT, :SLASH_COMMENT]
-  WHITESPACE_TOKENS = Set[:WHITESPACE, :NEWLINE, :INDENT]
+COMMENT_TOKENS = Set[:COMMENT, :MLCOMMENT, :SLASH_COMMENT]
+WHITESPACE_TOKENS = Set[:WHITESPACE, :NEWLINE, :INDENT]
 
+PuppetLint.new_check(:documentation) do
   def check
     (class_indexes + defined_type_indexes).each do |item_idx|
       comment_token = find_comment_token(item_idx[:tokens].first)
@@ -25,9 +25,9 @@ PuppetLint.new_check(:documentation) do
         message: "#{type} not documented",
         line: first_token.line,
         column: first_token.column,
-        description: 'Check the manifest tokens for any class or defined type that does not '\
-          'have a comment directly above it (hopefully, explaining the usage of it) and record '\
-          'a warning for each instance found.',
+        description: 'Check the manifest tokens for any class or defined type that does not ' \
+                     'have a comment directly above it (hopefully, explaining the usage of it) and record ' \
+                     'a warning for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#public-and-private',
       )
     end
@@ -40,6 +40,7 @@ PuppetLint.new_check(:documentation) do
     while !prev_token.nil? && WHITESPACE_TOKENS.include?(prev_token.type)
       newlines += 1 if prev_token.type == :NEWLINE
       break if newlines > 1
+
       prev_token = prev_token.prev_token
     end
 

data/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb

@@ -7,7 +7,7 @@ PuppetLint.new_check(:unquoted_node_name) do
     node_tokens = tokens.select { |token| token.type == :NODE }
     node_tokens.each do |node|
       node_token_idx = tokens.index(node)
-      node_lbrace_tok = tokens[node_token_idx..-1].find { |token| token.type == :LBRACE }
+      node_lbrace_tok = tokens[node_token_idx..].find { |token| token.type == :LBRACE }
       if node_lbrace_tok.nil?
         notify(
           :error,

data/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb

@@ -21,8 +21,8 @@ PuppetLint.new_check(:ensure_first_param) do
         line: ensure_token.line,
         column: ensure_token.column,
         resource: resource,
-        description: 'Check the tokens of each resource instance for an ensure parameter and if '\
-          'found, check that it is the first parameter listed.  If it is not the first parameter, record a warning.',
+        description: 'Check the tokens of each resource instance for an ensure parameter and if ' \
+                     'found, check that it is the first parameter listed.  If it is not the first parameter, record a warning.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#attribute-ordering',
       )
     end
@@ -37,9 +37,7 @@ PuppetLint.new_check(:ensure_first_param) do
 
     ensure_param_comma_token = ensure_param_name_token.next_token_of([:COMMA, :SEMIC])
 
-    if first_param_name_token.nil? || first_param_comma_token.nil? || ensure_param_comma_token.nil?
-      raise PuppetLint::NoFix
-    end
+    raise PuppetLint::NoFix if first_param_name_token.nil? || first_param_comma_token.nil? || ensure_param_comma_token.nil?
 
     first_param_name_idx = tokens.index(first_param_name_token)
     first_param_comma_idx = tokens.index(first_param_comma_token)

data/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb

@@ -21,8 +21,8 @@ PuppetLint.new_check(:ensure_not_symlink_target) do
           column: value_token.column,
           param_token: ensure_token,
           value_token: value_token,
-          description: 'Check the tokens of each File resource instance for an ensure parameter and '\
-            'record a warning if the value of that parameter looks like a symlink target (starts with a \'/\').',
+          description: 'Check the tokens of each File resource instance for an ensure parameter and ' \
+                       'record a warning if the value of that parameter looks like a symlink target (starts with a \'/\').',
           help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#symbolic-links',
         )
       end

data/lib/puppet-lint/plugins/check_resources/file_mode.rb

@@ -3,12 +3,12 @@
 # not a 4 digit octal value (0755) or a symbolic mode ('o=rwx,g+r').
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#file-modes
-PuppetLint.new_check(:file_mode) do
-  MSG = 'mode should be represented as a 4 digit octal value or symbolic mode'.freeze
-  SYM_RE = '([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*'.freeze
-  IGNORE_TYPES = Set[:VARIABLE, :UNDEF, :FUNCTION_NAME]
-  MODE_RE = %r{\A([0-7]{4}|#{SYM_RE})\Z}.freeze
+MSG = 'mode should be represented as a 4 digit octal value or symbolic mode'.freeze
+SYM_RE = '([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*'.freeze
+IGNORE_TYPES = Set[:VARIABLE, :UNDEF, :FUNCTION_NAME]
+MODE_RE = %r{\A([0-7]{4}|#{SYM_RE})\Z}.freeze
 
+PuppetLint.new_check(:file_mode) do
   def check
     resource_indexes.each do |resource|
       next unless resource[:type].value == 'file' || resource[:type].value == 'concat'
@@ -30,7 +30,7 @@ PuppetLint.new_check(:file_mode) do
           column: value_token.column,
           token: value_token,
           description: 'Check the tokens of each File resource instance for a mode parameter and if found, ' \
-                          'record a warning if the value of that parameter is not a 4 digit octal value (0755) or a symbolic mode (\'o=rwx,g\+r\').',
+                       'record a warning if the value of that parameter is not a 4 digit octal value (0755) or a symbolic mode (\'o=rwx,g\+r\').',
           help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#file-modes',
         )
       end

data/lib/puppet-lint/plugins/check_resources/unquoted_file_mode.rb

@@ -3,9 +3,9 @@
 # not a quoted string.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#file-modes
-PuppetLint.new_check(:unquoted_file_mode) do
-  TOKEN_TYPES = Set[:NAME, :NUMBER]
+TOKEN_TYPES = Set[:NAME, :NUMBER]
 
+PuppetLint.new_check(:unquoted_file_mode) do
   def check
     resource_indexes.each do |resource|
       next unless resource[:type].value == 'file' || resource[:type].value == 'concat'
@@ -23,8 +23,8 @@ PuppetLint.new_check(:unquoted_file_mode) do
           line: value_token.line,
           column: value_token.column,
           token: value_token,
-          description: 'Check the tokens of each File resource instance for a mode parameter '\
-            'and if found, record a warning if the value of that parameter is not a quoted string.',
+          description: 'Check the tokens of each File resource instance for a mode parameter ' \
+                       'and if found, record a warning if the value of that parameter is not a quoted string.',
           help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#file-modes',
         )
       end

data/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb

@@ -3,9 +3,9 @@
 # each instance found.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#quoting
-PuppetLint.new_check(:double_quoted_strings) do
-  ESCAPE_CHAR_RE = %r{(\\\$|\\"|\\'|'|\r|\t|\\t|\\s|\n|\\n|\\\\)}.freeze
+ESCAPE_CHAR_RE = %r{(\\\$|\\"|\\'|'|\r|\t|\\t|\\s|\n|\\n|\\\\)}.freeze
 
+PuppetLint.new_check(:double_quoted_strings) do
   def check
     invalid_tokens = tokens.select do |token|
       token.type == :STRING &&
@@ -19,8 +19,8 @@ PuppetLint.new_check(:double_quoted_strings) do
         line: token.line,
         column: token.column,
         token: token,
-        description: 'Check the manifest tokens for any double quoted strings that don\'t '\
-          'contain any variables or common escape characters and record a warning for each instance found.',
+        description: 'Check the manifest tokens for any double quoted strings that don\'t ' \
+                     'contain any variables or common escape characters and record a warning for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#quoting',
       )
     end

data/lib/puppet-lint/plugins/check_strings/only_variable_string.rb

@@ -2,9 +2,9 @@
 # a single variable only and record a warning for each instance found.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#quoting
-PuppetLint.new_check(:only_variable_string) do
-  VAR_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
+VAR_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
 
+PuppetLint.new_check(:only_variable_string) do
   def check
     tokens.each_with_index do |start_token, start_token_idx|
       next unless start_token.type == :DQPRE && start_token.value == ''
@@ -20,9 +20,8 @@ PuppetLint.new_check(:only_variable_string) do
           eos_offset += 3
         when :DQPOST
           if eos_token.value == ''
-            if eos_token.next_code_token && eos_token.next_code_token.type == :FARROW
-              break
-            end
+            break if eos_token.next_code_token && eos_token.next_code_token.type == :FARROW
+
             notify(
               :warning,
               message: 'string containing only a variable',

data/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb

@@ -3,10 +3,10 @@
 # found.
 #
 # No style guide reference
-PuppetLint.new_check(:quoted_booleans) do
-  STRING_TYPES = Set[:STRING, :SSTRING]
-  BOOLEANS = Set['true', 'false']
+STRING_TYPES = Set[:STRING, :SSTRING]
+BOOLEANS = Set['true', 'false']
 
+PuppetLint.new_check(:quoted_booleans) do
   def check
     invalid_tokens = tokens.select do |token|
       STRING_TYPES.include?(token.type) && BOOLEANS.include?(token.value)
@@ -29,4 +29,4 @@ PuppetLint.new_check(:quoted_booleans) do
     problem[:token].type = problem[:token].value.upcase.to_sym
   end
 end
-PuppetLint.configuration.send('disable_quoted_booleans')
+PuppetLint.configuration.send(:disable_quoted_booleans)

data/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb

@@ -14,8 +14,8 @@ PuppetLint.new_check(:single_quote_string_with_variables) do
         message: 'single quoted string containing a variable found',
         line: token.line,
         column: token.column,
-        description: 'Check the manifest tokens for any single quoted strings containing '\
-          'a enclosed variable and record an error for each instance found.',
+        description: 'Check the manifest tokens for any single quoted strings containing ' \
+                     'a enclosed variable and record an error for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#quoting',
       )
     end

data/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb

@@ -6,14 +6,14 @@ require 'strscan'
 # found.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#quoting
-PuppetLint.new_check(:variables_not_enclosed) do
-  STRING_TOKEN_TYPES = Set[
-    :DQMID,
-    :DQPOST,
-    :HEREDOC_MID,
-    :HEREDOC_POST,
-  ]
+STRING_TOKEN_TYPES = Set[
+  :DQMID,
+  :DQPOST,
+  :HEREDOC_MID,
+  :HEREDOC_POST,
+]
 
+PuppetLint.new_check(:variables_not_enclosed) do
   def check
     invalid_tokens = tokens.select do |token|
       token.type == :UNENC_VARIABLE
@@ -74,6 +74,7 @@ PuppetLint.new_check(:variables_not_enclosed) do
     var_token.value = var_name
 
     return if str_token.nil?
+
     str_token.value = "-#{text}#{str_token.value}"
   end
 

data/lib/puppet-lint/plugins/check_variables/variable_contains_dash.rb

@@ -2,16 +2,16 @@
 # record a warning for each instance found.
 #
 # No style guide reference
-PuppetLint.new_check(:variable_contains_dash) do
-  VARIABLE_DASH_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
+VARIABLE_DASH_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
 
+PuppetLint.new_check(:variable_contains_dash) do
   def check
     invalid_tokens = tokens.select do |token|
       VARIABLE_DASH_TYPES.include?(token.type)
     end
 
     invalid_tokens.each do |token|
-      next unless %r{-}.match?(token.value.gsub(%r{\[.+?\]}, ''))
+      next unless token.value.gsub(%r{\[.+?\]}, '').include?('-')
 
       notify(
         :warning,

data/lib/puppet-lint/plugins/check_variables/variable_is_lowercase.rb

@@ -2,9 +2,9 @@
 # letter and record a warning for each instance found.
 #
 # No style guide reference
-PuppetLint.new_check(:variable_is_lowercase) do
-  VARIABLE_LOWERCASE_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
+VARIABLE_LOWERCASE_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
 
+PuppetLint.new_check(:variable_is_lowercase) do
   def check
     invalid_tokens = tokens.select do |token|
       VARIABLE_LOWERCASE_TYPES.include?(token.type)

data/lib/puppet-lint/plugins/check_whitespace/140chars.rb

@@ -10,6 +10,7 @@ PuppetLint.new_check(:'140chars') do
       result = PuppetLint::LineLengthCheck.check(idx + 1, line, 140)
 
       next if result.nil?
+
       notify(*result)
     end
   end

data/lib/puppet-lint/plugins/check_whitespace/80chars.rb

@@ -9,8 +9,9 @@ PuppetLint.new_check(:'80chars') do
       result = PuppetLint::LineLengthCheck.check(idx + 1, line, 80)
 
       next if result.nil?
+
       notify(*result)
     end
   end
 end
-PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send(:disable_80chars)

data/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb

@@ -2,9 +2,9 @@
 # are not aligned with other arrows in that grouping.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
-PuppetLint.new_check(:arrow_alignment) do
-  COMMENT_TYPES = Set[:COMMENT, :SLASH_COMMENT, :MLCOMMENT]
+COMMENT_TYPES = Set[:COMMENT, :SLASH_COMMENT, :MLCOMMENT]
 
+PuppetLint.new_check(:arrow_alignment) do
   def check
     resource_indexes.each do |res_idx|
       arrow_column = [0]
@@ -24,7 +24,8 @@ PuppetLint.new_check(:arrow_alignment) do
       next if resource_tokens[first_arrow].line == resource_tokens[last_arrow].line
 
       resource_tokens.each do |token|
-        if token.type == :FARROW
+        case token.type
+        when :FARROW
           param_token = token.prev_code_token
 
           if param_token.type == :DQPOST
@@ -54,17 +55,15 @@ PuppetLint.new_check(:arrow_alignment) do
             this_arrow_column += 1
           end
 
-          if arrow_column[level_idx] < this_arrow_column
-            arrow_column[level_idx] = this_arrow_column
-          end
+          arrow_column[level_idx] = this_arrow_column if arrow_column[level_idx] < this_arrow_column
 
           (level_tokens[level_idx] ||= []) << token
-        elsif token.type == :LBRACE
+        when :LBRACE
           level_idx += 1
           arrow_column << 0
           level_tokens[level_idx] ||= []
           param_column << nil
-        elsif token.type == :RBRACE || token.type == :SEMIC
+        when :RBRACE, :SEMIC
           if (level_tokens[level_idx] ||= []).map(&:line).uniq.length > 1
             level_tokens[level_idx].each do |arrow_tok|
               next if arrow_tok.column == arrow_column[level_idx] || level_tokens[level_idx].size == 1
@@ -117,7 +116,8 @@ PuppetLint.new_check(:arrow_alignment) do
       new_ws_len += (problem[:arrow_column] - problem[:token].column)
     end
 
-    raise PuppetLint::NoFix if new_ws_len < 0
+    raise PuppetLint::NoFix if new_ws_len.negative?
+
     new_ws = ' ' * new_ws_len
 
     if problem[:token].prev_token.type == :WHITESPACE

data/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb

@@ -2,9 +2,9 @@
 # characters and record an error for each instance found.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
-PuppetLint.new_check(:hard_tabs) do
-  WHITESPACE_TYPES = Set[:INDENT, :WHITESPACE]
+WHITESPACE_TYPES = Set[:INDENT, :WHITESPACE]
 
+PuppetLint.new_check(:hard_tabs) do
   def check
     invalid_tokens = tokens.select do |token|
       WHITESPACE_TYPES.include?(token.type) && token.value.include?("\t")

data/lib/puppet-lint/plugins/check_whitespace/line_length.rb

@@ -18,12 +18,12 @@ class PuppetLint::LineLengthCheck
 
     [
       :warning,
-      message: "line has more than #{character_count} characters",
-      line: line_number,
-      column: character_count,
-      description: 'Test the raw manifest string for lines containing more than #{character_count} characters and record a warning for each instance found. '\
-        'The only exceptions to this rule are lines containing URLs and template() calls which would hurt readability if split.',
-      help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace',
+      { message: "line has more than #{character_count} characters",
+        line: line_number,
+        column: character_count,
+        description: "Test the raw manifest string for lines containing more than #{character_count} characters and record a warning for each instance found. " \
+                     'The only exceptions to this rule are lines containing URLs and template() calls which would hurt readability if split.',
+        help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace' },
     ]
   end
 end