puppet-lint-trailing_comma-check 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a1fd04aeaf11684d22adcb4306059667f41f3b
-  data.tar.gz: 8a8c5893f796a65d18dd266dd421aa42fad82dde
+  metadata.gz: 1ec20840a523a7403ecaeba4757f9b74554fa0f6
+  data.tar.gz: 5358c21db4b26f7fb842099e391f2a780e1399b0
 SHA512:
-  metadata.gz: 25749255ed6f56079cba85f26467768181c18716b8f3bc3583074f6f4c7f89f36ecee19cbf7373c054ca83d3fcc7ada2d2e785c3f78ad932498951c35973993e
-  data.tar.gz: d2930af4df68ea936200a1f7cc956bc95a28e48f986f107d0cd0466cc4f6ab04226d449aeb20c1b27207d74a4d1ce6254fae398834c7ef333454b45f18ac1024
+  metadata.gz: c4f1de378fd31e18f4326f191cd136d728f1e57a19d6e42eed51920138dfc2a3503c1c6aa57e412938f7ceea49fd1cf61b250e42fa1a9f50ac8e7a7436ae3534
+  data.tar.gz: 5e6542eb7c3601659e8657bfc8284402ea48a4c92160ae579e53ec9679d1212f99b072845de8621d87a73ceaf6f81abdaecfa71ad22a6cfef985d28e8598d187

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

@@ -3,7 +3,7 @@ PuppetLint.new_check(:trailing_comma) do
     # Resource and class declarations
     resource_indexes.each do |resource|
       lbo_token = resource[:tokens][-1].prev_code_token
-      if lbo_token && lbo_token.type != :COMMA
+      if lbo_token && lbo_token.type != :COLON && lbo_token.type != :COMMA
         notify :warning, {
           :message => 'missing trailing comma after last parameter',
           :line    => lbo_token.next_token.line,

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

@@ -12,10 +12,14 @@ describe 'trailing_comma' do
           docroot => '/var/www',
         }
 
+        class{ '::nginx': }
+
         file { '/etc/fstab':
           ensure  => 'file',
           content => 'foo',
         }
+
+        file { '/tmp/foo': }
         EOS
       }
 
@@ -32,10 +36,14 @@ describe 'trailing_comma' do
           docroot => '/var/www'
         }
 
+        class{ '::nginx': }
+
         file { '/etc/fstab':
           ensure  => 'file',
           content => 'foo'
         }
+
+        file { '/tmp/foo': }
         EOS
       }
 
@@ -45,7 +53,7 @@ describe 'trailing_comma' do
 
       it 'should create a warning' do
         expect(problems).to contain_warning(msg).on_line(3).in_column(32)
-        expect(problems).to contain_warning(msg).on_line(8).in_column(27)
+        expect(problems).to contain_warning(msg).on_line(10).in_column(27)
       end
     end
   end
@@ -67,10 +75,14 @@ describe 'trailing_comma' do
           docroot => '/var/www',
         }
 
+        class{ '::nginx': }
+
         file { '/etc/fstab':
           ensure  => 'file',
           content => 'foo',
         }
+
+        file { '/tmp/foo': }
         EOS
       }
 
@@ -91,10 +103,14 @@ describe 'trailing_comma' do
           docroot => '/var/www'
         }
 
+        class{ '::nginx': }
+
         file { '/etc/fstab':
           ensure  => 'file',
           content => 'foo'
         }
+
+        file { '/tmp/foo': }
         EOS
       }
 
@@ -104,7 +120,7 @@ describe 'trailing_comma' do
 
       it 'should create a warning' do
         expect(problems).to contain_fixed(msg).on_line(3).in_column(32)
-        expect(problems).to contain_fixed(msg).on_line(8).in_column(27)
+        expect(problems).to contain_fixed(msg).on_line(10).in_column(27)
       end
 
       it 'should add trailing commas' do
@@ -115,10 +131,14 @@ describe 'trailing_comma' do
           docroot => '/var/www',
         }
 
+        class{ '::nginx': }
+
         file { '/etc/fstab':
           ensure  => 'file',
           content => 'foo',
         }
+
+        file { '/tmp/foo': }
           EOS
         )
       end

metadata

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