halite 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ac06d0b44405d953ee4542a9193dbcbd9dddf6
-  data.tar.gz: 034f1aa01e6565741aba6bdc7619a4c10d8482ab
+  metadata.gz: 17db882da6b0bae3c6e9ce2b831d14ae2c5807c7
+  data.tar.gz: 5a0968925d77b2d5c18e2185aa1fa82bdd21adda
 SHA512:
-  metadata.gz: 8ecbf84b21b7d588bfcaf900a7bd0e5c3cc00b79974d34a1ceb070263ee55a84c569a67f563002fc1e2e4218dd73acaed44756c453b384163f9e8e8e7ffdcf87
-  data.tar.gz: be2fe0c44b6cd7bf6ad4674f7b06d8398bac9fa1c7700453ff20323779f6dba0908eceb6c5dd5466233f090c21f808816e900ae9ba9db310a413a934b1656437
+  metadata.gz: 6262b355b9183ebb3d365a98dd477d6dba0235226bbf7aa48023b560c7c9afe670149cff67517f4933be6cef47549c07bf99b41dcd44e28a843b4bfce24d906c
+  data.tar.gz: 46d28077eac059e3137dbf792e6fa5ccbc00751ae17d65f6f8dd976eb20ce4b22726683fc9e96a2beaa235d424f45ea692f2ae154d7c2b8bf5322623c3f04598

data/.travis.yml

@@ -10,7 +10,12 @@ rvm:
 - "2.1"
 - "2.2"
 gemfile:
-- gemfiles/default.gemfile
+- gemfiles/chef-12.0.gemfile
+- gemfiles/chef-12.1.gemfile
+- gemfiles/chef-12.2.gemfile
+- gemfiles/chef-12.3.gemfile
+- gemfiles/chef-12.4.0.gemfile
+- gemfiles/chef-12.gemfile
 - gemfiles/master.gemfile
 env:
   global:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.0.7
+
+* More fixes for Chef 12.4.1.
+
 ## v1.0.6
 
 * Minor fix for forward compatibility with 12.4.1+ and the spec helper's auto mode.

data/gemfiles/chef-12.0.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.0.0'

data/gemfiles/chef-12.1.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.1.0'

data/gemfiles/chef-12.2.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.2.0'

data/gemfiles/chef-12.3.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.3.0'

data/gemfiles/{default.gemfile → chef-12.4.0.gemfile}

@@ -15,3 +15,5 @@
 #
 
 eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '12.4.0'

data/gemfiles/chef-12.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.0'

data/lib/halite/spec_helper.rb

@@ -302,6 +302,11 @@ module Halite
           end
         end
 
+        # Try to set the resource name for 12.4+.
+        if defined?(resource_class.resource_name)
+          resource_class.resource_name(name)
+        end
+
         # Clean up any global registration that happens on class compile.
         Patcher.post_create_cleanup(name, resource_class)
 

data/lib/halite/spec_helper/patcher.rb

@@ -36,11 +36,13 @@ module Halite
         patch_descendants_tracker(klass) do
           patch_node_map(name, klass) do
             patch_priority_map(name, klass) do
-              patch_recipe_dsl(name, klass) do
-                if mod
-                  patch_module(mod, name, klass, &block)
-                else
-                  block.call
+              patch_handler_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
@@ -59,14 +61,16 @@ module Halite
       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)
+        # Remove from the priority and handler maps.
+        {priority: priority_map_for(klass), handler: handler_map_for(klass)}.each do |type, map|
+          if map
+            # Make sure we add name in there too because anonymous classes don't
+            # get a handler map registration by default.
+            removed_keys = remove_from_node_map(map, klass) | [name.to_sym]
+            # This ivar is used down in #patch_*_map to re-add the correct
+            # keys based on the class definition.
+            klass.instance_variable_set(:"@halite_original_#{type}_keys", removed_keys)
+          end
         end
         # Remove from the global node map.
         if defined?(Chef::Resource.node_map)
@@ -180,6 +184,27 @@ module Halite
         end
       end
 
+      # Patch a class in to the correct handler map for the duration of a code
+      # block. This is a no-op before Chef 12.4.1.
+      #
+      # @since 1.0.7
+      # @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_handler_map(name, klass, &block)
+        handler_map = handler_map_for(klass)
+        return block.call unless handler_map
+        begin
+          klass.instance_variable_get(:@halite_original_handler_keys).each do |key|
+            handler_map.set(key, klass)
+          end
+          block.call
+        ensure
+          remove_from_node_map(handler_map, klass)
+        end
+      end
+
       private
 
       # Find the global priority map for a class.
@@ -195,6 +220,19 @@ module Halite
         end
       end
 
+      # Find the global handler map for a class.
+      #
+      # @since 1.0.7
+      # @param klass [Class] Resource or provider class to look up.
+      # @return [nil, Chef::Platform::ResourceHandlerMap, Chef::Platform::ProviderHandlerMap]
+      def self.handler_map_for(klass)
+        if defined?(Chef.resource_handler_map) && klass < Chef::Resource
+          Chef.resource_handler_map
+        elsif defined?(Chef.provider_handler_map) && klass < Chef::Provider
+          Chef.provider_handler_map
+        end
+      end
+
       # Remove a value from a Chef::NodeMap. Returns the keys that were removed.
       #
       # @since 1.0.4
@@ -204,7 +242,13 @@ module Halite
       def self.remove_from_node_map(node_map, value)
         # Sigh.
         removed_keys = []
-        node_map.instance_variable_get(:@map).each do |key, matchers|
+        # 12.4.1+ switched this to a private accessor and lazy init.
+        map = if node_map.respond_to?(:map, true)
+          node_map.send(:map)
+        else
+          node_map.instance_variable_get(:@map)
+        end
+        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)
@@ -213,6 +257,8 @@ module Halite
               matcher[:value] == value
             end && removed_keys << key # Track removed keys in a hacky way.
           end
+          # Clear empty matchers entirely.
+          map.delete(key) if matchers.empty?
         end
         removed_keys
       end

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/spec/spec_helper_spec.rb

@@ -68,8 +68,8 @@ describe Halite::SpecHelper do
       it { is_expected.to be < Chef::Resource }
       # #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]) }
+      it { expect(Array(subject.new(nil, nil).action)).to eq [:nothing] }
+      it { expect(subject.new(nil, nil).allowed_actions).to eq [:nothing] }
     end # /context with auto:false
 
     context 'with a parent' do
@@ -104,6 +104,7 @@ describe Halite::SpecHelper do
           :parent
         end
       end
+      subject { resource(:halite_test).new(nil, nil).value }
 
       context 'sibling' do
         resource(:halite_parent) do
@@ -111,11 +112,14 @@ describe Halite::SpecHelper do
             :sibling
           end
         end
+        # Sanity check that this still works. Important test is below.
+        resource(:halite_test, parent: :halite_parent)
+        it { is_expected.to eq(:sibling) }
       end
 
       context 'inner' do
+        # The actual regression test.
         resource(:halite_test, parent: :halite_parent)
-        subject { resource(:halite_test).new(nil, nil).value }
         it { is_expected.to eq(:parent) }
       end
     end # /context regression test for finding the wrong parent in a sibling context
@@ -234,7 +238,8 @@ describe Halite::SpecHelper do
     end # /context with a named provider in scope
 
     context 'without a provider in scope' do
-      it { expect { subject }.to raise_error ArgumentError }
+      # 12.4.1+ uses Chef::Exceptions::ProviderNotFound, before that ArgumentError.
+      it { expect { subject }.to raise_error (defined?(Chef::Exceptions::ProviderNotFound) ? Chef::Exceptions::ProviderNotFound : ArgumentError) }
     end # /context without a provider in scope
   end # /describe patcher
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -130,7 +130,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/default.gemfile
+- gemfiles/chef-12.0.gemfile
+- gemfiles/chef-12.1.gemfile
+- gemfiles/chef-12.2.gemfile
+- gemfiles/chef-12.3.gemfile
+- gemfiles/chef-12.4.0.gemfile
+- gemfiles/chef-12.gemfile
 - gemfiles/master.gemfile
 - halite.gemspec
 - lib/berkshelf/halite.rb