Merge pull request #239 from tokenrove/fix-yaml-syntax-errors

Avoid using the manifest lexer on YAML

Author: david22swan

lib/puppet-lint/checks.rb

@@ -54,17 +54,20 @@ def load_data(path, content)
   #
   # Returns an Array of problem Hashes.
   def run(fileinfo, data)
-    load_data(fileinfo, data)
-
     checks_run = []
     if File.extname(fileinfo).downcase.match?(%r{\.ya?ml$})
+      PuppetLint::Data.path = fileinfo
+      PuppetLint::Data.manifest_lines = data.split("\n", -1)
+
       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
+      load_data(fileinfo, data)
+
       enabled_checks.each do |check|
         klass = PuppetLint.configuration.check_object[check].new
         # FIXME: shadowing #problems

spec/acceptance/puppet_lint_spec.rb

@@ -43,4 +43,11 @@
       expect(result[:stdout]).to have_warnings(2)
     end
   end
+
+  context 'with a YAML file provided' do
+    it 'returns zero errors' do
+      result = puppet_lint([File.join(manifest_root, 'parseable.yaml')])
+      expect(result[:stdout]).to have_errors(0)
+    end
+  end
 end

spec/fixtures/test/manifests/parseable.yaml

@@ -0,0 +1,3 @@
+---
+heredoc: |
+ contains $

spec/unit/puppet-lint/checks_spec.rb

@@ -223,11 +223,6 @@
       allow(File).to receive(:extname).with(fileinfo).and_return('.yaml')
     end
 
-    it 'loads the yaml data' do
-      expect(instance).to receive(:load_data).with(fileinfo, data).and_call_original # rubocop: disable RSpec/SubjectStub
-      instance.run(fileinfo, data)
-    end
-
     context 'when there are checks enabled' do
       let(:enabled_checks) { [:legacy_facts] }
       let(:enabled_check_classes) { enabled_checks.map { |r| PuppetLint.configuration.check_object[r] } }