puppet-catalog-test 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e460a3f5c3408505c299c277fc0821c7fa5079
-  data.tar.gz: 7ab1aadfda8d38b318734bc6a57a3af30d095e35
+  metadata.gz: 8e9ab263a7f76de207203221229750145e1e6156
+  data.tar.gz: 3b7997d24939efe752837764a1f4b301911a660b
 SHA512:
-  metadata.gz: 8ea372847d724e7e995c091f7d228af3432ec93a6095822e723a4c8dbc920100255ad6fcda494d43a1833ff5ff0e26144afa69589cdc78adeedd322d968b628d
-  data.tar.gz: bc025b96bcd6647307b281796b963a7ea3754c2785e95dc8e3c1f32d6d82701162792d04e22728f74e77bc98ac54b02ffb5ce6c059e8ebeb8a052d8e00aab0dd
+  metadata.gz: 38b83be5d37831e9d8ace38ee45a5f487786051c951b58feaa9c5c8bcb341a39fa076b884ac07270eb2106fbf20edb7af372762640ec8d30f7833f9b1bf15917
+  data.tar.gz: 319a65c89712d418292cd90be394fc088245ed7435b0be4b2e5f53b18aa5b53ceeb010374a9641e79ce2680b5a0bc6ad98fb38ff59fa9ba05a2d35c4c74c1959

data/Rakefile

@@ -2,6 +2,8 @@ require "rake/testtask"
 require "bundler/gem_tasks"
 require "puppet/version"
 require "rubygems"
+require "yaml"
+require "erb"
 
 desc "Clean workspace"
 task :clean do
@@ -71,4 +73,29 @@ task :test_integration do
   end
 end
 
+task :generate_test_matrix do
+  # rbenv doesn't support fuzzy version matching, so we are using a good old mapping table
+  ruby_version_mapping =  {
+    "1.8.7" => "1.8.7-p374",
+    "1.9.3" => "1.9.3-p551",
+    "2.0.0" => "2.0.0-p645"
+  }
+
+  config = YAML.load_file(".travis.yml")
+  checks = []
+
+  config["rvm"].each do |ruby_version|
+    config["env"].each do |env_var|
+      if !config["matrix"]["exclude"].detect { |ex| ex["rvm"] == ruby_version && ex["env"] == env_var }
+        puppet_version = env_var.match(/^PUPPET_VERSION=(.*)$/)[1]
+        mapped_ruby_version = ruby_version_mapping[ruby_version] || ruby_version
+        checks << "check #{mapped_ruby_version} #{puppet_version}"
+      end
+    end
+  end
+
+  template = ERB.new(File.read("run-all-tests.erb"))
+  File.open("run-all-tests", "w+") { |fp| fp.puts template.result(binding) }
+end
+
 task :default => [:test, :test_integration]

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

@@ -3,6 +3,11 @@ require "puppet"
 module PuppetCatalogTest
   class BasePuppetAdapter
     def initialize(config)
+      @config = config
+    end
+    
+    def init_config()
+      config = @config
       manifest_path = config[:manifest_path]
       module_paths = config[:module_paths]
       config_dir = config[:config_dir]

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

@@ -9,11 +9,15 @@ module PuppetCatalogTest
       require 'puppet/test/test_helper'
       parser = config[:parser]
 
+      init_config
+      
       # initialize was added in 3.1.0
       if Gem::Version.new(version) > Gem::Version.new('3.1.0')
         Puppet::Test::TestHelper.initialize
       end
 
+      Puppet::Test::TestHelper.before_all_tests
+      
       Puppet::Node::Environment.new.modules_by_path.each do |_, mod|
         mod.entries.each do |entry|
           ldir = entry.plugin_directory
@@ -39,8 +43,8 @@ module PuppetCatalogTest
 
     def compile(node)
       begin
-        Puppet::Test::TestHelper.before_each_test
-        Puppet::Parser::Compiler.compile(node)
+        catalog = Puppet::Parser::Compiler.compile(node)
+        validate_relationships(catalog)
       rescue => e
         raise e
       ensure
@@ -49,6 +53,8 @@ module PuppetCatalogTest
     end
 
     def create_node(hostname, facts)
+      Puppet::Test::TestHelper.before_each_test
+      init_config
       node = Puppet::Node.new(hostname)
       node.merge(facts)
       node
@@ -57,5 +63,40 @@ module PuppetCatalogTest
     def version
       Puppet::PUPPETVERSION
     end
+
+    def validate_relationships(catalog)
+      catalog.resources.each do |resource|
+        next unless resource.is_a?(Puppet::Resource)
+
+        resource.each do |param, value|
+          pclass = Puppet::Type.metaparamclass(param)
+          if !pclass.nil? && pclass < Puppet::Type::RelationshipMetaparam
+            next if value.is_a?(String)
+            check_if_resource_exists(catalog, resource, param, value)
+          end
+        end
+      end
+      nil
+    end
+
+    private
+
+    def check_if_resource_exists(catalog, resource, param, value)
+      case value
+      when Array
+        value.each { |v| check_if_resource_exists(catalog, resource, param, v) }
+      when Puppet::Resource
+        matching_resource = catalog.resources.find do |resource|
+          resource.type == value.type &&
+            (resource.title.to_s == value.title.to_s ||
+             resource[:name] == value.title ||
+             resource[:alias] == value.title)
+        end
+
+        unless matching_resource
+          fail "#{resource} has #{param} relationship to invalid resource #{value}"
+        end
+      end
+    end
   end
 end

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

@@ -28,6 +28,8 @@ module PuppetCatalogTest
     end
 
     def create_node(hostname, facts)
+      Puppet::Test::TestHelper.before_each_test
+      init_config
       node = Puppet::Node.new(hostname, :facts => Puppet::Node::Facts.new("facts", facts))
       node.merge(facts)
       node
@@ -35,7 +37,6 @@ module PuppetCatalogTest
 
     def compile(node)
       begin
-        Puppet::Test::TestHelper.before_each_test
         Puppet::Parser::Compiler.compile(node)
       rescue => e
         raise e

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

@@ -11,6 +11,8 @@ module PuppetCatalogTest
         return Puppet3xAdapter.new(config)
       elsif Puppet.version.start_with?("4.")
         return Puppet4xAdapter.new(config)
+      elsif Puppet.version.start_with?("5.")
+        return Puppet4xAdapter.new(config)
       end
 
       raise RuntimeException, "Unsupported Puppet version detected (#{Puppet.version})"

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

@@ -17,7 +17,7 @@ module PuppetCatalogTest
     attr_accessor :verbose
 
     def initialize(name, &task_block)
-      desc "Compile all puppet catalogs" unless ::Rake.application.last_comment
+      desc "Compile all puppet catalogs" unless ::Rake.application.last_description
 
       task name do
         task_block.call(self) if task_block

data/puppet-catalog-test.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'puppet-catalog-test'
-  s.version = '0.4.2'
+  s.version = '0.4.3'
   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.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Rene Lengwinat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2017-12-21 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.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Test all your puppet catalogs for compiler warnings and errors