poise 2.7.2 → 2.8.0

data/test/gemfiles/chef-12.9.gemfile

@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.9.41'
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.gemfile

@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.11'
+gem 'chef', '~> 12.19'

data/test/gemfiles/chef-13.0.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, 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', '~> 13.0.118'

data/test/gemfiles/chef-13.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, 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', '~> 13.0'

data/test/gemfiles/master.gemfile

@@ -16,7 +16,11 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', github: 'chef/chef'
-gem 'halite', github: 'poise/halite'
-gem 'poise-boiler', github: 'poise/poise-boiler'
-gem 'poise-profiler', github: 'poise/poise-profiler'
+gem 'chef', git: 'https://github.com/chef/chef.git'
+gem 'chefspec', git: 'https://github.com/sethvargo/chefspec.git'
+gem 'fauxhai', git: 'https://github.com/customink/fauxhai.git'
+gem 'foodcritic', git: 'https://github.com/foodcritic/foodcritic.git'
+gem 'halite', git: 'https://github.com/poise/halite.git'
+gem 'ohai', git: 'https://github.com/chef/ohai.git'
+gem 'poise-boiler', git: 'https://github.com/poise/poise-boiler.git'
+gem 'poise-profiler', git: 'https://github.com/poise/poise-profiler.git'

data/test/spec/helpers/fused_spec.rb

@@ -80,9 +80,12 @@ describe Poise::Helpers::Fused do
         ruby_block 'explicit'
       end
     end
+    before do
+      stub_const('PoiseExplicitProvider', provider(:poise_test2))
+    end
     recipe do
       poise_test 'test' do
-        provider :poise_test2
+        provider PoiseExplicitProvider
       end
     end
 

data/test/spec/helpers/inversion_spec.rb

@@ -272,36 +272,50 @@ describe Poise::Helpers::Inversion do
     end # /describe .resolve_inversion_provider
 
     describe 'provider resolution' do
+      # Declare these deirectly (i.e. without the helpers) because the
+      # subclass_providers test requires they exist at declaration time.
+      module InversionProviderResolution
+        class Resource < Chef::Resource
+          include Poise
+          provides(:inversion_provider_resolution)
+          attribute(:provider_no_auto, default: [])
+        end
+        class Provider < Chef::Provider
+          include Poise::Helpers::Inversion::Provider
+          inversion_resource(:inversion_provider_resolution)
+          inversion_attribute([])
+          provides(:inverted)
+          def self.provides_auto?(*args); true; end
+        end
+        class OtherProvider < Provider
+          provides(:other)
+        end
+        Chef::Platform::ProviderPriorityMap.instance.priority(:inversion_provider_resolution, [Provider, OtherProvider])
+        class ResourceSub < Resource
+          provides(:inversion_provider_resolution_sub)
+        end
+        class ResourceSub2 < Resource
+          include Poise::Helpers::ResourceSubclass
+          provides(:inversion_provider_resolution_sub2)
+          subclass_providers!
+        end
+      end
+
       before do
         default_attributes['poise'] ||= {}
         default_attributes['poise']['provider'] = 'auto'
       end
-      resource(:poise_test_inversion, step_into: false) do
-        include Poise
-        provides(:poise_test_inversion)
-        attribute(:provider_no_auto, default: [])
-      end
-      provider(:poise_test_inversion) do
-        include described_class
-        inversion_resource(:poise_test_inversion)
-        inversion_attribute([])
-        provides(:inverted)
-        def self.provides_auto?(*args); true; end
-      end
-      provider(:poise_test_inversion_other, parent: :poise_test_inversion) do
-        provides(:other)
-      end
       let(:test_resource) { nil }
       subject { Chef::ProviderResolver.new(chef_run.node, test_resource, :run) }
 
       context 'with an inversion resource' do
         recipe(subject: false) do
-          poise_test_inversion 'test'
+          inversion_provider_resolution 'test'
         end
-        let(:test_resource) { chef_run.poise_test_inversion('test') }
+        let(:test_resource) { chef_run.inversion_provider_resolution('test') }
 
-        its(:enabled_handlers) { is_expected.to eq [provider(:poise_test_inversion), provider(:poise_test_inversion_other)] }
-        its(:resolve) { is_expected.to eq provider(:poise_test_inversion) }
+        its(:enabled_handlers) { is_expected.to contain_exactly(InversionProviderResolution::Provider, InversionProviderResolution::OtherProvider) }
+        its(:resolve) { is_expected.to eq InversionProviderResolution::Provider }
       end # /context with an inversion resource
 
       context 'with a resource that has no providers' do
@@ -315,60 +329,49 @@ describe Poise::Helpers::Inversion do
         it { expect { subject.resolve }.to raise_error defined?(Chef::Exceptions::ProviderNotFound) ? Chef::Exceptions::ProviderNotFound : ArgumentError }
       end # /context with a resource that has no providers
 
-      context 'with a subclassed resource' do
-        resource(:poise_inversion_sub, parent: :poise_test_inversion, step_into: false) do
-          provides(:poise_inversion_sub)
-        end
+      context 'with an incorrectly subclassed resource' do
         recipe(subject: false) do
-          poise_inversion_sub 'test'
+          inversion_provider_resolution_sub 'test'
         end
-        let(:test_resource) { chef_run.find_resource(:poise_inversion_sub, 'test') }
+        let(:test_resource) { chef_run.find_resource(:inversion_provider_resolution_sub, 'test') }
 
         its(:enabled_handlers) { is_expected.to eq [] }
         it { expect { subject.resolve }.to raise_error defined?(Chef::Exceptions::ProviderNotFound) ? Chef::Exceptions::ProviderNotFound : ArgumentError }
-      end # /context with a subclassed resource
+      end # /context with an incorrectly subclassed resource
 
       context 'with a subclassed resource using subclass_providers!' do
-        resource(:poise_inversion_subproviders, parent: :poise_test_inversion, step_into: false) do
-          include Poise::Helpers::ResourceSubclass
-          provides(:poise_inversion_subproviders)
-          subclass_providers!
-        end
         recipe(subject: false) do
-          poise_inversion_subproviders 'test'
+          inversion_provider_resolution_sub2 'test'
         end
-        let(:test_resource) { chef_run.find_resource(:poise_inversion_subproviders, 'test') }
+        let(:test_resource) { chef_run.find_resource(:inversion_provider_resolution_sub2, 'test') }
 
-        its(:enabled_handlers) { is_expected.to eq [provider(:poise_test_inversion), provider(:poise_test_inversion_other)] }
-        its(:resolve) { is_expected.to eq provider(:poise_test_inversion) }
+        # its(:enabled_handlers) { is_expected.to contain_exactly(InversionProviderResolution::Provider, InversionProviderResolution::OtherProvider) }
+        its(:resolve) { is_expected.to eq InversionProviderResolution::Provider }
       end # /context with a subclassed resource using subclass_providers!
 
       context 'with provider_no_auto' do
         recipe(subject: false) do
-          poise_test_inversion 'test' do
+          inversion_provider_resolution 'test' do
             provider_no_auto %w{inverted}
           end
         end
-        let(:test_resource) { chef_run.poise_test_inversion('test') }
+        let(:test_resource) { chef_run.inversion_provider_resolution('test') }
 
-        its(:resolve) { is_expected.to eq provider(:poise_test_inversion_other) }
+        its(:resolve) { is_expected.to eq InversionProviderResolution::OtherProvider }
       end # /context with provider_no_auto
 
       context 'with a symbol provider via options' do
-        provider(:poise_test_inversion_subclass, parent: :poise_test_inversion) do
-          provides(:inverted_subclass)
-        end
         recipe(subject: false) do
           node.run_state['poise_inversion'] ||= {}
-          node.run_state['poise_inversion'][:poise_test_inversion] ||= {}
-          node.run_state['poise_inversion'][:poise_test_inversion]['test'] ||= {}
-          node.run_state['poise_inversion'][:poise_test_inversion]['test']['*'] ||= {}
-          node.run_state['poise_inversion'][:poise_test_inversion]['test']['*']['provider'] = :inverted_subclass
-          poise_test_inversion 'test'
+          node.run_state['poise_inversion'][:inversion_provider_resolution] ||= {}
+          node.run_state['poise_inversion'][:inversion_provider_resolution]['test'] ||= {}
+          node.run_state['poise_inversion'][:inversion_provider_resolution]['test']['*'] ||= {}
+          node.run_state['poise_inversion'][:inversion_provider_resolution]['test']['*']['provider'] = :other
+          inversion_provider_resolution 'test'
         end
-        let(:test_resource) { chef_run.poise_test_inversion('test') }
+        let(:test_resource) { chef_run.inversion_provider_resolution('test') }
 
-        its(:resolve) { is_expected.to eq provider(:poise_test_inversion_subclass) }
+        its(:resolve) { is_expected.to eq InversionProviderResolution::OtherProvider }
       end # /context with a symbol provider via options
     end # /describe provider resolution
   end # /describe Poise::Helpers::Inversion::Provider

data/test/spec/helpers/option_collector_spec.rb

@@ -137,10 +137,17 @@ describe Poise::Helpers::OptionCollector do
   end # /describe parser
 
   describe 'forced_keys' do
+    resource(:poise_test) do
+      include described_class
+      def foo(*args)
+        'foo'
+      end
+      attribute(:options, option_collector: true)
+    end
     recipe do
       poise_test 'test' do
         options do
-          name 'foo'
+          foo 'bar'
         end
       end
     end
@@ -152,9 +159,24 @@ describe Poise::Helpers::OptionCollector do
     context 'with forced_keys' do
       resource(:poise_test) do
         include described_class
-        attribute(:options, option_collector: true, forced_keys: %i{name})
+        def foo(*args)
+          'foo'
+        end
+        attribute(:options, option_collector: true, forced_keys: %i{foo})
+      end
+      it { is_expected.to run_poise_test('test').with(options: {'foo' => 'bar'}) }
+    end # /context with forced_keys
+
+    context 'with implicit forced_keys' do
+      recipe do
+        poise_test 'test' do
+          options do
+            name 'bar'
+          end
+        end
       end
-      it { is_expected.to run_poise_test('test').with(options: {'name' => 'foo'}) }
+      it { is_expected.to run_poise_test('test').with(options: {'name' => 'bar'}) }
+      it { is_expected.to_not run_poise_test('bar') }
     end # /context with forced_keys
   end # /describe forced_keys
 

data/test/spec/helpers/resource_cloning_spec.rb

@@ -33,13 +33,15 @@ describe Poise::Helpers::ResourceCloning do
     end
   end
 
-  context 'with a resource that should be cloned' do
-    # Baseline to make sure my test harness works.
-    it do
-      expect(Chef::Log).to receive(:warn).at_least(:once)
-      run_chef
-    end
-  end # /context with a resource that should be cloned
+  if ::Gem::Requirement.create('< 13').satisfied_by?(::Gem::Version.create(Chef::VERSION))
+    context 'with a resource that should be cloned' do
+      # Baseline to make sure my test harness works.
+      it do
+        expect(Chef::Log).to receive(:warn).at_least(:once)
+        run_chef
+      end
+    end # /context with a resource that should be cloned
+  end
 
   context 'a resource using the helper' do
     resource(:poise_test) do

data/test/spec/utils_spec.rb

@@ -66,6 +66,18 @@ describe Poise::Utils do
     let(:filename) { '/test/my_cookbook/libraries/default.rb' }
     subject { described_class.find_cookbook_name(run_context, filename) }
 
+    def add_file(ver, segment, path)
+      # Use CookbookVersion#files_for as a feature test for ManifestV2. This
+      # can be changed to ::Gem::Requirement.create('>= 13').satisfied_by?(::Gem::Version.create(Chef::VERSION))
+      # once https://github.com/chef/chef/pull/5929 is merged.
+      if defined?(ver.files_for)
+        ver.all_files << path
+        ver.cookbook_manifest.reset!
+      else
+        ver.send("#{segment}_filenames") << path
+      end
+    end
+
     context 'with no cookbooks' do
       it { expect { subject }.to raise_error Poise::Error }
     end # /context with no cookbooks
@@ -73,7 +85,7 @@ describe Poise::Utils do
     context 'with one cookbook' do
       before do
         cookbooks << Chef::CookbookVersion.new('my_cookbook', '/test/my_cookbook').tap do |ver|
-          ver.library_filenames << '/test/my_cookbook/libraries/default.rb'
+          add_file(ver, :library, '/test/my_cookbook/libraries/default.rb')
         end
       end
       it { is_expected.to eq 'my_cookbook' }
@@ -82,12 +94,12 @@ describe Poise::Utils do
     context 'with many cookbooks' do
       before do
         cookbooks << Chef::CookbookVersion.new('other_cookbook', '/test/other_cookbook').tap do |ver|
-          ver.library_filenames << '/test/other_cookbook/libraries/default.rb'
-          ver.recipe_filenames << '/test/other_cookbook/recipe/default.rb'
+          add_file(ver, :library, '/test/other_cookbook/libraries/default.rb')
+          add_file(ver, :recipe, '/test/other_cookbook/recipe/default.rb')
         end
         cookbooks << Chef::CookbookVersion.new('my_cookbook', '/test/my_cookbook').tap do |ver|
-          ver.library_filenames << '/test/my_cookbook/libraries/default.rb'
-          ver.recipe_filenames << '/test/my_cookbook/recipe/default.rb'
+          add_file(ver, :library, '/test/my_cookbook/libraries/default.rb')
+          add_file(ver, :recipe, '/test/my_cookbook/recipe/default.rb')
         end
       end
       it { is_expected.to eq 'my_cookbook' }
@@ -96,11 +108,11 @@ describe Poise::Utils do
     context 'with many non-matching cookbooks' do
       before do
         cookbooks << Chef::CookbookVersion.new('other_cookbook', '/test/other_cookbook').tap do |ver|
-          ver.library_filenames << '/test/other_cookbook/libraries/default.rb'
-          ver.recipe_filenames << '/test/other_cookbook/recipe/default.rb'
+          add_file(ver, :library, '/test/other_cookbook/libraries/default.rb')
+          add_file(ver, :recipe, '/test/other_cookbook/recipe/default.rb')
         end
         cookbooks << Chef::CookbookVersion.new('my_cookbook', '/test/my_cookbook').tap do |ver|
-          ver.recipe_filenames << '/test/my_cookbook/recipe/default.rb'
+          add_file(ver, :recipe, '/test/my_cookbook/recipe/default.rb')
         end
       end
       it { expect { subject }.to raise_error Poise::Error }
@@ -110,8 +122,8 @@ describe Poise::Utils do
       let(:filename) { '/source/halite_cookbook/lib/something.rb' }
       before do
         cookbooks << Chef::CookbookVersion.new('other_cookbook', '/test/other_cookbook').tap do |ver|
-          ver.library_filenames << '/test/other_cookbook/libraries/default.rb'
-          ver.recipe_filenames << '/test/other_cookbook/recipe/default.rb'
+          add_file(ver, :library, '/test/other_cookbook/libraries/default.rb')
+          add_file(ver, :recipe, '/test/other_cookbook/recipe/default.rb')
         end
         cookbooks << Chef::CookbookVersion.new('halite_cookbook', '/test/halite_cookbook').tap do |ver|
           def ver.halite_root
@@ -119,7 +131,7 @@ describe Poise::Utils do
           end
         end
         cookbooks << Chef::CookbookVersion.new('my_cookbook', '/test/my_cookbook').tap do |ver|
-          ver.recipe_filenames << '/test/my_cookbook/recipe/default.rb'
+          add_file(ver, :recipe, '/test/my_cookbook/recipe/default.rb')
         end
       end
       it { is_expected.to eq 'halite_cookbook' }
@@ -129,8 +141,8 @@ describe Poise::Utils do
       let(:filename) { '/source/halite_cookbook_other/lib/something.rb' }
       before do
         cookbooks << Chef::CookbookVersion.new('other_cookbook', '/test/other_cookbook').tap do |ver|
-          ver.library_filenames << '/test/other_cookbook/libraries/default.rb'
-          ver.recipe_filenames << '/test/other_cookbook/recipe/default.rb'
+          add_file(ver, :library, '/test/other_cookbook/libraries/default.rb')
+          add_file(ver, :recipe, '/test/other_cookbook/recipe/default.rb')
         end
         cookbooks << Chef::CookbookVersion.new('halite_cookbook', '/test/halite_cookbook').tap do |ver|
           def ver.halite_root
@@ -143,7 +155,7 @@ describe Poise::Utils do
           end
         end
         cookbooks << Chef::CookbookVersion.new('my_cookbook', '/test/my_cookbook').tap do |ver|
-          ver.recipe_filenames << '/test/my_cookbook/recipe/default.rb'
+          add_file(ver, :recipe, '/test/my_cookbook/recipe/default.rb')
         end
       end
       it { is_expected.to eq 'halite_cookbook_other' }
@@ -153,8 +165,8 @@ describe Poise::Utils do
       let(:filename) { '/source/halite_cookbook/vendor/other/lib/something.rb' }
       before do
         cookbooks << Chef::CookbookVersion.new('other_cookbook', '/test/other_cookbook').tap do |ver|
-          ver.library_filenames << '/test/other_cookbook/libraries/default.rb'
-          ver.recipe_filenames << '/test/other_cookbook/recipe/default.rb'
+          add_file(ver, :library, '/test/other_cookbook/libraries/default.rb')
+          add_file(ver, :recipe, '/test/other_cookbook/recipe/default.rb')
         end
         cookbooks << Chef::CookbookVersion.new('halite_cookbook', '/test/halite_cookbook').tap do |ver|
           def ver.halite_root
@@ -167,7 +179,7 @@ describe Poise::Utils do
           end
         end
         cookbooks << Chef::CookbookVersion.new('my_cookbook', '/test/my_cookbook').tap do |ver|
-          ver.recipe_filenames << '/test/my_cookbook/recipe/default.rb'
+          add_file(ver, :recipe, '/test/my_cookbook/recipe/default.rb')
         end
       end
       it { is_expected.to eq 'halite_cookbook_other' }

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: poise
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: halite
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +98,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- ".yo-rc.json"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -134,6 +155,14 @@ files:
 - test/gemfiles/chef-12.1.gemfile
 - test/gemfiles/chef-12.10.gemfile
 - test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.gemfile
+- test/gemfiles/chef-12.19.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
@@ -143,6 +172,8 @@ files:
 - test/gemfiles/chef-12.8.gemfile
 - test/gemfiles/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
+- test/gemfiles/chef-13.0.gemfile
+- test/gemfiles/chef-13.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/default_spec.rb
 - test/integration/default/inversion_spec.rb
@@ -182,8 +213,9 @@ files:
 - test/spec/utils_spec.rb
 homepage: https://github.com/poise/poise
 licenses:
-- Apache 2.0
-metadata: {}
+- Apache-2.0
+metadata:
+  platforms: any
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -200,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Helpers for writing extensible Chef cookbooks.
@@ -218,6 +250,14 @@ test_files:
 - test/gemfiles/chef-12.1.gemfile
 - test/gemfiles/chef-12.10.gemfile
 - test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.gemfile
+- test/gemfiles/chef-12.19.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
@@ -227,6 +267,8 @@ test_files:
 - test/gemfiles/chef-12.8.gemfile
 - test/gemfiles/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
+- test/gemfiles/chef-13.0.gemfile
+- test/gemfiles/chef-13.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/default_spec.rb
 - test/integration/default/inversion_spec.rb