vagrant-vbguest 0.10.0.pre1 → 0.10.0

data/CHANGELOG.md

@@ -1,19 +1,22 @@
-## 0.10.0 (UNRELEASED)
-  
+## 0.10.0 (2013-12-09)
+
+  - Adds new config option `installer_arguments`   
+    Customize arguments passed to the VirtualBox GuestAdditions shell script
+    installer. Defaults to "--no-x11". [GH-98]
   - Cope with UbuntuCloudImage by default [GH-86], [GH-64], [GH-43]
     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]
+  - Wait for SSH connection to be ready. Fixes timing issues with vagrant
+    v1.3.0 and later. [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]
+  - Fix crash on Vagrant 1.4 [GH-100]
 
 ### heads-up
   

data/Readme.md

@@ -176,7 +176,7 @@ When you switched off the middleware auto update, or you have a box up and runni
 $ vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]
 ```
 
-For example, when you just updated Virtual Box on your host system, you should update the gust additions right away. However, you may need to reload the box to get the guest additions working.
+For example, when you just updated Virtual Box on your host system, you should update the guest additions right away. However, you may need to reload the box to get the guest additions working.
 
 If you want to check the guest additions versions, without installing them, you may run:
 

data/lib/vagrant-vbguest/config.rb

@@ -3,7 +3,7 @@ module VagrantVbguest
   class Config <( Vagrant::VERSION < "1.1.0" ? Vagrant::Config::Base : Vagrant.plugin("2", :config) )
 
     module Attributes
-      attr_accessor :iso_path, :auto_update, :auto_reboot, :no_install, :no_remote, :installer
+      attr_accessor :iso_path, :auto_update, :auto_reboot, :no_install, :no_remote, :installer, :installer_arguments
     end
 
     class << self
@@ -13,6 +13,7 @@ module VagrantVbguest
       def auto_reboot; @auto_reboot.nil? ? true  : @auto_reboot end
       def no_install;  @no_install.nil?  ? false : @no_install  end
       def no_remote;   @no_remote.nil?   ? false : @no_remote   end
+      def installer_arguments; @installer_arguments.nil? ? '--nox11' : @installer_arguments end
 
       def iso_path
         return nil if !@iso_path || @iso_path == :auto
@@ -26,6 +27,7 @@ module VagrantVbguest
     def auto_reboot; @auto_reboot.nil? ? self.class.auto_reboot : @auto_reboot end
     def no_install;  @no_install.nil?  ? self.class.no_install  : @no_install  end
     def no_remote;   @no_remote.nil?   ? self.class.no_remote   : @no_remote   end
+    def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments : @installer_arguments end
 
     def iso_path
       return self.class.iso_path if !@iso_path || @iso_path == :auto
@@ -36,6 +38,7 @@ module VagrantVbguest
     def to_hash
       {
         :installer => installer,
+        :installer_arguments => installer_arguments,
         :iso_path => iso_path,
         :auto_update => auto_update,
         :auto_reboot => auto_reboot,

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

@@ -102,8 +102,7 @@ module VagrantVbguest
       end
 
 
-      # A generic helper method to execute the installer. The iso file
-      # has to be mounted on +mount_point+.
+      # A generic helper method to execute the installer.
       # This also yields a installation warning to the user, and an error
       # warning in the event that the installer returns a non-zero exit status.
       #
@@ -112,14 +111,24 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def execute_installer(opts=nil, &block)
-        installer = File.join(mount_point, 'VBoxLinuxAdditions.run')
         yield_installation_waring(installer)
         opts = {:error_check => false}.merge(opts || {})
-        exit_status = communicate.sudo("#{installer} --nox11", opts, &block)
+        exit_status = communicate.sudo("#{installer} #{installer_arguments}", opts, &block)
         yield_installation_error_warning(installer) unless exit_status == 0
         exit_status
       end
 
+      # The absolute path to the GuestAdditions installer script.
+      # The iso file has to be mounted on +mount_point+.
+      def installer
+        @installer ||= File.join(mount_point, 'VBoxLinuxAdditions.run')
+      end
+
+      # The arguments string, which gets passed to the installer script
+      def installer_arguments
+        @installer_arguments ||= Array(options[:installer_arguments]).join " "
+      end
+
       # A generic helper method for mounting the GuestAdditions iso file
       # on most linux system.
       # Mounts the given uploaded file from +tmp_path+ on +mount_point+.

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

@@ -7,7 +7,7 @@ module VagrantVbguest
       end
 
       def install(opts=nil, &block)
-        if (packaged = packaged_additions?)
+        if packaged_additions?
           unload_packaged_additions(opts, &block)
           remove_packaged_additions(opts, &block)
         end

data/lib/vagrant-vbguest/vagrant_compat.rb

@@ -7,9 +7,11 @@ supported_version = {
 }
 compat_version = supported_version.find { |requirement, version|
   Gem::Requirement.new(requirement).satisfied_by?(vagrant_version)
-}[1]
+}
 
-if !compat_version
+if compat_version
+  compat_version = compat_version[1]
+else
   # @TODO: yield warning
   compat_version = supported_version.to_a.last[1]
 end

data/lib/vagrant-vbguest/version.rb

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

data/locales/en.yml

@@ -6,7 +6,9 @@ en:
     installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
     rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
     rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
-    install_error: "An error occurred during installation of VirtualBox Guest Additions %{installer_version}. Some functionality may not work as intended."
+    install_error: |-
+      An error occurred during installation of VirtualBox Guest Additions %{installer_version}. Some functionality may not work as intended.
+      In most cases it is OK that the "Window System drivers" installation failed.
     start_copy_iso: "Copy iso file %{from} into the box %{to}"
     restart_vm: "Restarting VM to apply changes..."
     suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box running `vagrant reload %{name}`"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.10.0.pre1
-  prerelease: 7
+  version: 0.10.0
+  prerelease: 
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-09 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: 1853840948815147126
+      hash: 2424747477234363864
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: