vagrant 0.6.3 → 0.6.4

data/CHANGELOG.md

@@ -1,6 +1,29 @@
-## 0.6.1 (September 27, 2010)
+## 0.6.4 (October 4, 2010)
 
-  - Fix issues with Ruby 1.8.7 where Vagrant simply failed.
+  - Default VM name is now properly the parent folder of the working directory
+    of the environment.
+  - Added method to `TestHelpers` to assist with testing new downloaders.
+  - `up --no-provision` works again. This disables provisioning during the
+    boot process.
+  - Action warden doesn't do recovery process on `SystemExit` exceptions,
+    allowing the double ctrl-C to work properly again. [related to GH-166]
+  - Initial Vagrantfile is now heavily commented with various available
+    options. [GH-171]
+  - Box add checks if a box already exists before the download. [GH-170]
+  - NFS no longer attempts to clean exports file if VM is not created,
+    which was causing a stack trace during recovery. [related to GH-166]
+  - Basic validation added for Chef configuration (both solo and server).
+  - Top config class is now available in all `Vagrant::Config::Base`
+    subclasses, which is useful for config validation.
+  - Subcommand help shows proper full command in task listing. [GH-168]
+  - SSH gives error message if `ssh` binary is not found. [GH-161]
+  - SSH gives proper error message if VM is not running. [GH-167]
+  - Fix some issues with undefined constants in command errors.
+
+## 0.6.1, 0.6.2, 0.6.3 (September 27, 2010)
+
+A lot of quick releases which all were to fix issues with Ruby 1.8.7
+compatibility.
 
 ## 0.6.0 (September 27, 2010)
 

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (0.6.3)
+    vagrant (0.6.4)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)

data/README.md

@@ -10,7 +10,7 @@ Vagrant is a tool for building and distributing virtualized development environm
 By providing automated creation and provisioning of virtual machines using [Oracle’s VirtualBox](http://www.virtualbox.org),
 Vagrant provides the tools to create and configure lightweight, reproducible, and portable
 virtual environments. For more information, see the part of the getting started guide
-on ”[Why Vagrant?](http://vagrantup.com/docs/getting-started/index.html)”
+on “[Why Vagrant?](http://vagrantup.com/docs/getting-started/index.html)”
 
 ## Quick Start
 

data/config/default.rb

@@ -27,7 +27,7 @@ Vagrant::Config.run do |config|
 
   config.vm.customize do |vm|
     # Make VM name the name of the containing folder by default
-    vm.name = File.basename(File.expand_path("../", Vagrant.source_root)) + "_#{Time.now.to_i}"
+    vm.name = File.basename(config.env.cwd) + "_#{Time.now.to_i}"
   end
 
   # Share the root folder. This can then be overridden by

data/keys/vagrant.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== johnbender@vagrant.local
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key

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

@@ -31,7 +31,7 @@ module Vagrant
         end
 
         def recover(env)
-          if File.directory?(box_directory)
+          if box_directory && File.directory?(box_directory)
             FileUtils.rm_rf(box_directory)
           end
         end

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

@@ -16,7 +16,6 @@ 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.env.load_box!
           end
 
           @app.call(env)

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

@@ -42,7 +42,7 @@ module Vagrant
         end
 
         def recover(env)
-          clear_nfs_exports(env)
+          clear_nfs_exports(env) if env["vm"].created?
         end
 
         # Returns the folders which are to be synced via NFS.

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

@@ -5,6 +5,7 @@ module Vagrant
         def initialize(app, env)
           @app = app
           @env = env
+          @env["provision.enabled"] = true if !@env.has_key?("provision.enabled")
 
           load_provisioner if provisioning_enabled?
         end
@@ -19,7 +20,7 @@ module Vagrant
         end
 
         def provisioning_enabled?
-          !@env["config"].vm.provisioner.nil?
+          !@env["config"].vm.provisioner.nil? && @env["provision.enabled"]
         end
 
         def load_provisioner

data/lib/vagrant/action/warden.rb

@@ -26,6 +26,10 @@ module Vagrant
           raise Errors::VagrantInterrupt.new if env.interrupted?
           @stack.unshift(@actions.shift).first.call(env)
           raise Errors::VagrantInterrupt.new if env.interrupted?
+        rescue SystemExit
+          # This means that an "exit" or "abort" was called. In these cases,
+          # we just exit immediately.
+          raise
         rescue Exception => e
           env["vagrant.error"] = e
 

data/lib/vagrant/box.rb

@@ -57,6 +57,7 @@ module Vagrant
     # method requires that `name` and `uri` be set. The logic of this method
     # is kicked out to the `box_add` registered middleware.
     def add
+      raise Errors::BoxAlreadyExists.new(:name => name) if File.directory?(directory)
       env.actions.run(:box_add, { "box" => self })
     end
 

data/lib/vagrant/command/box.rb

@@ -11,14 +11,14 @@ module Vagrant
       desc "remove NAME", "Remove a box from the system"
       def remove(name)
         b = env.boxes.find(name)
-        raise BoxNotFound.new(:name => name) if !b
+        raise Errors::BoxNotFound.new(:name => name) if !b
         b.destroy
       end
 
       desc "repackage NAME", "Repackage an installed box into a `.box` file."
       def repackage(name)
         b = env.boxes.find(name)
-        raise BoxNotFound.new(:name => name) if !b
+        raise Errors::BoxNotFound.new(:name => name) if !b
         b.repackage
       end
 

data/lib/vagrant/command/group_base.rb

@@ -87,13 +87,21 @@ module Vagrant
       # @param [String] description
       # @param [Hash] opts
       def self.register(usage, description, opts=nil)
-        CLI.register(self, Base.extract_name_from_usage(usage), usage, description, opts)
+        @_name = Base.extract_name_from_usage(usage)
+        CLI.register(self, @_name, usage, description, opts)
       end
 
       def initialize(*args)
         super
         initialize_environment(*args)
       end
+
+      protected
+
+      # Override the basename to include the subcommand name.
+      def self.basename
+        "#{super} #{@_name}"
+      end
     end
   end
 end

data/lib/vagrant/command/ssh.rb

@@ -24,14 +24,15 @@ module Vagrant
       end
 
       def ssh_connect
-        raise VMNotCreatedError.new if !ssh_vm.created?
+        raise Errors::VMNotCreatedError.new if !ssh_vm.created?
+        raise Errors::VMNotRunningError.new if !ssh_vm.vm.running?
         ssh_vm.ssh.connect
       end
 
       def ssh_vm
         @ssh_vm ||= begin
           vm = self.name.nil? && env.multivm? ? env.primary_vm : nil
-          raise MultiVMTargetRequired.new(:command => "ssh") if !vm && target_vms.length > 1
+          raise Errors::MultiVMTargetRequired.new(:command => "ssh") if !vm && target_vms.length > 1
           vm = target_vms.first if !vm
           vm
         end

data/lib/vagrant/command/ssh_config.rb

@@ -5,9 +5,9 @@ module Vagrant
       register "ssh_config", "outputs .ssh/config valid syntax for connecting to this environment via ssh"
 
       def execute
-        raise MultiVMTargetRequired.new(:command => "ssh_config") if target_vms.length > 1
+        raise Errors::MultiVMTargetRequired.new(:command => "ssh_config") if target_vms.length > 1
         vm = target_vms.first
-        raise VMNotCreatedError.new if !vm.created?
+        raise Errors::VMNotCreatedError.new if !vm.created?
 
         env.ui.info(Util::TemplateRenderer.render("ssh_config", {
           :host_key => options[:host] || "vagrant",

data/lib/vagrant/command/up.rb

@@ -5,13 +5,12 @@ module Vagrant
       register "up", "Creates the Vagrant environment"
 
       def execute
-        # TODO: Make the options[:provision] actually mean something
         target_vms.each do |vm|
           if vm.created?
             vm.env.ui.info I18n.t("vagrant.commands.up.vm_created")
-            vm.start
+            vm.start("provision.enabled" => options[:provision])
           else
-            vm.up
+            vm.up("provision.enabled" => options[:provision])
           end
         end
       end

data/lib/vagrant/config.rb

@@ -137,6 +137,7 @@ module Vagrant
         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
 

data/lib/vagrant/config/base.rb

@@ -4,8 +4,12 @@ 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
+
       # Registers a subclass with the Vagrant configuration system so
       # that it can then be used in Vagrantfiles.
       #
@@ -58,7 +62,7 @@ module Vagrant
       # Returns the instance variables as a hash of key-value pairs.
       def instance_variables_hash
         instance_variables.inject({}) do |acc, iv|
-          acc[iv.to_s[1..-1]] = instance_variable_get(iv) unless iv.to_sym == :@env
+          acc[iv.to_s[1..-1]] = instance_variable_get(iv) unless [:@env, :@top].include?(iv.to_sym)
           acc
         end
       end

data/lib/vagrant/errors.rb

@@ -243,6 +243,11 @@ module Vagrant
       error_key(:ssh_key_bad_permissions)
     end
 
+    class SSHUnavailable < VagrantError
+      status_code(45)
+      error_key(:ssh_unavailable)
+    end
+
     class SSHUnavailableWindows < VagrantError
       status_code(10)
       error_key(:ssh_unavailable_windows)
@@ -293,6 +298,11 @@ module Vagrant
       error_key(:vm_not_found)
     end
 
+    class VMNotRunningError < VagrantError
+      status_code(44)
+      error_key(:vm_not_running)
+    end
+
     class VMPowerOffToPackage < VagrantError
       status_code(24)
       error_key(:power_off, "vagrant.actions.vm.export")

data/lib/vagrant/hosts/bsd.rb

@@ -35,12 +35,15 @@ module Vagrant
 
       def nfs_cleanup
         return if !File.exist?("/etc/exports")
-        system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
 
-        if $?.to_i == 0
-          # Use sed to just strip out the block of code which was inserted
-          # by Vagrant
-          system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -i bak /etc/exports")
+        retryable(:tries => 10, :on => TypeError) do
+          system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
+
+          if $?.to_i == 0
+            # Use sed to just strip out the block of code which was inserted
+            # by Vagrant
+            system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -i bak /etc/exports")
+          end
         end
       end
     end

data/lib/vagrant/provisioners/chef.rb

@@ -125,6 +125,24 @@ module Vagrant
           result.delete("json")
           result
         end
+
+        def validate(errors)
+          if top.vm.provisioner == :chef_solo
+            # Validate chef solo settings
+            errors.add(I18n.t("vagrant.config.chef.cookbooks_path_empty")) if !cookbooks_path || [cookbooks_path].flatten.empty?
+          end
+
+          if top.vm.provisioner == :chef_server
+            # Validate chef server settings
+            errors.add(I18n.t("vagrant.config.chef.server_url_empty")) if !chef_server_url || chef_server_url.strip == ""
+            errors.add(I18n.t("vagrant.config.chef.validation_key_path")) if !validation_key_path
+          end
+
+          if [:chef_solo, :chef_server].include?(top.vm.provisioner)
+            # Validations shared by both chef solo and server
+            errors.add(I18n.t("vagrant.config.chef.run_list_empty")) if !run_list || run_list.empty?
+          end
+        end
       end
     end
   end

data/lib/vagrant/ssh.rb

@@ -26,6 +26,8 @@ module Vagrant
                                                 :ssh_port => port(opts))
       end
 
+      raise Errors::SSHUnavailable.new if !Kernel.system("which ssh > /dev/null 2>&1")
+
       options = {}
       options[:port] = port(opts)
       [:host, :username, :private_key_path].each do |param|

data/lib/vagrant/test_helpers.rb

@@ -55,6 +55,19 @@ module Vagrant
       result
     end
 
+    # Returns an instantiated downloader with a mocked tempfile
+    # which can be passed into it.
+    #
+    # @param [Class] klass The downloader class
+    # @return [Array] Returns an array of `downloader` `tempfile`
+    def vagrant_mock_downloader(klass)
+      tempfile = mock("tempfile")
+      tempfile.stubs(:write)
+
+      _, env = action_env
+      [klass.new(env), tempfile]
+    end
+
     # Returns a blank app (callable) and action environment with the
     # given vagrant environment. This allows for testing of middlewares.
     def action_env(v_env = nil)

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/vagrant/vm.rb

@@ -115,11 +115,11 @@ module Vagrant
       env.actions.run(:up, options)
     end
 
-    def start
+    def start(options=nil)
       return if @vm.running?
       return resume if @vm.saved?
 
-      env.actions.run(:start)
+      env.actions.run(:start, options)
     end
 
     def halt(options=nil)

data/templates/commands/init/Vagrantfile.erb

@@ -1,13 +1,51 @@
 Vagrant::Config.run do |config|
-  # All Vagrant configuration is done here. For a detailed explanation
-  # and listing of configuration options, please view the documentation
-  # online.
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "<%= box_name %>"
-  <% if !box_url.nil? %>
 
   # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system
-  config.vm.box_url = "<%= box_url %>"<% end %>
+  # doesn't already exist on the user's system.
+  <% if box_url.nil? %># <% end %>config.vm.box_url = "<%= box_url || "http://domain.com/path/to/above.box" %>"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host only network IP, allowing you to access it
+  # via the IP.
+  # config.vm.network "33.33.33.10"
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port "http", 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data")
+
+  # Enable provisioning with chef solo, specifying a cookbooks path (relative
+  # to this Vagrantfile), and adding some recipes and/or roles.
+  #
+  # config.vm.provisioner = :chef_solo
+  # config.chef.cookbooks_path = "cookbooks"
+  # config.chef.add_recipe "mysql"
+  # config.chef.add_role "web"
+  #
+  # You may also specify custom JSON attributes:
+  # config.chef.json = { :mysql_password => "foo" }
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # config.vm.provisioner = :chef_server
+  # config.chef.chef_server_url = "http://api.opscode.com/organizations/organization"
+  # config.chef.validation_key_path = "kiip-validator.pem"
+  #
+  # If you're using the OpsCode platform, you'll have to set this as well.
+  # If you're using your own chef server, you may have to set it, but it depends
+  # on how your Chef server is configured.
+  # config.chef.validation_client_name = "organization-validator"
 end

data/templates/locales/en.yml

@@ -43,6 +43,7 @@ en:
         permissions on the following file to 0600 and then try running this command again:
 
         %{key_path}
+      ssh_unavailable: "`ssh` binary could not be found. Is an SSH client installed?"
       ssh_unavailable_windows: |-
         `vagrant ssh` isn't available on the Windows platform. The
         vagrant.ppk file for use with Putty is available at:
@@ -88,8 +89,9 @@ en:
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently
         requires VirtualBox 3.2.x. Please install the proper version to continue.
-      vm_creation_required: VM must be created before running this command. Run `vagrant up` first.
-      vm_not_found: A VM by the name of %{name} was not found.
+      vm_creation_required: "VM must be created before running this command. Run `vagrant up` first."
+      vm_not_found: "A VM by the name of %{name} was not found."
+      vm_not_running: "VM must be running to open SSH connection."
 
 #-------------------------------------------------------------------------------
 # Translations for config validation errors
@@ -97,6 +99,11 @@ en:
     config:
       common:
         error_empty: `%{field}` must be filled in.
+      chef:
+        run_list_empty: "Run list must not be empty."
+        cookbooks_path_empty: "Must specify a cookbooks path for chef solo."
+        server_url_empty: "Chef server URL must be populated."
+        validation_key_path: "Validation key path must be valid path to your chef server validation key."
       ssh:
         private_key_missing: "`private_key_path` file must exist: %{path}"
       vm:

data/test/test_helper.rb

@@ -22,23 +22,5 @@ I18n.load_path << File.expand_path("../locales/en.yml", __FILE__)
 
 class Test::Unit::TestCase
   include Vagrant::TestHelpers
-
-  # Sets up the mocks for a VM
-  def mock_vm(env=nil)
-    env ||= vagrant_env
-    vm = Vagrant::VM.new
-    vm.stubs(:env).returns(env)
-    vm.stubs(:ssh).returns(Vagrant::SSH.new(vm.env))
-    vm
-  end
-
-  # Sets up the mocks and stubs for a downloader
-  def mock_downloader(downloader_klass)
-    tempfile = mock("tempfile")
-    tempfile.stubs(:write)
-
-    _, env = action_env
-    [downloader_klass.new(env), tempfile]
-  end
 end
 

data/test/vagrant/action/box/unpackage_test.rb

@@ -26,6 +26,13 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
       FileUtils.stubs(:rm_rf)
     end
 
+    should "do nothing if box directory is not set" do
+      @instance.stubs(:box_directory).returns(nil)
+      File.expects(:directory?).never
+      FileUtils.expects(:rm_rf).never
+      @instance.recover(nil)
+    end
+
     should "do nothing if not a directory" do
       FileUtils.expects(:rm_rf).never
       @instance.recover(nil)

data/test/vagrant/action/vm/check_box_test.rb

@@ -47,7 +47,6 @@ class CheckBoxVMActionTest < Test::Unit::TestCase
       seq = sequence("seq")
       env.env.boxes.expects(:find).returns(nil)
       Vagrant::Box.expects(:add).with(env.env, env["config"].vm.box, env["config"].vm.box_url).in_sequence(seq)
-      env.env.expects(:load_box!).in_sequence(seq)
       app.expects(:call).with(env).once.in_sequence(seq)
 
       assert_nothing_raised {

data/test/vagrant/action/vm/nfs_test.rb

@@ -68,10 +68,20 @@ class NFSVMActionTest < Test::Unit::TestCase
     end
 
     context "recovery" do
+      setup do
+        @vm.stubs(:created?).returns(true)
+      end
+
       should "clear NFS exports" do
         @instance.expects(:clear_nfs_exports).with(@env).once
         @instance.recover(@env)
       end
+
+      should "do nothing if VM is not created" do
+        @vm.stubs(:created?).returns(false)
+        @instance.expects(:clear_nfs_exports).never
+        @instance.recover(@env)
+      end
     end
 
     context "extracting folders" do

data/test/vagrant/action/vm/provision_test.rb

@@ -31,6 +31,12 @@ class ProvisionVMActionTest < Test::Unit::TestCase
       @klass.any_instance.expects(:load_provisioner).never
       @klass.new(@app, @env)
     end
+
+    should "not load provisioner if disabled through env hash" do
+      @env["provision.enabled"] = false
+      @klass.any_instance.expects(:load_provisioner).never
+      @klass.new(@app, @env)
+    end
   end
 
   context "with an instance" do
@@ -122,6 +128,14 @@ class ProvisionVMActionTest < Test::Unit::TestCase
 
         @instance.call(@env)
       end
+
+      should "continue chain and not provision if not enabled through env hash" do
+        @env["provision.enabled"] = false
+        @prov.expects(:provision!).never
+        @app.expects(:call).with(@env).once
+
+        @instance.call(@env)
+      end
     end
   end
 end

data/test/vagrant/action/warden_test.rb

@@ -70,6 +70,20 @@ class ActionWardenTest < Test::Unit::TestCase
       assert_raises(RuntimeError) { @instance.call(new_env) }
     end
 
+    should "not begin recovery sequence if a SystemExit is raised" do
+      class Foo
+        def initialize(*args); end
+        def call(env)
+          # Raises a system exit
+          abort
+        end
+      end
+
+      @instance.actions << Foo.new
+      @instance.expects(:begin_rescue).never
+      assert_raises(SystemExit) { @instance.call(new_env) }
+    end
+
     should "raise interrupt if the environment is interupted" do
       env = new_env
       env.expects(:interrupted?).returns(true)

data/test/vagrant/box_test.rb

@@ -27,6 +27,14 @@ class BoxTest < Test::Unit::TestCase
       @box = Vagrant::Box.new(vagrant_env, "foo")
     end
 
+    should "raise an exception if a box exists with the name we're attempting to add" do
+      vagrant_box(@box.name)
+
+      assert_raises(Vagrant::Errors::BoxAlreadyExists) {
+        @box.add
+      }
+    end
+
     should "execute the Add action when add is called" do
       @box.env.actions.expects(:run).with(:box_add, { "box" => @box })
       @box.add

data/test/vagrant/config/base_test.rb

@@ -47,6 +47,12 @@ class ConfigBaseTest < Test::Unit::TestCase
         hash = @base.instance_variables_hash
         assert !hash.has_key?(:env)
       end
+
+      should "not include top in the JSON hash" do
+        @base.top = "FOO"
+        hash = @base.instance_variables_hash
+        assert !hash.has_key?(:top)
+      end
     end
   end
 end

data/test/vagrant/config/vagrant_test.rb

@@ -6,6 +6,38 @@ class ConfigVagrantTest < Test::Unit::TestCase
   end
 
   context "validation" do
-    # TODO
+    setup do
+      @config.dotfile_name = "foo"
+      @config.home = "foo"
+      @config.host = "foo"
+
+      @errors = Vagrant::Config::ErrorRecorder.new
+    end
+
+    should "be valid with given set of values" do
+      @config.validate(@errors)
+      assert @errors.errors.empty?
+    end
+
+    should "be invalid with no dotfile" do
+      @config.dotfile_name = nil
+
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid with no home" do
+      @config.home = nil
+
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid with no host" do
+      @config.host = nil
+
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
   end
 end

data/test/vagrant/config_test.rb

@@ -167,6 +167,10 @@ class ConfigTest < Test::Unit::TestCase
           klass = mock("klass#{i}")
           instance = mock("instance#{i}")
           instance.expects(:env=).with(env)
+          instance.expects(:top=).with() do |top|
+            assert top.is_a?(@klass::Top)
+            true
+          end
           klass.expects(:new).returns(instance)
           @configures_list[key] = klass
         end
@@ -179,6 +183,7 @@ class ConfigTest < Test::Unit::TestCase
         klass = mock("klass")
         instance = mock("instance")
         instance.stubs(:env=)
+        instance.stubs(:top=)
         klass.expects(:new).returns(instance)
         @klass::Top.configures(key, klass)
 

data/test/vagrant/downloaders/file_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class FileDownloaderTest < Test::Unit::TestCase
   setup do
-    @downloader, @tempfile = mock_downloader(Vagrant::Downloaders::File)
+    @downloader, @tempfile = vagrant_mock_downloader(Vagrant::Downloaders::File)
     @uri = "foo.box"
   end
 

data/test/vagrant/downloaders/http_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class HttpDownloaderTest < Test::Unit::TestCase
   setup do
-    @downloader, @tempfile = mock_downloader(Vagrant::Downloaders::HTTP)
+    @downloader, @tempfile = vagrant_mock_downloader(Vagrant::Downloaders::HTTP)
     @downloader.stubs(:report_progress)
     @downloader.stubs(:complete_progress)
     @uri = "http://google.com/"

data/test/vagrant/provisioners/chef_server_test.rb

@@ -2,8 +2,7 @@ require "test_helper"
 
 class ChefServerProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(vagrant_env)
-    @action_env.env.vm = mock_vm
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
     @action = Vagrant::Provisioners::ChefServer.new(@action_env)
     @env = @action.env

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -2,8 +2,7 @@ require "test_helper"
 
 class ChefSoloProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(vagrant_env)
-    @action_env.env.vm = mock_vm
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
     @action = Vagrant::Provisioners::ChefSolo.new(@action_env)
     @env = @action.env

data/test/vagrant/provisioners/chef_test.rb

@@ -2,8 +2,7 @@ require "test_helper"
 
 class ChefProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(vagrant_env)
-    @action_env.env.vm = mock_vm
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
     @action = Vagrant::Provisioners::Chef.new(@action_env)
     @env = @action.env
@@ -21,7 +20,6 @@ class ChefProvisionerTest < Test::Unit::TestCase
   context "config" do
     setup do
       @config = Vagrant::Provisioners::Chef::ChefConfig.new
-      @config.run_list.clear
     end
 
     should "not include the 'json' key in the config dump" do
@@ -44,6 +42,10 @@ class ChefProvisionerTest < Test::Unit::TestCase
       }
     end
 
+    should "have an empty run list to begin with" do
+      assert @config.run_list.empty?
+    end
+
     should "add a recipe to the run list" do
       @config.add_recipe("foo")
       assert_equal "recipe[foo]", @config.run_list[0]
@@ -63,6 +65,74 @@ class ChefProvisionerTest < Test::Unit::TestCase
       @config.add_role("role[user]")
       assert_equal "role[user]", @config.run_list[0]
     end
+
+    context "validation" do
+      setup do
+        @errors = Vagrant::Config::ErrorRecorder.new
+        @top = @config.top = Vagrant::Config::Top.new(@env)
+      end
+
+      context "chef solo" do
+        setup do
+          @top.vm.provisioner = :chef_solo
+
+          @config.run_list = ["foo"]
+          @config.cookbooks_path = "cookbooks"
+        end
+
+        should "be valid if provisioner is not chef solo" do
+          @top.vm.provisioner = nil
+          @config.validate(@errors)
+          assert @errors.errors.empty?
+        end
+
+        should "be invalid if run list is empty" do
+          @config.run_list = []
+          @config.validate(@errors)
+          assert !@errors.errors.empty?
+        end
+
+        should "be invalid if cookbooks path is empty" do
+          @config.cookbooks_path = nil
+          @config.validate(@errors)
+          assert !@errors.errors.empty?
+        end
+      end
+
+      context "chef server" do
+        setup do
+          @top.vm.provisioner = :chef_server
+
+          @config.run_list = ["foo"]
+          @config.chef_server_url = "foo"
+          @config.validation_key_path = "foo"
+        end
+
+        should "be valid if provisioner is not chef solo" do
+          @top.vm.provisioner = nil
+          @config.validate(@errors)
+          assert @errors.errors.empty?
+        end
+
+        should "be invalid if run list is empty" do
+          @config.run_list = []
+          @config.validate(@errors)
+          assert !@errors.errors.empty?
+        end
+
+        should "be invalid if run list is empty" do
+          @config.chef_server_url = nil
+          @config.validate(@errors)
+          assert !@errors.errors.empty?
+        end
+
+        should "be invalid if run list is empty" do
+          @config.validation_key_path = nil
+          @config.validate(@errors)
+          assert !@errors.errors.empty?
+        end
+      end
+    end
   end
 
   context "verifying binary" do
@@ -77,6 +147,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
       @action.verify_binary(binary)
     end
   end
+
   context "permissions on provisioning folder" do
     should "create and chown the folder to the ssh user" do
       ssh_seq = sequence("ssh_seq")

data/test/vagrant/ssh_test.rb

@@ -2,12 +2,10 @@ require "test_helper"
 
 class SshTest < Test::Unit::TestCase
   def mock_ssh
-    @env = vagrant_env
+    @env = vagrant_env.vms[:default].env
     @network_adapters = []
     @vm = mock("vm")
     @vm.stubs(:network_adapters).returns(@network_adapters)
-
-    @env.stubs(:vm).returns(mock_vm(@env))
     @env.vm.stubs(:vm).returns(@vm)
 
     @ssh = Vagrant::SSH.new(@env)
@@ -22,10 +20,23 @@ class SshTest < Test::Unit::TestCase
       mock_ssh
       @ssh.stubs(:check_key_permissions)
       Kernel.stubs(:exec)
+      Kernel.stubs(:system).returns(true)
 
       Vagrant::Util::Platform.stubs(:leopard?).returns(false)
     end
 
+    should "raise an exception if SSH is not found" do
+      Kernel.stubs(:system).returns(false)
+      Kernel.expects(:system).returns(false).with() do |command|
+        assert command =~ /^which ssh/
+        true
+      end
+
+      assert_raises(Vagrant::Errors::SSHUnavailable) {
+        @ssh.connect
+      }
+    end
+
     should "check key permissions prior to exec" do
       exec_seq = sequence("exec_seq")
       @ssh.expects(:check_key_permissions).with(@env.config.ssh.private_key_path).once.in_sequence(exec_seq)

data/test/vagrant/vm_test.rb

@@ -3,8 +3,6 @@ require "test_helper"
 class VMTest < Test::Unit::TestCase
   setup do
     @env = vagrant_env
-
-    Net::SSH.stubs(:start)
   end
 
   context "finding a VM" do
@@ -177,6 +175,11 @@ class VMTest < Test::Unit::TestCase
         @vm.env.actions.expects(:run).with(:up, nil).once
         @vm.up
       end
+
+      should "forward options to the action sequence" do
+        @vm.env.actions.expects(:run).with(:up, :foo => :bar).once
+        @vm.up(:foo => :bar)
+      end
     end
 
     context "halting" do
@@ -236,14 +239,19 @@ class VMTest < Test::Unit::TestCase
       should "execute the resume action if saved" do
         @mock_vm.expects(:saved?).returns(true)
         @vm.expects(:resume).once
-        @vm.env.actions.expects(:run).with(:start).never
+        @vm.env.actions.expects(:run).with(:start, nil).never
         @vm.start
       end
 
       should "execute the start action" do
-        @vm.env.actions.expects(:run).with(:start).once
+        @vm.env.actions.expects(:run).with(:start, nil).once
         @vm.start
       end
+
+      should "forward options to the action sequence" do
+        @vm.env.actions.expects(:run).with(:start, :foo => :bar).once
+        @vm.start(:foo => :bar)
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,218 +15,205 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 -07:00
+date: 2010-10-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: archive-tar-minitar
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 5
         - 2
         version: 0.5.2
-  requirement: *id001
   type: :runtime
-  name: archive-tar-minitar
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: erubis
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 2
         - 6
         - 6
         version: 2.6.6
-  requirement: *id002
   type: :runtime
-  name: erubis
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: json
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 4
         - 6
         version: 1.4.6
-  requirement: *id003
   type: :runtime
-  name: json
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: mario
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 0
         - 6
         version: 0.0.6
-  requirement: *id004
   type: :runtime
-  name: mario
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: net-ssh
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 2
         - 0
         - 23
         version: 2.0.23
-  requirement: *id005
   type: :runtime
-  name: net-ssh
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: net-scp
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 0
         - 3
         version: 1.0.3
-  requirement: *id006
   type: :runtime
-  name: net-scp
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: i18n
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 4
         - 1
         version: 0.4.1
-  requirement: *id007
   type: :runtime
-  name: i18n
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: thor
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 0
         - 14
         - 2
         version: 0.14.2
-  requirement: *id008
   type: :runtime
-  name: thor
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: virtualbox
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
         - 3
         version: 0.7.3
-  requirement: *id009
   type: :runtime
-  name: virtualbox
   prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id010
   type: :development
-  name: rake
   prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: contest
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 1
         - 2
         version: 0.1.2
-  requirement: *id011
   type: :development
-  name: contest
   prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: mocha
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id012
   type: :development
-  name: mocha
   prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  name: ruby-debug
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id013
   type: :development
-  name: ruby-debug
   prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  name: bundler
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424057
         segments: 
         - 1
         - 0
@@ -235,10 +221,9 @@ dependencies:
         - rc
         - 6
         version: 1.0.0.rc.6
-  requirement: *id014
   type: :development
-  name: bundler
   prerelease: false
+  version_requirements: *id014
 description: Vagrant is a tool for building and distributing virtualized development environments.
 email: 
 - mitchell.hashimoto@gmail.com
@@ -366,7 +351,6 @@ files:
 - lib/vagrant/util/template_renderer.rb
 - lib/vagrant/version.rb
 - lib/vagrant/vm.rb
-- templates/Vagrantfile.erb
 - templates/chef_server_client.erb
 - templates/chef_solo_solo.erb
 - templates/commands/init/Vagrantfile.erb
@@ -471,7 +455,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4185578386053162887
       segments: 
       - 0
       version: "0"
@@ -480,7 +464,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3

data/templates/Vagrantfile.erb

@@ -1,14 +0,0 @@
-Vagrant::Config.run do |config|
-  # All Vagrant configuration is done here. For a detailed explanation
-  # and listing of configuration options, please view the documentation
-  # online.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "<%= default_box %>"
-  <% if !default_box_url.nil? -%>
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system
-  config.vm.box_url = "<%= default_box_url %>"
-  <% end -%>
-end