puppet-catalog-test 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f53f78fc8023e2f26117a42efe335a2a28d7001
-  data.tar.gz: e7e7f8458131b14e1ce871a678d5c599a56e6edd
+  metadata.gz: 517c2bbbda18dac16199a792a47cccbcf0e92903
+  data.tar.gz: 9d3c28e74e25f164166a840ec97974d7962ab0f3
 SHA512:
-  metadata.gz: bb3d70830479daf9a712bb61587bd31ff264e4931777ecbfa95341932d63622abcf0dc216e0564ba31ea88f78a10078f6c78b60d1d186f532ebf86b7bc2867a3
-  data.tar.gz: 06c3830c8c6711c7602b80b069f4d866c1e9e8539635142d2b0754d40468733b18517a5043d2c32194c0d375af08bab3f1c804224cb050082619e09b389e89af
+  metadata.gz: 027de364b14c2cb16138a78e04ba2eb8c02ebcc032c6de1ea573a04827ca733f88dcc5ef63ba3d853f0c9745ba60f97c79514b3f9938ea84ee6498f0e3cc9a95
+  data.tar.gz: c97ce7f98c65ff6acab2166784f7b28307da94a64631c42c9c74504108270e57b8db14ab2f83dddec7d4360ba0e780582c5178932c0ceb23577774072d4d36fc

data/README.md

@@ -27,6 +27,7 @@ USAGE: puppet-catalog-test [options]
     -e, --exclude-pattern PATTERN    Exclude test cases that match pattern
     -s, --scenario FILE              Scenario definition to use
     -f, --fact KEY=VALUE             Add custom fact
+    -p, --parser (current|future)    Change puppet parser (3.2+ only)
     -v, --verbose                    Verbose
     -x, --xml                        Use xml report
     -h, --help                       Show this message
@@ -124,6 +125,23 @@ namespace :catalog do
 end
 ```
 
+### Testing catalog with future parser
+```ruby
+require 'puppet-catalog-test'
+
+namespace :catalog do
+  PuppetCatalogTest::RakeTask.new(:scenarios) do |t|
+    t.module_paths = ["modules"]
+    t.manifest_path = File.join("scripts", "site.pp")
+
+    t.scenario_yaml = "scenarios.yml"
+    t.parser = "future"
+
+    t.include_pattern = ENV["include"]
+    t.exclude_pattern = ENV["exclude"]
+  end
+```
+
 ## Scenario testing
 
 Scenarios allow testing of more complex catalogs, e.g. having conditional branches depending on custom facts.

data/Rakefile

@@ -1,5 +1,7 @@
 require "rake/testtask"
 require "bundler/gem_tasks"
+require "puppet/version"
+require "rubygems"
 
 desc "Clean workspace"
 task :clean do
@@ -20,6 +22,9 @@ task :test_integration do
 
   Dir["test/**/Rakefile"].each do |rf|
     supposed_to_fail = rf.include?("failing")
+    if rf.include?("future-parser")
+      supposed_to_fail = Gem::Version.new(Puppet.version) > Gem::Version.new('3.2.0')
+    end
     Dir.chdir rf.split("/")[0..-2].join("/")
 
     ["catalog:scenarios", "catalog:all"].each do |tc|

data/bin/puppet-catalog-test

@@ -42,6 +42,10 @@ opt_parser = OptionParser.new do |opts|
     options[:custom_facts][k] = v
   end
 
+  opts.on("-p", "--parser (current|future)", "Change puppet parser (3.2+ only)") do |arg|
+    options[:parser] = arg
+  end
+
   opts.on("-v", "--verbose", "Verbose") do |arg|
     options[:verbose] = true
   end
@@ -68,6 +72,7 @@ pct = PuppetCatalogTest::TestRunner.new(
   :module_paths => options[:module_paths],
   :hiera_config => options[:hiera_config],
   :verbose => options[:verbose],
+  :parser => options[:parser],
   :xml => options[:xml])
 
 filter = PuppetCatalogTest::Filter.new

data/lib/puppet-catalog-test.rb

@@ -1,5 +1,5 @@
 module PuppetCatalogTest
-  VERSION = "0.2.2"
+  VERSION = "0.4.1"
 
   DEFAULT_FILTER = /.*/
 

data/lib/puppet-catalog-test/puppet_adapter/puppet_3x_adapter.rb

@@ -1,4 +1,5 @@
 require "puppet"
+require "rubygems"
 
 module PuppetCatalogTest
   class Puppet3xAdapter < BasePuppetAdapter
@@ -6,9 +7,10 @@ module PuppetCatalogTest
       super(config)
 
       require 'puppet/test/test_helper'
+      parser = config[:parser]
 
-      # works 3.7.x
-      if version.start_with?("3.7.")
+      # initialize was added in 3.1.0
+      if Gem::Version.new(version) > Gem::Version.new('3.1.0')
         Puppet::Test::TestHelper.initialize
       end
 
@@ -19,6 +21,14 @@ module PuppetCatalogTest
         end
       end
 
+      # future parser was added in 3.2.0
+      if parser and Gem::Version.new(version) > Gem::Version.new('3.2.0')
+        parser_regex = /^(current|future)$/
+        raise ArgumentError, "[ERROR] parser (#{parser}) is not a valid parser, should be 'current' or 'future'" if !parser.match(parser_regex)
+        puts "[INFO] Using #{parser} puppet parser"
+        Puppet.settings[:parser] = parser
+      end
+
       Puppet.parse_config
     end
 

data/lib/puppet-catalog-test/rake_task.rb

@@ -5,14 +5,15 @@ module PuppetCatalogTest
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    attr_accessor :module_paths
-    attr_accessor :manifest_path
     attr_accessor :config_dir
-    attr_accessor :scenario_yaml
-    attr_accessor :include_pattern
     attr_accessor :exclude_pattern
     attr_accessor :facts
+    attr_accessor :include_pattern
+    attr_accessor :manifest_path
+    attr_accessor :module_paths
+    attr_accessor :parser
     attr_accessor :reporter
+    attr_accessor :scenario_yaml
     attr_accessor :verbose
 
     def initialize(name, &task_block)
@@ -26,9 +27,10 @@ module PuppetCatalogTest
 
     def setup
       puppet_config = {
+        :config_dir => @config_dir,
         :manifest_path => @manifest_path,
         :module_paths => @module_paths,
-        :config_dir => @config_dir,
+        :parser => @parser,
         :verbose => @verbose
       }
 

data/puppet-catalog-test.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'puppet-catalog-test'
-  s.version = '0.4.0'
+  s.version = '0.4.1'
   s.homepage = 'https://github.com/invadersmustdie/puppet-catalog-test/'
   s.summary = 'Test all your puppet catalogs for compiler warnings and errors'
   s.description = 'Test all your puppet catalogs for compiler warnings and errors.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-catalog-test
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Rene Lengwinat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Test all your puppet catalogs for compiler warnings and errors