chef 12.4.0.rc.2-universal-mingw32 → 12.4.0-universal-mingw32

data/lib/chef/platform/priority_map.rb

@@ -0,0 +1,54 @@
+require 'chef/node_map'
+
+class Chef
+  class Platform
+    class PriorityMap < Chef::NodeMap
+      def priority(resource_name, priority_array, *filter)
+        set_priority_array(resource_name.to_sym, priority_array, *filter)
+      end
+      
+      # @api private
+      def get_priority_array(node, key)
+        get(node, key)
+      end
+
+      # @api private
+      def set_priority_array(key, priority_array, *filter, &block)
+        priority_array = Array(priority_array)
+        set(key, priority_array, *filter, &block)
+        priority_array
+      end
+
+      # @api private
+      def list_handlers(node, key, **filters)
+        list(node, key, **filters).flatten(1).uniq
+      end
+
+      #
+      # Priority maps have one extra precedence: priority arrays override "provides,"
+      # and "provides" lines with identical filters sort by class name (ascending).
+      #
+      def compare_matchers(key, new_matcher, matcher)
+        # Priority arrays come before "provides"
+        if new_matcher[:value].is_a?(Array) != matcher[:value].is_a?(Array)
+          return new_matcher[:value].is_a?(Array) ? -1 : 1
+        end
+
+        cmp = super
+        if cmp == 0
+          # Sort by class name (ascending) as well, if all other properties
+          # are exactly equal
+          if new_matcher[:value].is_a?(Class) && !new_matcher[:override]
+            cmp = compare_matcher_properties(new_matcher, matcher) { |m| m[:value].name }
+            if cmp < 0
+              Chef::Log.warn "You are overriding #{key} on #{new_matcher[:filters].inspect} with #{new_matcher[:value].inspect}: used to be #{matcher[:value].inspect}. Use override: true if this is what you intended."
+            elsif cmp > 0
+              Chef::Log.warn "You declared a new resource #{new_matcher[:value].inspect} for resource #{key}, but it comes alphabetically after #{matcher[:value].inspect} and has the same filters (#{new_matcher[:filters].inspect}), so it will not be used. Use override: true if you want to use it for #{key}."
+            end
+          end
+        end
+        cmp
+      end
+    end
+  end
+end

data/lib/chef/platform/provider_mapping.rb

@@ -201,8 +201,8 @@ class Chef
 
             begin
               result = Chef::Provider.const_get(class_name)
-              Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'provides #{convert_to_snake_case(class_name).to_sym.inspect}'.")
-              Chef::Log.warn("This will no longer work in Chef 13: you must use 'provides' to provide DSL.")
+              Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'resource_name #{convert_to_snake_case(class_name).to_sym.inspect}'.")
+              Chef::Log.warn("This will no longer work in Chef 13: you must use 'resource_name' to provide DSL.")
             rescue NameError
             end
           end

data/lib/chef/platform/provider_priority_map.rb

@@ -1,29 +1,11 @@
 require 'singleton'
+require 'chef/platform/priority_map'
 
 class Chef
   class Platform
-    class ProviderPriorityMap
+    # @api private
+    class ProviderPriorityMap < Chef::Platform::PriorityMap
       include Singleton
-
-      def get_priority_array(node, resource_name)
-        priority_map.get(node, resource_name.to_sym)
-      end
-
-      def set_priority_array(resource_name, priority_array, *filter, &block)
-        priority_map.set(resource_name.to_sym, Array(priority_array), *filter, &block)
-      end
-
-      # @api private
-      def list_handlers(node, resource_name)
-        priority_map.list(node, resource_name.to_sym).flatten(1).uniq
-      end
-
-      private
-
-      def priority_map
-        require 'chef/node_map'
-        @priority_map ||= Chef::NodeMap.new
-      end
     end
   end
 end

data/lib/chef/platform/resource_priority_map.rb

@@ -1,34 +1,17 @@
 require 'singleton'
+require 'chef/platform/priority_map'
 
 class Chef
   class Platform
-    class ResourcePriorityMap
+    # @api private
+    class ResourcePriorityMap < Chef::Platform::PriorityMap
       include Singleton
 
-      def get_priority_array(node, resource_name, canonical: nil)
-        priority_map.get(node, resource_name.to_sym, canonical: canonical)
-      end
-
-      def set_priority_array(resource_name, priority_array, *filter, &block)
-        priority_map.set(resource_name.to_sym, Array(priority_array), *filter, &block)
-      end
-
       # @api private
-      def delete_canonical(resource_name, resource_class)
-        priority_map.delete_canonical(resource_name, resource_class)
-      end
-
-      # @api private
-      def list_handlers(*args)
-        priority_map.list(*args).flatten(1).uniq
+      def get_priority_array(node, resource_name, canonical: nil)
+        super(node, resource_name.to_sym, canonical: canonical)
       end
 
-      private
-
-      def priority_map
-        require 'chef/node_map'
-        @priority_map ||= Chef::NodeMap.new
-      end
     end
   end
 end

data/lib/chef/provider.rb

@@ -176,7 +176,7 @@ class Chef
     end
 
     def self.provides(short_name, opts={}, &block)
-      Chef.set_provider_priority_array(short_name, self, opts, &block)
+      Chef.provider_priority_map.set(short_name, self, opts, &block)
     end
 
     def self.provides?(node, resource)

data/lib/chef/provider/package/rpm.rb

@@ -61,7 +61,7 @@ class Chef
             Chef::Log.debug("#{@new_resource} checking rpm status")
             shell_out_with_timeout!("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}").stdout.each_line do |line|
               case line
-              when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/
+              when /^([\w\d+_.-]+)\s([\w\d~_.-]+)$/
                 @current_resource.package_name($1)
                 @new_resource.version($2)
                 @candidate_version = $2
@@ -78,7 +78,7 @@ class Chef
           @rpm_status = shell_out_with_timeout("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}")
           @rpm_status.stdout.each_line do |line|
             case line
-            when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/
+            when /^([\w\d+_.-]+)\s([\w\d~_.-]+)$/
               Chef::Log.debug("#{@new_resource} current version is #{$2}")
               @current_resource.version($2)
             end

data/lib/chef/provider/service/debian.rb

@@ -25,8 +25,6 @@ class Chef
         UPDATE_RC_D_ENABLED_MATCHES = /\/rc[\dS].d\/S|not installed/i
         UPDATE_RC_D_PRIORITIES = /\/rc([\dS]).d\/([SK])(\d\d)/i
 
-        provides :service, platform_family: "debian"
-
         def self.provides?(node, resource)
           super && Chef::Platform::ServiceHelpers.service_resource_providers.include?(:debian)
         end

data/lib/chef/provider/service/insserv.rb

@@ -24,8 +24,6 @@ class Chef
     class Service
       class Insserv < Chef::Provider::Service::Init
 
-        provides :service, os: "linux"
-
         def self.provides?(node, resource)
           super && Chef::Platform::ServiceHelpers.service_resource_providers.include?(:insserv)
         end

data/lib/chef/provider/service/invokercd.rb

@@ -23,8 +23,6 @@ class Chef
     class Service
       class Invokercd < Chef::Provider::Service::Init
 
-        provides :service, platform_family: "debian"
-
         def self.provides?(node, resource)
           super && Chef::Platform::ServiceHelpers.service_resource_providers.include?(:invokercd)
         end

data/lib/chef/provider/service/redhat.rb

@@ -26,8 +26,6 @@ class Chef
         CHKCONFIG_ON = /\d:on/
         CHKCONFIG_MISSING = /No such/
 
-        provides :service, platform_family: [ "rhel", "fedora", "suse" ]
-
         def self.provides?(node, resource)
           super && Chef::Platform::ServiceHelpers.service_resource_providers.include?(:redhat)
         end

data/lib/chef/provider/service/upstart.rb

@@ -27,8 +27,6 @@ class Chef
       class Upstart < Chef::Provider::Service::Simple
         UPSTART_STATE_FORMAT = /\w+ \(?(\w+)\)?[\/ ](\w+)/
 
-        provides :service, os: "linux"
-
         def self.provides?(node, resource)
           super && Chef::Platform::ServiceHelpers.service_resource_providers.include?(:upstart)
         end

data/lib/chef/provider/user.rb

@@ -23,8 +23,6 @@ require 'etc'
 class Chef
   class Provider
     class User < Chef::Provider
-      provides :user
-
       include Chef::Mixin::Command
 
       attr_accessor :user_exists, :locked

data/lib/chef/resource.rb

@@ -924,11 +924,6 @@ class Chef
         else
           @resource_name = nil
         end
-      else
-        # set resource_name automatically if it's not set
-        if !instance_variable_defined?(:@resource_name) && self.name
-          resource_name convert_to_snake_case(self.name.split('::')[-1])
-        end
       end
 
       @resource_name
@@ -965,7 +960,7 @@ class Chef
     #
     # @param actions [Array<Symbol>] The list of actions to add to allowed_actions.
     #
-    # @return [Arrau<Symbol>] The list of actions, as symbols.
+    # @return [Array<Symbol>] The list of actions, as symbols.
     #
     def self.allowed_actions(*actions)
       @allowed_actions ||=
@@ -974,10 +969,10 @@ class Chef
         else
           [ :nothing ]
         end
-      @allowed_actions |= actions
+      @allowed_actions |= actions.flatten
     end
     def self.allowed_actions=(value)
-      @allowed_actions = value
+      @allowed_actions = value.uniq
     end
 
     #
@@ -1111,7 +1106,12 @@ class Chef
     def self.inherited(child)
       super
       @sorted_descendants = nil
-      child.resource_name
+      # set resource_name automatically if it's not set
+      if child.name && !child.resource_name
+        if child.name =~ /^Chef::Resource::(\w+)$/
+          child.resource_name(convert_to_snake_case($1))
+        end
+      end
     end
 
 
@@ -1143,7 +1143,7 @@ class Chef
         remove_canonical_dsl
       end
 
-      result = Chef.set_resource_priority_array(name, self, options, &block)
+      result = Chef.resource_priority_map.set(name, self, options, &block)
       Chef::DSL::Resources.add_resource_dsl(name)
       result
     end
@@ -1318,23 +1318,22 @@ class Chef
       #   when Chef::Resource::MyLwrp
       #   end
       #
-      resource_subclass = class_eval <<-EOM, __FILE__, __LINE__+1
-        class Chef::Resource::#{class_name} < resource_class
-          resource_name nil # we do not actually provide anything
-          def initialize(*args, &block)
-            Chef::Log.deprecation("Using an LWRP by its name (#{class_name}) directly is no longer supported in Chef 13 and will be removed.  Use Chef::Resource.resource_for_node(node, name) instead.")
+      resource_subclass = Class.new(resource_class) do
+        resource_name nil # we do not actually provide anything
+        def initialize(*args, &block)
+          Chef::Log.deprecation("Using an LWRP by its name (#{self.class.name}) directly is no longer supported in Chef 13 and will be removed.  Use Chef::Resource.resource_for_node(node, name) instead.")
+          super
+        end
+        def self.resource_name(*args)
+          if args.empty?
+            @resource_name ||= superclass.resource_name
+          else
             super
           end
-          def self.resource_name(*args)
-            if args.empty?
-              @resource_name ||= superclass.resource_name
-            else
-              super
-            end
-          end
-          self
         end
-      EOM
+        self
+      end
+      eval("Chef::Resource::#{class_name} = resource_subclass")
       # Make case, is_a and kind_of work with the new subclass, for backcompat.
       # Any subclass of Chef::Resource::ResourceClass is already a subclass of resource_class
       # Any subclass of resource_class is considered a subclass of Chef::Resource::ResourceClass

data/lib/chef/resource/lwrp_base.rb

@@ -85,8 +85,9 @@ class Chef
         # Adds +action_names+ to the list of valid actions for this resource.
         # Does not include superclass's action list when appending.
         def actions(*action_names)
+          action_names = action_names.flatten
           if !action_names.empty? && !@allowed_actions
-            self.allowed_actions = action_names
+            self.allowed_actions = ([ :nothing ] + action_names).uniq
           else
             allowed_actions(*action_names)
           end

data/lib/chef/resource/macports_package.rb

@@ -16,10 +16,11 @@
 # limitations under the License.
 #
 
+require 'chef/resource/package'
+
 class Chef
   class Resource
     class MacportsPackage < Chef::Resource::Package
-      provides :package, os: "darwin"
     end
   end
 end

data/lib/chef/resource/package.rb

@@ -100,8 +100,3 @@ class Chef
     end
   end
 end
-
-require 'chef/chef_class'
-require 'chef/resource/homebrew_package'
-
-Chef.set_resource_priority_array :package, Chef::Resource::HomebrewPackage, os: "darwin"

data/lib/chef/resource_resolver.rb

@@ -18,6 +18,7 @@
 
 require 'chef/exceptions'
 require 'chef/platform/resource_priority_map'
+require 'chef/mixin/convert_to_class_name'
 
 class Chef
   class ResourceResolver

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '12.4.0.rc.2'
+  VERSION = '12.4.0'
 end
 
 #

data/spec/integration/recipes/lwrp_spec.rb

@@ -45,12 +45,8 @@ log_level :warn
 EOM
 
       result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'l-w-r-p::default'", :cwd => chef_dir)
-      actual = result.stdout.lines.map { |l| l.chomp }.join("\n")
-      expected = <<EOM
-  * l_w_r_p_foo[me] action create (up to date)
-EOM
-      expected = expected.lines.map { |l| l.chomp }.join("\n")
-      expect(actual).to include(expected)
+      expect(result.stdout).to match(/\* l_w_r_p_foo\[me\] action create \(up to date\)/)
+      expect(result.stdout).not_to match(/WARN: You are overriding l_w_r_p_foo/)
       result.error!
     end
   end

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -15,13 +15,8 @@ describe "Recipe DSL methods" do
     before(:context) {
 
       class BaseThingy < Chef::Resource
-        def initialize(*args, &block)
-          super
-          @allowed_actions = [ :create ]
-          @action = :create
-        end
-
         resource_name 'base_thingy'
+        default_action :create
 
         class<<self
           attr_accessor :created_resource
@@ -61,11 +56,7 @@ describe "Recipe DSL methods" do
         before(:context) {
 
           class Chef::Resource::BackcompatThingy < Chef::Resource
-            def initialize(*args, &block)
-              super
-              @allowed_actions = [ :create ]
-              @action = :create
-            end
+            default_action :create
           end
           class Chef::Provider::BackcompatThingy < Chef::Provider
             def load_current_resource
@@ -100,7 +91,7 @@ describe "Recipe DSL methods" do
             recipe = converge {
               backcompat_thingy 'blah' do; end
             }
-            expect(recipe.logged_warnings).to eq ''
+            expect(recipe.logged_warnings).to match(/Class Chef::Provider::BackcompatThingy does not declare 'resource_name :backcompat_thingy'./)
             expect(BaseThingy.created_resource).not_to be_nil
           end
         end
@@ -114,19 +105,17 @@ describe "Recipe DSL methods" do
 
         }
 
-        it "bar_thingy works" do
-          recipe = converge {
+        it "bar_thingy does not work" do
+          expect_converge {
             bar_thingy 'blah' do; end
-          }
-          expect(recipe.logged_warnings).to eq ''
-          expect(BaseThingy.created_resource).to eq(RecipeDSLSpecNamespace::Bar::BarThingy)
+          }.to raise_error(NoMethodError)
         end
       end
 
-      context "With a resource named NoNameThingy with resource_name nil" do
+      context "With a resource named Chef::Resource::NoNameThingy with resource_name nil" do
         before(:context) {
 
-          class NoNameThingy < BaseThingy
+          class Chef::Resource::NoNameThingy < BaseThingy
             resource_name nil
           end
 
@@ -134,7 +123,7 @@ describe "Recipe DSL methods" do
 
         it "no_name_thingy does not work" do
           expect_converge {
-            thingy 'blah' do; end
+            no_name_thingy 'blah' do; end
           }.to raise_error(NoMethodError)
         end
       end
@@ -199,6 +188,7 @@ describe "Recipe DSL methods" do
           before(:context) {
 
             class AnotherNoNameThingy3 < BaseThingy
+              resource_name :another_no_name_thingy_3
               provides :another_no_name_thingy3, os: 'blarghle'
             end
 
@@ -227,6 +217,7 @@ describe "Recipe DSL methods" do
           before(:context) {
 
             class AnotherNoNameThingy4 < BaseThingy
+              resource_name :another_no_name_thingy_4
               provides :another_no_name_thingy4, os: 'blarghle'
               provides :another_no_name_thingy4, platform_family: 'foo'
             end
@@ -418,6 +409,7 @@ describe "Recipe DSL methods" do
           before {
             eval <<-EOM, nil, __FILE__, __LINE__+1
               class #{class_name} < BaseThingy
+                resource_name #{dsl_method.inspect}
               end
             EOM
           }
@@ -426,11 +418,12 @@ describe "Recipe DSL methods" do
               eval <<-EOM, nil, __FILE__, __LINE__+1
                 module BlahModule
                   class #{class_name} < BaseThingy
+                    resource_name #{dsl_method.inspect}
                   end
                 end
               EOM
             }
-            it "two_classes_one_dsl resolves to BlahModule::TwoClassesOneDsl (last declared)" do
+            it "two_classes_one_dsl resolves to BlahModule::TwoClassesOneDsl (alphabetical)" do
               dsl_method = self.dsl_method
               recipe = converge {
                 instance_eval("#{dsl_method} 'blah' do; end")
@@ -491,6 +484,7 @@ describe "Recipe DSL methods" do
               eval <<-EOM, nil, __FILE__, __LINE__+1
                 module BlahModule
                   class BlahModule::#{class_name} < BaseThingy
+                    resource_name #{dsl_method.inspect}
                     provides #{dsl_method.inspect}, os: 'blarghle'
                   end
                 end
@@ -572,11 +566,11 @@ describe "Recipe DSL methods" do
 
           }
 
-          it "thingy3 works in a recipe and yields Foo::Thingy4 (the explicit one)" do
+          it "thingy3 works in a recipe and yields Thingy3 (the alphabetical one)" do
             recipe = converge {
               thingy3 'blah' do; end
             }
-            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy4
+            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
           end
 
           it "thingy4 does not work in a recipe" do
@@ -586,16 +580,19 @@ describe "Recipe DSL methods" do
           end
 
           it "resource_matching_short_name returns Thingy4" do
-            expect(Chef::Resource.resource_matching_short_name(:thingy3)).to eq RecipeDSLSpecNamespace::Thingy4
+            expect(Chef::Resource.resource_matching_short_name(:thingy3)).to eq RecipeDSLSpecNamespace::Thingy3
           end
         end
       end
 
-      context "when Thingy5 has resource_name :thingy5" do
+      context "when Thingy5 has resource_name :thingy5 and provides :thingy5reverse, :thingy5_2 and :thingy5_2reverse" do
         before(:context) {
 
           class RecipeDSLSpecNamespace::Thingy5 < BaseThingy
             resource_name :thingy5
+            provides :thingy5reverse
+            provides :thingy5_2
+            provides :thingy5_2reverse
           end
 
         }
@@ -611,6 +608,7 @@ describe "Recipe DSL methods" do
           before(:context) {
 
             class RecipeDSLSpecNamespace::Thingy6 < BaseThingy
+              resource_name :thingy6
               provides :thingy5
             end
 
@@ -623,23 +621,151 @@ describe "Recipe DSL methods" do
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy6
           end
 
-          it "thingy5 works in a recipe and yields Foo::Thingy6 (the later one)" do
+          it "thingy5 works in a recipe and yields Foo::Thingy5 (the alphabetical one)" do
             recipe = converge {
               thingy5 'blah' do; end
             }
-            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy6
+            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
           end
 
           it "resource_matching_short_name returns Thingy5" do
             expect(Chef::Resource.resource_matching_short_name(:thingy5)).to eq RecipeDSLSpecNamespace::Thingy5
           end
+
+          context "and AThingy5 provides :thingy5reverse" do
+            before(:context) {
+
+              class RecipeDSLSpecNamespace::AThingy5 < BaseThingy
+                resource_name :thingy5reverse
+              end
+
+            }
+
+            it "thingy5reverse works in a recipe and yields AThingy5 (the alphabetical one)" do
+              recipe = converge {
+                thingy5reverse 'blah' do; end
+              }
+              expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::AThingy5
+            end
+          end
+
+          context "and ZRecipeDSLSpecNamespace::Thingy5 provides :thingy5_2" do
+            before(:context) {
+
+              module ZRecipeDSLSpecNamespace
+                class Thingy5 < BaseThingy
+                  resource_name :thingy5_2
+                end
+              end
+
+            }
+
+            it "thingy5_2 works in a recipe and yields the RecipeDSLSpaceNamespace one (the alphabetical one)" do
+              recipe = converge {
+                thingy5_2 'blah' do; end
+              }
+              expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
+            end
+          end
+
+          context "and ARecipeDSLSpecNamespace::Thingy5 provides :thingy5_2" do
+            before(:context) {
+
+              module ARecipeDSLSpecNamespace
+                class Thingy5 < BaseThingy
+                  resource_name :thingy5_2reverse
+                end
+              end
+
+            }
+
+            it "thingy5_2reverse works in a recipe and yields the ARecipeDSLSpaceNamespace one (the alphabetical one)" do
+              recipe = converge {
+                thingy5_2reverse 'blah' do; end
+              }
+              expect(BaseThingy.created_resource).to eq ARecipeDSLSpecNamespace::Thingy5
+            end
+          end
         end
+
+        context "when Thingy3 has resource_name :thingy3" do
+          before(:context) {
+
+            class RecipeDSLSpecNamespace::Thingy3 < BaseThingy
+              resource_name :thingy3
+            end
+
+          }
+
+          it "thingy3 works in a recipe" do
+            expect_recipe {
+              thingy3 'blah' do; end
+            }.to emit_no_warnings_or_errors
+            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
+          end
+
+          context "and Thingy4 has resource_name :thingy3" do
+            before(:context) {
+
+              class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
+                resource_name :thingy3
+              end
+
+            }
+
+            it "thingy3 works in a recipe and yields Thingy3 (the alphabetical one)" do
+              recipe = converge {
+                thingy3 'blah' do; end
+              }
+              expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
+            end
+
+            it "thingy4 does not work in a recipe" do
+              expect_converge {
+                thingy4 'blah' do; end
+              }.to raise_error(NoMethodError)
+            end
+
+            it "resource_matching_short_name returns Thingy4" do
+              expect(Chef::Resource.resource_matching_short_name(:thingy3)).to eq RecipeDSLSpecNamespace::Thingy3
+            end
+          end
+
+          context "and Thingy4 has resource_name :thingy3" do
+            before(:context) {
+
+              class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
+                resource_name :thingy3
+              end
+
+            }
+
+            it "thingy3 works in a recipe and yields Thingy3 (the alphabetical one)" do
+              recipe = converge {
+                thingy3 'blah' do; end
+              }
+              expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
+            end
+
+            it "thingy4 does not work in a recipe" do
+              expect_converge {
+                thingy4 'blah' do; end
+              }.to raise_error(NoMethodError)
+            end
+
+            it "resource_matching_short_name returns Thingy4" do
+              expect(Chef::Resource.resource_matching_short_name(:thingy3)).to eq RecipeDSLSpecNamespace::Thingy3
+            end
+          end
+        end
+
       end
 
       context "when Thingy7 provides :thingy8" do
         before(:context) {
 
           class RecipeDSLSpecNamespace::Thingy7 < BaseThingy
+            resource_name :thingy7
             provides :thingy8
           end
 
@@ -661,11 +787,11 @@ describe "Recipe DSL methods" do
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy7
           end
 
-          it "thingy8 works in a recipe and yields Thingy8 (the later one)" do
+          it "thingy8 works in a recipe and yields Thingy7 (alphabetical)" do
             recipe = converge {
               thingy8 'blah' do; end
             }
-            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy8
+            expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy7
           end
 
           it "resource_matching_short_name returns Thingy8" do
@@ -674,36 +800,36 @@ describe "Recipe DSL methods" do
         end
       end
 
-      context "when Thingy5 provides :thingy5, :twizzle and :twizzle2" do
+      context "when Thingy12 provides :thingy12, :twizzle and :twizzle2" do
         before(:context) {
 
-          class RecipeDSLSpecNamespace::Thingy5 < BaseThingy
-            resource_name :thingy5
+          class RecipeDSLSpecNamespace::Thingy12 < BaseThingy
+            resource_name :thingy12
             provides :twizzle
             provides :twizzle2
           end
 
         }
 
-        it "thingy5 works in a recipe and yields Thingy5" do
+        it "thingy12 works in a recipe and yields Thingy12" do
           expect_recipe {
-            thingy5 'blah' do; end
+            thingy12 'blah' do; end
           }.to emit_no_warnings_or_errors
-          expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
+          expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy12
         end
 
-        it "twizzle works in a recipe and yields Thingy5" do
+        it "twizzle works in a recipe and yields Thingy12" do
           expect_recipe {
             twizzle 'blah' do; end
           }.to emit_no_warnings_or_errors
-          expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
+          expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy12
         end
 
-        it "twizzle2 works in a recipe and yields Thingy5" do
+        it "twizzle2 works in a recipe and yields Thingy12" do
           expect_recipe {
             twizzle2 'blah' do; end
           }.to emit_no_warnings_or_errors
-          expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
+          expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy12
         end
       end
 
@@ -752,6 +878,95 @@ describe "Recipe DSL methods" do
           }.to raise_error(Chef::Exceptions::NoSuchResourceType)
         end
       end
+
+      context "when Thingy9 provides :thingy9" do
+        before(:context) {
+          class RecipeDSLSpecNamespace::Thingy9 < BaseThingy
+            resource_name :thingy9
+          end
+        }
+
+        it "declaring a resource providing the same :thingy9 produces a warning" do
+          expect(Chef::Log).to receive(:warn).with("You declared a new resource RecipeDSLSpecNamespace::Thingy9AlternateProvider for resource thingy9, but it comes alphabetically after RecipeDSLSpecNamespace::Thingy9 and has the same filters ({}), so it will not be used. Use override: true if you want to use it for thingy9.")
+          class RecipeDSLSpecNamespace::Thingy9AlternateProvider < BaseThingy
+            resource_name :thingy9
+          end
+        end
+      end
+
+      context "when Thingy10 provides :thingy10" do
+        before(:context) {
+          class RecipeDSLSpecNamespace::Thingy10 < BaseThingy
+            resource_name :thingy10
+          end
+        }
+
+        it "declaring a resource providing the same :thingy10 with override: true does not produce a warning" do
+          expect(Chef::Log).not_to receive(:warn)
+          class RecipeDSLSpecNamespace::Thingy10AlternateProvider < BaseThingy
+            provides :thingy10, override: true
+          end
+        end
+      end
+
+      context "when Thingy11 provides :thingy11" do
+        before(:context) {
+          class RecipeDSLSpecNamespace::Thingy11 < BaseThingy
+            resource_name :thingy10
+          end
+        }
+
+        it "declaring a resource providing the same :thingy11 with os: 'linux' does not produce a warning" do
+          expect(Chef::Log).not_to receive(:warn)
+          class RecipeDSLSpecNamespace::Thingy11AlternateProvider < BaseThingy
+            provides :thingy11, os: 'linux'
+          end
+        end
+      end
+    end
+  end
+
+  before(:all) { Namer.current_index = 0 }
+  before { Namer.current_index += 1 }
+
+  context "with an LWRP that declares actions" do
+    let(:resource_class) {
+      Class.new(Chef::Resource::LWRPBase) do
+        provides :"recipe_dsl_spec#{Namer.current_index}"
+        actions :create
+      end
+    }
+    let(:resource) {
+      resource_class.new("blah", run_context)
+    }
+    it "The actions are part of actions along with :nothing" do
+      expect(resource_class.actions).to eq [ :nothing, :create ]
+    end
+    it "The actions are part of allowed_actions along with :nothing" do
+      expect(resource.allowed_actions).to eq [ :nothing, :create ]
+    end
+
+    context "and a subclass that declares more actions" do
+      let(:subresource_class) {
+        Class.new(Chef::Resource::LWRPBase) do
+          provides :"recipe_dsl_spec_sub#{Namer.current_index}"
+          actions :delete
+        end
+      }
+      let(:subresource) {
+        subresource_class.new("subblah", run_context)
+      }
+
+      it "The parent class actions are not part of actions" do
+        expect(subresource_class.actions).to eq [ :nothing, :delete ]
+      end
+      it "The parent class actions are not part of allowed_actions" do
+        expect(subresource.allowed_actions).to eq [ :nothing, :delete ]
+      end
+      it "The parent class actions do not change" do
+        expect(resource_class.actions).to eq [ :nothing, :create ]
+        expect(resource.allowed_actions).to eq [ :nothing, :create ]
+      end
     end
   end
 end