Merge pull request #242 from puppetlabs/CAT-2281-Remove_puppet_7_test_infrastructure

david22swan · web-flow · commit ac944388fd7c · 2025-04-09T10:59:56.000+01:00
(CAT-2281) Remove puppet 7 infrastructure
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
           - '3.3'
     name: "spec (ruby ${{ matrix.ruby_version }})"
@@ -34,7 +33,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
           - '3.3'
     name: "acceptance (ruby ${{ matrix.ruby_version }})"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
           - '3.3'
     name: "spec (ruby ${{ matrix.ruby_version }})"
@@ -26,7 +25,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
           - '3.3'
     name: "acceptance (ruby ${{ matrix.ruby_version }})"
diff --git a/lib/puppet-lint.rb b/lib/puppet-lint.rb
@@ -250,11 +250,11 @@ def print_problems
   #     def check
   #     end
   #   end
-  def self.new_check(name, &block)
+  def self.new_check(name, &)
     class_name = name.to_s.split('_').map(&:capitalize).join
     klass = PuppetLint.const_set(:"Check#{class_name}", Class.new(PuppetLint::CheckPlugin))
     klass.const_set(:NAME, name)
-    klass.class_exec(&block)
+    klass.class_exec(&)
     PuppetLint.configuration.add_check(name, klass)
     PuppetLint::Data.ignore_overrides[name] ||= {}
   end
diff --git a/lib/puppet-lint/checkplugin.rb b/lib/puppet-lint/checkplugin.rb
@@ -180,9 +180,9 @@ def manifest_lines
   def default_info
     @default_info ||= {
       check: self.class.const_get(:NAME),
-      fullpath: fullpath,
-      path: path,
-      filename: filename
+      fullpath:,
+      path:,
+      filename:
     }
   end
 
diff --git a/lib/puppet-lint/checks.rb b/lib/puppet-lint/checks.rb
@@ -36,7 +36,7 @@ def load_data(path, content)
       problems << {
         kind: :error,
         check: :syntax,
-        message: message,
+        message:,
         line: e.line_no,
         column: e.column,
         fullpath: PuppetLint::Data.fullpath,
diff --git a/lib/puppet-lint/configuration.rb b/lib/puppet-lint/configuration.rb
@@ -48,7 +48,7 @@ def self.add_check(check)
   # Signature
   #
   #   <option>=(value)
-  def method_missing(method, *args, &_block)
+  def method_missing(method, *args, &)
     super unless method.to_s =~ %r{^(\w+)=?$}
 
     option = Regexp.last_match(1)
diff --git a/lib/puppet-lint/data.rb b/lib/puppet-lint/data.rb
@@ -359,7 +359,7 @@ def definition_indexes(type)
                 end: i + j + 1,
                 tokens: tokens[i..(i + j + 1)],
                 param_tokens: param_tokens(tokens[i..(i + j + 1)]),
-                type: type,
+                type:,
                 name_token: token.next_code_token,
                 inherited_token: inherited_class
               }
diff --git a/lib/puppet-lint/lexer.rb b/lib/puppet-lint/lexer.rb
@@ -111,9 +111,9 @@ def heredoc_queue
   # \p{Zs} == ASCII + Unicode non-linebreaking whitespace
   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
+  LINE_END_RE = %r{(?:\r\n|\r|\n)}
 
-  NAME_RE = %r{\A((?:(?:::)?[_a-z0-9][-\w]*)(?:::[a-z0-9][-\w]*)*)}.freeze
+  NAME_RE = %r{\A((?:(?:::)?[_a-z0-9][-\w]*)(?:::[a-z0-9][-\w]*)*)}
 
   # Internal: An Array of Arrays containing tokens that can be described by
   # a single regular expression.  Each sub-Array contains 2 elements, the
diff --git a/lib/puppet-lint/lexer/string_slurper.rb b/lib/puppet-lint/lexer/string_slurper.rb
@@ -6,12 +6,12 @@ class PuppetLint::Lexer
   class StringSlurper
     attr_accessor :scanner, :results, :interp_stack
 
-    START_INTERP_PATTERN = %r{\$\{}.freeze
-    END_INTERP_PATTERN = %r{\}}.freeze
-    END_STRING_PATTERN = %r{(\A|[^\\])(\\\\)*"}.freeze
-    UNENC_VAR_PATTERN = %r{(\A|[^\\])\$(::)?(\w+(-\w+)*::)*\w+(-\w+)*}.freeze
-    ESC_DQUOTE_PATTERN = %r{\\+"}.freeze
-    LBRACE_PATTERN = %r{\{}.freeze
+    START_INTERP_PATTERN = %r{\$\{}
+    END_INTERP_PATTERN = %r{\}}
+    END_STRING_PATTERN = %r{(\A|[^\\])(\\\\)*"}
+    UNENC_VAR_PATTERN = %r{(\A|[^\\])\$(::)?(\w+(-\w+)*::)*\w+(-\w+)*}
+    ESC_DQUOTE_PATTERN = %r{\\+"}
+    LBRACE_PATTERN = %r{\{}
 
     def initialize(string)
       @scanner = StringScanner.new(string)
diff --git a/lib/puppet-lint/monkeypatches.rb b/lib/puppet-lint/monkeypatches.rb
@@ -5,7 +5,7 @@
   class String
     Percent = instance_method(:%) unless defined?(Percent)
 
-    def %(*a, &b)
+    def %(*a, &)
       a.flatten!
 
       string = case a.last
@@ -18,7 +18,7 @@ def %(*a, &b)
       if a.empty?
         string
       else
-        Percent.bind_call(string, a, &b)
+        Percent.bind_call(string, a, &)
       end
     end
 
diff --git a/lib/puppet-lint/plugins.rb b/lib/puppet-lint/plugins.rb
@@ -75,7 +75,7 @@ def gem_directories
   end
 end
 
-Dir[File.expand_path('plugins/**/*.rb', File.dirname(__FILE__))].sort.each do |file|
+Dir[File.expand_path('plugins/**/*.rb', File.dirname(__FILE__))].each do |file|
   require file
 end
 
diff --git a/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb b/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb
@@ -12,7 +12,7 @@ def check
         message: "arrow should be on the right operand's line",
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Test the manifest tokens for chaining arrow that is on the line of the left operand when the right operand is on another line.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#chaining-arrow-syntax',
       )
diff --git a/lib/puppet-lint/plugins/check_comments/slash_comments.rb b/lib/puppet-lint/plugins/check_comments/slash_comments.rb
@@ -12,7 +12,7 @@ def check
         message: '// comment found',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for any comments started with slashes (//) and record a warning for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#comments',
       )
diff --git a/lib/puppet-lint/plugins/check_comments/star_comments.rb b/lib/puppet-lint/plugins/check_comments/star_comments.rb
@@ -12,7 +12,7 @@ def check
         message: '/* */ comment found',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for any comments encapsulated with slash-asterisks (/* */) and record a warning for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#comments',
       )
diff --git a/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb b/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb
@@ -31,7 +31,7 @@ def check
           message: 'unquoted node name found',
           line: token.line,
           column: token.column,
-          token: token,
+          token:,
           description: 'Check the manifest for unquoted node names and record a warning for each instance found.',
           help_uri: nil,
         )
diff --git a/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb b/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb
@@ -20,7 +20,7 @@ def check
         message: "ensure found on line but it's not the first attribute",
         line: ensure_token.line,
         column: ensure_token.column,
-        resource: 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.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#attribute-ordering',
diff --git a/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb b/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb
@@ -20,7 +20,7 @@ def check
           line: value_token.line,
           column: value_token.column,
           param_token: ensure_token,
-          value_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 \'/\').',
           help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#symbolic-links',
diff --git a/lib/puppet-lint/plugins/check_resources/file_mode.rb b/lib/puppet-lint/plugins/check_resources/file_mode.rb
@@ -6,7 +6,7 @@
 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
+MODE_RE = %r{\A([0-7]{4}|#{SYM_RE})\Z}
 
 PuppetLint.new_check(:file_mode) do
   def check
diff --git a/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb b/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb
@@ -12,7 +12,7 @@ def check
         message: 'unquoted resource title',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for any resource titles / namevars that are not quoted and record a warning for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#resource-names',
       )
diff --git a/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb b/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb
@@ -3,7 +3,7 @@
 # each instance found.
 #
 # https://puppet.com/docs/puppet/latest/style_guide.html#quoting
-ESCAPE_CHAR_RE = %r{(\\\$|\\"|\\'|'|\r|\t|\\t|\\s|\n|\\n|\\\\)}.freeze
+ESCAPE_CHAR_RE = %r{(\\\$|\\"|\\'|'|\r|\t|\\t|\\s|\n|\\n|\\\\)}
 
 PuppetLint.new_check(:double_quoted_strings) do
   def check
@@ -18,7 +18,7 @@ def check
         message: 'double quoted string containing no variables',
         line: token.line,
         column: token.column,
-        token: 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.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#quoting',
diff --git a/lib/puppet-lint/plugins/check_strings/only_variable_string.rb b/lib/puppet-lint/plugins/check_strings/only_variable_string.rb
@@ -27,8 +27,8 @@ def check
               message: 'string containing only a variable',
               line: var_token.line,
               column: var_token.column,
-              start_token: start_token,
-              var_token: var_token,
+              start_token:,
+              var_token:,
               end_token: eos_token,
               description: 'Check the manifest tokens for double quoted strings that contain a single variable only and record a warning for each instance found.',
               help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#quoting',
diff --git a/lib/puppet-lint/plugins/check_strings/puppet_url_without_modules.rb b/lib/puppet-lint/plugins/check_strings/puppet_url_without_modules.rb
@@ -19,7 +19,7 @@ def check
         message: 'puppet:// URL without modules/ found',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for any puppet:// URL strings where the path section doesn\'t start with modules/ and record a warning for each instance found.',
         help_uri: nil,
       )
diff --git a/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb b/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb
@@ -18,7 +18,7 @@ def check
         message: 'quoted boolean value found',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for any double or single quoted strings containing only a boolean value and record a warning for each instance found.',
         help_uri: nil,
       )
diff --git a/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb b/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb
@@ -25,7 +25,7 @@ def check
         message: 'variable not enclosed in {}',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for any variables in a string that have not been enclosed by braces ({}) and record a warning for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#quoting',
       )
diff --git a/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb b/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb
@@ -16,7 +16,7 @@ def check
         message: 'tab character found',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the raw manifest string for lines containing hard tab characters and record an error for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace',
       )
diff --git a/lib/puppet-lint/plugins/check_whitespace/space_before_arrow.rb b/lib/puppet-lint/plugins/check_whitespace/space_before_arrow.rb
@@ -51,8 +51,8 @@ def check
         notify(
           :warning,
           message: "there should be a single space before '=>' on line #{line}, column #{column}",
-          line: line,
-          column: column,
+          line:,
+          column:,
           token: prev_token,
         )
       end
diff --git a/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb b/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb
@@ -18,7 +18,7 @@ def check
         message: 'trailing whitespace found',
         line: token.line,
         column: token.column,
-        token: token,
+        token:,
         description: 'Check the manifest tokens for lines ending with whitespace and record an error for each instance found.',
         help_uri: 'https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace',
       )
diff --git a/lib/puppet-lint/plugins/legacy_facts/legacy_facts.rb b/lib/puppet-lint/plugins/legacy_facts/legacy_facts.rb
@@ -184,8 +184,8 @@ def check_puppet
         message: "legacy fact '#{fact_name}'",
         line: token.line,
         column: token.column,
-        token: token,
-        fact_name: fact_name
+        token:,
+        fact_name:
       }
     end
   end
diff --git a/lib/puppet-lint/plugins/top_scope_facts/top_scope_facts.rb b/lib/puppet-lint/plugins/top_scope_facts/top_scope_facts.rb
@@ -38,7 +38,7 @@ def check
         message: 'top scope fact instead of facts hash',
         line: token.line,
         column: token.column,
-        token: token
+        token:
       }
     end
   end
diff --git a/lib/puppet-lint/report/codeclimate.rb b/lib/puppet-lint/report/codeclimate.rb
@@ -25,7 +25,7 @@ def self.write_report_file(problems, report_file)
             check_name: message[:check],
             description: message[:message],
             categories: [:Style],
-            severity: severity,
+            severity:,
             location: {
               path: message[:path],
               lines: {
diff --git a/lib/puppet-lint/tasks/puppet-lint.rb b/lib/puppet-lint/tasks/puppet-lint.rb
@@ -27,15 +27,15 @@ class PuppetLint::RakeTask < Rake::TaskLib
   #
   #   PuppetLint::RakeTask.new
   # rubocop:disable Lint/MissingSuper
-  def initialize(*args, &task_block)
+  def initialize(*args, &)
     @name = args.shift || :lint
     @pattern = DEFAULT_PATTERN
     @with_filename = true
     @disable_checks = []
     @only_checks = []
     @ignore_paths = []
 
-    define(args, &task_block)
+    define(args, &)
   end
 
   def define(args, &task_block)
diff --git a/lib/puppet-lint/tasks/release_test.rb b/lib/puppet-lint/tasks/release_test.rb
@@ -27,7 +27,7 @@ def run_cmd(message, *cmd)
   [output.strip, status.success?]
 end
 
-def with_puppet_lint_head(&block)
+def with_puppet_lint_head(&)
   print('  Updating Gemfile to use puppet-lint HEAD... ')
 
   buffer = Parser::Source::Buffer.new('Gemfile')
@@ -49,7 +49,7 @@ def with_puppet_lint_head(&block)
 
   puts 'Done'
 
-  Bundler.with_clean_env(&block)
+  Bundler.with_clean_env(&)
 
   run_cmd('Restoring Gemfile', 'git', 'checkout', '--', 'Gemfile')
 end
diff --git a/puppet-lint.gemspec b/puppet-lint.gemspec
@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   ]
   spec.license = 'MIT'
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7'.freeze)
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.1'.freeze)
 end
diff --git a/rubocop_baseline.yml b/rubocop_baseline.yml
@@ -6,7 +6,7 @@ AllCops:
   NewCops: enable
   ExtraDetails: true
   DisplayStyleGuide: true
-  TargetRubyVersion: '2.7'
+  TargetRubyVersion: '3.1'
   DisplayCopNames: true
   SuggestExtensions: false
   Exclude:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -33,7 +33,7 @@ class HaveProblem
     def initialize(method, message)
       @expected_problem = {
         kind: method.to_s.delete_prefix('contain_').to_sym,
-        message: message
+        message:
       }
       @description = ["contain a #{@expected_problem[:kind]}"]
     end
@@ -107,7 +107,7 @@ def failure_message_when_negated
     end
   end
 
-  def method_missing(method, *args, &block)
+  def method_missing(method, *args, &)
     return HaveProblem.new(method, args.first) if method.to_s.start_with?('contain_')
 
     super

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def self.add_check(check)`
`48`	`48`	`# Signature`
`49`	`49`	`#`
`50`	`50`	`# <option>=(value)`
`51`		`- def method_missing(method, *args, &_block)`
	`51`	`+ def method_missing(method, *args, &)`
`52`	`52`	`super unless method.to_s =~ %r{^(\w+)=?$}`
`53`	`53`
`54`	`54`	`option = Regexp.last_match(1)`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ def definition_indexes(type)`
`359`	`359`	`end: i + j + 1,`
`360`	`360`	`tokens: tokens[i..(i + j + 1)],`
`361`	`361`	`param_tokens: param_tokens(tokens[i..(i + j + 1)]),`
`362`		`- type: type,`
	`362`	`+ type:,`
`363`	`363`	`name_token: token.next_code_token,`
`364`	`364`	`inherited_token: inherited_class`
`365`	`365`	`}`