extended legacy facts check to .yaml files

lib/puppet-lint/bin.rb

@@ -66,10 +66,13 @@ def run
 
       path = path.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
       path = if File.directory?(path)
-               Dir.glob("#{path}/**/*.pp")
-             else
-               @args
-             end
+        Dir.glob([
+          "#{path}/**/*.pp",
+          "#{path}/**/*.{yaml,yml}"
+        ])
+      else
+        @args
+      end
 
       PuppetLint.configuration.with_filename = true if path.length > 1
 

lib/puppet-lint/checks.rb

@@ -6,6 +6,8 @@ class PuppetLint::Checks
   # Public: Get an Array of problem Hashes.
   attr_accessor :problems
 
+  YAML_COMPATIBLE_CHECKS = [:legacy_facts].freeze
+
   # Public: Initialise a new PuppetLint::Checks object.
   def initialize
     @problems = []
@@ -45,23 +47,31 @@ def load_data(path, content)
     end
   end
 
-  # Internal: Run the lint checks over the manifest code.
+  # Internal: Run the lint checks over the manifest or YAML code.
   #
   # fileinfo - The path to the file as passed to puppet-lint as a String.
-  # data     - The String manifest code to be checked.
+  # data     - The String manifest or YAML code to be checked.
   #
   # Returns an Array of problem Hashes.
   def run(fileinfo, data)
     load_data(fileinfo, data)
 
     checks_run = []
-    enabled_checks.each do |check|
-      klass = PuppetLint.configuration.check_object[check].new
-      # FIXME: shadowing #problems
-      problems = klass.run
-      checks_run << [klass, problems]
+    if File.extname(fileinfo).downcase.match?(/\.ya?ml$/)
+      enabled_checks.select { |check| YAML_COMPATIBLE_CHECKS.include?(check) }.each do |check|
+        klass = PuppetLint.configuration.check_object[check].new
+        # FIXME: shadowing #problems
+        problems = klass.run
+        checks_run << [klass, problems]
+      end
+    else
+      enabled_checks.each do |check|
+        klass = PuppetLint.configuration.check_object[check].new
+        # FIXME: shadowing #problems
+        problems = klass.run
+        checks_run << [klass, problems]
+      end
     end
-
     checks_run.each do |klass, problems|
       if PuppetLint.configuration.fix
         @problems.concat(klass.fix_problems)

lib/puppet-lint/plugins/legacy_facts/legacy_facts.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 # Public: A puppet-lint custom check to detect legacy facts.
 #
 # This check will optionally convert from legacy facts like $::operatingsystem
@@ -112,6 +114,55 @@
 
 PuppetLint.new_check(:legacy_facts) do
   def check
+    if File.extname(PuppetLint::Data.path).downcase.match?(/\.ya?ml$/)
+      begin
+        content = PuppetLint::Data.manifest_lines
+        yaml_content = content.join("\n")
+        data = YAML.safe_load(yaml_content, aliases: true, permitted_classes: [Symbol])
+        search_yaml(data)
+      rescue => e
+        raise e
+      end
+    else
+      check_puppet
+    end
+  end
+
+  def search_yaml(data, path = [])
+    case data
+    when Hash
+      data.each do |k, v|
+        search_value(k.to_s, path)
+        search_yaml(v, path + [k.to_s])
+      end
+    when Array
+      data.each_with_index { |v, i| search_yaml(v, path + [i]) }
+    when String
+      search_value(data, path)
+    end
+  end
+
+  def search_value(value, path)    
+    value.scan(/%{(?:(?:::?)?|facts\.)([a-zA-Z0-9_]+)(?!\.[a-zA-Z])}/) do |match|      
+      base_fact = match[0].split('.').first
+      next unless EASY_FACTS.include?(base_fact) || UNCONVERTIBLE_FACTS.include?(base_fact) || base_fact.match(Regexp.union(REGEX_FACTS))
+
+      notify :warning, {
+        message: "legacy fact '#{base_fact}'",
+        line: find_line_for_content(value),
+        column: 1
+      }
+    end
+  end
+
+  def find_line_for_content(content)
+    PuppetLint::Data.manifest_lines.each_with_index do |line, index|
+      return index + 1 if line.include?(content)
+    end
+    1
+  end
+
+  def check_puppet
     tokens.select { |x| LEGACY_FACTS_VAR_TYPES.include?(x.type) }.each do |token|
       fact_name = ''