rspec-puppet 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fedfa152ac9857ea6c8546a70342cf148c3f89e9
-  data.tar.gz: ed8fbef4a778aae5e62f2726333013b6a7ebdcf9
+  metadata.gz: 1b281ece69d4cace3c52f168407b4908346ba8a0
+  data.tar.gz: 9283c5b26b51922083be60949279b67b5596e4b4
 SHA512:
-  metadata.gz: ab88d6b0992c638114272cdfd820a0be3a50e5cfa118ec07b5f39f52a5d4c4b657b9bf9c40a83d1a7cb805bf7d5241e95c1e5dfe3e12910709b5144824ad97f9
-  data.tar.gz: a5a51096595b4074a91626363e01158f14724e9907e2569a5a801e1acfde5d21de9a1be06d6c664d80dbfb1ec87fba0193f0a541f7e49e91fec880dc4c4a390a
+  metadata.gz: a3f49d510e15dd345dc15c8cca0a7c23642f70fe6f8efef15763a1846cc46a004d65097435715086db7a65c203a6862269d4fde4bd6d9e1321ef18caa586b623
+  data.tar.gz: ba1bb977bf0f91a1d0478bd5631abea1b3893c5d38ba80e4b146f95c549cee704ed3cae184f38caa388f91459f9aba5d9d65410437a773bc3a9fc1732c09b952

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.3]
+
+### Fixed
+
+ * Facts derived from the node name now only get merged on top of the facts
+   specified by `RSpec.configuration.default_facts` and `let(:facts)` if the
+   node name has been manually specified with `let(:node)`.
+
 ## [2.6.2]
 
 ### Changed

data/lib/rspec-puppet/support.rb

@@ -228,11 +228,21 @@ module RSpec::Puppet
                        {}
                      end
 
+      # Merge in node facts so they always exist by default, but only if they
+      # haven't been defined in `RSpec.configuration.default_facts`
+      result_facts.merge!(munge_facts(node_facts)) { |_key, old_val, new_val| old_val.nil? ? new_val : old_val }
+      (result_facts['networking'] ||= {}).merge!(networking_facts) { |_key, old_val, new_val| old_val.nil? ? new_val : old_val }
+
+      # Merge in `let(:facts)` facts
       result_facts.merge!(munge_facts(base_facts))
       result_facts.merge!(munge_facts(facts)) if self.respond_to?(:facts)
-      result_facts.merge!(munge_facts(node_facts))
 
-      (result_facts['networking'] ||= {}).merge!(networking_facts)
+      # Merge node facts again on top of `let(:facts)` facts, but only if
+      # a node name is given with `let(:node)`
+      if respond_to?(:node)
+        result_facts.merge!(munge_facts(node_facts))
+        (result_facts['networking'] ||= {}).merge!(networking_facts)
+      end
 
       # Facter currently supports lower case facts.  Bug FACT-777 has been submitted to support case sensitive
       # facts.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec