halite 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577aff0788b35c31b43e31a40d5fe5eddc9018a1
-  data.tar.gz: 7c967c99985629798dc8dacb7c5a92bb5d3f43cd
+  metadata.gz: 759f66650fe2e7a304845bd62730aa796c81b4ac
+  data.tar.gz: bc405024358044f1532672757e589a7f204715c5
 SHA512:
-  metadata.gz: 18a8ae4db88b1bf4a08cf8b365bee9317e21080879447d925ddbd0262ffc0236ee02b8886b8fbe920e002133db551f36317d6a4b399b9ea07952a709a5dca2ac
-  data.tar.gz: 2429414aade1578d376d5dee34bf8df98c141ba4276512121ca40855b1ef5bbfa3ff99bdf0dab1b476bf3bc18c3608e2e368737b52facb889fb0ef78b93dc00c
+  metadata.gz: 370b0aa318e442112bcfb0e80249aebd484325e38aadc3b0a079d5f2517d540c1fbdf235693672bfb931b6a988511b5c820a246ede47499c1713c08427229321
+  data.tar.gz: d9d42a3c5ccfd23d2dbf4ae361ff64573c125ddd35810ce5a73cd40e7af023bd45bdf06962af3ebe1eba149546f61c996c573a920fcfc047604b080ec5c31944

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.0.4
+
+* Fixes to work with Chef 12.4.
+
+## v1.0.3
+
+* Never try to do universe installs of pre-release gems in the Berkshelf extension.
+
 ## v1.0.2
 
 * Handle converting cookbooks with pre-release version numbers and other

data/lib/halite/spec_helper.rb

@@ -302,8 +302,8 @@ module Halite
           end
         end
 
-        # Remove from overall descendants tracker.
-        Chef::Mixin::DescendantsTracker.direct_descendants(parent).delete(resource_class)
+        # Clean up any global registration that happens on class compile.
+        Patcher.post_create_cleanup(name, resource_class)
 
         # Store for use up with the parent system
         halite_helpers[:resources][name.to_sym] = resource_class
@@ -393,8 +393,8 @@ module Halite
           class_exec(&block) if block
         end
 
-        # Remove from overall descendants tracker.
-        Chef::Mixin::DescendantsTracker.direct_descendants(parent).delete(provider_class)
+        # Clean up any global registration that happens on class compile.
+        Patcher.post_create_cleanup(name, provider_class)
 
         # Store for use up with the parent system
         halite_helpers[:providers][name.to_sym] = provider_class

data/lib/halite/spec_helper/patcher.rb

@@ -35,17 +35,41 @@ module Halite
       def self.patch(name, klass, mod=nil, &block)
         patch_descendants_tracker(klass) do
           patch_node_map(name, klass) do
-            patch_recipe_dsl(name, klass) do
-              if mod
-                patch_module(mod, name, klass, &block)
-              else
-                block.call
+            patch_priority_map(name, klass) do
+              patch_recipe_dsl(name, klass) do
+                if mod
+                  patch_module(mod, name, klass, &block)
+                else
+                  block.call
+                end
               end
             end
           end
         end
       end
 
+      # Perform any post-class-creation cleanup tasks to deal with compile time
+      # global registrations.
+      #
+      # @since 1.0.4
+      # @param name [String, Symbol] Name of the class that was created in
+      #   snake-case (eg. :my_name).
+      # @param klass [Class] Newly created class.
+      # @return [void]
+      def self.post_create_cleanup(name, klass)
+        # Remove from DescendantsTracker.
+        Chef::Mixin::DescendantsTracker.direct_descendants(klass.superclass).delete(klass)
+        # Remove from the priority maps.
+        if priority_map = priority_map_for(klass)
+          # Make sure we add name in there too because anonymous classes don't
+          # get a priority map registration by default.
+          removed_keys = remove_from_node_map(priority_map, klass) | [name.to_sym]
+          # This ivar is used down in #patch_priority_map to re-add the correct
+          # keys based on the class definition.
+          klass.instance_variable_set(:@halite_original_priority_keys, removed_keys)
+        end
+      end
+
       # Patch an object in to a global namespace for the duration of a block.
       #
       # @param mod [Module] Namespace to patch in to.
@@ -91,20 +115,20 @@ module Halite
         end
       end
 
-      # Patch a class in to its node_map.
+      # Patch a class in to its node_map. This is not used in 12.4+.
       #
       # @param name [Symbol] Name to patch in.
       # @param klass [Class] Resource class to patch in.
       # @param block [Proc] Block to execute while the patch is available.
       # @return [void]
       def self.patch_node_map(name, klass, &block)
+        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)
           block.call
         ensure
-          # Sigh.
-          klass.node_map.instance_variable_get(:@map).delete(name)
+          remove_from_node_map(klass.node_map, klass)
         end
       end
 
@@ -125,6 +149,65 @@ module Halite
         end
       end
 
+      # Patch a class in to the correct priority map for the duration of a code
+      # block. This is a no-op before Chef 12.4.
+      #
+      # @since 1.0.4
+      # @param name [Symbol] Name to patch in.
+      # @param klass [Class] Resource or provider class to patch in.
+      # @param block [Proc] Block to execute while the patch is available.
+      # @return [void]
+      def self.patch_priority_map(name, klass, &block)
+        priority_map = priority_map_for(klass)
+        return block.call unless priority_map
+        begin
+          # Unlike patch_node_map, this has to be an array!
+          klass.instance_variable_get(:@halite_original_priority_keys).each do |key|
+            priority_map.set(key, [klass])
+          end
+          block.call
+        ensure
+          remove_from_node_map(priority_map, klass)
+        end
+      end
+
+      private
+
+      # Find the global priority map for a class.
+      #
+      # @since 1.0.4
+      # @param klass [Class] Resource or provider class to look up.
+      # @return [nil, Chef::Platform::ResourcePriorityMap, Chef::Platform::ProviderPriorityMap]
+      def self.priority_map_for(klass)
+        if defined?(Chef.resource_priority_map) && klass < Chef::Resource
+          Chef.resource_priority_map
+        elsif defined?(Chef.provider_priority_map) && klass < Chef::Provider
+          Chef.provider_priority_map
+        end
+      end
+
+      # Remove a value from a Chef::NodeMap. Returns the keys that were removed.
+      #
+      # @since 1.0.4
+      # @param node_map [Chef::NodeMap] Node map to remove from.
+      # @param value [Object] Value to remove.
+      # @return [Array<Symbol>]
+      def self.remove_from_node_map(node_map, value)
+        # Sigh.
+        removed_keys = []
+        node_map.instance_variable_get(:@map).each do |key, matchers|
+          matchers.delete_if do |matcher|
+            # In 12.4+ this value is an array of classes, before that it is the class.
+            if matcher[:value].is_a?(Array)
+              matcher[:value].include?(value)
+            else
+              matcher[:value] == value
+            end && removed_keys << key # Track removed keys in a hacky way.
+          end
+        end
+        removed_keys
+      end
+
     end
   end
 end

data/lib/halite/version.rb

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

data/spec/spec_helper_spec.rb

@@ -66,7 +66,8 @@ describe Halite::SpecHelper do
       resource(:halite_test, auto: false)
       it { is_expected.to be_a(Class) }
       it { is_expected.to be < Chef::Resource }
-      it { expect(subject.new(nil, nil).resource_name).to be_nil }
+      # #resource_name was added upstream in 12.4 so ignore this test there.
+      it { expect(subject.new(nil, nil).resource_name).to be_nil } unless defined?(Chef::Resource.resource_name)
       it { expect(subject.new(nil, nil).action).to eq(:nothing) }
       it { expect(subject.new(nil, nil).allowed_actions).to eq([:nothing]) }
     end # /context with auto:false
@@ -193,7 +194,7 @@ describe Halite::SpecHelper do
       provider(:halite_test_help)
 
       context 'helper-created resource' do
-        resource(:halite_test_helper, step_into:false)
+        resource(:halite_test_helper, step_into: false)
         recipe do
           halite_test_helper 'test'
         end
@@ -201,7 +202,7 @@ describe Halite::SpecHelper do
       end # /context helper-created resource
 
       context 'helper-created resource with Poise' do
-        resource(:halite_test_helper_poise, step_into:false) do
+        resource(:halite_test_helper_poise, step_into: false) do
           include Poise
           provides(:halite_test_helper_poise)
         end
@@ -213,7 +214,8 @@ describe Halite::SpecHelper do
     end # describe without step-into there should be no ChefSpec resource-level matcher
   end # /describe #step_into
 
-  describe '#patch_descendants_tracker' do
+  describe 'patcher' do
+    #let(:chefspec_options) { {log_level: :debug} }
     resource(:halite_test)
     subject { resource(:halite_test).new('test', chef_run.run_context).provider_for_action(:run) }
 
@@ -234,5 +236,5 @@ describe Halite::SpecHelper do
     context 'without a provider in scope' do
       it { expect { subject }.to raise_error ArgumentError }
     end # /context without a provider in scope
-  end # /describe #patch_descendants_tracker
+  end # /describe patcher
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A set of helpers to write Chef cookbooks as Ruby gems.