poise 2.7.2 → 2.8.0

data/lib/poise.rb

@@ -69,7 +69,7 @@ end
 #   include Poise(container: true)
 def Poise(options={})
   # Allow passing a class as a shortcut
-  if options.is_a?(Class)
+  if options.is_a?(Class) || options.is_a?(Symbol)
     options = {parent: options}
   end
 

data/lib/poise/helpers/option_collector.rb

@@ -99,6 +99,8 @@ module Poise
           raise Poise::Error.new("Parser must be a Proc or Symbol: #{parser.inspect}") if parser && !(parser.is_a?(Proc) || parser.is_a?(Symbol))
           # Cast to a set at definition time.
           forced_keys = Set.new(forced_keys) unless forced_keys.is_a?(Set)
+          # Never allow name to be called accidentally since it does really wonky things.
+          forced_keys.add(:name)
           # Unlike LWRPBase.attribute, I don't care about Ruby 1.8. Worlds tiniest violin.
           define_method(name.to_sym) do |arg=nil, &block|
             iv_sym = :"@#{name}"

data/lib/poise/helpers/resource_subclass.rb

@@ -39,7 +39,11 @@ module Poise
           # Deal with the node maps.
           node_maps = {}
           node_maps['handler map'] = Chef.provider_handler_map if defined?(Chef.provider_handler_map)
-          node_maps['priority map'] = Chef.provider_priority_map if defined?(Chef.provider_priority_map)
+          node_maps['priority map'] = if defined?(Chef.provider_priority_map)
+            Chef.provider_priority_map
+          else
+            Chef::Platform::ProviderPriorityMap.instance.send(:priority_map)
+          end
           # Patch anything in the descendants tracker.
           Chef::Provider.descendants.each do |provider|
             node_maps["#{provider} node map"] = provider.node_map if defined?(provider.node_map)

data/lib/poise/version.rb

@@ -16,5 +16,5 @@
 
 
 module Poise
-  VERSION = '2.7.2'
+  VERSION = '2.8.0'
 end

data/poise.gemspec

@@ -26,13 +26,15 @@ Gem::Specification.new do |spec|
   spec.description = "Helpers for writing extensible Chef cookbooks."
   spec.summary = spec.description
   spec.homepage = 'https://github.com/poise/poise'
-  spec.license = 'Apache 2.0'
+  spec.license = 'Apache-2.0'
+  spec.metadata['platforms'] = 'any'
 
   spec.files = `git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w{lib}
 
+  spec.add_dependency 'chef', '>= 12', '< 14'
   spec.add_dependency 'halite', '~> 1.0'
 
   spec.add_development_dependency 'fauxhai', '>= 3.3.0' # For now.

data/test/cookbook/libraries/app.rb

@@ -14,31 +14,38 @@
 # limitations under the License.
 #
 
+require 'chef/provider'
+require 'chef/resource'
+
 require 'poise'
 
 
-class Chef
-  class Resource::App < Resource
-    include Poise(container: true)
-    provides(:app)
-    actions(:install)
+module PoiseTest
+  module App
+    class Resource < Chef::Resource
+      include Poise(container: true)
+      provides(:app)
+      actions(:install)
 
-    attribute(:path, kind_of: String, name_attribute: true)
-    attribute(:user, kind_of: String, default: 'root')
-    attribute(:group, kind_of: String, default: 'root')
-  end
+      attribute(:path, kind_of: String, name_attribute: true)
+      attribute(:user, kind_of: String, default: 'root')
+      attribute(:group, kind_of: String, default: 'root')
+    end
 
-  class Provider::App < Provider
-    include Poise
+    class Provider < Chef::Provider
+      include Poise
+      provides(:app)
 
-    def action_install
-      notifying_block do
-        directory new_resource.path do
-          owner new_resource.user
-          group new_resource.group
-          mode '755'
+      def action_install
+        notifying_block do
+          directory new_resource.path do
+            owner new_resource.user
+            group new_resource.group
+            mode '755'
+          end
         end
       end
     end
+
   end
 end

data/test/cookbook/libraries/app_config.rb

@@ -14,34 +14,42 @@
 # limitations under the License.
 #
 
-require_relative 'app'
+require 'chef/provider'
+require 'chef/resource'
 
-class Chef
-  class Resource::AppConfig < Resource
-    include Poise(App)
-    provides(:app_config)
-    actions(:create)
+require 'poise'
 
-    attribute('', template: true, required: true)
-    attribute(:config_name, kind_of: String, default: lazy { name.split('::').last })
 
-    def path
-      ::File.join(parent.path, config_name+'.conf')
+module PoiseTest
+  module AppConfig
+    class Resource < Chef::Resource
+      include Poise(:app)
+      provides(:app_config)
+      actions(:create)
+
+      attribute('', template: true, required: true)
+      attribute(:config_name, kind_of: String, default: lazy { name.split('::').last })
+
+      def path
+        ::File.join(parent.path, config_name+'.conf')
+      end
     end
-  end
 
-  class Provider::AppConfig < Provider
-    include Poise
+    class Provider < Chef::Provider
+      include Poise
+      provides(:app_config)
 
-    def action_create
-      notifying_block do
-        file new_resource.path do
-          owner new_resource.parent.user
-          group new_resource.parent.group
-          mode '644'
-          content new_resource.content
+      def action_create
+        notifying_block do
+          file new_resource.path do
+            owner new_resource.parent.user
+            group new_resource.parent.group
+            mode '644'
+            content new_resource.content
+          end
         end
       end
     end
+
   end
 end

data/test/gemfiles/chef-12.0.gemfile

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

data/test/gemfiles/chef-12.1.gemfile

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

data/test/gemfiles/chef-12.10.gemfile

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

data/test/gemfiles/chef-12.11.gemfile

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

data/test/gemfiles/chef-12.12.gemfile

@@ -0,0 +1,22 @@
+#
+# 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', '~> 12.12.15'
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'

data/test/gemfiles/chef-12.13.gemfile

@@ -0,0 +1,22 @@
+#
+# 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', '~> 12.13.37'
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'

data/test/gemfiles/chef-12.14.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', '~> 12.14.89'

data/test/gemfiles/chef-12.15.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', '~> 12.15.19'

data/test/gemfiles/chef-12.16.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', '~> 12.16.42'

data/test/gemfiles/chef-12.17.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', '~> 12.17.44'

data/test/gemfiles/chef-12.18.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', '~> 12.18.31'

data/test/gemfiles/chef-12.19.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', '~> 12.19.36'

data/test/gemfiles/chef-12.2.gemfile

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

data/test/gemfiles/chef-12.3.gemfile

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

data/test/gemfiles/chef-12.4.gemfile

@@ -17,5 +17,8 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.4.3'
-# Pending https://github.com/berkshelf/ridley/pull/335
-gem 'ridley', '4.4.1'
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'gh', '0.14.0'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.5.gemfile

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

data/test/gemfiles/chef-12.6.gemfile

@@ -21,3 +21,7 @@ gem 'chef', '~> 12.6.0'
 # Disable "Thread.exclusive is deprecated, use Mutex" warnings because they
 # overflow the Travis logs.
 $VERBOSE = nil
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.7.gemfile

@@ -21,3 +21,7 @@ gem 'chef', '~> 12.7.2'
 # Disable "Thread.exclusive is deprecated, use Mutex" warnings because they
 # overflow the Travis logs.
 $VERBOSE = nil
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.8.gemfile

@@ -21,3 +21,7 @@ gem 'chef', '~> 12.8.1'
 # Disable "Thread.exclusive is deprecated, use Mutex" warnings because they
 # overflow the Travis logs.
 $VERBOSE = nil
+gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'