rspec-puppet 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 176a810cdf4b4c2640ac1d8d8ec5085ef192d8c99b921a0a7b8612f9a067a35e
-  data.tar.gz: c4397dd3a4636280346e7ca4d5a251d8de496f004b47d9b3cd233e96314399c0
+SHA1:
+  metadata.gz: 19d42e088ccfb87af21e6880cb8792bddaa61728
+  data.tar.gz: a408822bbfade1dd6925f3943f4e6f0fd85cd38b
 SHA512:
-  metadata.gz: 23ed9a0f35e5193952868083155e0519620d0e09e2deee04e5c272ef695935c398637bec4102ef04f224f47cbd8ba884de3248f4e78fb389f3294eeb1071f370
-  data.tar.gz: 01ad7d0d738923721f0ba267b58d31b5d8ccc6fb32cc2590f085a24a562302af62ec049a4d3e15f33dfdd604f9233b5902423a8afd2d29afe1ca5cf5f6a39c60
+  metadata.gz: 5c46f7fb21a4b7032900a23a8dac1c7dbc47b3a2c6cab6b38c9929bfacc095f1e86d9007c11e17946467004acb5dc54856cfe2d1bedd33babd17b199a6524cf6
+  data.tar.gz: babc61b15e854817b85d1355704ba45adb37c4e371f4262154c73146f7349aa635dd9b20c21db6879ae94e5959e122e71aeb4391fbca5571267467aa48e5f198

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.7.3]
+
+### Fixed
+ * Puppet 6 deferred functions are now evaluated and resolved as part of the
+   catalogue compilation process.
+ * If running with parallel\_tests, the resources that are filtered out of the
+   resource coverage report are now taken into account when merging the final
+   report, fixing false negative results that can occur.
+
 ## [2.7.2]
 
 ### Changed

data/lib/rspec-puppet/adapters.rb

@@ -199,6 +199,12 @@ module RSpec::Puppet
           [:vendormoduledir, :vendormoduledir],
         ])
       end
+
+      def catalog(node, _exported)
+        super.tap do |c|
+          Puppet::Pops::Evaluator::DeferredResolver.resolve_and_replace(node.facts, c)
+        end
+      end
     end
 
     class Adapter30 < Base

data/lib/rspec-puppet/coverage.rb

@@ -39,6 +39,9 @@ module RSpec::Puppet
 
     def save_results
       slug = "#{Digest::MD5.hexdigest(Dir.pwd)}-#{Process.pid}"
+      File.open(File.join(Dir.tmpdir, "rspec-puppet-filter-#{slug}"), 'w+') do |f|
+        f.puts @filters.to_json
+      end
       File.open(File.join(Dir.tmpdir, "rspec-puppet-coverage-#{slug}"), 'w+') do |f|
         f.puts @collection.to_json
       end
@@ -52,6 +55,14 @@ module RSpec::Puppet
       end
     end
 
+    def merge_filters
+      pattern = File.join(Dir.tmpdir, "rspec-puppet-filter-#{Digest::MD5.hexdigest(Dir.pwd)}-*")
+      Dir[pattern].each do |result_file|
+        load_filters(result_file)
+        FileUtils.rm(result_file)
+      end
+    end
+
     def load_results(path)
       saved_results = JSON.parse(File.read(path))
       saved_results.each do |resource, data|
@@ -60,6 +71,14 @@ module RSpec::Puppet
       end
     end
 
+    def load_filters(path)
+      saved_filters = JSON.parse(File.read(path))
+      saved_filters.each do |resource|
+        @filters << resource
+        @collection.delete(resource) if @collection.key?(resource)
+      end
+    end
+
     def add(resource)
       if !exists?(resource) && !filtered?(resource)
         @collection[resource.to_s] = ResourceWrapper.new(resource)
@@ -117,7 +136,10 @@ module RSpec::Puppet
     end
 
     def run_report(coverage_desired = nil)
-      merge_results if ENV['TEST_ENV_NUMBER']
+      if ENV['TEST_ENV_NUMBER']
+        merge_filters
+        merge_results
+      end
 
       report = results
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests