rspec-puppet 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c6c2a6e166342f02c503667f8312efd1d411e5
-  data.tar.gz: 407d9b0fc06f52c63428320819fd634eee4cf049
+  metadata.gz: 37a6de12d38ce6c99a1bd99a3292d3f5d34e2724
+  data.tar.gz: 929a90de8b45f893e3394c9cf668dfb832856b67
 SHA512:
-  metadata.gz: e1c780ece606028d4a134797cec9740204529a597b2b4a14400dd4dbf623c8b689ba067726d4ebcac7f09ce792c7867ab47860b8d5fbd82304e1204be46c5b74
-  data.tar.gz: c5b11365c94d792e111b804c87a225583461f68570b5e29be03bb1e87a621cef66b08283c04e5bf42eb120c50afaae57375a8483a0be33f1ea569eaf2fa71617
+  metadata.gz: a080e6059982a35b4387b2be636486352091638def20248111e2fe08c606feed03a751156aa19cfd4af31054dde72f9f4d2233eab4bd03e146a3bc2cf7bd706a
+  data.tar.gz: 21f51c2cfc8f04adc464d53660860dcb8eab1beb4d9ec250a16a0e3d7df1269f52f4dc06b39d2e7ed9c631453842307e5d7b06c9645416ba190f4ec42aa47ff7

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.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.
+
 ## [2.3.0]
 
 Rspec-puppet now supports testing custom types, `:undef` values in params, structured facts, and checks resource dependencies recursively.

data/lib/rspec-puppet/support.rb

@@ -9,7 +9,18 @@ module RSpec::Puppet
     end
 
     def environment
-      'rp_env'
+      # 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
     end
 
     def load_catalogue(type)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RSpec tests for your Puppet manifests
@@ -33,16 +33,19 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - README.md
+- bin/rspec-puppet-init
+- lib/rspec-puppet.rb
 - lib/rspec-puppet/cache.rb
 - lib/rspec-puppet/coverage.rb
 - lib/rspec-puppet/errors.rb
+- lib/rspec-puppet/example.rb
 - lib/rspec-puppet/example/class_example_group.rb
 - lib/rspec-puppet/example/define_example_group.rb
 - lib/rspec-puppet/example/function_example_group.rb
 - lib/rspec-puppet/example/host_example_group.rb
 - lib/rspec-puppet/example/provider_example_group.rb
 - lib/rspec-puppet/example/type_example_group.rb
-- lib/rspec-puppet/example.rb
+- lib/rspec-puppet/matchers.rb
 - lib/rspec-puppet/matchers/compile.rb
 - lib/rspec-puppet/matchers/count_generic.rb
 - lib/rspec-puppet/matchers/create_generic.rb
@@ -51,13 +54,10 @@ files:
 - lib/rspec-puppet/matchers/parameter_matcher.rb
 - lib/rspec-puppet/matchers/run.rb
 - lib/rspec-puppet/matchers/type_matchers.rb
-- lib/rspec-puppet/matchers.rb
 - lib/rspec-puppet/rake_task.rb
 - lib/rspec-puppet/setup.rb
 - lib/rspec-puppet/spec_helper.rb
 - lib/rspec-puppet/support.rb
-- lib/rspec-puppet.rb
-- bin/rspec-puppet-init
 homepage: https://github.com/rodjek/rspec-puppet/
 licenses:
 - MIT
@@ -68,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests