puppet-lint 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f8119856eb91c58047532aa02757d8b4904120ad6401a3af2b385a1a40aa321
-  data.tar.gz: 870ad4f57b3c1dfcf40207af7a84d5afc18ec388bb520e362e6d8bafbd647205
+  metadata.gz: 200023e7df4e5c5ad823fba0f940ee2ad73ae5d05eb04796e83dbcc118e2a47e
+  data.tar.gz: 3a14e87f1f69fdc2495068d246609af04c81e6610e4e878a669ab9b8262f1265
 SHA512:
-  metadata.gz: 76294db75e44acc05da97c12f26f5dae32d358e4b0e254c92bda9a0d3f9948d0e07b2d6a6e615e238457214ea85f22e2d499e15184ad1b747665d63d667bdc80
-  data.tar.gz: 5d2402a687836436ceb7a63d7510d28acb6e594a399d2904cc2a2215d14971b006642cfb8a89365833af5a7307c08e44759e980870bd75e828944920e5149bc3
+  metadata.gz: 5bad4d387c8695aa0bc3fca805a819c5af1e0c410953f61093ec77a1139848c1b284a53aa238bed450ba5195d9af8736a2ba6a9dfec97ceca09bdaca08da80bf
+  data.tar.gz: 4d26e6093580630b0b838562efdc2d2e9492d8185652a469aaca3fdb48cec0f88b9d02367cacc595b46d10d08745d4b76874d304a891e1e265c35ffb01625752

data/lib/puppet-lint/checkplugin.rb

@@ -55,7 +55,9 @@ class PuppetLint::CheckPlugin
   #
   # Returns an Array of PuppetLint::Lexer::Token objects.
   def tokens
-    PuppetLint::Data.tokens
+    # When called from a plugins `check` method, the tokens array returned should be a (shallow) copy
+    called_from_check = (caller_locations(1..1).first.base_label == 'check')
+    PuppetLint::Data.tokens(duplicate: called_from_check)
   end
 
   def add_token(index, token)

data/lib/puppet-lint/data.rb

@@ -38,37 +38,14 @@ class PuppetLint::Data
       @defaults_indexes = nil
     end
 
-    # @api private
-    def ruby1?
-      @ruby1 = RbConfig::CONFIG['MAJOR'] == '1' if @ruby1.nil?
-      @ruby1
-    end
-
     # Get the tokenised manifest.
     #
+    # @param duplicate [Boolean] if true, returns a duplicate of the token array.
     # @return [Array[PuppetLint::Lexer::Token]]
     #
     # @api public
-    def tokens
-      calling_method = if ruby1?
-                         begin
-                           caller[0][%r{`.*'}][1..-2] # rubocop:disable Performance/Caller
-                         rescue NoMethodError
-                           caller[1][%r{`.*'}][1..-2] # rubocop:disable Performance/Caller
-                         end
-                       else
-                         begin
-                           caller(0..0).first[%r{`.*'}][1..-2]
-                         rescue NoMethodError
-                           caller(1..1).first[%r{`.*'}][1..-2]
-                         end
-                       end
-
-      if calling_method == 'check'
-        @tokens.dup
-      else
-        @tokens
-      end
+    def tokens(duplicate: false)
+      duplicate ? @tokens.dup : @tokens
     end
 
     # Add new token.

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/spec/unit/puppet-lint/checkplugin_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+class DummyCheckPlugin < PuppetLint::CheckPlugin
+  def check
+    # Since we're calling `tokens` from a `check` method, we should get our own Array object.
+    # If we add an extra token to it, PuppetLint::Data.tokens should remain unchanged.
+    tokens << :extra_token
+  end
+
+  def fix
+    tokens << :fix_token
+  end
+end
+
+describe PuppetLint::CheckPlugin do
+  before(:each) do
+    PuppetLint::Data.tokens = [:token1, :token2, :token3]
+  end
+
+  it 'returns a duplicate of the token array when called from check' do
+    plugin = DummyCheckPlugin.new
+
+    plugin.check
+
+    # Verify that the global token array remains unchanged.
+    expect(PuppetLint::Data.tokens).to eq([:token1, :token2, :token3])
+  end
+
+  it 'other methods can modify the tokens array' do
+    plugin = DummyCheckPlugin.new
+
+    plugin.fix
+
+    expect(PuppetLint::Data.tokens).to eq([:token1, :token2, :token3, :fix_token])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies: []
 description: "    Checks your Puppet manifests against the Puppetlabs style guide
   and alerts you to any discrepancies.\n"
@@ -105,6 +105,7 @@ files:
 - spec/spec_helper_acceptance.rb
 - spec/spec_helper_acceptance_local.rb
 - spec/unit/puppet-lint/bin_spec.rb
+- spec/unit/puppet-lint/checkplugin_spec.rb
 - spec/unit/puppet-lint/checks_spec.rb
 - spec/unit/puppet-lint/configuration_spec.rb
 - spec/unit/puppet-lint/data_spec.rb