Only add a comma before a newline

voxpupuli · Feb 10, 2015 · c49e00c · c49e00c
1 parent 0bc6a3e
commit c49e00c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/puppet-lint/plugins/check_trailing_comma.rb b/lib/puppet-lint/plugins/check_trailing_comma.rb
@@ -5,7 +5,8 @@ def check
       lbo_token = resource[:tokens][-1].prev_code_token
       if lbo_token && lbo_token.type != :COLON && \
                       resource[:tokens][-1].type != :SEMIC && \
-                      lbo_token.type != :COMMA
+                      lbo_token.type != :COMMA && \
+                      lbo_token.next_token.type == :NEWLINE
         notify :warning, {
           :message => 'missing trailing comma after last parameter',
           :line    => lbo_token.next_token.line,

diff --git a/spec/puppet-lint/plugins/check_trailing_comma/check_trailing_comma_spec.rb b/spec/puppet-lint/plugins/check_trailing_comma/check_trailing_comma_spec.rb
@@ -24,6 +24,8 @@ class { '::apache':
         file { '/tmp/bar':
            ensure => file;
         }
+
+        resources { 'sshkey': purge => true }
         EOS
       }
 
@@ -52,6 +54,8 @@ class { '::apache':
         file { '/tmp/bar':
            ensure => file;
         }
+
+        resources { 'sshkey': purge => true }
         EOS
       }
 
@@ -95,6 +99,8 @@ class { '::apache':
         file { '/tmp/bar':
            ensure => file;
         }
+
+        resources { 'sshkey': purge => true }
         EOS
       }
 
@@ -127,6 +133,8 @@ class { '::apache':
         file { '/tmp/bar':
            ensure => file;
         }
+
+        resources { 'sshkey': purge => true }
         EOS
       }
 
@@ -159,6 +167,8 @@ class { '::apache':
         file { '/tmp/bar':
            ensure => file;
         }
+
+        resources { 'sshkey': purge => true }
           EOS
         )
       end