vagrant-vbguest 0.10.0.pre0 → 0.10.0.pre1

data/CHANGELOG.md

@@ -4,12 +4,23 @@
     On Ubuntu, always try to remove conflicting installations of
     GuestAdditions by removing those packages:
     virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11
+  - Unload kernel modules when UbuntuCloudImage packages are installed.
+    (Thanks @eric1234 for commenting on ec9a7b1f0a)
+  - Wait for SSH connection to be ready. Depends on vagrant's
+    `WaitForCommunicator` action, which is available from vagrant v1.3.0.
+    [GH-80], [GH-90]
   - Fix a typo in command description [GH-84]
   - Tweak gem dependencies [GH-82]
     - add rake as development dependency
     - remove version locks on gems provided by vagrant
   - Pass plugin name when registration the action hook for vagrant ≥1.1 [GH-80]
 
+### heads-up
+  
+  - With [GH-94] the **name**, `vagrant-vbguest` registers itself to vagrant's
+    (≥1.1) plugin-system changed from 'vbguest management' to
+    'vagrant-vbguest'
+
 ## 0.9.0
 
   - Adds support for vagrant 1.3 [GH-71], [GH-72]
@@ -93,13 +104,13 @@
   - Fix typos and wording in error messages and I18n keys
     et al. [GH-38]
 
-## 0.6.1 (2012-01-13)
+## 0.6.1 (2013-01-13)
 
   - Fix missing command output block and parameters for
     installation process [GH-37]
   - Update README to reflect new wording for status informations
 
-## 0.6.0 (2012-01-13)
+## 0.6.0 (2013-01-13)
 
  - Debian installer now cope with missing `dkms` package [GH-30]
  - Fixed some issues when runnig on just creating boxes [GH-31]

data/Readme.md

@@ -156,7 +156,7 @@ The plugin's part starts at `[default] Installing Virtualbox Guest Additions 4.1
 * which installer script will be used
 * all the VirtualBox Guest Additions installer output.
 
-No worries on the `Installing the Window System drivers ...fail!`. Most dev boxes you are using won't run a Window Server, thus it's absolutely save to ignore that error.
+No worries on the `Installing the Window System drivers ...fail!`. Most dev boxes you are using won't run a Window Server, thus it's absolutely safe to ignore that error.
 
 When everything is fine, and no update is needed, you see log like:
 

data/lib/vagrant-vbguest/installers/ubuntu.rb

@@ -7,15 +7,34 @@ module VagrantVbguest
       end
 
       def install(opts=nil, &block)
-        remove_packaged_additions(opts=nil, &block)
+        if (packaged = packaged_additions?)
+          unload_packaged_additions(opts, &block)
+          remove_packaged_additions(opts, &block)
+        end
         super
       end
 
     protected
 
+      def packaged_additions?
+        communicate.test("dpkg --list | grep virtualbox-guest")
+      end
+
       def remove_packaged_additions(opts=nil, &block)
         options = (opts || {}).merge(:error_check => false)
-        command = "dpkg --list | grep virtualbox-guest && apt-get -y -q purge virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11"
+        command = "apt-get -y -q purge virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11"
+        communicate.sudo(command, options, &block)
+      end
+
+      def unload_packaged_additions(opts=nil, &block)
+        commands = [
+          "service virtualbox-guest-utils stop",
+          "umount -a -t vboxsf",
+          "rmmod vboxsf",
+          "rmmod vboxguest"
+        ]
+        command = "(" + commands.join("; sleep 1; ") + ")"
+        options = (opts || {}).merge(:error_check => false)
         communicate.sudo(command, options, &block)
       end
 

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/rebootable.rb

@@ -13,6 +13,9 @@ module VagrantVbguest
               end
             end
             b.use VagrantPlugins::ProviderVirtualBox::Action::Boot
+            if defined?(Vagrant::Action::Builtin::WaitForCommunicator)
+              b.use Vagrant::Action::Builtin::WaitForCommunicator, [:starting, :running]
+            end
           end
           @env[:action_runner].run(simle_reboot, @env)
         end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.10.0.pre0"
+  VERSION = "0.10.0.pre1"
 end

data/lib/vagrant-vbguest.rb

@@ -28,7 +28,7 @@ module VagrantVbguest
 
   class Plugin < Vagrant.plugin("2")
 
-    name "vbguest management"
+    name "vagrant-vbguest"
     description <<-DESC
     Provides automatic and/or manual management of the
     VirtualBox Guest Additions inside the Vagrant environment.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.10.0.pre0
+  version: 0.10.0.pre1
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2431188333984855511
+      hash: 1853840948815147126
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: