vagrantup 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c70a3a83837519484b826e25dbc7e75612709d
-  data.tar.gz: 5cef9d5ebf2aadf320fb54b3935a03601f9b6a9f
+  metadata.gz: 42d712d36ea2a82c44438f1834b8070b0a74865c
+  data.tar.gz: 0de1b39127ac575572f8fc91a8b70532e50ae1fe
 SHA512:
-  metadata.gz: f6f3b491899e2e7206dba1839917770c29ec468ac1c90f6b34295bdc8b4d520413d00649e80dc1333066112638b864a363f531aeae757c5a2d6b358fcef71b47
-  data.tar.gz: 069cb53688281e704c5913104c7e6236896786b8a84f070fe58c6161b13ab58da669d72ddecbe3e5d07790308617727cc0931fceb561f440f1f2704e10a22e59
+  metadata.gz: 58be730f65e731dfc6c829c726e083d7170adffeb0841adcbe3bb1b778a30164c693a237a415629fa63b4c40c9165a8f0250c1f9606394216b7ede3444554128
+  data.tar.gz: f8c4f21482b350456e8cecd52568b935087ebc4fdd274b80e951deb3d079ec0ce05f8ea54e8a3b9c8edd800f9a7a76f473f5ebd233516f59daccb35901d816f6

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/config/default.rb

@@ -9,6 +9,7 @@ Vagrant::Config.run do |config|
   config.ssh.host = "localhost"
   config.ssh.forwarded_port_key = "ssh"
   config.ssh.max_tries = 10
+  config.ssh.timeout = 10
 
   config.vm.box_ovf = "box.ovf"
   config.vm.base_mac = "0800279C2E42"

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

@@ -0,0 +1,50 @@
+module Vagrant
+  module Actions
+    module VM
+      class Boot < Base
+        def execute!
+          @runner.invoke_around_callback(:boot) do
+            # Startup the VM
+            boot
+
+            # Wait for it to complete booting, or error if we could
+            # never detect it booted up successfully
+            if !wait_for_boot
+              error_and_exit(<<-error)
+Failed to connect to VM! Failed to boot?
+error
+            end
+          end
+        end
+
+        def collect_shared_folders
+          # The root shared folder for the project
+          ["vagrant-root", Env.root_path, Vagrant.config.vm.project_directory]
+        end
+
+        def boot
+          logger.info "Booting VM..."
+          @runner.vm.start(:headless, true)
+        end
+
+        def wait_for_boot(sleeptime=5)
+          logger.info "Waiting for VM to boot..."
+
+          Vagrant.config[:ssh][:max_tries].to_i.times do |i|
+            logger.info "Trying to connect (attempt ##{i+1} of #{Vagrant.config[:ssh][:max_tries]})..."
+
+            if Vagrant::SSH.up?
+              logger.info "VM booted and ready for use!"
+              return true
+            end
+
+            sleep sleeptime
+          end
+
+          logger.info "Failed to connect to VM! Failed to boot?"
+          false
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/actions/vm/start.rb

@@ -2,48 +2,15 @@ module Vagrant
   module Actions
     module VM
       class Start < Base
-        def execute!
-          @runner.invoke_around_callback(:boot) do
-            # Startup the VM
-            boot
+        def prepare
+          # Start is a "meta-action" so it really just queues up a bunch
+          # of other actions in its place:
+          steps = [ForwardPorts, SharedFolders, Boot]
 
-            # Wait for it to complete booting, or error if we could
-            # never detect it booted up successfully
-            if !wait_for_boot
-              error_and_exit(<<-error)
-Failed to connect to VM! Failed to boot?
-error
-            end
+          steps.each do |action_klass|
+            @runner.add_action(action_klass)
           end
         end
-
-        def collect_shared_folders
-          # The root shared folder for the project
-          ["vagrant-root", Env.root_path, Vagrant.config.vm.project_directory]
-        end
-
-        def boot
-          logger.info "Booting VM..."
-          @runner.vm.start(:headless, true)
-        end
-
-        def wait_for_boot(sleeptime=5)
-          logger.info "Waiting for VM to boot..."
-
-          Vagrant.config[:ssh][:max_tries].to_i.times do |i|
-            logger.info "Trying to connect (attempt ##{i+1} of #{Vagrant.config[:ssh][:max_tries]})..."
-
-            if Vagrant::SSH.up?
-              logger.info "VM booted and ready for use!"
-              return true
-            end
-
-            sleep sleeptime
-          end
-
-          logger.info "Failed to connect to VM! Failed to boot?"
-          false
-        end
       end
     end
   end

data/lib/vagrant/actions/vm/up.rb

@@ -3,9 +3,20 @@ module Vagrant
     module VM
       class Up < Base
         def prepare
+          # If the dotfile is not a file, raise error
+          if File.exist?(Env.dotfile_path) && !File.file?(Env.dotfile_path)
+            raise ActionException.new(<<-msg)
+The dotfile which Vagrant uses to store the UUID of the project's
+virtual machine already exists and is not a file! The dotfile is
+currently configured to be `#{Env.dotfile_path}`
+
+To change this value, please see `config.vagrant.dotfile_name`
+msg
+          end
+
           # Up is a "meta-action" so it really just queues up a bunch
           # of other actions in its place:
-          steps = [Import, ForwardPorts, SharedFolders, Start]
+          steps = [Import, ForwardPorts, SharedFolders, Boot]
           steps << Provision if Vagrant.config.chef.enabled
           steps.insert(0, MoveHardDrive) if Vagrant.config.vm.hd_location
 

data/lib/vagrant/box.rb

@@ -52,6 +52,22 @@ module Vagrant
     attr_accessor :temp_path
 
     class <<self
+      # Returns an array of all created boxes, as strings.
+      #
+      # @return [Array<String>]
+      def all
+        results = []
+
+        Dir.open(Env.boxes_path) do |dir|
+          dir.each do |d|
+            next if d == "." || d == ".." || !File.directory?(File.join(Env.boxes_path, d))
+            results << d.to_s
+          end
+        end
+
+        results
+      end
+
       # Finds a box with the given name. This method searches for a box
       # with the given name, returning `nil` if none is found or returning
       # a {Box} instance otherwise.

data/lib/vagrant/commands.rb

@@ -128,9 +128,9 @@ error
       # which action to take and calls the respective action method
       # (see {box_add} and {box_remove})
       def box(argv)
-        Env.load!(:suppress_errors => true)
+        Env.load!
 
-        sub_commands = ["add", "remove"]
+        sub_commands = ["list", "add", "remove"]
 
         if !sub_commands.include?(argv[0])
           error_and_exit(<<-error)
@@ -145,6 +145,22 @@ error
         send("box_#{argv[0]}", *argv[1..-1])
       end
 
+      # Lists all added boxes
+      def box_list
+        boxes = Box.all.sort
+
+        wrap_output do
+          if !boxes.empty?
+            puts "Installed Vagrant Boxes:\n\n"
+            boxes.each do |box|
+              puts box
+            end
+          else
+            puts "No Vagrant Boxes Added!"
+          end
+        end
+      end
+
       # Adds a box to the local filesystem, given a URI.
       def box_add(name, path)
         Box.add(name, path)

data/lib/vagrant/config.rb

@@ -59,6 +59,7 @@ module Vagrant
       attr_accessor :host
       attr_accessor :forwarded_port_key
       attr_accessor :max_tries
+      attr_accessor :timeout
     end
 
     class VMConfig < Base

data/lib/vagrant/env.rb

@@ -19,8 +19,8 @@ module Vagrant
       def tmp_path; File.join(home_path, "tmp"); end
       def boxes_path; File.join(home_path, "boxes"); end
 
-      def load!(opts={})
-        load_root_path!(Pathname.new(Dir.pwd), opts)
+      def load!
+        load_root_path!
         load_config!
         load_home_directory!
         load_box!
@@ -60,6 +60,8 @@ module Vagrant
       end
 
       def load_box!
+        return unless root_path
+
         @@box = Box.find(Vagrant.config.vm.box) if Vagrant.config.vm.box
 
         if @@box
@@ -69,7 +71,7 @@ module Vagrant
       end
 
       def load_vm!
-        return unless root_path
+        return if !root_path || !File.file?(dotfile_path)
 
         File.open(dotfile_path) do |f|
           @@persisted_vm = Vagrant::VM.find(f.read)
@@ -84,17 +86,10 @@ module Vagrant
         end
       end
 
-      def load_root_path!(path=Pathname.new(Dir.pwd), opts={})
-        if path.to_s == '/'
-          return false if opts[:suppress_errors]
-          error_and_exit(<<-msg)
-A `#{ROOTFILE_NAME}` was not found! This file is required for vagrant to run
-since it describes the expected environment that vagrant is supposed
-to manage. Please create a #{ROOTFILE_NAME} and place it in your project
-root.
-msg
-          return
-        end
+      def load_root_path!(path=nil)
+        path ||= Pathname.new(Dir.pwd)
+
+        return false if path.to_s == '/'
 
         file = "#{path}/#{ROOTFILE_NAME}"
         if File.exist?(file)
@@ -102,10 +97,23 @@ msg
           return true
         end
 
-        load_root_path!(path.parent, opts)
+        load_root_path!(path.parent)
+      end
+
+      def require_root_path
+        if !root_path
+          error_and_exit(<<-msg)
+A `#{ROOTFILE_NAME}` was not found! This file is required for vagrant to run
+since it describes the expected environment that vagrant is supposed
+to manage. Please create a #{ROOTFILE_NAME} and place it in your project
+root.
+msg
+        end
       end
 
       def require_box
+        require_root_path
+
         if !box
           if !Vagrant.config.vm.box
             error_and_exit(<<-msg)
@@ -125,6 +133,8 @@ msg
       end
 
       def require_persisted_vm
+        require_root_path
+
         if !persisted_vm
           error_and_exit(<<-error)
 The task you're trying to run requires that the vagrant environment

data/lib/vagrant/ssh.rb

@@ -26,13 +26,19 @@ module Vagrant
       end
 
       def up?
-        Net::SSH.start(Vagrant.config.ssh.host, Vagrant.config.ssh.username, :port => port, :password => Vagrant.config.ssh.password, :timeout => 5) do |ssh|
-          return true
+        check_thread = Thread.new do
+          begin
+            Thread.current[:result] = false
+            Net::SSH.start(Vagrant.config.ssh.host, Vagrant.config.ssh.username, :port => port, :password => Vagrant.config.ssh.password, :timeout => Vagrant.config.ssh.timeout) do |ssh|
+              Thread.current[:result] = true
+            end
+          rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
+            # False, its defaulted above
+          end
         end
 
-        false
-      rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
-        false
+        check_thread.join(Vagrant.config.ssh.timeout)
+        return check_thread[:result]
       end
 
       def port(opts={})

data/lib/vagrant/util.rb

@@ -4,6 +4,12 @@ module Vagrant
       base.extend Vagrant::Util
     end
 
+    def wrap_output
+      puts "====================================================================="
+      yield
+      puts "====================================================================="
+    end
+
     def error_and_exit(error)
       abort <<-error
 =====================================================================

data/lib/vagrant/vm.rb

@@ -28,12 +28,7 @@ module Vagrant
     def start
       return if @vm.running?
 
-      actions = [Actions::VM::ForwardPorts, Actions::VM::SharedFolders, Actions::VM::Start]
-      actions.each do |action|
-        add_action(action)
-      end
-
-      execute!
+      execute!(Actions::VM::Start)
     end
 
     def destroy

data/test/test_helper.rb

@@ -31,6 +31,7 @@ class Test::Unit::TestCase
       config.ssh.host = "baz"
       config.ssh.forwarded_port_key = "ssh"
       config.ssh.max_tries = 10
+      config.ssh.timeout = 10
 
       config.vm.box = "foo"
       config.vm.box_ovf = "box.ovf"

data/test/vagrant/actions/vm/boot_test.rb

@@ -0,0 +1,55 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+
+class BootActionTest < Test::Unit::TestCase
+  setup do
+    @mock_vm, @vm, @action = mock_action(Vagrant::Actions::VM::Boot)
+    @mock_vm.stubs(:invoke_callback)
+    mock_config
+  end
+
+  context "execution" do
+    should "invoke the 'boot' around callback" do
+      boot_seq = sequence("boot_seq")
+      @mock_vm.expects(:invoke_around_callback).with(:boot).once.in_sequence(boot_seq).yields
+      @action.expects(:boot).in_sequence(boot_seq)
+      @action.expects(:wait_for_boot).returns(true).in_sequence(boot_seq)
+      @action.execute!
+    end
+
+    should "error and exit if the bootup failed" do
+      fail_boot_seq = sequence("fail_boot_seq")
+      @action.expects(:boot).once.in_sequence(fail_boot_seq)
+      @action.expects(:wait_for_boot).returns(false).in_sequence(fail_boot_seq)
+      @action.expects(:error_and_exit).once.in_sequence(fail_boot_seq)
+      @action.execute!
+    end
+  end
+
+  context "booting" do
+    should "start the VM in headless mode" do
+      @vm.expects(:start).with(:headless, true).once
+      @action.boot
+    end
+  end
+
+  context "waiting for boot" do
+    should "repeatedly ping the SSH port and return false with no response" do
+      seq = sequence('pings')
+      Vagrant::SSH.expects(:up?).times(Vagrant.config[:ssh][:max_tries].to_i - 1).returns(false).in_sequence(seq)
+      Vagrant::SSH.expects(:up?).once.returns(true).in_sequence(seq)
+      assert @action.wait_for_boot(0)
+    end
+
+    should "ping the max number of times then just return" do
+      Vagrant::SSH.expects(:up?).times(Vagrant.config[:ssh][:max_tries].to_i).returns(false)
+      assert !@action.wait_for_boot(0)
+    end
+  end
+
+  context "callbacks" do
+    should "setup the root directory shared folder" do
+      expected = ["vagrant-root", Vagrant::Env.root_path, Vagrant.config.vm.project_directory]
+      assert_equal expected, @action.collect_shared_folders
+    end
+  end
+end

data/test/vagrant/actions/vm/start_test.rb

@@ -3,53 +3,26 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class StartActionTest < Test::Unit::TestCase
   setup do
     @mock_vm, @vm, @action = mock_action(Vagrant::Actions::VM::Start)
-    @mock_vm.stubs(:invoke_callback)
     mock_config
   end
 
-  context "execution" do
-    should "invoke the 'boot' around callback" do
-      boot_seq = sequence("boot_seq")
-      @mock_vm.expects(:invoke_around_callback).with(:boot).once.in_sequence(boot_seq).yields
-      @action.expects(:boot).in_sequence(boot_seq)
-      @action.expects(:wait_for_boot).returns(true).in_sequence(boot_seq)
-      @action.execute!
+  context "sub-actions" do
+    setup do
+      File.stubs(:file?).returns(true)
+      File.stubs(:exist?).returns(true)
+      @default_order = [Vagrant::Actions::VM::ForwardPorts, Vagrant::Actions::VM::SharedFolders, Vagrant::Actions::VM::Boot]
     end
 
-    should "error and exit if the bootup failed" do
-      fail_boot_seq = sequence("fail_boot_seq")
-      @action.expects(:boot).once.in_sequence(fail_boot_seq)
-      @action.expects(:wait_for_boot).returns(false).in_sequence(fail_boot_seq)
-      @action.expects(:error_and_exit).once.in_sequence(fail_boot_seq)
-      @action.execute!
+    def setup_action_expectations
+      default_seq = sequence("default_seq")
+      @default_order.each do |action|
+        @mock_vm.expects(:add_action).with(action).once.in_sequence(default_seq)
+      end
     end
-  end
-
-  context "booting" do
-    should "start the VM in headless mode" do
-      @vm.expects(:start).with(:headless, true).once
-      @action.boot
-    end
-  end
-
-  context "waiting for boot" do
-    should "repeatedly ping the SSH port and return false with no response" do
-      seq = sequence('pings')
-      Vagrant::SSH.expects(:up?).times(Vagrant.config[:ssh][:max_tries].to_i - 1).returns(false).in_sequence(seq)
-      Vagrant::SSH.expects(:up?).once.returns(true).in_sequence(seq)
-      assert @action.wait_for_boot(0)
-    end
-
-    should "ping the max number of times then just return" do
-      Vagrant::SSH.expects(:up?).times(Vagrant.config[:ssh][:max_tries].to_i).returns(false)
-      assert !@action.wait_for_boot(0)
-    end
-  end
 
-  context "callbacks" do
-    should "setup the root directory shared folder" do
-      expected = ["vagrant-root", Vagrant::Env.root_path, Vagrant.config.vm.project_directory]
-      assert_equal expected, @action.collect_shared_folders
+    should "do the proper actions by default" do
+      setup_action_expectations
+      @action.prepare
     end
   end
 end

data/test/vagrant/actions/vm/up_test.rb

@@ -8,7 +8,9 @@ class UpActionTest < Test::Unit::TestCase
 
   context "sub-actions" do
     setup do
-      @default_order = [Vagrant::Actions::VM::Import, Vagrant::Actions::VM::ForwardPorts, Vagrant::Actions::VM::SharedFolders, Vagrant::Actions::VM::Start]
+      File.stubs(:file?).returns(true)
+      File.stubs(:exist?).returns(true)
+      @default_order = [Vagrant::Actions::VM::Import, Vagrant::Actions::VM::ForwardPorts, Vagrant::Actions::VM::SharedFolders, Vagrant::Actions::VM::Boot]
     end
 
     def setup_action_expectations
@@ -18,6 +20,26 @@ class UpActionTest < Test::Unit::TestCase
       end
     end
 
+    should "raise an ActionException if a dotfile exists but is not a file" do
+      File.expects(:file?).with(Vagrant::Env.dotfile_path).returns(false)
+      assert_raises(Vagrant::Actions::ActionException) {
+        @action.prepare
+      }
+    end
+
+    should "not raise an ActionException if dotfile doesn't exist" do
+      setup_action_expectations
+      File.stubs(:exist?).returns(false)
+      assert_nothing_raised { @action.prepare }
+    end
+
+    should "not raise an ActionException if dotfile exists but is a file" do
+      File.stubs(:file?).returns(true)
+      File.stubs(:exist?).returns(true)
+      setup_action_expectations
+      assert_nothing_raised { @action.prepare }
+    end
+
     should "do the proper actions by default" do
       setup_action_expectations
       @action.prepare

data/test/vagrant/box_test.rb

@@ -2,6 +2,53 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class BoxTest < Test::Unit::TestCase
   context "class methods" do
+    context "listing all boxes" do
+      setup do
+        Dir.stubs(:open)
+        File.stubs(:directory?).returns(true)
+
+        @boxes_path = "foo"
+        Vagrant::Env.stubs(:boxes_path).returns(@boxes_path)
+      end
+
+      should "open the boxes directory" do
+        Dir.expects(:open).with(Vagrant::Env.boxes_path)
+        Vagrant::Box.all
+      end
+
+      should "return an array" do
+        result = Vagrant::Box.all
+        assert result.is_a?(Array)
+      end
+
+      should "not return the '.' and '..' directories" do
+        dir = [".", "..", "..", ".", ".."]
+        Dir.expects(:open).yields(dir)
+        result = Vagrant::Box.all
+        assert result.empty?
+      end
+
+      should "return the other directories" do
+        dir = [".", "foo", "bar", "baz"]
+        Dir.expects(:open).yields(dir)
+        result = Vagrant::Box.all
+        assert_equal ["foo", "bar", "baz"], result
+      end
+
+      should "ignore the files" do
+        dir = ["foo", "bar"]
+        files = [true, false]
+        Dir.expects(:open).yields(dir)
+        dir_sequence = sequence("directory")
+        dir.each_with_index do |dir, index|
+          File.expects(:directory?).with(File.join(@boxes_path, dir)).returns(files[index]).in_sequence(dir_sequence)
+        end
+
+        result = Vagrant::Box.all
+        assert_equal ["foo"], result
+      end
+    end
+
     context "finding" do
       setup do
         @dir = "foo"

data/test/vagrant/commands_test.rb

@@ -7,6 +7,7 @@ class CommandsTest < Test::Unit::TestCase
     @persisted_vm = mock("persisted_vm")
     @persisted_vm.stubs(:execute!)
     Vagrant::Env.stubs(:persisted_vm).returns(@persisted_vm)
+    Vagrant::Env.stubs(:require_persisted_vm)
   end
 
   context "init" do
@@ -194,7 +195,7 @@ class CommandsTest < Test::Unit::TestCase
     end
 
     should "load the environment" do
-      Vagrant::Env.expects(:load!).with(:suppress_errors => true).once
+      Vagrant::Env.expects(:load!).once
       Vagrant::Commands.box(["add"])
     end
 
@@ -219,6 +220,22 @@ class CommandsTest < Test::Unit::TestCase
     end
   end
 
+  context "box list" do
+    setup do
+      @boxes = ["foo", "bar"]
+
+      Vagrant::Box.stubs(:all).returns(@boxes)
+      Vagrant::Commands.stubs(:puts)
+    end
+
+    should "call all on box and sort the results" do
+      @all = mock("all")
+      @all.expects(:sort).returns(@boxes)
+      Vagrant::Box.expects(:all).returns(@all)
+      Vagrant::Commands.box_list
+    end
+  end
+
   context "box add" do
     setup do
       @name = "foo"

data/test/vagrant/env_test.rb

@@ -6,6 +6,7 @@ class EnvTest < Test::Unit::TestCase
     filemock.expects(:read).returns("foo")
     Vagrant::VM.expects(:find).with("foo").returns(returnvalue)
     File.expects(:open).with(Vagrant::Env.dotfile_path).once.yields(filemock)
+    File.expects(:file?).with(Vagrant::Env.dotfile_path).once.returns(true)
     Vagrant::Env.load_vm!
   end
 
@@ -15,6 +16,16 @@ class EnvTest < Test::Unit::TestCase
   end
 
   context "requiring a VM" do
+    setup do
+      Vagrant::Env.stubs(:require_root_path)
+      Vagrant::Env.stubs(:error_and_exit)
+    end
+
+    should "require root path" do
+      Vagrant::Env.expects(:require_root_path).once
+      Vagrant::Env.require_persisted_vm
+    end
+
     should "error and exit if no persisted VM was found" do
       assert_nil Vagrant::Env.persisted_vm
       Vagrant::Env.expects(:error_and_exit).once
@@ -121,7 +132,7 @@ class EnvTest < Test::Unit::TestCase
     test "load! should load the config and set the persisted_uid" do
       Vagrant::Env.expects(:load_config!).once
       Vagrant::Env.expects(:load_vm!).once
-      Vagrant::Env.expects(:load_root_path!).with(Pathname.new(Dir.pwd), {}).once
+      Vagrant::Env.expects(:load_root_path!).once
       Vagrant::Env.expects(:load_home_directory!).once
       Vagrant::Env.expects(:load_box!).once
       Vagrant::Env.load!
@@ -145,7 +156,11 @@ class EnvTest < Test::Unit::TestCase
   end
 
   context "loading the UUID out from the persisted file" do
-    test "loading of the uuid from the dotfile" do
+    setup do
+      File.stubs(:file?).returns(true)
+    end
+
+    should "loading of the uuid from the dotfile" do
       mock_persisted_vm
       assert_equal 'foovm', Vagrant::Env.persisted_vm
     end
@@ -156,21 +171,39 @@ class EnvTest < Test::Unit::TestCase
       Vagrant::Env.load_vm!
     end
 
-    test "uuid should be nil if dotfile didn't exist" do
+    should "do nothing if dotfile is not a file" do
+      File.expects(:file?).returns(false)
+      File.expects(:open).never
+      Vagrant::Env.load_vm!
+    end
+
+    should "uuid should be nil if dotfile didn't exist" do
       File.expects(:open).raises(Errno::ENOENT)
       Vagrant::Env.load_vm!
       assert_nil Vagrant::Env.persisted_vm
     end
 
-    test "should build up the dotfile out of the root path and the dotfile name" do
+    should "should build up the dotfile out of the root path and the dotfile name" do
       assert_equal File.join(Vagrant::Env.root_path, Vagrant.config.vagrant.dotfile_name), Vagrant::Env.dotfile_path
     end
   end
 
   context "loading the root path" do
-    test "should walk the parent directories looking for rootfile" do
-      Vagrant::Env.expects(:error_and_exit).once
+    should "default the path to the pwd if nil" do
+      @path = mock("path")
+      @path.stubs(:to_s).returns("/")
+      Pathname.expects(:new).with(Dir.pwd).returns(@path)
+      Vagrant::Env.load_root_path!(nil)
+    end
 
+    should "not default the path to pwd if its not nil" do
+      @path = mock("path")
+      @path.stubs(:to_s).returns("/")
+      Pathname.expects(:new).never
+      Vagrant::Env.load_root_path!(@path)
+    end
+
+    should "should walk the parent directories looking for rootfile" do
       paths = [
         Pathname.new("/foo/bar/baz"),
         Pathname.new("/foo/bar"),
@@ -182,32 +215,15 @@ class EnvTest < Test::Unit::TestCase
         File.expects(:exist?).with("#{path}/#{Vagrant::Env::ROOTFILE_NAME}").returns(false).in_sequence(search_seq)
       end
 
-      assert_nil Vagrant::Env.load_root_path!(paths.first)
-    end
-
-    test "should print out an error and exit if not found" do
-      path = Pathname.new("/")
-
-      Vagrant::Env.expects(:error_and_exit).once
-      Vagrant::Env.load_root_path!(path)
+      assert !Vagrant::Env.load_root_path!(paths.first)
     end
 
-    should "return false if suppress errors is set and no root path is found" do
+    should "should return false if not found" do
       path = Pathname.new("/")
-
-      Vagrant::Env.expects(:error_and_exit).never
-      assert !Vagrant::Env.load_root_path!(path, :suppress_errors => true)
+      assert !Vagrant::Env.load_root_path!(path)
     end
 
-    should "pipe suppress errors flag through recursion" do
-      path = Pathname.new("/foo/bar/baz")
-      File.expects(:exist?).times(3).returns(false)
-
-      Vagrant::Env.expects(:error_and_exit).never
-      assert !Vagrant::Env.load_root_path!(path, :suppress_errors => true)
-    end
-
-    test "should set the path for the rootfile" do
+    should "should set the path for the rootfile" do
       path = "/foo"
       File.expects(:exist?).with("#{path}/#{Vagrant::Env::ROOTFILE_NAME}").returns(true)
 
@@ -239,6 +255,13 @@ class EnvTest < Test::Unit::TestCase
       @box = mock("box")
 
       Vagrant::Env.stubs(:load_config!)
+      Vagrant::Env.stubs(:root_path).returns("foo")
+    end
+
+    should "do nothing if the root path is nil" do
+      Vagrant::Box.expects(:find).never
+      Vagrant::Env.stubs(:root_path).returns(nil)
+      Vagrant::Env.load_vm!
     end
 
     should "not load the box if its not set" do
@@ -264,6 +287,16 @@ class EnvTest < Test::Unit::TestCase
   end
 
   context "requiring boxes" do
+    setup do
+      Vagrant::Env.stubs(:require_root_path)
+      Vagrant::Env.stubs(:error_and_exit)
+    end
+
+    should "require root path" do
+      Vagrant::Env.expects(:require_root_path).once
+      Vagrant::Env.require_box
+    end
+
     should "error and exit if no box is found" do
       mock_config do |config|
         config.vm.box = nil
@@ -290,4 +323,18 @@ class EnvTest < Test::Unit::TestCase
       Vagrant::Env.require_box
     end
   end
+
+  context "requiring root_path" do
+    should "error and exit if no root_path is set" do
+      Vagrant::Env.expects(:root_path).returns(nil)
+      Vagrant::Env.expects(:error_and_exit).once
+      Vagrant::Env.require_root_path
+    end
+
+    should "not error and exit if root_path is set" do
+      Vagrant::Env.expects(:root_path).returns("foo")
+      Vagrant::Env.expects(:error_and_exit).never
+      Vagrant::Env.require_root_path
+    end
+  end
 end

data/test/vagrant/ssh_test.rb

@@ -68,6 +68,14 @@ class SshTest < Test::Unit::TestCase
       assert !Vagrant::SSH.up?
     end
 
+    should "allow the thread the configured timeout time" do
+      @thread = mock("thread")
+      @thread.stubs(:[])
+      Thread.expects(:new).returns(@thread)
+      @thread.expects(:join).with(Vagrant.config.ssh.timeout).once
+      Vagrant::SSH.up?
+    end
+
     should "return false if the connection is refused" do
       Net::SSH.expects(:start).raises(Errno::ECONNREFUSED)
       assert_nothing_raised {

data/test/vagrant/vm_test.rb

@@ -80,15 +80,8 @@ class VMTest < Test::Unit::TestCase
         @vm.start
       end
 
-      should "add and execute the proper actions" do
-        actions = [Vagrant::Actions::VM::ForwardPorts, Vagrant::Actions::VM::SharedFolders, Vagrant::Actions::VM::Start]
-
-        action_seq = sequence("action_seq")
-        actions.each do |action|
-          @vm.expects(:add_action).with(action).in_sequence(action_seq)
-        end
-
-        @vm.expects(:execute!).once.in_sequence(action_seq)
+      should "execute the start action" do
+        @vm.expects(:execute!).once.with(Vagrant::Actions::VM::Start)
         @vm.start
       end
     end

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrantup}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-03-07}
+  s.date = %q{2010-03-08}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
   s.executables = ["vagrant", "vagrant-box", "vagrant-down", "vagrant-halt", "vagrant-init", "vagrant-package", "vagrant-reload", "vagrant-resume", "vagrant-ssh", "vagrant-suspend", "vagrant-up"]
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/vagrant/actions/box/download.rb",
      "lib/vagrant/actions/box/unpackage.rb",
      "lib/vagrant/actions/runner.rb",
+     "lib/vagrant/actions/vm/boot.rb",
      "lib/vagrant/actions/vm/destroy.rb",
      "lib/vagrant/actions/vm/down.rb",
      "lib/vagrant/actions/vm/export.rb",
@@ -79,6 +80,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/unpackage_test.rb",
      "test/vagrant/actions/runner_test.rb",
+     "test/vagrant/actions/vm/boot_test.rb",
      "test/vagrant/actions/vm/destroy_test.rb",
      "test/vagrant/actions/vm/down_test.rb",
      "test/vagrant/actions/vm/export_test.rb",
@@ -120,6 +122,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/unpackage_test.rb",
      "test/vagrant/actions/runner_test.rb",
+     "test/vagrant/actions/vm/boot_test.rb",
      "test/vagrant/actions/vm/destroy_test.rb",
      "test/vagrant/actions/vm/down_test.rb",
      "test/vagrant/actions/vm/export_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-03-07 00:00:00.000000000 Z
+date: 2010-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtualbox
@@ -143,6 +143,7 @@ files:
 - lib/vagrant/actions/box/download.rb
 - lib/vagrant/actions/box/unpackage.rb
 - lib/vagrant/actions/runner.rb
+- lib/vagrant/actions/vm/boot.rb
 - lib/vagrant/actions/vm/destroy.rb
 - lib/vagrant/actions/vm/down.rb
 - lib/vagrant/actions/vm/export.rb
@@ -178,6 +179,7 @@ files:
 - test/vagrant/actions/box/download_test.rb
 - test/vagrant/actions/box/unpackage_test.rb
 - test/vagrant/actions/runner_test.rb
+- test/vagrant/actions/vm/boot_test.rb
 - test/vagrant/actions/vm/destroy_test.rb
 - test/vagrant/actions/vm/down_test.rb
 - test/vagrant/actions/vm/export_test.rb
@@ -237,6 +239,7 @@ test_files:
 - test/vagrant/actions/box/download_test.rb
 - test/vagrant/actions/box/unpackage_test.rb
 - test/vagrant/actions/runner_test.rb
+- test/vagrant/actions/vm/boot_test.rb
 - test/vagrant/actions/vm/destroy_test.rb
 - test/vagrant/actions/vm/down_test.rb
 - test/vagrant/actions/vm/export_test.rb