(PDOC-228) some test fixing and puppet_5? function

lib/puppet-strings.rb

@@ -63,6 +63,10 @@ def self.generate(search_patterns = DEFAULT_SEARCH_PATTERNS, options = {})
     end
   end
 
+  def self.puppet_5?
+    Puppet::Util::Package.versioncmp(Puppet.version, "5.0.0") >= 0
+  end
+
   def self.render_json(path)
     require 'puppet-strings/json'
     PuppetStrings::Json.render(path)

lib/puppet-strings/yard.rb

@@ -84,6 +84,7 @@ def stats_for_puppet_tasks
   end
 
   def stats_for_puppet_plans
+    return unless PuppetStrings.puppet_5?
     output 'Puppet Plans', *type_statistics_all(:puppet_plan)
   end
 

lib/puppet-strings/yard/parsers/puppet/parser.rb

@@ -21,13 +21,13 @@ def initialize(source, filename)
   def parse
     begin
       Puppet[:tasks] = true if Puppet.settings.include?(:tasks)
-      @statements ||= (@visitor.visit(::Puppet::Pops::Parser::Parser.new.parse_string(source)) || []).compact
-    rescue ::Puppet::ParseError => ex
       if Puppet::Util::Package.versioncmp(Puppet.version, "5.0.0") < 0 && @file.to_s.match(/^plans\//)
-        log.error "Failed to parse #{@file}: #{ex.message}. Puppet Plans require Puppet 5 or greater."
-      else
-        log.error "Failed to parse #{@file}: #{ex.message}"
+        log.warn "Skipping #{@file}: Puppet Plans require Puppet 5 or greater."
+        return
       end
+      @statements ||= (@visitor.visit(::Puppet::Pops::Parser::Parser.new.parse_string(source)) || []).compact
+    rescue ::Puppet::ParseError => ex
+      log.error "Failed to parse #{@file}: #{ex.message}"
       @statements = []
     end
     @statements.freeze

spec/fixtures/unit/json/output.json

@@ -647,43 +647,6 @@
     }
   ],
   "puppet_plans": [
-    {
-      "name": "plann",
-      "file": "(stdin)",
-      "line": 19,
-      "docstring": {
-        "text": "A simple plan.",
-        "tags": [
-          {
-            "tag_name": "param",
-            "text": "First param.",
-            "types": [
-              "String"
-            ],
-            "name": "param1"
-          },
-          {
-            "tag_name": "param",
-            "text": "Second param.",
-            "types": [
-              "Any"
-            ],
-            "name": "param2"
-          },
-          {
-            "tag_name": "param",
-            "text": "Third param.",
-            "types": [
-              "Integer"
-            ],
-            "name": "param3"
-          }
-        ]
-      },
-      "defaults": {
-        "param3": "1"
-      },
-      "source": "plan plann(String $param1, $param2, Integer $param3 = 1) {\n}"
-    }
+
   ]
 }