vagrant 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/vagrant/actions/box/add.rb

@@ -15,6 +15,7 @@ module Vagrant
 
           @runner.add_action(Download)
           @runner.add_action(Unpackage)
+          @runner.add_action(Verify)
         end
       end
     end

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

@@ -4,7 +4,6 @@ module Vagrant
       # This action unpackages a downloaded box file into its final
       # box destination within the vagrant home folder.
       class Unpackage < Base
-
         def execute!
           @runner.invoke_around_callback(:unpackage) do
             setup_box_dir

data/lib/vagrant/actions/box/verify.rb

@@ -0,0 +1,32 @@
+module Vagrant
+  module Actions
+    module Box
+      # This action verifies that a given box is valid. This works by attempting
+      # to read/interpret the appliance file (OVF). If the reading succeeds, then
+      # the box is assumed to be valid.
+      class Verify < Base
+        def execute!
+          logger.info "Verifying box..."
+          reload_configuration
+          verify_appliance
+        end
+
+        def reload_configuration
+          # We have to reload the environment config since we _just_ added the
+          # box. We do this by setting the current box to the recently added box,
+          # then reloading
+          @runner.env.config.vm.box = @runner.name
+          @runner.env.load_box!
+          @runner.env.load_config!
+        end
+
+        def verify_appliance
+          # We now try to read the applince. If it succeeds, we return true.
+          VirtualBox::Appliance.new(@runner.ovf_file)
+        rescue VirtualBox::Exceptions::FileErrorException
+          raise ActionException.new(:box_verification_failed)
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,13 @@ module Vagrant
             @runner.add_action(action_klass)
           end
         end
+
+        def after_halt
+          # This sleep is here to allow the VM to clean itself up. There appears
+          # nothing [obvious] in the VirtualBox API to automate this. For now, this
+          # is an interim solution.
+          sleep 1
+        end
       end
     end
   end

data/lib/vagrant/box.rb

@@ -126,7 +126,7 @@ module Vagrant
     #
     # @return [String]
     def ovf_file
-      File.join(directory, Vagrant.config.vm.box_ovf)
+      File.join(directory, env.config.vm.box_ovf)
     end
 
     # Begins the process of adding a box to the vagrant installation. This

data/lib/vagrant/commands/init.rb

@@ -21,7 +21,7 @@ module Vagrant
         rootfile_path = File.join(Dir.pwd, Environment::ROOTFILE_NAME)
         error_and_exit(:rootfile_already_exists) if File.exist?(rootfile_path)
 
-        # Copy over the rootfile template into this directory
+        # Write the rootfile
         default_box ||= "base"
         File.open(rootfile_path, 'w+') do |f|
           f.write(TemplateRenderer.render(Environment::ROOTFILE_NAME, :default_box => default_box))

data/lib/vagrant/environment.rb

@@ -37,6 +37,8 @@ module Vagrant
           error_and_exit(:virtualbox_not_detected)
         elsif version.to_f < 3.1
           error_and_exit(:virtualbox_invalid_version, :version => version.to_s)
+        elsif version.to_s.downcase.include?("ose")
+          error_and_exit(:virtualbox_invalid_ose, :version => version.to_s)
         end
       end
     end

data/templates/errors.yml

@@ -17,6 +17,9 @@
 
   The box must be added through the `vagrant box add` command. Please view
   the documentation associated with the command for more information.
+:box_verification_failed: |-
+  The specified box is invalid. This can commonly be attributed to incorrectly
+  typing in the path to the box or invalid packaging of the box.
 :box_not_specified: |-
   No base box was specified! A base box is required as a staring point
   for every vagrant virtual machine. Please specify one in your Vagrantfile
@@ -115,6 +118,11 @@
   Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
   If VirtualBox is installed, it may be an incorrect version. Vagrant currently
   only supports VirtualBox 3.1.x. Please install the proper version to continue.
+:virtualbox_invalid_ose: |-
+  Vagrant has detected you're using an OSE ("Open Source Edition") of VirtualBox.
+  Vagrant currently doesn't support any of the OSE editions due to slight API
+  differences. Please download the regular package from virtualbox.org and install
+  to continue.
 :vm_failed_to_boot: |-
   Failed to connect to VM! Failed to boot?
 :vm_base_not_found: |-

data/test/vagrant/actions/box/add_test.rb

@@ -7,7 +7,7 @@ class AddBoxActionTest < Test::Unit::TestCase
 
   context "prepare" do
     setup do
-      @default_order = [Vagrant::Actions::Box::Download, Vagrant::Actions::Box::Unpackage]
+      @default_order = [Vagrant::Actions::Box::Download, Vagrant::Actions::Box::Unpackage, Vagrant::Actions::Box::Verify]
       @runner.stubs(:directory).returns("foo")
       File.stubs(:exists?).returns(false)
     end

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

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+
+class VerifyBoxActionTest < Test::Unit::TestCase
+  setup do
+    @runner, @vm, @action = mock_action(Vagrant::Actions::Box::Verify)
+    @runner.stubs(:name).returns("foo")
+    @runner.stubs(:temp_path).returns("bar")
+  end
+
+  context "executing" do
+    should "execute the proper actions in the proper order" do
+      exec_seq = sequence("exec_seq")
+      @action.expects(:reload_configuration).in_sequence(exec_seq)
+      @action.expects(:verify_appliance).in_sequence(exec_seq)
+      @action.execute!
+    end
+  end
+
+  context "reloading configuration" do
+    should "set the new box, load box, then load config" do
+      reload_seq = sequence("reload_seq")
+      @runner.env.config.vm.expects(:box=).with(@runner.name).in_sequence(reload_seq)
+      @runner.env.expects(:load_box!).in_sequence(reload_seq)
+      @runner.env.expects(:load_config!).in_sequence(reload_seq)
+      @action.reload_configuration
+    end
+  end
+
+  context "verifying appliance" do
+    setup do
+      @runner.stubs(:ovf_file).returns("foo")
+    end
+
+    should "create new appliance and return true if succeeds" do
+      VirtualBox::Appliance.expects(:new).with(@runner.ovf_file)
+      assert_nothing_raised { @action.verify_appliance }
+    end
+
+    should "return false if an exception is raised" do
+      VirtualBox::Appliance.expects(:new).with(@runner.ovf_file).raises(VirtualBox::Exceptions::FileErrorException)
+      assert_raises(Vagrant::Actions::ActionException) { @action.verify_appliance }
+    end
+  end
+end

data/test/vagrant/box_test.rb

@@ -112,6 +112,7 @@ class BoxTest < Test::Unit::TestCase
   context "instance methods" do
     setup do
       @box = Vagrant::Box.new
+      @box.env = mock_environment
     end
 
     should "execute the Add action when add is called" do
@@ -141,10 +142,12 @@ class BoxTest < Test::Unit::TestCase
     context "ovf file" do
       setup do
         @box.stubs(:directory).returns("foo")
+
+        @box.env.config.vm.box_ovf = "foo.ovf"
       end
 
       should "be the directory joined with the config ovf file" do
-        assert_equal File.join(@box.directory, Vagrant.config.vm.box_ovf), @box.ovf_file
+        assert_equal File.join(@box.directory, @box.env.config.vm.box_ovf), @box.ovf_file
       end
     end
   end

data/test/vagrant/environment_test.rb

@@ -24,6 +24,13 @@ class EnvironmentTest < Test::Unit::TestCase
       VirtualBox.expects(:version).returns(version)
       Vagrant::Environment.check_virtualbox!
     end
+
+    should "error and exit for OSE VirtualBox" do
+      version = "3.1.6_OSE"
+      Vagrant::Environment.expects(:error_and_exit).with(:virtualbox_invalid_ose, :version => version.to_s).once
+      VirtualBox.expects(:version).returns(version)
+      Vagrant::Environment.check_virtualbox!
+    end
   end
 
   context "class method load!" do

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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-04-15}
+  s.date = %q{2010-04-21}
   s.default_executable = %q{vagrant}
   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"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/vagrant/actions/box/destroy.rb",
      "lib/vagrant/actions/box/download.rb",
      "lib/vagrant/actions/box/unpackage.rb",
+     "lib/vagrant/actions/box/verify.rb",
      "lib/vagrant/actions/collection.rb",
      "lib/vagrant/actions/runner.rb",
      "lib/vagrant/actions/vm/boot.rb",
@@ -107,6 +108,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/box/destroy_test.rb",
      "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/unpackage_test.rb",
+     "test/vagrant/actions/box/verify_test.rb",
      "test/vagrant/actions/collection_test.rb",
      "test/vagrant/actions/runner_test.rb",
      "test/vagrant/actions/vm/boot_test.rb",
@@ -176,6 +178,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/box/destroy_test.rb",
      "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/unpackage_test.rb",
+     "test/vagrant/actions/box/verify_test.rb",
      "test/vagrant/actions/collection_test.rb",
      "test/vagrant/actions/runner_test.rb",
      "test/vagrant/actions/vm/boot_test.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 -07:00
+date: 2010-04-21 00:00:00 -07:00
 default_executable: vagrant
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ files:
 - lib/vagrant/actions/box/destroy.rb
 - lib/vagrant/actions/box/download.rb
 - lib/vagrant/actions/box/unpackage.rb
+- lib/vagrant/actions/box/verify.rb
 - lib/vagrant/actions/collection.rb
 - lib/vagrant/actions/runner.rb
 - lib/vagrant/actions/vm/boot.rb
@@ -202,6 +203,7 @@ files:
 - test/vagrant/actions/box/destroy_test.rb
 - test/vagrant/actions/box/download_test.rb
 - test/vagrant/actions/box/unpackage_test.rb
+- test/vagrant/actions/box/verify_test.rb
 - test/vagrant/actions/collection_test.rb
 - test/vagrant/actions/runner_test.rb
 - test/vagrant/actions/vm/boot_test.rb
@@ -295,6 +297,7 @@ test_files:
 - test/vagrant/actions/box/destroy_test.rb
 - test/vagrant/actions/box/download_test.rb
 - test/vagrant/actions/box/unpackage_test.rb
+- test/vagrant/actions/box/verify_test.rb
 - test/vagrant/actions/collection_test.rb
 - test/vagrant/actions/runner_test.rb
 - test/vagrant/actions/vm/boot_test.rb