Get rid of provisioners directory

lib/vagrant/provisioners.rb

@@ -1,12 +1,44 @@
-# These aren't autoloaded because they have to register things such
-# as configuration classes right away with Vagrant.
 module Vagrant
   module Provisioners
-    autoload :Base,         'vagrant/provisioners/base'
+    # The base class for a "provisioner." A provisioner is responsible for
-    autoload :ChefSolo,     'vagrant/provisioners/chef_solo'
+    # provisioning a Vagrant system.
-    autoload :ChefClient,   'vagrant/provisioners/chef_client'
+    #
-    autoload :Puppet,       'vagrant/provisioners/puppet'
+    # This has been abstracted out so it is easy to provide support for
-    autoload :PuppetServer, 'vagrant/provisioners/puppet_server'
+    # multiple solutions.
-    autoload :Shell,        'vagrant/provisioners/shell'
+    class Base
+      include Vagrant::Util
+
+      # The environment which provisioner is running in. This is the
+      # action environment, not a Vagrant::Environment.
+      attr_reader :env
+
+      # The configuration for this provisioner. This will be an instance of
+      # the `Config` class which is part of the provisioner.
+      attr_reader :config
+
+      def initialize(env, config)
+        @env = env
+        @config = config
+      end
+
+      # This method is expected to return a class that is used for configuration
+      # for the provisioner.
+      def self.config_class; end
+
+      # This is the method called to "prepare" the provisioner. This is called
+      # before any actions are run by the action runner (see {Vagrant::Actions::Runner}).
+      # This can be used to setup shared folders, forward ports, etc. Whatever is
+      # necessary on a "meta" level.
+      def prepare; end
+
+      # This is the method called to provision the system. This method
+      # is expected to do whatever necessary to provision the system (create files,
+      # SSH, etc.)
+      def provision!; end
+
+      # This is the method called to when the system is being destroyed
+      # and allows the provisioners to engage in any cleanup tasks necessary.
+      def cleanup; end
+    end
   end
 end

lib/vagrant/provisioners/base.rb

@@ -1,44 +0,0 @@
-module Vagrant
-  module Provisioners
-    # The base class for a "provisioner." A provisioner is responsible for
-    # provisioning a Vagrant system.
-    #
-    # This has been abstracted out so it is easy to provide support for
-    # multiple solutions.
-    class Base
-      include Vagrant::Util
-
-      # The environment which provisioner is running in. This is the
-      # action environment, not a Vagrant::Environment.
-      attr_reader :env
-
-      # The configuration for this provisioner. This will be an instance of
-      # the `Config` class which is part of the provisioner.
-      attr_reader :config
-
-      def initialize(env, config)
-        @env = env
-        @config = config
-      end
-
-      # This method is expected to return a class that is used for configuration
-      # for the provisioner.
-      def self.config_class; end
-
-      # This is the method called to "prepare" the provisioner. This is called
-      # before any actions are run by the action runner (see {Vagrant::Actions::Runner}).
-      # This can be used to setup shared folders, forward ports, etc. Whatever is
-      # necessary on a "meta" level.
-      def prepare; end
-
-      # This is the method called to provision the system. This method
-      # is expected to do whatever necessary to provision the system (create files,
-      # SSH, etc.)
-      def provision!; end
-
-      # This is the method called to when the system is being destroyed
-      # and allows the provisioners to engage in any cleanup tasks necessary.
-      def cleanup; end
-    end
-  end
-end