vagrant 0.5.4 → 0.6.0

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

@@ -3,28 +3,16 @@ require "test_helper"
 class DestroyBoxActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Box::Destroy
-    @app, @env = mock_action_data
-
-    @vm = mock("vm")
-    @env["vm"] = @vm
-    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
-
-    @internal_vm = mock("internal")
-    @vm.stubs(:vm).returns(@internal_vm)
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
 
     @instance = @klass.new(@app, @env)
   end
 
-  context "calling" do
-    setup do
-      @env.logger.stubs(:info)
-    end
-
-    should "delete the box directory" do
-      seq = sequence("seq")
-      FileUtils.expects(:rm_rf).with(@env["box"].directory).in_sequence(seq)
-      @app.expects(:call).with(@env).once.in_sequence(seq)
-      @instance.call(@env)
-    end
+  should "delete the box directory" do
+    seq = sequence("seq")
+    FileUtils.expects(:rm_rf).with(@env["box"].directory).in_sequence(seq)
+    @app.expects(:call).with(@env).once.in_sequence(seq)
+    @instance.call(@env)
   end
 end

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

@@ -3,15 +3,9 @@ require "test_helper"
 class DownloadBoxActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Box::Download
-    @app, @env = mock_action_data
-
-    @vm = mock("vm")
-    @env["vm"] = @vm
-    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
     @env["box"].uri = "http://google.com"
-
-    @internal_vm = mock("internal")
-    @vm.stubs(:vm).returns(@internal_vm)
   end
 
   context "initializing" do
@@ -32,17 +26,7 @@ class DownloadBoxActionTest < Test::Unit::TestCase
         @instance.expects(:instantiate_downloader).in_sequence(seq).returns(true)
         @instance.expects(:download).in_sequence(seq)
         @app.expects(:call).with(@env).in_sequence(seq)
-        @instance.expects(:cleanup).in_sequence(seq)
-        @instance.call(@env)
-      end
-
-      should "halt the chain if downloader instantiation fails" do
-        seq = sequence("seq")
-        @env.error!(:foo)
-        @instance.expects(:instantiate_downloader).in_sequence(seq).returns(false)
-        @instance.expects(:download).never
-        @app.expects(:call).with(@env).never
-        @instance.expects(:cleanup).never
+        @instance.expects(:recover).with(@env).in_sequence(seq)
         @instance.call(@env)
       end
     end
@@ -57,9 +41,9 @@ class DownloadBoxActionTest < Test::Unit::TestCase
 
       should "error environment if URI is invalid for any downloaders" do
         @env["box"].uri = "foobar"
-        assert !@instance.instantiate_downloader
-        assert @env.error?
-        assert_equal :box_download_unknown_type, @env.error.first
+        assert_raises(Vagrant::Errors::BoxDownloadUnknownType) {
+          @instance.instantiate_downloader
+        }
       end
     end
 
@@ -91,7 +75,7 @@ class DownloadBoxActionTest < Test::Unit::TestCase
     context "tempfile" do
       should "create a tempfile in the vagrant tmp directory" do
         File.expects(:open).with { |name, bitmask|
-          name =~ /#{Vagrant::Action::Box::Download::BASENAME}/ &&  name =~ /#{@env.env.tmp_path}/
+          name.to_s =~ /#{Vagrant::Action::Box::Download::BASENAME}/ &&  name.to_s =~ /#{@env.env.tmp_path}/
         }.once
         @instance.with_tempfile
       end
@@ -115,13 +99,13 @@ class DownloadBoxActionTest < Test::Unit::TestCase
 
       should "delete the temporary file if it exists" do
         File.expects(:unlink).with(@temp_path).once
-        @instance.cleanup
+        @instance.recover(@env)
       end
 
       should "not delete anything if it doesn't exist" do
         File.stubs(:exist?).returns(false)
         File.expects(:unlink).never
-        @instance.cleanup
+        @instance.recover(@env)
       end
     end
 

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

@@ -3,8 +3,8 @@ require "test_helper"
 class PackageBoxActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Box::Package
-    @app, @env = mock_action_data
-    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
 
     @instance = @klass.new(@app, @env)
   end

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

@@ -3,14 +3,8 @@ require "test_helper"
 class UnpackageBoxActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Box::Unpackage
-    @app, @env = mock_action_data
-
-    @vm = mock("vm")
-    @env["vm"] = @vm
-    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
-
-    @internal_vm = mock("internal")
-    @vm.stubs(:vm).returns(@internal_vm)
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
 
     @instance = @klass.new(@app, @env)
   end
@@ -21,26 +15,6 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
       @instance.expects(:setup_box_directory).in_sequence(seq).returns(true)
       @instance.expects(:decompress).in_sequence(seq)
       @app.expects(:call).with(@env)
-      @instance.expects(:cleanup).never
-      @instance.call(@env)
-    end
-
-    should "halt the chain if setting up the box directory fails" do
-      @instance.expects(:setup_box_directory).returns(false)
-      @instance.expects(:decompress).never
-      @app.expects(:call).never
-      @instance.expects(:cleanup).never
-      @instance.call(@env)
-    end
-
-    should "cleanup if there was an error" do
-      @env.error!(:foo)
-
-      seq = sequence("sequence")
-      @instance.expects(:setup_box_directory).in_sequence(seq).returns(true)
-      @instance.expects(:decompress).in_sequence(seq)
-      @app.expects(:call).with(@env)
-      @instance.expects(:cleanup).once
       @instance.call(@env)
     end
   end
@@ -54,13 +28,13 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
 
     should "do nothing if not a directory" do
       FileUtils.expects(:rm_rf).never
-      @instance.cleanup
+      @instance.recover(nil)
     end
 
     should "remove the directory if exists" do
       File.expects(:directory?).with(@instance.box_directory).once.returns(true)
       FileUtils.expects(:rm_rf).with(@instance.box_directory).once
-      @instance.cleanup
+      @instance.recover(nil)
     end
   end
 
@@ -72,9 +46,9 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
 
     should "error the environment if the box already exists" do
       File.expects(:directory?).returns(true)
-      assert !@instance.setup_box_directory
-      assert @env.error?
-      assert_equal :box_already_exists, @env.error.first
+      assert_raises(Vagrant::Errors::BoxAlreadyExists) {
+        @instance.setup_box_directory
+      }
     end
 
     should "create the directory" do
@@ -96,7 +70,7 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
     end
 
     should "open the tar file within the new directory, and extract it all" do
-      Archive::Tar::Minitar.expects(:unpack).with(@env["download.temp_path"], @env["box"].directory).once
+      Archive::Tar::Minitar.expects(:unpack).with(@env["download.temp_path"], @env["box"].directory.to_s).once
       @instance.decompress
     end
   end

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

@@ -3,37 +3,28 @@ require "test_helper"
 class VerifyBoxActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Box::Verify
-    @app, @env = mock_action_data
-
-    @vm = mock("vm")
-    @env["vm"] = @vm
-    @env["box"] = Vagrant::Box.new(mock_environment, "foo")
-
-    @internal_vm = mock("internal")
-    @vm.stubs(:vm).returns(@internal_vm)
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
 
     @instance = @klass.new(@app, @env)
   end
 
   context "calling" do
-    setup do
-      @env.logger.stubs(:info)
-    end
-
     should "continue fine if verification succeeds" do
       seq = sequence("seq")
-      VirtualBox::Appliance.expects(:new).with(@env["box"].ovf_file).in_sequence(seq)
+      VirtualBox::Appliance.expects(:new).with(@env["box"].ovf_file.to_s).in_sequence(seq)
       @app.expects(:call).with(@env).once.in_sequence(seq)
-      @instance.call(@env)
-      assert !@env.error?
+      assert_nothing_raised {
+        @instance.call(@env)
+      }
     end
 
     should "halt chain if verification fails" do
-      VirtualBox::Appliance.expects(:new).with(@env["box"].ovf_file).raises(Exception)
+      VirtualBox::Appliance.expects(:new).with(@env["box"].ovf_file.to_s).raises(Exception)
       @app.expects(:call).with(@env).never
-      @instance.call(@env)
-      assert @env.error?
-      assert_equal :box_verification_failed, @env.error.first
+      assert_raises(Vagrant::Errors::BoxVerificationFailed) {
+        @instance.call(@env)
+      }
     end
   end
 end

data/test/vagrant/action/builder_test.rb

@@ -155,21 +155,6 @@ class ActionBuilderTest < Test::Unit::TestCase
     end
 
     context "converting to an app" do
-      teardown do
-        Vagrant::Action.actions.clear
-      end
-
-      should "preprend error halt to the chain" do
-        result = mock("result")
-        env = {:a => :b}
-        middleware = mock("middleware")
-        middleware.stubs(:is_a?).with(Class).returns(true)
-        middleware.expects(:new).with(anything, env).returns(result)
-        @instance.use middleware
-        result = @instance.to_app(env)
-        assert result.kind_of?(Vagrant::Action::Env::ErrorHalt)
-      end
-
       should "make non-classes lambdas" do
         env = Vagrant::Action::Environment.new(nil)
         env.expects(:foo).once

data/test/vagrant/action/env/set_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class SetEnvActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Env::Set
-    @app, @env = mock_action_data
+    @app, @env = action_env
     @env.clear
   end
 

data/test/vagrant/action/environment_test.rb

@@ -3,7 +3,11 @@ require "test_helper"
 class ActionEnvironmentTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::Environment
-    @instance = @klass.new(mock_environment)
+    @instance = @klass.new(vagrant_env)
+  end
+
+  should "be a hash with indifferent access" do
+    assert @instance.is_a?(Vagrant::Util::HashWithIndifferentAccess)
   end
 
   should "default values to those on the env" do
@@ -11,35 +15,13 @@ class ActionEnvironmentTest < Test::Unit::TestCase
     assert_equal "value", @instance["key"]
   end
 
-  should "setup the logger" do
-    assert_equal @instance.env.logger, @instance.logger
-  end
-
-  should "not be erroneous initially" do
-    assert !@instance.error?
-  end
-
-  should "mark as erroneous" do
-    @instance.error!(:key)
-    assert_equal [:key, {}], @instance.error
-  end
-
-  should "properly report erroneous" do
-    @instance.error!(:key)
-    assert @instance.error?
+  should "setup the UI" do
+    assert_equal @instance.env.ui, @instance.ui
   end
 
   should "report interrupted if interrupt error" do
     assert !@instance.interrupted?
-    @instance.error!(:interrupt)
+    @instance.interrupt!
     assert @instance.interrupted?
   end
-
-  should "have indifferent access" do
-    @instance[:foo] = :bar
-    @instance["bar"] = :baz
-
-    assert_equal :bar, @instance["foo"]
-    assert_equal :baz, @instance[:bar]
-  end
 end

data/test/vagrant/action/general/package_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class PackageGeneralActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::General::Package
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env["vm"] = @vm
@@ -18,7 +18,6 @@ class PackageGeneralActionTest < Test::Unit::TestCase
 
     should "initialize fine" do
       @klass.new(@app, @env)
-      assert !@env.error?
     end
 
     should "set the output path to configured by default" do
@@ -37,7 +36,7 @@ class PackageGeneralActionTest < Test::Unit::TestCase
       assert_equal [], @env["package.include"]
     end
 
-    should "not set the output path if it is already set" do
+    should "not set the include path if it is already set" do
       @env["package.include"] = "foo"
       @klass.new(@app, @env)
       assert_equal "foo", @env["package.include"]
@@ -56,58 +55,34 @@ class PackageGeneralActionTest < Test::Unit::TestCase
     context "calling" do
       should "call the proper methods then continue chain" do
         seq = sequence("seq")
-        @instance.expects(:verify_included_files).in_sequence(seq).returns(true)
+        @instance.expects(:verify_files_to_copy).in_sequence(seq).returns(true)
         @instance.expects(:compress).in_sequence(seq)
         @app.expects(:call).with(@env).in_sequence(seq)
-        @instance.expects(:cleanup).never
-
-        @instance.call(@env)
-      end
-
-      should "halt the chain if verify failed" do
-        @instance.expects(:verify_included_files).returns(false)
-        @instance.expects(:compress).never
-        @app.expects(:call).never
-
         @instance.call(@env)
       end
 
       should "halt the chain if the output file already exists" do
         File.expects(:exist?).returns(true)
         @app.expects(:call).never
-        @instance.call(@env)
-
-        assert @env.error?
-        assert_equal :package_output_exists, @env.error.first
+        assert_raises(Vagrant::Errors::PackageOutputExists) {
+          @instance.call(@env)
+        }
       end
 
       should "halt the chain if directory isn't set" do
         @env["package.directory"] = nil
         @app.expects(:call).never
-        @instance.call(@env)
-
-        assert @env.error?
-        assert_equal :package_requires_directory, @env.error.first
+        assert_raises(Vagrant::Errors::PackageRequiresDirectory) {
+          @instance.call(@env)
+        }
       end
 
       should "halt the chain if directory doesn't exist" do
         File.expects(:directory?).with(@env["package.directory"]).returns(false)
         @app.expects(:call).never
-        @instance.call(@env)
-
-        assert @env.error?
-        assert_equal :package_requires_directory, @env.error.first
-      end
-
-      should "run cleanup if environment errors" do
-        seq = sequence("seq")
-        @instance.expects(:verify_included_files).in_sequence(seq).returns(true)
-        @instance.expects(:compress).in_sequence(seq)
-        @app.expects(:call).with(@env).in_sequence(seq)
-        @instance.expects(:cleanup).in_sequence(seq)
-
-        @env.error!(:foo)
-        @instance.call(@env)
+        assert_raises(Vagrant::Errors::PackageRequiresDirectory) {
+          @instance.call(@env)
+        }
       end
     end
 
@@ -123,18 +98,45 @@ class PackageGeneralActionTest < Test::Unit::TestCase
         File.expects(:exist?).with(@instance.tar_path).returns(false)
         File.expects(:delete).never
 
-        @instance.cleanup
+        @instance.recover(@env)
       end
 
       should "delete the packaged box if it exists" do
         File.expects(:exist?).returns(true)
         File.expects(:delete).with(@instance.tar_path).once
 
-        @instance.cleanup
+        @instance.recover(@env)
       end
     end
 
-    context "verifying included files" do
+    context "files to copy" do
+      setup do
+        @env["package.include"] = []
+        @package_dir = Pathname.new(@env["package.directory"]).join("include")
+      end
+
+      should "have included files whole path if relative" do
+        path = "lib/foo"
+        @env["package.include"] = [path]
+        result = @instance.files_to_copy
+        assert_equal @package_dir.join(path), result[path]
+      end
+
+      should "have the filename if an absolute path" do
+        path = "/foo/bar"
+        @env["package.include"] = [path]
+        result = @instance.files_to_copy
+        assert_equal @package_dir.join("bar"), result[path]
+      end
+
+      should "include the Vagrantfile if specified" do
+        @env["package.vagrantfile"] = "foo"
+        result = @instance.files_to_copy
+        assert_equal @package_dir.join("_Vagrantfile"), result["foo"]
+      end
+    end
+
+    context "verifying files to copy" do
       setup do
         @env["package.include"] = ["foo"]
         File.stubs(:exist?).returns(true)
@@ -142,14 +144,15 @@ class PackageGeneralActionTest < Test::Unit::TestCase
 
       should "error if included file is not found" do
         File.expects(:exist?).with("foo").returns(false)
-        assert !@instance.verify_included_files
-        assert @env.error?
-        assert_equal :package_include_file_doesnt_exist, @env.error.first
+        assert_raises(Vagrant::Errors::PackageIncludeMissing) {
+          @instance.verify_files_to_copy
+        }
       end
 
       should "return true if all exist" do
-        assert @instance.verify_included_files
-        assert !@env.error?
+        assert_nothing_raised {
+          assert @instance.verify_files_to_copy
+        }
       end
     end
 
@@ -166,14 +169,11 @@ class PackageGeneralActionTest < Test::Unit::TestCase
       end
 
       should "create the include directory and copy files to it" do
-        include_dir = File.join(@env["package.directory"], "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}")
-          @env["package.include"] << file
-          FileUtils.expects(:cp).with(file, include_dir).in_sequence(copy_seq)
+        @env["package.include"] = ["/foo/bar", "lib/foo"]
+        seq = sequence("seq")
+        @instance.files_to_copy.each do |from, to|
+          FileUtils.expects(:mkdir_p).with(to.parent).in_sequence(seq)
+          FileUtils.expects(:cp).with(from, to).in_sequence(seq)
         end
 
         @instance.copy_include_files