halite 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759f66650fe2e7a304845bd62730aa796c81b4ac
-  data.tar.gz: bc405024358044f1532672757e589a7f204715c5
+  metadata.gz: 9c04dc8c5f3da51f78963e12a57c904e02183253
+  data.tar.gz: 36e10a49ccac0e160564144a0c55bdfbef240a97
 SHA512:
-  metadata.gz: 370b0aa318e442112bcfb0e80249aebd484325e38aadc3b0a079d5f2517d540c1fbdf235693672bfb931b6a988511b5c820a246ede47499c1713c08427229321
-  data.tar.gz: d9d42a3c5ccfd23d2dbf4ae361ff64573c125ddd35810ce5a73cd40e7af023bd45bdf06962af3ebe1eba149546f61c996c573a920fcfc047604b080ec5c31944
+  metadata.gz: f7099cd0cba999e8244ae605f1867e507601f4650129e79d1d3325e2a77f13049c752a07b8938ba335241dbec366b71b6d312a50de42a9cb0113264ff67ea926
+  data.tar.gz: b10f257c96e7a39a9a91aa17375edd3e4ab610c35693d91848b6a2236aac2293ae2ab110cb54db9623e62bab6e8186fabeb99cc6255afd592be763106a7feddf

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.0.5
+
+* Fix the spec helper for Chef <= 12.2.
+
 ## v1.0.4
 
 * Fixes to work with Chef 12.4.

data/lib/halite/spec_helper/patcher.rb

@@ -68,6 +68,12 @@ module Halite
           # keys based on the class definition.
           klass.instance_variable_set(:@halite_original_priority_keys, removed_keys)
         end
+        # Remove from the global node map.
+        if defined?(Chef::Resource.node_map)
+          removed_keys = remove_from_node_map(Chef::Resource.node_map, klass)
+          # Used down in patch_node_map.
+          klass.instance_variable_set(:@halite_original_nodemap_keys, removed_keys)
+        end
       end
 
       # Patch an object in to a global namespace for the duration of a block.
@@ -125,7 +131,10 @@ module Halite
         return block.call unless defined?(klass.node_map)
         begin
           # Technically this is set to true on >=12.4, but this should work.
-          klass.node_map.set(name, klass)
+          keys = klass.instance_variable_get(:@halite_original_nodemap_keys) | [name.to_sym]
+          keys.each do |key|
+            klass.node_map.set(key, klass)
+          end
           block.call
         ensure
           remove_from_node_map(klass.node_map, klass)

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef