vagrant 0.7.0.beta → 0.7.0.beta2

data/.gitignore

@@ -11,3 +11,5 @@ _site/*
 doc/
 tags
 Gemfile.lock
+.idea/*
+*.iml

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 0.7.0.beta2 (January 13, 2010)
+
+  - Puppet server provisioner. [GH-262]
+  - Use numeric uid/gid in mounting shared folders to increase portability. [GH-252]
+  - HTTP downloading follows redirects. [GH-163]
+  - Downloaders have clearer output to note what they're doing.
+  - Shared folders with no guest path are not automounted. [GH-184]
+  - Boxes downloaded during `vagrant up` reload the Vagrantfile config, which
+    fixes a problem with box settings not being properly loaded. [GH-231]
+  - `config.ssh.forward_x11` to enable the ForwardX11 SSH option. [GH-255]
+  - Vagrant source now has a `contrib` directory where contributions of miscellaneous
+    addons for Vagrant will be added.
+  - Vagrantfiles are now loaded only once (instead of 4+ times) [GH-238]
+  - Ability to move home vagrant dir (~/.vagrant) by setting VAGRANT_HOME
+    environmental variable.
+  - Removed check and error for the "OSE" version of VirtualBox, since with
+    VirtualBox 4 this distinction no longer exists.
+  - Ability to specify proxy settings for chef. [GH-169]
+  - Helpful error message shown if NFS mounting fails. [GH-135]
+  - Gentoo guests now support host only networks. [GH-240]
+  - RedHat (CentOS included) guests now support host only networks. [GH-260]
+  - New Vagrantfile syntax for enabling and configuring provisioners. This
+    change is not backwards compatible. [GH-265]
+  - Provisioners are now RVM-friendly, meaning if you installed chef or puppet
+    with an RVM managed Ruby, Vagrant now finds then. [GH-254]
+
 ## 0.7.0.beta (December 24, 2010)
 
   - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since

data/Gemfile

@@ -16,12 +16,4 @@ group :test do
   # For documentation
   gem "yard", "~> 0.6.1"
   gem "bluecloth"
-
-  platforms :mri_18 do
-    gem "ruby-debug"
-  end
-
-  platforms :mri_19 do
-    gem "ruby-debug19"
-  end
 end

data/config/default.rb

@@ -1,7 +1,6 @@
 Vagrant::Config.run do |config|
   # default config goes here
   config.vagrant.dotfile_name = ".vagrant"
-  config.vagrant.home = "~/.vagrant"
   config.vagrant.host = :detect
 
   config.ssh.username = "vagrant"
@@ -12,6 +11,7 @@ Vagrant::Config.run do |config|
   config.ssh.timeout = 30
   config.ssh.private_key_path = File.expand_path("keys/vagrant", Vagrant.source_root)
   config.ssh.forward_agent = false
+  config.ssh.forward_x11 = false
 
   config.vm.auto_port_range = (2200..2250)
   config.vm.box_ovf = "box.ovf"
@@ -19,7 +19,6 @@ Vagrant::Config.run do |config|
   config.vm.base_mac = nil
   config.vm.forward_port("ssh", 22, 2222, :auto => true)
   config.vm.disk_image_format = 'VMDK'
-  config.vm.provisioner = nil
   config.vm.shared_folder_uid = nil
   config.vm.shared_folder_gid = nil
   config.vm.boot_mode = "vrdp"

data/contrib/README.md

@@ -0,0 +1,12 @@
+# Vagrant Contrib
+
+Miscellaneous contributions which assist people in using Vagrant will
+make their way into this directory. An up-to-date list of short descriptions
+for each item will be kept below.
+
+## List of Contrib Items
+
+* `emacs` - Contains a file showing how to associate `Vagrantfile` with
+  Ruby syntax highlighting.
+* `vim` - Contains a `.vim` file for enabling Ruby syntax highlighting
+  for `Vagrantfile`s.

data/contrib/emacs/vagrant.el

@@ -0,0 +1,8 @@
+;;--------------------------------------------------------------------
+;; Teach emacs to syntax highlight Vagrantfile as Ruby.
+;;
+;; Installation: Copy the line below into your emacs configuration,
+;; or drop this file anywhere in your "~/.emacs.d" directory and be
+;; sure to "load" it.
+;;--------------------------------------------------------------------
+(add-to-list 'auto-mode-alist '("Vagrantfile$" . ruby-mode))

data/contrib/vim/vagrantfile.vim

@@ -0,0 +1,9 @@
+" Teach vim to syntax highlight Vagrantfile as ruby
+"
+" Install: $HOME/.vim/plugin/vagrant.vim
+" Author: Brandon Philips <brandon@ifup.org>
+
+augroup vagrant
+	au!
+	au BufRead,BufNewFile Vagrantfile set filetype=ruby
+augroup END

data/lib/vagrant.rb

@@ -4,25 +4,21 @@ require 'i18n'
 require 'virtualbox'
 
 module Vagrant
-  # TODO: Move more classes over to the autoload model. We'll
-  # start small, but slowly move everything over.
-
+  autoload :Action,        'vagrant/action'
   autoload :Box,           'vagrant/box'
   autoload :BoxCollection, 'vagrant/box_collection'
   autoload :CLI,           'vagrant/cli'
   autoload :Config,        'vagrant/config'
   autoload :DataStore,     'vagrant/data_store'
+  autoload :Downloaders,   'vagrant/downloaders'
+  autoload :Environment,   'vagrant/environment'
   autoload :Errors,        'vagrant/errors'
+  autoload :Hosts,         'vagrant/hosts'
   autoload :Plugin,        'vagrant/plugin'
   autoload :TestHelpers,   'vagrant/test_helpers'
+  autoload :UI,            'vagrant/ui'
   autoload :Util,          'vagrant/util'
-
-  module Command
-    autoload :Base,      'vagrant/command/base'
-    autoload :GroupBase, 'vagrant/command/group_base'
-    autoload :Helpers,   'vagrant/command/helpers'
-    autoload :NamedBase, 'vagrant/command/named_base'
-  end
+  autoload :VM,            'vagrant/vm'
 
   # The source root is the path to the root directory of
   # the Vagrant gem.
@@ -34,13 +30,13 @@ end
 # Default I18n to load the en locale
 I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root)
 
-# Load them up. One day we'll convert this to autoloads. Today
-# is not that day. Low hanging fruit for anyone wishing to do it.
-libdir = File.expand_path("lib/vagrant", Vagrant.source_root)
-Vagrant::Util::GlobLoader.glob_require(libdir, %w{
-  downloaders/base provisioners/base provisioners/chef systems/base
-  hosts/base})
-
-# Initialize the built-in actions and load the plugins.
+# Load the things which must be loaded before anything else. Note that
+# I'm not sure why 'vagrant/ssh' must be loaded. But if I don't, I get
+# a very scary "unsupported cipher" error from net-ssh for no apparent reason.
+require 'vagrant/command'
+require 'vagrant/provisioners'
+require 'vagrant/systems'
+require 'vagrant/ssh'
+require 'vagrant/version'
 Vagrant::Action.builtin!
 Vagrant::Plugin.load!

data/lib/vagrant/action.rb

@@ -1,3 +1,12 @@
+require 'vagrant/action/builder'
+require 'vagrant/action/builtin'
+
+# The builtin middlewares
+require 'vagrant/action/box'
+require 'vagrant/action/env'
+require 'vagrant/action/general'
+require 'vagrant/action/vm'
+
 module Vagrant
   # Manages action running and registration. Every Vagrant environment
   # has an instance of {Action} to allow for running in the context of
@@ -44,6 +53,9 @@ module Vagrant
   # Where `:name` is the name of the registered action.
   #
   class Action
+    autoload :Environment, 'vagrant/action/environment'
+    autoload :Warden,      'vagrant/action/warden'
+
     include Util
     @@reported_interrupt = false
 

data/lib/vagrant/action/box.rb

@@ -0,0 +1,11 @@
+module Vagrant
+  class Action
+    module Box
+      autoload :Destroy,   'vagrant/action/box/destroy'
+      autoload :Download,  'vagrant/action/box/download'
+      autoload :Package,   'vagrant/action/box/package'
+      autoload :Unpackage, 'vagrant/action/box/unpackage'
+      autoload :Verify,    'vagrant/action/box/verify'
+    end
+  end
+end

data/lib/vagrant/action/box/download.rb

@@ -64,7 +64,6 @@ module Vagrant
         end
 
         def download_to(f)
-          @env.ui.info I18n.t("vagrant.actions.box.download.copying")
           @downloader.download!(@env["box"].uri, f)
         end
       end

data/lib/vagrant/action/env.rb

@@ -0,0 +1,7 @@
+module Vagrant
+  class Action
+    module Env
+      autoload :Set, 'vagrant/action/env/set'
+    end
+  end
+end

data/lib/vagrant/action/general.rb

@@ -0,0 +1,8 @@
+module Vagrant
+  class Action
+    module General
+      autoload :Package,  'vagrant/action/general/package'
+      autoload :Validate, 'vagrant/action/general/validate'
+    end
+  end
+end

data/lib/vagrant/action/vm.rb

@@ -0,0 +1,30 @@
+module Vagrant
+  class Action
+    module VM
+      autoload :Boot,                'vagrant/action/vm/boot'
+      autoload :CheckBox,            'vagrant/action/vm/check_box'
+      autoload :CheckGuestAdditions, 'vagrant/action/vm/check_guest_additions'
+      autoload :CleanMachineFolder,  'vagrant/action/vm/clean_machine_folder'
+      autoload :ClearForwardedPorts, 'vagrant/action/vm/clear_forwarded_ports'
+      autoload :ClearNFSExports,     'vagrant/action/vm/clear_nfs_exports'
+      autoload :ClearSharedFolders,  'vagrant/action/vm/clear_shared_folders'
+      autoload :Customize,           'vagrant/action/vm/customize'
+      autoload :Destroy,             'vagrant/action/vm/destroy'
+      autoload :DestroyUnusedNetworkInterfaces, 'vagrant/action/vm/destroy_unused_network_interfaces'
+      autoload :DiscardState,        'vagrant/action/vm/discard_state'
+      autoload :Export,              'vagrant/action/vm/export'
+      autoload :ForwardPorts,        'vagrant/action/vm/forward_ports'
+      autoload :Halt,                'vagrant/action/vm/halt'
+      autoload :Import,              'vagrant/action/vm/import'
+      autoload :MatchMACAddress,     'vagrant/action/vm/match_mac_address'
+      autoload :Network,             'vagrant/action/vm/network'
+      autoload :NFS,                 'vagrant/action/vm/nfs'
+      autoload :Package,             'vagrant/action/vm/package'
+      autoload :PackageVagrantfile,  'vagrant/action/vm/package_vagrantfile'
+      autoload :Provision,           'vagrant/action/vm/provision'
+      autoload :Resume,              'vagrant/action/vm/resume'
+      autoload :ShareFolders,        'vagrant/action/vm/share_folders'
+      autoload :Suspend,             'vagrant/action/vm/suspend'
+    end
+  end
+end

data/lib/vagrant/action/vm/boot.rb

@@ -13,6 +13,7 @@ module Vagrant
           # Start up the VM and wait for it to boot.
           boot
           raise Errors::VMFailedToBoot if !wait_for_boot
+
           @app.call(env)
         end
 
@@ -24,7 +25,7 @@ module Vagrant
         def wait_for_boot
           @env.ui.info I18n.t("vagrant.actions.vm.boot.waiting")
 
-          @env.env.config.ssh.max_tries.to_i.times do |i|
+          @env["config"].ssh.max_tries.to_i.times do |i|
             if @env["vm"].ssh.up?
               @env.ui.info I18n.t("vagrant.actions.vm.boot.ready")
               return true
@@ -34,7 +35,7 @@ module Vagrant
             # get shown
             return true if @env.interrupted?
 
-            sleep 5 if !@env["vagrant.test"]
+            sleep 2 if !@env["vagrant.test"]
           end
 
           @env.ui.error I18n.t("vagrant.actions.vm.boot.failed")

data/lib/vagrant/action/vm/check_box.rb

@@ -17,6 +17,7 @@ module Vagrant
             env.ui.info I18n.t("vagrant.actions.vm.check_box.not_found", :name => box_name)
             Vagrant::Box.add(env.env, box_name, box_url)
             env["boxes"].reload!
+            env.env.reload_config!
           end
 
           @app.call(env)

data/lib/vagrant/action/vm/network.rb

@@ -25,8 +25,8 @@ module Vagrant
 
           if enable_network?
             @env.ui.info I18n.t("vagrant.actions.vm.network.enabling")
-            @env["vm"].system.prepare_host_only_network
             @env.env.config.vm.network_options.compact.each do |network_options|
+              @env["vm"].system.prepare_host_only_network(network_options)
               @env["vm"].system.enable_host_only_network(network_options)
             end
           end

data/lib/vagrant/action/vm/nfs.rb

@@ -113,7 +113,9 @@ module Vagrant
         def mount_folders
           @env.ui.info I18n.t("vagrant.actions.vm.nfs.mounting")
 
-          @env["vm"].system.mount_nfs(host_ip, folders)
+          # Only mount the folders which have a guest path specified
+          am_folders = folders.select { |name, folder| folder[:guestpath] }
+          @env["vm"].system.mount_nfs(host_ip, Hash[am_folders])
         end
 
         # Returns the IP address of the first host only network adapter

data/lib/vagrant/action/vm/provision.rb

@@ -2,49 +2,38 @@ module Vagrant
   class Action
     module VM
       class Provision
+        attr_reader :provisioners
+
         def initialize(app, env)
           @app = app
           @env = env
           @env["provision.enabled"] = true if !@env.has_key?("provision.enabled")
+          @provisioners = []
 
-          load_provisioner if provisioning_enabled?
+          load_provisioners if provisioning_enabled?
         end
 
         def call(env)
           @app.call(env)
 
-          if provisioning_enabled?
-            @env.ui.info I18n.t("vagrant.actions.vm.provision.beginning")
-            @provisioner.provision!
+          @provisioners.each do |instance|
+            @env.ui.info I18n.t("vagrant.actions.vm.provision.beginning", :provisioner => instance.class)
+            instance.provision!
           end
         end
 
         def provisioning_enabled?
-          !@env["config"].vm.provisioner.nil? && @env["provision.enabled"]
+          !@env["config"].vm.provisioners.empty? && @env["provision.enabled"]
         end
 
-        def load_provisioner
-          provisioner = @env["config"].vm.provisioner
-
-          if provisioner.is_a?(Class)
-            @provisioner = provisioner.new(@env)
-            raise Errors::ProvisionInvalidClass if !@provisioner.is_a?(Provisioners::Base)
-          elsif provisioner.is_a?(Symbol)
-            # We have a few hard coded provisioners for built-ins
-            mapping = {
-              :chef_solo    => Provisioners::ChefSolo,
-              :chef_server  => Provisioners::ChefServer,
-              :puppet       => Provisioners::Puppet
-            }
+        def load_provisioners
+          @env["config"].vm.provisioners.each do |provisioner|
+            @env.ui.info I18n.t("vagrant.actions.vm.provision.enabled", :provisioner => provisioner.shortcut)
 
-            provisioner_klass = mapping[provisioner]
-            raise Errors::ProvisionUnknownType, :provisioner => provisioner.to_s if provisioner_klass.nil?
-            @provisioner = provisioner_klass.new(@env)
+            instance = provisioner.provisioner.new(@env, provisioner.config)
+            instance.prepare
+            @provisioners << instance
           end
-
-          @env.ui.info I18n.t("vagrant.actions.vm.provision.enabled", :provisioner => @provisioner.class.to_s)
-          @provisioner.prepare
-          @provisioner
         end
       end
     end

data/lib/vagrant/action/vm/share_folders.rb

@@ -50,10 +50,17 @@ module Vagrant
 
           @env["vm"].ssh.execute do |ssh|
             shared_folders.each do |name, data|
-              @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
-                           :name => name,
-                           :guest_path => data[:guestpath]))
-              @env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
+              if data[:guestpath]
+                # Guest path specified, so mount the folder to specified point
+                @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                                    :name => name,
+                                    :guest_path => data[:guestpath]))
+                @env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
+              else
+                # If no guest path is specified, then automounting is disabled
+                @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.nomount_entry",
+                                    :name => name))
+              end
             end
           end
         end

data/lib/vagrant/command.rb

@@ -0,0 +1,25 @@
+module Vagrant
+  module Command
+    autoload :Base,      'vagrant/command/base'
+    autoload :GroupBase, 'vagrant/command/group_base'
+    autoload :Helpers,   'vagrant/command/helpers'
+    autoload :NamedBase, 'vagrant/command/named_base'
+  end
+end
+
+# The built-in commands must always be loaded
+require 'vagrant/command/box'
+require 'vagrant/command/destroy'
+require 'vagrant/command/halt'
+require 'vagrant/command/init'
+require 'vagrant/command/package'
+require 'vagrant/command/provision'
+require 'vagrant/command/reload'
+require 'vagrant/command/resume'
+require 'vagrant/command/ssh'
+require 'vagrant/command/ssh_config'
+require 'vagrant/command/status'
+require 'vagrant/command/suspend'
+require 'vagrant/command/up'
+require 'vagrant/command/upgrade_to_060'
+require 'vagrant/command/version'

data/lib/vagrant/config.rb

@@ -1,5 +1,13 @@
 require 'vagrant/config/base'
 require 'vagrant/config/error_recorder'
+require 'vagrant/config/top'
+
+# The built-in configuration classes
+require 'vagrant/config/vagrant'
+require 'vagrant/config/ssh'
+require 'vagrant/config/nfs'
+require 'vagrant/config/vm'
+require 'vagrant/config/package'
 
 module Vagrant
   # The config class is responsible for loading Vagrant configurations, which
@@ -17,157 +25,99 @@ module Vagrant
   # class you are looking for. Loading configuration is quite easy. The following
   # example assumes `env` is already a loaded instance of {Environment}:
   #
-  #     config = Vagrant::Config.new(env)
-  #     config.queue << "/path/to/some/Vagrantfile"
-  #     result = config.load!
+  #     config = Vagrant::Config.new
+  #     config.set(:first, "/path/to/some/Vagrantfile")
+  #     config.set(:second, "/path/to/another/Vagrantfile")
+  #     config.load_order = [:first, :second]
+  #     result = config.load(env)
   #
   #     p "Your box is: #{result.vm.box}"
   #
+  # The load order determines what order the config files specified are loaded.
+  # If a key is not mentioned (for example if above the load order was set to
+  # `[:first]`, therefore `:second` was not mentioned), then that config file
+  # won't be loaded.
   class Config
-    extend Util::StackedProcRunner
-
-    @@config = nil
-
-    attr_reader :queue
-
-    class << self
-      # Resets the current loaded config object to the specified environment.
-      # This clears the proc stack and initializes a new {Top} for loading.
-      # This method shouldn't be called directly, instead use an instance of this
-      # class for config loading.
-      #
-      # @param [Environment] env
-      def reset!(env=nil)
-        @@config = nil
-        proc_stack.clear
+    # An array of symbols specifying the load order for the procs.
+    attr_accessor :load_order
+    attr_reader :procs
 
-        # Reset the configuration to the specified environment
-        config(env)
-      end
-
-      # Returns the current {Top} configuration object. While this is still
-      # here for implementation purposes, it shouldn't be called directly. Instead,
-      # use an instance of this class.
-      def config(env=nil)
-        @@config ||= Config::Top.new(env)
-      end
-
-      # Adds the given proc/block to the stack of config procs which are all
-      # run later on a single config object. This is the main way to configure
-      # Vagrant, and is how all Vagrantfiles are formatted:
-      #
-      #     Vagrant::Config.run do |config|
-      #       # ...
-      #     end
-      #
-      def run(&block)
-        push_proc(&block)
-      end
-
-      # Executes all the config procs onto the currently loaded {Top} object,
-      # and returns the final configured object. This also validates the
-      # configuration by calling {Top#validate!} on every configuration
-      # class.
-      def execute!
-        config_object ||= config
-        run_procs!(config_object)
-        config_object
-      end
+    # This is the method which is called by all Vagrantfiles to configure Vagrant.
+    # This method expects a block which accepts a single argument representing
+    # an instance of the {Config::Top} class.
+    #
+    # Note that the block is not run immediately. Instead, it's proc is stored
+    # away for execution later.
+    def self.run(&block)
+      # Store it for later
+      @last_procs ||= []
+      @last_procs << block
     end
 
-    # Initialize a {Config} object for the given {Environment}.
+    # Returns the last proc which was activated for the class via {run}. This
+    # also sets the last proc to `nil` so that calling this method multiple times
+    # will not return duplicates.
     #
-    # @param [Environment] env Environment which config object will be part
-    #   of.
-    def initialize(env)
-      @env = env
-      @queue = []
+    # @return [Proc]
+    def self.last_proc
+      value = @last_procs
+      @last_procs = nil
+      value
     end
 
-    # Loads the queue of files/procs, executes them in the proper
-    # sequence, and returns the resulting configuration object.
-    def load!
-      self.class.reset!(@env)
+    def initialize(parent=nil)
+      @procs = {}
+      @load_order = []
 
-      queue.flatten.each do |item|
-        if item.is_a?(String) && File.exist?(item)
-          begin
-            load item
-          rescue SyntaxError => e
-            # Report syntax errors in a nice way for Vagrantfiles
-            raise Errors::VagrantfileSyntaxError, :file => e.message
-          end
-        elsif item.is_a?(Proc)
-          self.class.run(&item)
-        end
+      if parent
+        # Shallow copy the procs and load order from parent if given
+        @procs = parent.procs.dup
+        @load_order = parent.load_order.dup
       end
+    end
 
-      return self.class.execute!
+    # Adds a Vagrantfile to be loaded to the queue of config procs. Note
+    # that this causes the Vagrantfile file to be loaded at this point,
+    # and it will never be loaded again.
+    def set(key, path)
+      return if @procs.has_key?(key)
+      @procs[key] = [path].flatten.map(&method(:proc_for)).flatten
     end
-  end
 
-  class Config
-    # This class is the "top" configure class, which handles registering
-    # other configuration classes as well as validation of all configured
-    # classes. This is the object which is returned by {Environment#config}
-    # and has accessors to all other configuration classes.
+    # Loads the added procs using the set `load_order` attribute and returns
+    # the {Config::Top} object result. The configuration is loaded for the
+    # given {Environment} object.
     #
-    # If you're looking to create your own configuration class, see {Base}.
-    class Top < Base
-      @@configures = {} if !defined?(@@configures)
-
-      class << self
-        # The list of registered configuration classes as well as the key
-        # they're registered under.
-        def configures_list
-          @@configures ||= {}
-        end
-
-        # Registers a configuration class with the given key. This method shouldn't
-        # be called. Instead, inherit from {Base} and call {Base.configures}.
-        def configures(key, klass)
-          configures_list[key] = klass
-          attr_reader key.to_sym
+    # @param [Environment] env
+    def load(env)
+      config = Top.new(env)
+
+      # Only run the procs specified in the load order, in the order
+      # specified.
+      load_order.each do |key|
+        if @procs[key]
+          @procs[key].each do |proc|
+            proc.call(config) if proc
+          end
         end
       end
 
-      def initialize(env=nil)
-        self.class.configures_list.each do |key, klass|
-          config = klass.new
-          config.env = env
-          config.top = self
-          instance_variable_set("@#{key}".to_sym, config)
-        end
+      config
+    end
 
-        @env = env
-      end
+    protected
 
-      # Validates the configuration classes of this instance and raises an
-      # exception if they are invalid. If you are implementing a custom configuration
-      # class, the method you want to implement is {Base#validate}. This is
-      # the method that checks all the validation, not one which defines
-      # validation rules.
-      def validate!
-        # Validate each of the configured classes and store the results into
-        # a hash.
-        errors = self.class.configures_list.inject({}) do |container, data|
-          key, _ = data
-          recorder = ErrorRecorder.new
-          send(key.to_sym).validate(recorder)
-          container[key.to_sym] = recorder if !recorder.errors.empty?
-          container
-        end
+    def proc_for(path)
+      return nil if !path
+      return path if path.is_a?(Proc)
 
-        return if errors.empty?
-        raise Errors::ConfigValidationFailed, :messages => Util::TemplateRenderer.render("config/validation_failed", :errors => errors)
+      begin
+        Kernel.load path if File.exist?(path)
+        return self.class.last_proc
+      rescue SyntaxError => e
+        # Report syntax errors in a nice way for Vagrantfiles
+        raise Errors::VagrantfileSyntaxError, :file => e.message
       end
     end
   end
 end
-
-# The built-in configuration classes
-require 'vagrant/config/vagrant'
-require 'vagrant/config/ssh'
-require 'vagrant/config/nfs'
-require 'vagrant/config/vm'
-require 'vagrant/config/package'