puppet-lint-trailing_comma-check 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c8aa1aee4468b15ba95fb44d739f5bf8cb7aa6701d2ef356b6fac6521c586c
-  data.tar.gz: 4d7d7d5e31bb93253e68421761f2f949d03123bbedb7c75aba7b6a2037503a6e
+  metadata.gz: 86adcccda246662d25e00fa8d9daa1527e6203493c1ee0cbd2bda4e2c4b769cc
+  data.tar.gz: 26976dd1f21925da59d0a0ddc11339ab7a9a1044ae740267b237d601d1547637
 SHA512:
-  metadata.gz: fdf70e104a01928c9eafdc0c71d7fc866552d4e8db6fcbf72403e93120f3c918bcf2321abca54051a8c3f0f290b1ede13482aab9b7b5293cbb374dd149bff226
-  data.tar.gz: dbb02bce63093fa298adbf933e16f06de60a10e6030b2931957110b3f8c5680a4bc62acb5ae0fb3fd229a406ebee107171ebf5f54e63130c06dd671fbb3d723a
+  metadata.gz: 294d7eb8f6f53ea7c349b961ad0a6216aae23c95294b15c7b4089d42507e0743eb3685732c66cdbdfdeb119ff48a5caf95080c14ecee91485f89f2500bca42a7
+  data.tar.gz: 6b239638d055253653177221acf1a5c9d0b8e6611bd0825c611017236c64761995c0d79f96d93e3db5e3791f9f072486e57d83fd0f1b274e0d6cd4ffc25e3563

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

@@ -83,10 +83,19 @@ PuppetLint.new_check(:trailing_comma) do
 
   def check_elem(elem, except_type)
     lbo_token = elem[:tokens][-1].prev_code_token
+
+    # If we get a token indicating the end of a HEREDOC, backtrack
+    # until we find HEREDOC_OPEN. That is the line which should
+    # be examined for the comma.
+    if lbo_token && [:HEREDOC, :HEREDOC_POST].include?(lbo_token.type)
+      while lbo_token && lbo_token.type != :HEREDOC_OPEN do
+        lbo_token = lbo_token.prev_code_token
+      end
+    end
+
     if lbo_token && lbo_token.type != except_type && \
                     elem[:tokens][-1].type != :SEMIC && \
                     lbo_token.type != :COMMA && \
-                    lbo_token.type != :HEREDOC && \
                     lbo_token.next_token.type == :NEWLINE
       notify :warning, {
         :message => 'missing trailing comma after last element',
@@ -95,17 +104,6 @@ PuppetLint.new_check(:trailing_comma) do
         :token   => lbo_token.next_token,
       }
     end
-    if lbo_token && lbo_token.type == :HEREDOC && \
-        lbo_token.prev_code_token.type != :COMMA && \
-        lbo_token.prev_code_token.next_token.type == :NEWLINE
-      notify :warning, {
-        :message => 'missing trailing comma after last element',
-        :line    => lbo_token.prev_code_token.next_token.line,
-        :column  => lbo_token.prev_code_token.next_token.column,
-        :token   => lbo_token.prev_code_token.next_token,
-      }
-    end
-
   end
 
   def check

data/spec/puppet-lint/plugins/check_trailing_comma/check_trailing_comma_spec.rb

@@ -153,6 +153,15 @@ describe 'trailing_comma' do
               World
               EOT
           }
+
+          file { '/tmp/test2.txt':
+            ensure  => 'file',
+            content => @("FRAGMENT"),
+              ${var1}
+              some text
+              ${var2}
+              | FRAGMENT
+          }
           EOS
         }
 
@@ -171,15 +180,25 @@ describe 'trailing_comma' do
               World
             EOT
           }
+
+          file { '/tmp/test2.txt':
+            ensure  => 'file',
+            content => @("FRAGMENT")
+              ${var1}
+              some text
+              ${var2}
+              | FRAGMENT
+          }
           EOS
         }
 
         it 'should detect a problem' do
-          expect(problems).to have(1).problems
+          expect(problems).to have(2).problems
         end
 
         it 'should create a warning' do
           expect(problems).to contain_warning(msg).on_line(3).in_column(30)
+          expect(problems).to contain_warning(msg).on_line(11).in_column(37)
         end
       end
     end
@@ -391,6 +410,15 @@ describe 'trailing_comma' do
               World
               EOT
           }
+
+          file { '/tmp/test2.txt':
+            ensure  => 'file',
+            content => @("FRAGMENT"),
+              ${var1}
+              some text
+              ${var2}
+              | FRAGMENT
+          }
           EOS
         }
 
@@ -413,15 +441,25 @@ describe 'trailing_comma' do
               World
             EOT
           }
+
+          file { '/tmp/test2.txt':
+            ensure  => 'file',
+            content => @("FRAGMENT")
+              ${var1}
+              some text
+              ${var2}
+              | FRAGMENT
+          }
           EOS
         }
 
         it 'should detect a problem' do
-          expect(problems).to have(1).problems
+          expect(problems).to have(2).problems
         end
 
         it 'should create a warning' do
           expect(problems).to contain_fixed(msg).on_line(3).in_column(30)
+          expect(problems).to contain_fixed(msg).on_line(11).in_column(37)
         end
 
         it 'should add trailing commas' do
@@ -434,6 +472,15 @@ describe 'trailing_comma' do
               World
             EOT
           }
+
+          file { '/tmp/test2.txt':
+            ensure  => 'file',
+            content => @("FRAGMENT"),
+              ${var1}
+              some text
+              ${var2}
+              | FRAGMENT
+          }
           EOS
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-trailing_comma-check
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Puppet Community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint