puppet-lint-trailing_comma-check 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d68ac60631084104f565a115f14a8492d2e41d8
-  data.tar.gz: cfa1c09748146e3cd158cd08f58e705c685e07a8
+  metadata.gz: efe5aee738e1475cc878f16a346cd865a65816d5
+  data.tar.gz: c28c215aa8395c695d3a2110a3d80fb1094d5aec
 SHA512:
-  metadata.gz: 23415bfa426889069025182ef393b769a0eb9926f0115466d6aebae0ea7e81ce244f517bea03e9557d4066343017855291064f5ba2babed3bf06c36236d0d782
-  data.tar.gz: ae3f3b49374e58d5a5b4453f8b47db53e795c6f2c307f54aa2aaedf49119dd30c425461487e28f6b9892c2635de9cfe18d4f4aa78578fba0ea43580ec4d644a0
+  metadata.gz: 90b31b52f716941fb3febcc736b8bc87b0f507d4355cd2bbe1205db5f843cf968b96b38b46b5c2e48b22bafb7a60edeca75bcdd5f2b168bbc259b6d924366c98
+  data.tar.gz: 4b983edc4f6f5f6ddbb6f4943af3accd9754b1bf0119835772c588f49809d00cd83c82683531a96eb7a905a87be6b673c91e5f6ce0cc3e3a44612a9ec3a70e06

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

@@ -41,9 +41,9 @@ PuppetLint.new_check(:trailing_comma) do
     results
   end
 
-  def check_elem(elem)
+  def check_elem(elem, except_type)
     lbo_token = elem[:tokens][-1].prev_code_token
-    if lbo_token && lbo_token.type != :COLON && \
+    if lbo_token && lbo_token.type != except_type && \
                     elem[:tokens][-1].type != :SEMIC && \
                     lbo_token.type != :COMMA && \
                     lbo_token.next_token.type == :NEWLINE
@@ -59,17 +59,17 @@ PuppetLint.new_check(:trailing_comma) do
   def check
     # Resource and class declarations
     resource_indexes.each do |resource|
-      check_elem(resource)
+      check_elem(resource, :COLON)
     end
 
     # Arrays
     array_indexes.each do |array|
-      check_elem(array)
+      check_elem(array, :LBRACK)
     end
 
     # Defaults
     defaults_indexes.each do |defaults|
-      check_elem(defaults)
+      check_elem(defaults, :LBRACE)
     end
   end
 

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

@@ -33,6 +33,8 @@ describe 'trailing_comma' do
             'bar',
             ],
           groupss => ['baz', 'qux'],
+          groupz  => [
+          ],
         }
 
         File {
@@ -76,6 +78,8 @@ describe 'trailing_comma' do
             'bar'
             ],
           groupss => ['baz', 'qux'],
+          groupz  => [
+          ],
         }
 
         File {
@@ -93,7 +97,7 @@ describe 'trailing_comma' do
         expect(problems).to contain_warning(msg).on_line(3).in_column(32)
         expect(problems).to contain_warning(msg).on_line(10).in_column(27)
         expect(problems).to contain_warning(msg).on_line(24).in_column(18)
-        expect(problems).to contain_warning(msg).on_line(31).in_column(23)
+        expect(problems).to contain_warning(msg).on_line(33).in_column(23)
       end
     end
   end
@@ -136,6 +140,8 @@ describe 'trailing_comma' do
             'bar',
             ],
           groupss => ['baz', 'qux'],
+          groupz  => [
+          ],
         }
 
         File {
@@ -183,6 +189,8 @@ describe 'trailing_comma' do
             'bar'
             ],
           groupss => ['baz', 'qux'],
+          groupz  => [
+          ],
         }
 
         File {
@@ -200,7 +208,7 @@ describe 'trailing_comma' do
         expect(problems).to contain_fixed(msg).on_line(3).in_column(32)
         expect(problems).to contain_fixed(msg).on_line(10).in_column(27)
         expect(problems).to contain_fixed(msg).on_line(24).in_column(18)
-        expect(problems).to contain_fixed(msg).on_line(31).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(33).in_column(23)
       end
 
       it 'should add trailing commas' do
@@ -232,6 +240,8 @@ describe 'trailing_comma' do
             'bar',
             ],
           groupss => ['baz', 'qux'],
+          groupz  => [
+          ],
         }
 
         File {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-trailing_comma-check
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Camptocamp