vagrant-vbguest 0.6.4 → 0.7.0.pre0

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.7.0
+
+  - Add support for redhat-based distributions (Scientific Linux and
+    presumably CentOS) [GH-47], [GH-46] / (thanks @neerolyte)
+  - Fix an issue with VirtualBox GuestAdditions 4.2.8 [GH-44] /
+    (thanks @jimmycuadra)
+
+### heads-up
+
+  - [GH-44] changes the behavior of vbguest to that effect, that it
+    will no longer halt vagrant workflow if running the VirtualBox
+    GuestAdditions Installer returns an error-code.
+    Instead it will print a human readable waring message.
+
 ## 0.6.4 (2013-01-24)
 
   - Fix passing a installer class as an config option [GH-40]
@@ -40,7 +54,7 @@
 ## 0.5.1 (2012-11-30)
 
  - Fix: Provisioning will not run twice when rebooted due
-   to incomplete GuestAdditions installation [GH-27]
+   to incomplete GuestAdditions installation [GH-27] /
    (thanks @gregsymons for pointing)
 
 ## 0.5.0 (2012-11-19)

data/lib/vagrant-vbguest.rb

@@ -11,6 +11,7 @@ require 'vagrant-vbguest/installers/base'
 require 'vagrant-vbguest/installers/linux'
 require 'vagrant-vbguest/installers/debian'
 require 'vagrant-vbguest/installers/ubuntu'
+require 'vagrant-vbguest/installers/redhat'
 
 require 'vagrant-vbguest/config'
 require 'vagrant-vbguest/command'

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

@@ -160,6 +160,17 @@ module VagrantVbguest
           :host_version => host_version)
       end
 
+      # Helper to yield a warning message to the user in the event that the
+      # installer returned a non-zero exit status. Because lack of a window
+      # system will cause this result in VirtualBox 4.2.8+, we don't want to
+      # kill the entire boot process, but we do want to make sure the user
+      # knows there could be a problem. The message includles the installer
+      # version.
+      def yield_installation_error_warning(path_to_installer)
+        @vm.ui.warn I18n.t("vagrant.plugins.vbguest.install_error",
+          :installer_version => installer_version(path_to_installer) || I18n.t("vagrant.plugins.vbguest.unknown"))
+      end
+
       # GuestAdditions-iso-file-detection-magig.
       #
       # Detectio runs in those stages:

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

@@ -104,7 +104,8 @@ module VagrantVbguest
 
       # A generic helper method to execute the installer. The iso file
       # has to be mounted on +mount_point+.
-      # This also yields a installation warning to the user.
+      # 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.
       #
       # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
       # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
@@ -113,7 +114,10 @@ module VagrantVbguest
       def execute_installer(opts=nil, &block)
         installer = File.join(mount_point, 'VBoxLinuxAdditions.run')
         yield_installation_waring(installer)
-        vm.channel.sudo("#{installer} --nox11", opts, &block)
+        opts = {:error_check => false}.merge(opts || {})
+        exit_status = vm.channel.sudo("#{installer} --nox11", opts, &block)
+        yield_installation_error_warning(installer) unless exit_status == 0
+        exit_status
       end
 
       # A generic helper method for mounting the GuestAdditions iso file

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

@@ -0,0 +1,29 @@
+module VagrantVbguest
+  module Installers
+    class RedHat < Linux
+      # Scientific Linux (and probably CentOS) both show up as :redhat
+      # fortunately they're probably both similar enough to RHEL
+      # (RedHat Enterprise Linux) not to matter.
+      def self.match?(vm)
+        :redhat == self.distro(vm)
+      end
+
+      # Install missing deps and yield up to regular linux installation
+      def install(opts=nil, &block)
+        vm.channel.sudo(install_dependencies_cmd, opts, &block)
+        super
+      end
+
+    protected
+      def install_dependencies_cmd
+        "yum install -y #{dependencies}"
+      end
+
+      def dependencies
+        packages = ['kernel-devel-`uname -r`', 'gcc', 'make', 'perl']
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::RedHat, 5)

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.6.4"
+  VERSION = "0.7.0.pre0"
 end

data/locales/en.yml

@@ -8,6 +8,7 @@ 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."
         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.6.4
-  prerelease: 
+  version: 0.7.0.pre0
+  prerelease: 6
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -100,6 +100,7 @@ files:
 - lib/vagrant-vbguest/installers/base.rb
 - lib/vagrant-vbguest/installers/debian.rb
 - lib/vagrant-vbguest/installers/linux.rb
+- lib/vagrant-vbguest/installers/redhat.rb
 - lib/vagrant-vbguest/installers/ubuntu.rb
 - lib/vagrant-vbguest/machine.rb
 - lib/vagrant-vbguest/middleware.rb
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM