vagrantup 0.2.0 → 0.3.0

data/test/vagrant/actions/collection_test.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
 class CollectionTest < Test::Unit::TestCase
+  class MockAction; end
+  class MockActionOther; end
+
   context "checking uniqueness" do
     setup do
       @actions = Vagrant::Actions::Collection.new([1])
@@ -10,14 +13,14 @@ class CollectionTest < Test::Unit::TestCase
       @actions << 1
       assert @actions.duplicates?
     end
-    
+
     should "return false it all the classes are unique" do
       @actions << 1.0 << "foo"
       assert !@actions.duplicates?
     end
 
     should "raise an exception when there are duplicates" do
-      @actions << 1 
+      @actions << 1
       assert_raise Vagrant::Actions::DuplicateActionException do
         @actions.duplicates!
       end
@@ -42,7 +45,7 @@ class CollectionTest < Test::Unit::TestCase
       stub_default_action_dependecies(@mock_action)
       stub_default_action_dependecies(@mock_action2)
     end
-    
+
     context "that come before an action" do
       setup do
         @mock_action.stubs(:follows).returns([MockActionOther])
@@ -52,7 +55,7 @@ class CollectionTest < Test::Unit::TestCase
           collection.new([@mock_action]).dependencies!
         end
       end
-    
+
       should "not raise an exception if they are met" do
         assert_nothing_raised do
           collection.new([@mock_action2, @mock_action]).dependencies!
@@ -97,7 +100,7 @@ class CollectionTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "klasses" do
     should "return a list of the collection element's classes" do
       @action = mock('action')

data/test/vagrant/actions/runner_test.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
 class ActionRunnerTest < Test::Unit::TestCase
+  class MockAction; end
+  class MockActionOther; end
+
   def mock_fake_action(action_klass = nil, runner = nil)
     action = action_klass ? action_klass.new(runner) : mock("action")
     action.stubs(:prepare)
@@ -162,7 +165,7 @@ class ActionRunnerTest < Test::Unit::TestCase
       [MockAction, MockActionOther].each_with_index do |klass, i|
         action = mock("action#{i}")
         action.expects(:class).returns(klass)
-        stub_default_action_dependecies(action, klass)
+        stub_default_action_dependecies(action)
         @runner.actions << action
         actions << action
       end
@@ -212,11 +215,10 @@ class ActionRunnerTest < Test::Unit::TestCase
       end
 
       should "call error_and_exit if it is an ActionException" do
-        msg = "Message"
-        @exception = Vagrant::Actions::ActionException.new(msg)
+        @exception = Vagrant::Actions::ActionException.new("foo")
         @actions[0].stubs(:prepare).raises(@exception)
 
-        @runner.expects(:error_and_exit).with(msg).once
+        @runner.expects(:error_and_exit).with(@exception.key, @exception.data).once
         @runner.execute!
       end
     end
@@ -243,7 +245,7 @@ class ActionRunnerTest < Test::Unit::TestCase
     setup do
       @runner = Vagrant::Actions::Runner.new
     end
-    
+
     should "should be raised when a duplicate is added" do
       action = mock_fake_action
       2.times {@runner.actions << action }
@@ -255,7 +257,7 @@ class ActionRunnerTest < Test::Unit::TestCase
     should "should not be raise when no duplicate actions are present" do
       @runner.actions << mock_fake_action(Vagrant::Actions::Base, @runner)
       @runner.actions << mock_fake_action(Vagrant::Actions::VM::Halt, @runner)
-      
+
       assert_nothing_raised { @runner.execute! }
     end
 

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

@@ -2,14 +2,13 @@ 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
+    @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Boot)
+    @runner.stubs(:invoke_callback)
   end
 
   context "preparing" do
     should "add the root shared folder" do
-      Vagrant.config.vm.expects(:share_folder).with("vagrant-root", Vagrant.config.vm.project_directory, Vagrant::Env.root_path).once
+      @runner.env.config.vm.expects(:share_folder).with("v-root", @runner.env.config.vm.project_directory, @runner.env.root_path).once
       @action.prepare
     end
   end
@@ -17,7 +16,7 @@ class BootActionTest < Test::Unit::TestCase
   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
+      @runner.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!
@@ -27,14 +26,16 @@ class BootActionTest < Test::Unit::TestCase
       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.expects(:error_and_exit).with(:vm_failed_to_boot).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
+    should "start the VM in specified mode" do
+      mode = mock("boot_mode")
+      @runner.env.config.vm.boot_mode = mode
+      @vm.expects(:start).with(mode).once
       @action.boot
     end
   end
@@ -42,13 +43,13 @@ class BootActionTest < Test::Unit::TestCase
   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)
+      @runner.env.ssh.expects(:up?).times(@runner.env.config.ssh.max_tries.to_i - 1).returns(false).in_sequence(seq)
+      @runner.env.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)
+      @runner.env.ssh.expects(:up?).times(Vagrant.config.ssh.max_tries.to_i).returns(false)
       assert !@action.wait_for_boot(0)
     end
   end

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

@@ -3,13 +3,12 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class CustomizeActionTest < Test::Unit::TestCase
   setup do
     @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Customize)
-    mock_config
   end
 
   context "executing" do
     should "run the VM customization procs then save the VM" do
-      Vagrant.config.vm.expects(:run_procs!).with(@vm)
-      @vm.expects(:save).with(true).once
+      @runner.env.config.vm.expects(:run_procs!).with(@vm)
+      @vm.expects(:save).once
       @action.execute!
     end
   end

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

@@ -3,7 +3,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class DestroyActionTest < Test::Unit::TestCase
   setup do
     @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Destroy)
-    mock_config
   end
 
   context "executing" do
@@ -23,14 +22,14 @@ class DestroyActionTest < Test::Unit::TestCase
 
   context "destroying the VM" do
     should "destroy VM and attached images" do
-      @vm.expects(:destroy).with(:destroy_image => true).once
+      @vm.expects(:destroy).with(:destroy_medium => :delete).once
       @action.destroy_vm
     end
   end
 
   context "depersisting" do
     should "call depersist_vm on Env" do
-      Vagrant::Env.expects(:depersist_vm).with(@runner).once
+      @runner.env.expects(:depersist_vm).once
       @action.depersist
     end
   end

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

@@ -2,8 +2,7 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 
 class DownActionTest < Test::Unit::TestCase
   setup do
-    @mock_vm, @vm, @action = mock_action(Vagrant::Actions::VM::Down)
-    mock_config
+    @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Down)
   end
 
   context "preparing" do
@@ -14,7 +13,7 @@ class DownActionTest < Test::Unit::TestCase
     def setup_action_expectations(order)
       default_seq = sequence("default_seq")
       order.each do |action|
-        @mock_vm.expects(:add_action).with(action).once.in_sequence(default_seq)
+        @runner.expects(:add_action).with(action).once.in_sequence(default_seq)
       end
     end
 
@@ -29,4 +28,18 @@ class DownActionTest < Test::Unit::TestCase
       @action.prepare
     end
   end
+
+  context "after halting" do
+    should "sleep if boot mode is GUI" do
+      @runner.env.config.vm.boot_mode = "gui"
+      Kernel.expects(:sleep).once
+      @action.after_halt
+    end
+
+    should "not sleep if boot mode is anything else" do
+      @runner.env.config.vm.boot_mode = "vrdp"
+      Kernel.expects(:sleep).never
+      @action.after_halt
+    end
+  end
 end

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

@@ -3,7 +3,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class ExportActionTest < Test::Unit::TestCase
   setup do
     @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Export)
-    mock_config
   end
 
   context "executing" do
@@ -21,9 +20,9 @@ class ExportActionTest < Test::Unit::TestCase
       Time.stubs(:now).returns(@time_now)
 
       @tmp_path = "foo"
-      Vagrant::Env.stubs(:tmp_path).returns(@tmp_path)
+      @runner.env.stubs(:tmp_path).returns(@tmp_path)
 
-      @temp_dir = File.join(Vagrant::Env.tmp_path, @time_now)
+      @temp_dir = File.join(@runner.env.tmp_path, @time_now)
       FileUtils.stubs(:mkpath)
     end
 
@@ -45,7 +44,7 @@ class ExportActionTest < Test::Unit::TestCase
     end
 
     should "be the temporary directory joined with the OVF filename" do
-      assert_equal File.join(@temp_dir, Vagrant.config.vm.box_ovf), @action.ovf_path
+      assert_equal File.join(@temp_dir, @runner.env.config.vm.box_ovf), @action.ovf_path
     end
   end
 
@@ -56,7 +55,7 @@ class ExportActionTest < Test::Unit::TestCase
     end
 
     should "call export on the runner with the ovf path" do
-      @vm.expects(:export).with(@ovf_path, {}, true).once
+      @vm.expects(:export).with(@ovf_path).once
       @action.export
     end
   end

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

@@ -3,7 +3,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class ForwardPortsActionTest < Test::Unit::TestCase
   setup do
     @mock_vm, @vm, @action = mock_action(Vagrant::Actions::VM::ForwardPorts)
-    mock_config
   end
 
   context "checking for colliding ports" do
@@ -20,10 +19,12 @@ class ForwardPortsActionTest < Test::Unit::TestCase
       vms = [@vm]
       VirtualBox::VM.stubs(:all).returns(vms)
 
-      mock_config do |config|
+      @env = mock_environment do |config|
         config.vm.forwarded_ports.clear
         config.vm.forward_port("ssh", 22, 2222)
       end
+
+      @mock_vm.stubs(:env).returns(@env)
     end
 
     should "ignore vms which aren't running" do
@@ -71,7 +72,7 @@ class ForwardPortsActionTest < Test::Unit::TestCase
     should "create a port forwarding for the VM" do
       forwarded_ports = mock("forwarded_ports")
 
-      Vagrant.config.vm.forwarded_ports.each do |name, opts|
+      @mock_vm.env.config.vm.forwarded_ports.each do |name, opts|
         forwarded_ports.expects(:<<).with do |port|
           assert_equal name, port.name
           assert_equal opts[:hostport], port.hostport
@@ -81,7 +82,7 @@ class ForwardPortsActionTest < Test::Unit::TestCase
       end
 
       @vm.expects(:forwarded_ports).returns(forwarded_ports)
-      @vm.expects(:save).with(true).once
+      @vm.expects(:save).once
       @action.forward_ports
     end
   end
@@ -91,7 +92,7 @@ class ForwardPortsActionTest < Test::Unit::TestCase
       forwarded_ports = []
       5.times do |i|
         port = mock("port#{i}")
-        port.expects(:destroy).with(true).once
+        port.expects(:destroy).once
         forwarded_ports << port
       end
 

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

@@ -3,7 +3,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class HaltActionTest < Test::Unit::TestCase
   setup do
     @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Halt)
-    mock_config
   end
 
   context "executing" do
@@ -11,8 +10,15 @@ class HaltActionTest < Test::Unit::TestCase
       @vm.stubs(:running?).returns(true)
     end
 
+    should "invoke the 'halt' around callback" do
+      halt_seq = sequence("halt_seq")
+      @runner.expects(:invoke_around_callback).with(:halt).once.in_sequence(halt_seq).yields
+      @vm.expects(:stop).in_sequence(halt_seq)
+      @action.execute!
+    end
+
     should "force the VM to stop" do
-      @vm.expects(:stop).with(true).once
+      @vm.expects(:stop).once
       @action.execute!
     end
 

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

@@ -2,12 +2,12 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 
 class ImportActionTest < Test::Unit::TestCase
   setup do
-    @mock_vm, @vm, @import = mock_action(Vagrant::Actions::VM::Import)
+    @runner, @vm, @import = mock_action(Vagrant::Actions::VM::Import)
 
     @ovf_file = "foo"
     @box = mock("box")
     @box.stubs(:ovf_file).returns(@ovf_file)
-    Vagrant::Env.stubs(:box).returns(@box)
+    @runner.env.stubs(:box).returns(@box)
 
     VirtualBox::VM.stubs(:import)
   end
@@ -18,7 +18,7 @@ class ImportActionTest < Test::Unit::TestCase
   end
 
   should "invoke an around callback around the import" do
-    @mock_vm.expects(:invoke_around_callback).with(:import).once
+    @runner.expects(:invoke_around_callback).with(:import).once
     @import.execute!
   end
 
@@ -28,7 +28,7 @@ class ImportActionTest < Test::Unit::TestCase
   end
 
   should "raise an exception if import is nil" do
-    @mock_vm.expects(:vm).returns(nil)
+    @runner.expects(:vm).returns(nil)
     assert_raises(Vagrant::Actions::ActionException) {
       @import.execute!
     }
@@ -36,7 +36,7 @@ class ImportActionTest < Test::Unit::TestCase
 
   should "set the resulting VM as the VM of the Vagrant VM object" do
     new_vm = mock("new_vm")
-    @mock_vm.expects(:vm=).with(new_vm).once
+    @runner.expects(:vm=).with(new_vm).once
     VirtualBox::VM.expects(:import).returns(new_vm).returns("foo")
     @import.execute!
   end

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

@@ -4,10 +4,8 @@ class MoveHardDriveActionTest < Test::Unit::TestCase
   setup do
     @mock_vm, @vm, @action = mock_action(Vagrant::Actions::VM::MoveHardDrive)
     @hd_location = "/foo"
-    mock_config do |config|
-      File.expects(:directory?).with(@hd_location).returns(true)
-      config.vm.hd_location = @hd_location
-    end
+
+    @mock_vm.env.config.vm.stubs(:hd_location).returns(@hd_location)
   end
 
 
@@ -28,7 +26,7 @@ class MoveHardDriveActionTest < Test::Unit::TestCase
   context "execution" do
     should "error and exit if the vm is not powered off" do
       @mock_vm.expects(:powered_off?).returns(false)
-      @action.expects(:error_and_exit).once
+      @action.expects(:error_and_exit).with(:vm_power_off_to_move_hd).once
       @action.execute!
     end
 
@@ -51,7 +49,7 @@ class MoveHardDriveActionTest < Test::Unit::TestCase
     end
 
     should "be the configured hd location and the existing hard drive filename" do
-      joined = File.join(Vagrant.config.vm.hd_location, @filename)
+      joined = File.join(@mock_vm.env.config.vm.hd_location, @filename)
       assert_equal joined, @action.new_image_path
     end
   end

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

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class PackageActionTest < Test::Unit::TestCase
   setup do
     @runner, @vm, @action = mock_action(Vagrant::Actions::VM::Package, "bing", [])
-
-    mock_config
   end
 
   context "initialization" do
@@ -41,7 +39,7 @@ class PackageActionTest < Test::Unit::TestCase
     should "be the temporary directory with the name and extension attached" do
       pwd = "foo"
       FileUtils.stubs(:pwd).returns(pwd)
-      assert_equal File.join(pwd, "#{@action.out_path}#{Vagrant.config.package.extension}"), @action.tar_path
+      assert_equal File.join(pwd, "#{@action.out_path}#{@runner.env.config.package.extension}"), @action.tar_path
     end
   end
 
@@ -58,6 +56,60 @@ class PackageActionTest < Test::Unit::TestCase
     end
   end
 
+  context "copying include files" do
+    setup do
+      @include_files = []
+      @action.stubs(:include_files).returns(@include_files)
+
+      @temp_path = "foo"
+      @action.stubs(:temp_path).returns(@temp_path)
+    end
+
+    should "do nothing if no include files are specified" do
+      assert @action.include_files.empty?
+      FileUtils.expects(:mkdir_p).never
+      FileUtils.expects(:cp).never
+      @action.copy_include_files
+    end
+
+    should "create the include directory and copy files to it" do
+      include_dir = File.join(@action.temp_path, "include")
+      copy_seq = sequence("copy_seq")
+      FileUtils.expects(:mkdir_p).with(include_dir).once.in_sequence(copy_seq)
+
+      5.times do |i|
+        file = mock("f#{i}")
+        @include_files << file
+        FileUtils.expects(:cp).with(file, include_dir).in_sequence(copy_seq)
+      end
+
+      @action.copy_include_files
+    end
+  end
+
+  context "creating vagrantfile" do
+    setup do
+      @temp_path = "foo"
+      @action.stubs(:temp_path).returns(@temp_path)
+
+      @network_adapter = mock("nic")
+      @network_adapter.stubs(:mac_address).returns("mac_address")
+      @vm.stubs(:network_adapters).returns([@network_adapter])
+    end
+
+    should "write the rendered vagrantfile to temp_path Vagrantfile" do
+      f = mock("file")
+      rendered = mock("rendered")
+      File.expects(:open).with(File.join(@action.temp_path, "Vagrantfile"), "w").yields(f)
+      Vagrant::Util::TemplateRenderer.expects(:render).returns(rendered).with("package_Vagrantfile", {
+        :base_mac => @runner.vm.network_adapters.first.mac_address
+      })
+      f.expects(:write).with(rendered)
+
+      @action.create_vagrantfile
+    end
+  end
+
   context "compression" do
     setup do
       @tar_path = "foo"
@@ -80,6 +132,9 @@ class PackageActionTest < Test::Unit::TestCase
       @tar = Archive::Tar::Minitar
       Archive::Tar::Minitar::Output.stubs(:open).yields(@output)
       @tar.stubs(:pack_file)
+
+      @action.stubs(:copy_include_files)
+      @action.stubs(:create_vagrantfile)
     end
 
     should "open the tar file with the tar path properly" do
@@ -100,6 +155,8 @@ class PackageActionTest < Test::Unit::TestCase
       compress_seq = sequence("compress_seq")
 
       FileUtils.expects(:pwd).once.returns(@pwd).in_sequence(compress_seq)
+      @action.expects(:copy_include_files).once.in_sequence(compress_seq)
+      @action.expects(:create_vagrantfile).once.in_sequence(compress_seq)
       FileUtils.expects(:cd).with(@temp_path).in_sequence(compress_seq)
       Dir.expects(:glob).returns(@files).in_sequence(compress_seq)
 
@@ -122,25 +179,6 @@ class PackageActionTest < Test::Unit::TestCase
         @action.compress
       }
     end
-
-    should "add included files when passed" do
-      compress_seq = sequence("compress")
-      @files = []
-      5.times do |i|
-        file = mock("file#{i}")
-        @tar.expects(:pack_file).with(file, @output).once.in_sequence(compress_seq)
-        @files << file
-      end
-
-      @action.expects(:include_files).returns(@files)
-      @action.compress
-    end
-
-    should "not add files when none are specified" do
-      @tar.expects(:pack_file).never
-      Dir.expects(:glob).once.returns([])
-      @action.compress
-    end
   end
 
   context "preparing the action" do