rspec-puppet 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8f890c54b412a4d326895c3c3cd0ecae65f915049c69b9cb75c0a5c2811365
-  data.tar.gz: 39407acdeb509d98797e23cdcb7e71c378d89186039538fba4cc25c6c1eb0bf1
+  metadata.gz: c0983cc8fe444bc2035b1e58df39027ab7589cbeae175ace159a384dea8ef2cf
+  data.tar.gz: 8d91008e48102d7053911236a0173daa8daf64e94274a5f6046a45656770c8fa
 SHA512:
-  metadata.gz: 1105e0778581b90855d2d43511b1016cd0193fb088c0b4fbe7bf8de4947e3043a6a005bf1894fed0ac9fbdf87b283b9075997f47c2530ba82038db9c23d43e2f
-  data.tar.gz: 719205730a4e0f4bd0b17378872e134de10eedf3e623f9584aaf85577665033ea36d393d5a3619a0b5eb9fd091530bc6071d394291d7d48094aad11d00836585
+  metadata.gz: 5c2a790b3d4e4f7dc14dce67ba3c1e2c635534962acfa8523390aa2b07389c216c7ffb1cbddccd5ebd0e627372267dad4f07c59293e5fd36ce3d659b9d0c35bd
+  data.tar.gz: 7c9d11d0c5047af4ad2dd7a7743c2e5ff341257f9f2036beabd4b23a88294bf22e8d7e282f1a95cef230a66e7b6e5e5f2c429fb95a265116dd341bc38698aaa7

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.12.0]
+
+### Added
+* Handle nil autorequire results ([#22](https://github.com/puppetlabs/rspec-puppet/pull/22))
+* Add the ability to use kind_of matchers ([#24](https://github.com/puppetlabs/rspec-puppet/pull/24))
+
+## [2.11.1]
+
+### Fixed
+* Ensure FacterImpl consistency between example groups ([#19](https://github.com/puppetlabs/rspec-puppet/pull/19))
+
 ## [2.11.0]
 
 ### Added
@@ -565,7 +576,8 @@ Thanks to Adrien Thebo, Alex Harvey, Brian, Dan Bode, Dominic Cleal, Javier Pala
 ## 1.0.1 and earlier
 For changelog of versions 1.0.1 and earlier, see http://rspec-puppet.com/changelog/
 
-[2.x]: https://github.com/puppetlabs/rspec-puppet/compare/v2.11.0...master
+[2.x]: https://github.com/puppetlabs/rspec-puppet/compare/v2.11.1...master
+[2.11.1]: https://github.com/puppetlabs/rspec-puppet/compare/v2.11.0..v2.11.1
 [2.11.0]: https://github.com/puppetlabs/rspec-puppet/compare/v2.10.0...v2.11.0
 [2.10.0]: https://github.com/puppetlabs/rspec-puppet/compare/v2.9.0...v2.10.0
 [2.9.0]: https://github.com/puppetlabs/rspec-puppet/compare/v2.8.0...v2.9.0

data/lib/rspec-puppet/adapters.rb

@@ -113,12 +113,16 @@ module RSpec::Puppet
       #
       # @api private
       #
-      # Set the FacterImpl constant to the given Facter implementation.
-      # The method noops if the constant is already set
+      # Set the FacterImpl constant to the given Facter implementation or noop
+      # if the constant is already set. If a proc is given, it will only be
+      # called if FacterImpl is not defined.
       #
-      # @param impl [Object]
+      # @param impl [Object, Proc] An object or a proc that implements the Facter API
       def set_facter_impl(impl)
-        Object.send(:const_set, :FacterImpl, impl) unless defined? FacterImpl
+        return if defined?(FacterImpl)
+
+        impl = impl.call if impl.is_a?(Proc)
+        Object.send(:const_set, :FacterImpl, impl)
       end
 
       def setup_puppet(example_group)
@@ -237,11 +241,13 @@ module RSpec::Puppet
         case RSpec.configuration.facter_implementation.to_sym
         when :rspec
           if supports_facter_runtime?
-            Puppet.runtime[:facter] = proc { RSpec::Puppet::FacterTestImpl.new }
-            set_facter_impl(Puppet.runtime[:facter])
+            # Lazily instantiate FacterTestImpl here to optimize memory
+            # allocation, as the proc will only be called if FacterImpl is unset
+            set_facter_impl(proc { RSpec::Puppet::FacterTestImpl.new })
+            Puppet.runtime[:facter] = FacterImpl
           else
             warn "Facter runtime implementations are not supported in Puppet #{Puppet.version}, continuing with facter_implementation 'facter'"
-            RSpec.configuration.facter_implementation = 'facter'
+            RSpec.configuration.facter_implementation = :facter
             set_facter_impl(Facter)
           end
         when :facter

data/lib/rspec-puppet/matchers/create_generic.rb

@@ -313,6 +313,8 @@ module RSpec::Puppet
           if resource.resource_type.respond_to?(func)
             resource.resource_type.send(func) do |t, b|
               Array(resource.to_ral.instance_eval(&b)).each do |dep|
+                next if dep.nil?
+
                 res = "#{t.to_s.capitalize}[#{dep}]"
                 if r = relationship_refs(res, type, visited)
                   results << res

data/lib/rspec-puppet/matchers/run.rb

@@ -35,6 +35,8 @@ module RSpec::Puppet
             case @expected_return
             when Regexp
               return !!(@actual_return =~ @expected_return)
+            when RSpec::Mocks::ArgumentMatchers::KindOf, RSpec::Matchers::AliasedMatcher
+              return @expected_return === @actual_return
             else
               return @actual_return == @expected_return
             end

data/lib/rspec-puppet.rb

@@ -43,7 +43,7 @@ RSpec.configure do |c|
   c.add_setting :default_node_params, :default => {}
   c.add_setting :default_trusted_facts, :default => {}
   c.add_setting :default_trusted_external_data, :default => {}
-  c.add_setting :facter_implementation, :default => 'facter'
+  c.add_setting :facter_implementation, :default => :facter
   c.add_setting :hiera_config, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
   c.add_setting :parser, :default => 'current'
   c.add_setting :trusted_node_data, :default => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -96,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: RSpec tests for your Puppet manifests