vagrant 0.3.1 → 0.3.2

data/Gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 
 # Gems required for the lib to even run
-gem "virtualbox", "~> 0.6.0"
+gem "virtualbox", "~> 0.6.1"
 gem "net-ssh", ">= 2.0.19"
 gem "net-scp", ">= 1.0.2"
 gem "json_pure", ">= 1.2.0"

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gemspec.homepage = "http://github.com/mitchellh/vagrant"
     gemspec.authors = ["Mitchell Hashimoto", "John Bender"]
 
-    gemspec.add_dependency('virtualbox', '~> 0.6.0')
+    gemspec.add_dependency('virtualbox', '~> 0.6.1')
     gemspec.add_dependency('net-ssh', '>= 2.0.19')
     gemspec.add_dependency('net-scp', '>= 1.0.2')
     gemspec.add_dependency('json_pure', '>= 1.2.0')

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

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

@@ -36,7 +36,7 @@ module Vagrant
         def export
           logger.info "Exporting VM to #{ovf_path}..."
           @runner.vm.export(ovf_path) do |progress|
-            update_progress(progress, 100, false)
+            update_progress(progress.percent, 100, false)
           end
 
           complete_progress

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

@@ -10,7 +10,7 @@ module Vagrant
               logger.info "Importing base VM (#{@runner.env.box.ovf_file})..."
               # Use the first argument passed to the action
               @runner.vm = VirtualBox::VM.import(@runner.env.box.ovf_file) do |progress|
-                update_progress(progress, 100, false)
+                update_progress(progress.percent, 100, false)
               end
 
               complete_progress

data/lib/vagrant/busy.rb

@@ -28,8 +28,7 @@ module Vagrant
           begin
             Signal.trap("INT") { wait_for_not_busy }
             Busy.busy = true
-            runner = Thread.new(block) { block.call }
-            runner.join
+            block.call
           ensure
             # In the case an exception is thrown, make sure we restore
             # busy back to some sane state.

data/test/vagrant/busy_test.rb

@@ -63,23 +63,9 @@ class BusyTest < Test::Unit::TestCase
     should "report busy to the outside world regardless of thread" do
       Thread.new do
         Vagrant.busy do
-          sleep(2)
+          assert Vagrant.busy?
         end
       end
-      # Give the thread time to start
-      sleep(1)
-
-      # While the above thread is executing vagrant should be busy
-      assert Vagrant.busy?
-    end
-
-    should "run the action in a new thread" do
-      runner_thread = nil
-      Vagrant.busy do
-        runner_thread = Thread.current
-      end
-
-      assert_not_equal Thread.current, runner_thread
     end
 
     should "trap INT" do

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.3.1"
+  s.version = "0.3.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-04-21}
+  s.date = %q{2010-04-24}
   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"]
@@ -241,14 +241,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<virtualbox>, ["~> 0.6.0"])
+      s.add_runtime_dependency(%q<virtualbox>, ["~> 0.6.1"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_runtime_dependency(%q<net-scp>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
       s.add_runtime_dependency(%q<mario>, ["~> 0.0.6"])
     else
-      s.add_dependency(%q<virtualbox>, ["~> 0.6.0"])
+      s.add_dependency(%q<virtualbox>, ["~> 0.6.1"])
       s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_dependency(%q<net-scp>, [">= 1.0.2"])
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
@@ -256,7 +256,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mario>, ["~> 0.0.6"])
     end
   else
-    s.add_dependency(%q<virtualbox>, ["~> 0.6.0"])
+    s.add_dependency(%q<virtualbox>, ["~> 0.6.1"])
     s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
     s.add_dependency(%q<net-scp>, [">= 1.0.2"])
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -07:00
+date: 2010-04-24 00:00:00 -07:00
 default_executable: vagrant
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 0
-        version: 0.6.0
+        - 1
+        version: 0.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency