just use extend

2 files changed, 10 insertions, 15 deletions

diff --git a/lib/chef/mixin/subclass_directive.rb b/lib/chef/mixin/subclass_directive.rb
index c0c7aa0328..0f386b6cb2 100644
--- a/lib/chef/mixin/subclass_directive.rb
+++ b/lib/chef/mixin/subclass_directive.rb
@@ -19,22 +19,17 @@
 class Chef
   module Mixin
     module SubclassDirective
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-      module ClassMethods
-        def subclass_directive(sym)
-          define_singleton_method sym do
-            instance_variable_set(:"@#{sym}", true)
-          end
+      def subclass_directive(sym)
+        define_singleton_method sym do
+          instance_variable_set(:"@#{sym}", true)
+        end
 
-          define_singleton_method :"#{sym}?" do
-            !!instance_variable_get(:"@#{sym}")
-          end
+        define_singleton_method :"#{sym}?" do
+          !!instance_variable_get(:"@#{sym}")
+        end
 
-          define_method :"#{sym}?" do
-            self.class.send(:"#{sym}?")
-          end
+        define_method :"#{sym}?" do
+          self.class.send(:"#{sym}?")
         end
       end
     end
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index c78d125f96..abb181c571 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -28,7 +28,7 @@ class Chef
     class Package < Chef::Provider
       include Chef::Mixin::Command
       include Chef::Mixin::ShellOut
-      include Chef::Mixin::SubclassDirective
+      extend Chef::Mixin::SubclassDirective
 
       # subclasses declare this if they want all their arguments as arrays of packages and names
       subclass_directive :use_multipackage_api