rspec-puppet 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a6de12d38ce6c99a1bd99a3292d3f5d34e2724
-  data.tar.gz: 929a90de8b45f893e3394c9cf668dfb832856b67
+  metadata.gz: 320021848da7cb4b21717e49b02ce505a6d507a9
+  data.tar.gz: 132dc40418a858f94d097a9342bfdfc108cb7976
 SHA512:
-  metadata.gz: a080e6059982a35b4387b2be636486352091638def20248111e2fe08c606feed03a751156aa19cfd4af31054dde72f9f4d2233eab4bd03e146a3bc2cf7bd706a
-  data.tar.gz: 21f51c2cfc8f04adc464d53660860dcb8eab1beb4d9ec250a16a0e3d7df1269f52f4dc06b39d2e7ed9c631453842307e5d7b06c9645416ba190f4ec42aa47ff7
+  metadata.gz: 3819322db7dbab18f6e943c21345aa26584bb7a2916aade4894b73af8e1a99a10cab204faf20ef6b31a26247845af3366872a4402d64acd89c3b3297f8ac0dac
+  data.tar.gz: d564f7fc7f190f224f89a4ca4496e3892dc555dc067070a9f943bfa2601d78069979f05985b876eb94cf055125cb27bd75a6bb96cc849339c1787d9eff829cf0

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.3.2]
+
+Properly fix yesterday's issue by unsharing the cache key before passing the data to puppet. This also contains a new test matrix to avoid missing a half-baked fix like yesterday.
+
 ## [2.3.1]
 
 A quick workaround to re-enable testing with the recently released puppet 3.8.5 and the soon to be released puppet 4.3.2. See PUP-5743 for the gritty details. Upgrade to this version if you hit the "undefined method \`resource' for nil:NilClass" error.
@@ -92,6 +96,8 @@ Thanks to Adrien Thebo, Alex Harvey, Brian, Dan Bode, Dominic Cleal, Javier Pala
 For changelog of versions 1.0.1 and earlier, see http://rspec-puppet.com/changelog/
 
 [2.x]: https://github.com/rodjek/rspec-puppet/compare/v2.3.0...master
+[2.3.2]: https://github.com/rodjek/rspec-puppet/compare/v2.3.1...v2.3.2
+[2.3.1]: https://github.com/rodjek/rspec-puppet/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/rodjek/rspec-puppet/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/rodjek/rspec-puppet/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/rodjek/rspec-puppet/compare/v2.0.1...v2.1.0

data/lib/rspec-puppet/cache.rb

@@ -11,13 +11,15 @@ module RSpec::Puppet
     end
 
     def get(*args, &blk)
-      if !@cache.has_key? args
-        @cache[args] = (blk || @default_proc).call(*args)
-        @lra << args
+      # decouple the hash key from whatever the blk might do to it
+      key = Marshal.load(Marshal.dump(args))
+      if !@cache.has_key? key
+        @cache[key] = (blk || @default_proc).call(*args)
+        @lra << key
         expire!
       end
 
-      @cache[args]
+      @cache[key]
     end
 
     private

data/lib/rspec-puppet/support.rb

@@ -9,18 +9,7 @@ module RSpec::Puppet
     end
 
     def environment
-      # unfreeze PUPPETVERSION because of https://github.com/bundler/bundler/issues/3187
-      ver = Gem::Version.new("#{Puppet::PUPPETVERSION}")
-      # Since applying a fix for PUP-5522 (puppet 3.8.5 and 4.3.2) puppet symbolizes environment names
-      # internally. The catalog cache needs to assume that the facts and other args do not change between
-      # runs, so we have to mirror this here. Puppet versions before the change require a string as environment
-      # name, or they fail with "Unsupported data type: 'Symbol' on node xyz"
-      # See https://github.com/rodjek/rspec-puppet/pull/354 and PUP-5743 for discussion of this
-      if (Gem::Version.new('3.8.5') <= ver && ver < Gem::Version.new('4.0.0')) || Gem::Version.new('4.3.2') <= ver
-        :rp_env
-      else
-        'rp_env'
-      end
+      'rp_env'
     end
 
     def load_catalogue(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec