Do not fix variables called $present

voxpupuli · Feb 10, 2015 · 7fe7841 · 7fe7841
1 parent 3cea067
commit 7fe7841
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/lib/puppet-lint/plugins/check_file_ensure.rb b/lib/puppet-lint/plugins/check_file_ensure.rb
@@ -5,18 +5,17 @@ def check
         attr = resource[:tokens].select { |t| t.type == :NAME && \
                                               t.value == 'ensure' && \
                                               t.next_code_token.type == :FARROW }
-        unless attr.empty?
-          val_token = attr[0].next_code_token.next_code_token
-          if val_token.value == 'present'
-              notify :warning, {
-                :message  => 'ensure set to present on file resource',
-                :line     => val_token.line,
-                :column   => val_token.column,
-                :token    => val_token,
-                :resource => resource,
-              }
-          end
-        end
+        next if attr.empty?
+        val_token = attr[0].next_code_token.next_code_token
+        next unless val_token.value == 'present'
+        next unless [:NAME, :STRING, :SSTRING].include? val_token.type
+        notify :warning, {
+          :message  => 'ensure set to present on file resource',
+          :line     => val_token.line,
+          :column   => val_token.column,
+          :token    => val_token,
+          :resource => resource,
+        }
       end
     end
   end

diff --git a/spec/puppet-lint/plugins/check_file_ensure/check_file_ensure_spec.rb b/spec/puppet-lint/plugins/check_file_ensure/check_file_ensure_spec.rb
@@ -15,6 +15,10 @@
           ensure => 'target',
           target => '/etc/mtab',
         }
+
+        file { '/tmp/foo':
+          ensure => $present,
+        }
         EOS
       }
 
@@ -34,6 +38,10 @@
           ensure => 'present',
           target => '/etc/mtab',
         }
+
+        file { '/tmp/foo':
+          ensure => $present,
+        }
         EOS
       }
 
@@ -68,6 +76,10 @@
           ensure => 'target',
           target => '/etc/mtab',
         }
+
+        file { '/tmp/foo':
+          ensure => $present,
+        }
         EOS
       }
 
@@ -91,6 +103,10 @@
           ensure => 'present',
           target => '/etc/mtab',
         }
+
+        file { '/tmp/foo':
+          ensure => $present,
+        }
         EOS
       }
 
@@ -114,6 +130,10 @@
           ensure => 'link',
           target => '/etc/mtab',
         }
+
+        file { '/tmp/foo':
+          ensure => $present,
+        }
           EOS
         )
       end