puppet-lint-global_definition-check 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f49eb058c88589fba6ae40663949eedb9d23c76b4b0611b10b138569ad6a91
-  data.tar.gz: 41b8e536eb95df3fdc0d3755dae5195f15bd906dfdd54bb4409cbed17809ec6b
+  metadata.gz: 2896bfc30e8ea8bb554cf3bb9d287ccd67f77365fb3cc35d505206d34508cc24
+  data.tar.gz: cff254e83cf89d4d6e6bf11bfbb0052d41b85918a7a7760342daa0c5b96ddf76
 SHA512:
-  metadata.gz: 16bc7ad6b276ad7491dbc5200929c6bb58e9a13f7af17cb1b6f84782c947e0d61c051a1d4fb9ef603b90c3f91853a5b3427b7da9f59d523b9d0ab3d295c5f234
-  data.tar.gz: a955faeb4f1cef540723ab8f11c37e8c1fe96c3a52566a3c1e8809fe8026dab940b13c9a16b2bd2dc2b4debbc6499bc69e275b8cd052b7e8db0fa6b5b7bcfdec
+  metadata.gz: '0294aea977236fe3bfb2f6e34e423f1cc097e51e774691971ffc0db022709d896be7f112b55193d627dea3ef5c9a6ff4fb0ea7e024ce48a515a7b90a1d5bb48e'
+  data.tar.gz: 9b8945fb065a3ab9261155a9fd4aceb184f82f6b97f93af4a3fc62de5fca0a12f0d18d9de47b1e32712c29cc21649be8a741aa8d9baef5e10626974ff706bfc1

data/lib/puppet-lint/plugins/check_global_definition.rb

@@ -1,12 +1,12 @@
 module PuppetLintGlobalDefinionCheck
   private
 
-  def check_for_global_token(type, value = nil)
-    global_tokens.each_with_index do |token, i|
+  def check_for_global_token(type)
+    global_tokens.each do |token|
       next unless token.type == type
-      next unless value.nil? || token.value == value
 
-      message = value.nil? ? token.value : "#{token.value} #{token.next_code_token.value}"
+      message = yield(token)
+      next unless message
 
       notify :error,
         message: "definition #{message} in global space",
@@ -37,7 +37,9 @@ PuppetLint.new_check(:global_resource) do
 
   def check
     check_for_global_resources
-    check_for_global_token(:NAME, "include")
+    check_for_global_token(:NAME) do |token|
+      "#{token.value} #{token.next_code_token.value}" if token.value == "include"
+    end
   end
 
   def check_for_global_resources
@@ -56,6 +58,8 @@ PuppetLint.new_check(:global_function) do
   include PuppetLintGlobalDefinionCheck
 
   def check
-    check_for_global_token(:FUNCTION_NAME)
+    check_for_global_token(:FUNCTION_NAME) do |token|
+        "#{token.value} #{token.next_code_token.value}" unless !token.prev_code_token.nil? && token.prev_code_token.type == :FUNCTION
+    end
   end
 end

data/spec/puppet-lint/plugins/check_global_function_spec.rb

@@ -1,53 +1,49 @@
 require "spec_helper"
 
-describe "global_resource" do
-  context "just a class" do
-    let(:code) { "class test { file { 'file': } }" }
-
-    it "should not detect any problems" do
-      expect(problems).to have(0).problems
-    end
-  end
-
-  context "just a define" do
-    let(:code) { "define test ($param = undef) { file { 'file': } }" }
-
-    it "should not detect any problems" do
-      expect(problems).to have(0).problems
+describe "global_function" do
+  context "just a function" do
+    let(:code) do
+      <<-EOS
+      class test {
+        ensure_packages(['wordpress']);
+      }
+      EOS
     end
-  end
-
-  context "allow node resources" do
-    let(:code) { "node 'test' { file { 'file': } }" }
 
     it "should not detect any problems" do
       expect(problems).to have(0).problems
     end
   end
 
-  context "global file" do
+  context "global functions" do
     let(:code) do
-      "file { 'file': } define test ($param = undef) { file { 'file': } }"
-    end
+      <<-EOS
+      class test {
+        ensure_packages(['wordpress']);
+      }
 
-    it "should detect a problem" do
-      expect(problems).to have(1).problems
+      ensure_packages(['wordpress']);
+      EOS
     end
-  end
-
-  context "global includes" do
-    let(:code) { "class test { file { 'file': } } \ninclude testclass" }
 
     it "should detect a problem" do
       expect(problems).to have(1).problems
     end
   end
 
-  context "global defaults" do
+  context "module function definition" do
     let(:code) do
       <<-EOS
-      Exec {
-        path => '/usr/bin:/usr/sbin/:/bin:/sbin',
+      # @summary function to clean hash of undef and empty values
+      function nine_networkinterfaces::delete_empty_values(
+        Hash $hash,
+      ) >> Hash {
+        $hash.filter |$key, $value| {
+          case $value {
+            Collection: { $value =~ NotUndef and !$value.empty }
+            default:    { $value =~ NotUndef }
+          }
+        }
       }
       EOS
     end

data/spec/puppet-lint/plugins/check_global_resource_spec.rb

@@ -1,33 +1,59 @@
 require "spec_helper"
 
-describe "global_function" do
-  context "just a function" do
-    let(:code) do
-      <<-EOS
-      class test {
-        ensure_packages(['wordpress']);
-      }
-      EOS
+describe "global_resource" do
+  context "just a class" do
+    let(:code) { "class test { file { 'file': } }" }
+
+    it "should not detect any problems" do
+      expect(problems).to have(0).problems
     end
+  end
+
+  context "just a define" do
+    let(:code) { "define test ($param = undef) { file { 'file': } }" }
 
     it "should not detect any problems" do
       expect(problems).to have(0).problems
     end
   end
 
-  context "global functions" do
+  context "allow node resources" do
+    let(:code) { "node 'test' { file { 'file': } }" }
+
+    it "should not detect any problems" do
+      expect(problems).to have(0).problems
+    end
+  end
+
+  context "global file" do
     let(:code) do
-      <<-EOS
-      class test {
-        ensure_packages(['wordpress']);
-      }
+      "file { 'file': } define test ($param = undef) { file { 'file': } }"
+    end
 
-      ensure_packages(['wordpress']);
-      EOS
+    it "should detect a problem" do
+      expect(problems).to have(1).problems
     end
+  end
+
+  context "global includes" do
+    let(:code) { "class test { file { 'file': } } \ninclude testclass" }
 
     it "should detect a problem" do
       expect(problems).to have(1).problems
     end
   end
+
+  context "global defaults" do
+    let(:code) do
+      <<-EOS
+      Exec {
+        path => '/usr/bin:/usr/sbin/:/bin:/sbin',
+      }
+      EOS
+    end
+
+    it "should not detect any problems" do
+      expect(problems).to have(0).problems
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-global_definition-check
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Nine Internet Solutions AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint