vagrant 0.7.0.beta → 0.7.0.beta2

data/lib/vagrant/config/base.rb

@@ -4,9 +4,6 @@ module Vagrant
     # basic things such as the environment instance variable which all
     # config classes need as well as a basic `to_json` implementation.
     class Base
-      # {Environment} that this config belongs to
-      attr_accessor :env
-
       # {Top} of this configuration stack
       attr_accessor :top
 
@@ -32,6 +29,23 @@ module Vagrant
         end
       end
 
+      # A helper to access the environment that this configuration is for.
+      # This is obtained by getting the env from the {Top}.
+      #
+      # @return [Vagrant::Envrionment]
+      def env
+        top.env
+      end
+
+      # Allows setting options from a hash. By default this simply calls
+      # the `#{key}=` method on the config class with the value, which is
+      # the expected behavior most of the time.
+      def set_options(options)
+        options.each do |key, value|
+          send("#{key}=", value)
+        end
+      end
+
       # Called by {Top} after the configuration is loaded to validate
       # the configuaration objects. Subclasses should implement this
       # method and add any errors to the `errors` object given.

data/lib/vagrant/config/ssh.rb

@@ -11,6 +11,7 @@ module Vagrant
       attr_accessor :timeout
       attr_writer :private_key_path
       attr_accessor :forward_agent
+      attr_accessor :forward_x11
 
       def private_key_path
         File.expand_path(@private_key_path, env.root_path)

data/lib/vagrant/config/top.rb

@@ -0,0 +1,61 @@
+module Vagrant
+  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.
+    #
+    # If you're looking to create your own configuration class, see {Base}.
+    class Top < Base
+      @@configures = {} if !defined?(@@configures)
+
+      # The environment that this configuration is for.
+      attr_reader :env
+
+      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
+        end
+      end
+
+      def initialize(env=nil)
+        self.class.configures_list.each do |key, klass|
+          config = klass.new
+          config.top = self
+          instance_variable_set("@#{key}".to_sym, config)
+        end
+
+        @env = env
+      end
+
+      # 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
+
+        return if errors.empty?
+        raise Errors::ConfigValidationFailed, :messages => Util::TemplateRenderer.render("config/validation_failed", :errors => errors)
+      end
+    end
+  end
+end

data/lib/vagrant/config/vagrant.rb

@@ -4,15 +4,10 @@ module Vagrant
       configures :vagrant
 
       attr_accessor :dotfile_name
-      attr_accessor :home
       attr_accessor :host
 
-      def initialize
-        @home = nil
-      end
-
       def validate(errors)
-        [:dotfile_name, :home, :host].each do |field|
+        [:dotfile_name, :host].each do |field|
           errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)
         end
       end

data/lib/vagrant/config/vm.rb

@@ -1,3 +1,6 @@
+require 'vagrant/config/vm/sub_vm'
+require 'vagrant/config/vm/provisioner'
+
 module Vagrant
   class Config
     class VMConfig < Base
@@ -14,28 +17,17 @@ module Vagrant
       attr_reader :forwarded_ports
       attr_reader :shared_folders
       attr_reader :network_options
-      attr_reader :hd_location
+      attr_reader :provisioners
       attr_accessor :disk_image_format
-      attr_accessor :provisioner
       attr_writer :shared_folder_uid
       attr_writer :shared_folder_gid
       attr_accessor :system
 
-      # Represents a SubVM. This class is only used here in the VMs
-      # hash.
-      class SubVM
-        include Util::StackedProcRunner
-
-        def options
-          @options ||= {}
-        end
-      end
-
       def initialize
         @forwarded_ports = {}
         @shared_folders = {}
-        @provisioner = nil
         @network_options = []
+        @provisioners = []
       end
 
       def forward_port(name, guestport, hostport, options=nil)
@@ -68,6 +60,17 @@ module Vagrant
         @network_options[options[:adapter]] = options
       end
 
+      def provision(name, options=nil, &block)
+        @provisioners << Provisioner.new(top, name, options, &block)
+      end
+
+      # This shows an error message to smooth the transition for the
+      # backwards incompatible provisioner syntax change introduced
+      # in Vagrant 0.7.0.
+      def provisioner=(_value)
+        raise Errors::VagrantError, :_key => :provisioner_equals_not_supported
+      end
+
       def shared_folder_uid
         @shared_folder_uid || env.config.ssh.username
       end
@@ -95,14 +98,25 @@ module Vagrant
       end
 
       def define(name, options=nil, &block)
+        name = name.to_sym
         options ||= {}
+
+        # Add the name to the array of VM keys. This array is used to
+        # preserve the order in which VMs are defined.
         defined_vm_keys << name
-        defined_vms[name.to_sym] ||= SubVM.new
-        defined_vms[name.to_sym].options.merge!(options)
-        defined_vms[name.to_sym].push_proc(&block)
+
+        # Add the SubVM to the hash of defined VMs
+        defined_vms[name] ||= SubVM.new
+        defined_vms[name].options.merge!(options)
+        defined_vms[name].push_proc(&block)
       end
 
       def validate(errors)
+        errors.add(I18n.t("vagrant.config.vm.box_missing")) if !box
+        errors.add(I18n.t("vagrant.config.vm.box_not_found", :name => box)) if box && !box_url && !env.box
+        errors.add(I18n.t("vagrant.config.vm.boot_mode_invalid")) if ![:vrdp, :gui].include?(boot_mode.to_sym)
+        errors.add(I18n.t("vagrant.config.vm.base_mac_invalid")) if env.box && !base_mac
+
         shared_folders.each do |name, options|
           if !File.directory?(File.expand_path(options[:hostpath].to_s, env.root_path))
             errors.add(I18n.t("vagrant.config.vm.shared_folder_hostpath_missing",
@@ -111,10 +125,10 @@ module Vagrant
           end
         end
 
-        errors.add(I18n.t("vagrant.config.vm.box_missing")) if !box
-        errors.add(I18n.t("vagrant.config.vm.box_not_found", :name => box)) if box && !box_url && !env.box
-        errors.add(I18n.t("vagrant.config.vm.boot_mode_invalid")) if ![:vrdp, :gui].include?(boot_mode.to_sym)
-        errors.add(I18n.t("vagrant.config.vm.base_mac_invalid")) if env.box && !base_mac
+        # Each provisioner can validate itself
+        provisioners.each do |prov|
+          prov.validate(errors)
+        end
       end
     end
   end

data/lib/vagrant/config/vm/provisioner.rb

@@ -0,0 +1,56 @@
+module Vagrant
+  class Config
+    class VMConfig < Base
+      # Represents a single configured provisioner for a VM.
+      class Provisioner
+        attr_reader :top
+        attr_reader :shortcut
+        attr_reader :provisioner
+        attr_reader :config
+
+        def initialize(top, shortcut, options=nil, &block)
+          @top = top
+          @shortcut = shortcut
+          @provisioner = shortcut
+          @provisioner = Provisioners::Base.registered[shortcut] if shortcut.is_a?(Symbol)
+          @config = nil
+
+          configure(options, &block)
+        end
+
+        # Configures the provisioner if it can (if it is valid).
+        def configure(options=nil, &block)
+          # We don't want ancestors to be searched. This is the default in 1.8,
+          # but not in 1.9, hence this hackery.
+          const_args = ["Config"]
+          const_args << false if RUBY_VERSION >= "1.9"
+
+          # We assume that every provisioner has a `Config` class beneath
+          # it for configuring.
+          return if !@provisioner || !@provisioner.const_defined?(*const_args)
+
+          # Instantiate the config class and configure it
+          @config = @provisioner.const_get(*const_args).new
+          @config.top = top
+          @config.set_options(options) if options
+          block.call(@config) if block
+        end
+
+        def validate(errors)
+          if !provisioner
+            # If we don't have a provisioner then the whole thing is invalid.
+            errors.add(I18n.t("vagrant.config.vm.provisioner_not_found", :shortcut => shortcut))
+            return
+          end
+
+          if !(provisioner <= Provisioners::Base)
+            errors.add(I18n.t("vagrant.config.vm.provisioner_invalid_class", :shortcut => shortcut))
+          end
+
+          # Pass on validation to the provisioner config
+          config.validate(errors) if config
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/config/vm/sub_vm.rb

@@ -0,0 +1,17 @@
+module Vagrant
+  class Config
+    class VMConfig < Base
+      # Represents a single sub-VM in a multi-VM environment.
+      class SubVM
+        include Util::StackedProcRunner
+
+        attr_reader :options
+
+        def initialize
+          @options = {}
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant/downloaders.rb

@@ -0,0 +1,7 @@
+module Vagrant
+  module Downloaders
+    autoload :Base, 'vagrant/downloaders/base'
+    autoload :File, 'vagrant/downloaders/file'
+    autoload :HTTP, 'vagrant/downloaders/http'
+  end
+end

data/lib/vagrant/downloaders/file.rb

@@ -14,6 +14,7 @@ module Vagrant
       end
 
       def download!(source_url, destination_file)
+        env.ui.info I18n.t("vagrant.downloaders.file.download")
         FileUtils.cp(source_url, destination_file.path)
       end
     end

data/lib/vagrant/downloaders/http.rb

@@ -25,7 +25,16 @@ module Vagrant
         end
 
         http.start do |h|
+          env.ui.info I18n.t("vagrant.downloaders.http.download", :url => source_url)
+
           h.request_get(uri.request_uri) do |response|
+            if response.is_a?(Net::HTTPRedirection)
+              # Follow the HTTP redirect.
+              # TODO: Error on some redirect limit
+              download!(response["Location"], destination_file)
+              return
+            end
+
             total = response.content_length
             progress = 0
             segment_count = 0

data/lib/vagrant/environment.rb

@@ -9,6 +9,7 @@ module Vagrant
     ROOTFILE_NAME = "Vagrantfile"
     HOME_SUBDIRS = ["tmp", "boxes", "logs"]
     DEFAULT_VM = :default
+    DEFAULT_HOME = "~/.vagrant"
 
     # Parent environment (in the case of multi-VMs)
     attr_reader :parent
@@ -23,6 +24,9 @@ module Vagrant
     # The {UI} object to communicate with the outside world.
     attr_writer :ui
 
+    # The {Config} object representing the Vagrantfile loader
+    attr_reader :config_loader
+
     #---------------------------------------------------------------
     # Class Methods
     #---------------------------------------------------------------
@@ -33,7 +37,6 @@ module Vagrant
         version = VirtualBox.version
         raise Errors::VirtualBoxNotDetected if version.nil?
         raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 4.0
-        raise Errors::VirtualBoxInvalidOSE, :version => version.to_s if version.to_s.downcase.include?("ose")
       rescue Errors::VirtualBoxNotDetected
         # On 64-bit Windows, show a special error. This error is a subclass
         # of VirtualBoxNotDetected, so libraries which use Vagrant can just
@@ -79,12 +82,11 @@ module Vagrant
       root_path.join(config.vagrant.dotfile_name) rescue nil
     end
 
-    # The path to the home directory, expanded relative to the root path,
-    # and converted into a Pathname object.
+    # The path to the home directory and converted into a Pathname object.
     #
     # @return [Pathname]
     def home_path
-      @_home_path ||= Pathname.new(File.expand_path(config.vagrant.home, root_path))
+      @_home_path ||= Pathname.new(File.expand_path(ENV["VAGRANT_HOME"] || DEFAULT_HOME))
     end
 
     # The path to the Vagrant tmp directory
@@ -114,7 +116,8 @@ module Vagrant
     #
     # @return [String]
     def resource
-      vm.name rescue "vagrant"
+      result = vm.name rescue nil
+      result || "vagrant"
     end
 
     # Returns the collection of boxes for the environment.
@@ -146,7 +149,7 @@ module Vagrant
     #
     # @return [Array<VM>]
     def vms_ordered
-      @vms_enum ||= config.vm.defined_vm_keys.map {|name| @vms[name]}
+      @vms_enum ||= config.vm.defined_vm_keys.map { |name| @vms[name] }
     end
 
     # Returns the primary VM associated with this environment. This
@@ -305,6 +308,14 @@ module Vagrant
       self
     end
 
+    # Reloads the configuration of this environment.
+    def reload_config!
+      @config = nil
+      @config_loader = nil
+      load_config!
+      self
+    end
+
     # Loads this environment's configuration and stores it in the {#config}
     # variable. The configuration loaded by this method is specified to
     # this environment, meaning that it will use the given root directory
@@ -313,22 +324,23 @@ module Vagrant
       first_run = @config.nil?
 
       # First load the initial, non config-dependent Vagrantfiles
-      loader = Config.new(self)
-      loader.queue << File.expand_path("config/default.rb", Vagrant.source_root)
-      loader.queue << File.join(box.directory, ROOTFILE_NAME) if !first_run && box
-      loader.queue << File.join(home_path, ROOTFILE_NAME) if !first_run && home_path
-      loader.queue << File.join(root_path, ROOTFILE_NAME) if root_path
+      @config_loader ||= Config.new(parent ? parent.config_loader : nil)
+      @config_loader.load_order = [:default, :box, :home, :root, :sub_vm]
+      @config_loader.set(:default, File.expand_path("config/default.rb", Vagrant.source_root))
+      @config_loader.set(:box, File.join(box.directory, ROOTFILE_NAME)) if !first_run && vm && box
+      @config_loader.set(:home, File.join(home_path, ROOTFILE_NAME)) if !first_run && home_path
+      @config_loader.set(:root, File.join(root_path, ROOTFILE_NAME)) if root_path
 
       # If this environment is representing a sub-VM, then we push that
       # proc on as the last configuration.
       if vm
         subvm = parent.config.vm.defined_vms[vm.name]
-        loader.queue << subvm.proc_stack if subvm
+        @config_loader.set(:sub_vm, subvm.proc_stack) if subvm
       end
 
       # Execute the configuration stack and store the result as the final
       # value in the config ivar.
-      @config = loader.load!
+      @config = @config_loader.load(self)
 
       # (re)load the logger
       @logger = nil

data/lib/vagrant/errors.rb

@@ -230,16 +230,6 @@ module Vagrant
       error_key(:dotfile_error, "vagrant.actions.vm.persist")
     end
 
-    class ProvisionInvalidClass < VagrantError
-      status_code(35)
-      error_key(:invalid_class, "vagrant.actions.vm.provision")
-    end
-
-    class ProvisionUnknownType < VagrantError
-      status_code(36)
-      error_key(:unknown_type, "vagrant.actions.vm.provision")
-    end
-
     class SSHAuthenticationFailed < VagrantError
       status_code(11)
       error_key(:ssh_authentication_failed)
@@ -275,11 +265,6 @@ module Vagrant
       error_key(:vagrantfile_syntax_error)
     end
 
-    class VirtualBoxInvalidOSE < VagrantError
-      status_code(9)
-      error_key(:virtualbox_invalid_ose)
-    end
-
     class VirtualBoxInvalidVersion < VagrantError
       status_code(17)
       error_key(:virtualbox_invalid_version)