vagrant-vbguest 0.10.1 → 0.11.0.beta0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13084bb868cab9e4f72ffe2736fc19431766c040
-  data.tar.gz: 2c741a74f26808fe8b7982d9bbc969e155e399b0
+  metadata.gz: 48daaa682d1954afa47077d851e909ee59f4de16
+  data.tar.gz: e0463a03f2399f33f936c78a7d7a85fc28a2ea10
 SHA512:
-  metadata.gz: 0aa5063d60c8593ebdc717f2b317c84e4a513c5c6bb5535401d98613ab58c0773f388253cd6d4e64a3da312ccd54c0441aecfd663ceb282be013f196aef9551f
-  data.tar.gz: 05ccc67697bde6ccf34c92eed2a8d1124dc1934a026dccc0a372021ffa187494385f29f6b4e9e0c09464563d87013b5d293eaf0ca599562d1bad74b5530cc87f
+  metadata.gz: fa1f488dcb5c2260dfc377aa2e6b789bcdc14355d3b0a5522dee7cb75a479d7592bf05f7898e5e371629479132e3c572724760f0877586a6d7723c7a414a7c4f
+  data.tar.gz: 81abe6a1a27e15588257a30890bb8628480ad92306eb53c88f47b9fc0f27427d1e758ea58662a31798d3ff54af115231c75ffe602d13302aca044d3adc943a1e

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+testdrive/.vagrant/
+testdrive/.vagrant.d/

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.11.0 (unreleased)
+
+  - Add installer for opensuse. Thanks @darnells for [GH-163]
+  - Add installer for fedora. Thanks @jamesgecko and @PatrickCoffey for [GH-158]
+  - Add redhat installer support for centos7. Thanks @roidelapluie for [GH-162]
+  - Add debian installer support for debian8. Thanks @ubermuda for [GH-171]
+  - Add ISO autodetection on Archlinux hosts. [GH-135]
+  - Add configuration options for iso upload path and mount point.
+  - Add a `--no-cleanup` command-line switch to make debugging a bit more convenient.
+
 ## 0.10.1 (2015-10-08)
 
   - Make sure our log message strings are loaded [GH-107]

data/Gemfile

@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in vagrant-vbguest.gemspec
-gemspec
-
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end
+
+group :plugins do
+  gem "vagrant-vbguest", path: "."
+end

data/Readme.md

@@ -2,7 +2,8 @@
 
 *vagrant-vbguest* is a [Vagrant](http://vagrantup.com) plugin which automatically installs the host's VirtualBox Guest Additions on the guest system.
 
-[![Code Climate](https://codeclimate.com/github/dotless-de/vagrant-vbguest.png)](https://codeclimate.com/github/dotless-de/vagrant-vbguest) [![Dependency Status](https://gemnasium.com/dotless-de/vagrant-vbguest.png)](https://gemnasium.com/dotless-de/vagrant-vbguest)
+[![Code Climate](https://codeclimate.com/github/dotless-de/vagrant-vbguest.png)](https://codeclimate.com/github/dotless-de/vagrant-vbguest) [![Dependency Status](https://gemnasium.com/dotless-de/vagrant-vbguest.png)](https://gemnasium.com/dotless-de/vagrant-vbguest) [![Inline docs](http://inch-ci.org/github/dotless-de/vagrant-vbguest.svg?branch=master)](http://inch-ci.org/github/dotless-de/vagrant-vbguest)
+
 
 ## Installation
 
@@ -59,11 +60,14 @@ end
 The `iso_path` may contain the optional placeholder `%{version}` replaced with detected VirtualBox version (e.g. `4.1.8`).
 The default URI for the actual iso download is: `http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso`<br/>
 vbguest will try to autodetect the best option for your system. WTF? see below.
+* `iso_upload_path` (String, default: `/tmp`): A writeable directory where to put the VBoxGuestAdditions.iso file on the guest system.
+* `iso_mount_point` (String, default: `/mnt`): Where to mount the VBoxGuestAdditions.iso file on the guest system.
 * `auto_update` (Boolean, default: `true`) : Whether to check the correct additions version on each start (where start is _not_ resuming a box).
 * `auto_reboot` (Boolean, default: `true` when running as a middleware, `false` when running as a command) : Whether to reboot the box after GuestAdditions has been installed, but not loaded.
 * `no_install` (Boolean, default: `false`) : Whether to check the correct additions version only. This will warn you about version mis-matches, but will not try to install anything.
 * `no_remote` (Boolean, default: `false`) : Whether to _not_ download the iso file from a remote location. This includes any `http` location!
 * `installer` (`VagrantVbguest::Installers::Base`, optional) : Reference to a (custom) installer class
+* `installer_arguments` (Array, default: `['--nox11']`) : List of additional arguments to pass to the installer. eg: `%w{--nox11 --force}` would execute `VBoxLinuxAdditions.run install --nox11 --force`
 
 #### Global Configuration
 
@@ -173,7 +177,7 @@ When everything is fine, and no update is needed, you see log like:
 When you switched off the middleware auto update, or you have a box up and running you may also run the installer manually.
 
 ```bash
-$ vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]
+$ vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso] [--no-cleanup]
 ```
 
 For example, when you just updated VirtualBox 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.
@@ -205,7 +209,7 @@ You can also pass vagrant's `reload` options like:
 $ vagrant vbguest --auto-reboot --no-provision
 ```
 
-
+When running the install step manually like this: `vagrant vbguest --do install`, adding `--no-cleanup` keeps the downloaded, uploaded files and mounted iso in their place. Happy debugging ;)
 
 ### ISO autodetection
 
@@ -262,6 +266,7 @@ end
 ## Known Issues
 
 * The installer script, which mounts and runs the GuestAdditions Installer Binary, works on Linux only. Most likely it will run on most Unix-like platforms.
-* The installer script requires a directory `/mnt` on the guest system
-* On multi vm boxes, the iso file will be downloaded for each vm
+* The installer script requires a writeable upload directory on the guest system. This defaults to `/tmp` but can be overwritten with the `iso_upload_path` option.
+* The installer script requires a valid mount point on the guest system. This defaults to `/mnt` but can be overwritten with the `iso_mount_point` option.
+* On multi vm boxes, the iso file will be downloaded for each vm.
 * The plugin installation on Windows host systems may not work as expected (using `vagrant gem install vagrant-vbguest`). Try `C:\vagrant\vagrant\embedded\bin\gem.bat install vagrant-vbguest` instead. (See [issue #19](https://github.com/dotless-de/vagrant-vbguest/issues/19#issuecomment-7040304))

data/lib/vagrant-vbguest.rb

@@ -22,6 +22,9 @@ require 'vagrant-vbguest/installers/linux'
 require 'vagrant-vbguest/installers/debian'
 require 'vagrant-vbguest/installers/ubuntu'
 require 'vagrant-vbguest/installers/redhat'
+require 'vagrant-vbguest/installers/oracle'
+require 'vagrant-vbguest/installers/fedora'
+require 'vagrant-vbguest/installers/opensuse'
 
 require 'vagrant-vbguest/middleware'
 

data/lib/vagrant-vbguest/command.rb

@@ -17,7 +17,15 @@ module VagrantVbguest
         :auto_reboot => false
       }
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]"
+        opts.banner = "Usage: vagrant vbguest [vm-name] "\
+                      "[--do start|rebuild|install] "\
+                      "[--status] "\
+                      "[-f|--force] "\
+                      "[-b|--auto-reboot] "\
+                      "[-R|--no-remote] "\
+                      "[--iso VBoxGuestAdditions.iso] "\
+                      "[--no-cleanup]"
+
         opts.separator ""
 
         opts.on("--do COMMAND", [:start, :rebuild, :install], "Manually `start`, `rebuild` or `install` GuestAdditions.") do |command|
@@ -46,6 +54,10 @@ module VagrantVbguest
           options[:iso_path] = file_or_uri
         end
 
+        opts.on("--no-cleanup", "Do not run cleanup tasks after installation. (for debugging)") do
+          options[:no_cleanup] = true
+        end
+
         build_start_options(opts, options)
       end
 
@@ -65,7 +77,10 @@ module VagrantVbguest
 
     protected
 
-    # Executes a command on a specific VM.
+    # Executes a task on a specific VM.
+    #
+    # @param vm [Vagrant::VM]
+    # @param options [Hash] Parsed options from the command line
     def execute_on_vm(vm, options)
       check_runable_on(vm)
 

data/lib/vagrant-vbguest/config.rb

@@ -3,7 +3,9 @@ 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, :installer_arguments
+      attr_accessor :auto_update, :auto_reboot, :no_install, :no_remote,
+                    :installer, :installer_arguments,
+                    :iso_path, :iso_upload_path, :iso_mount_point
     end
 
     class << self
@@ -40,6 +42,8 @@ module VagrantVbguest
         :installer => installer,
         :installer_arguments => installer_arguments,
         :iso_path => iso_path,
+        :iso_upload_path => iso_upload_path,
+        :iso_mount_point => iso_mount_point,
         :auto_update => auto_update,
         :auto_reboot => auto_reboot,
         :no_install => no_install,

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

@@ -91,9 +91,9 @@ module VagrantVbguest
         # replaces the veriosn placeholder with the additions
         # version string
         #
-        # @param [String] A path or URL (or any other String)
+        # @param path [String] A path or URL (or any other String)
         #
-        # @retrun [String] A copy of the passed string, with verision
+        # @return [String] A copy of the passed string, with verision
         #                  placeholder replaced
         def versionize(path)
           path % {:version => version}
@@ -104,7 +104,7 @@ module VagrantVbguest
         #
         # To remove the created tempfile call +cleanup+
         #
-        # @param [String] The path or URI to download
+        # @param path [String] The path or URI to download
         #
         # @return [String] The path to the downloaded file
         def download(path)

data/lib/vagrant-vbguest/hosts/virtualbox.rb

@@ -25,7 +25,7 @@ module VagrantVbguest
         #
         # To remove the created tempfile call +cleanup+
         #
-        # @param [String] The path or URI to download
+        # @param path [String] The path or URI to download
         #
         # @return [String] The path to the downloaded file
         def download(path)
@@ -70,7 +70,10 @@ module VagrantVbguest
         # Makes an educated guess where the GuestAdditions iso file
         # on linux based systems
         def linux_path
-          paths = ["/usr/share/virtualbox/VBoxGuestAdditions.iso"]
+          paths = [
+            "/usr/share/virtualbox/VBoxGuestAdditions.iso",
+            "/usr/lib/virtualbox/additions/VBoxGuestAdditions.iso"
+          ]
           paths.unshift(File.join(ENV['HOME'], '.VirtualBox', "VBoxGuestAdditions_#{version}.iso")) if ENV['HOME']
           paths
         end

data/lib/vagrant-vbguest/installer.rb

@@ -26,8 +26,8 @@ module VagrantVbguest
       # specific version of a distribution should use heigher
       # priority numbers.
       #
-      # @param [Class] installer_class A reference to the Installer class.
-      # @param [Fixnum] prio Priority describing how specific the Installer matches. (default: `5`)
+      # @param installer_class [Class] A reference to the Installer class.
+      # @param prio [Fixnum] Priority describing how specific the Installer matches. (default: `5`)
       def register(installer_class, prio = 5)
         @installers ||= {}
         @installers[prio] ||= []
@@ -35,8 +35,11 @@ module VagrantVbguest
       end
 
       ##
-      # Returns the class of the registrated Installer class which
+      # Returns the class of the registered Installer class which
       # matches first (according to it's priority) or `nil` if none matches.
+      #
+      # @param vm [Vagrant::VM]
+      # @param options [Hash]
       def detect(vm, options)
         @installers.keys.sort.reverse.each do |prio|
           klass = @installers[prio].detect { |k| k.match?(vm) }

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

@@ -19,7 +19,7 @@ module VagrantVbguest
       # is run. It is ignored, when passing an Installer class
       # directly as an config (`installer`) option.
       #
-      # @param [Vagrant::VM]
+      # @param vm [Vagrant::VM]
       # @return [Boolean]
       def self.match?(vm)
         false
@@ -57,7 +57,7 @@ module VagrantVbguest
       # The path to the local iso file should be obtained by calling +iso_file+
       # Subclasses must override this method!
       #
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -74,7 +74,7 @@ module VagrantVbguest
       # empty.
       # Subclasses should override this method.
       #
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -90,7 +90,7 @@ module VagrantVbguest
       # this method should left empty.
       # Subclasses should override this method.
       #
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -113,7 +113,7 @@ module VagrantVbguest
       # Determinates the GuestAdditions version installed on the
       # guest system.
       #
-      # @param [Boolean] reload Whether to read the value again or use
+      # @param reload [Boolean] Whether to read the value again or use
       #                  the cached value form an erlier call.
       # @return [String] The version code of the VirtualBox Guest Additions
       #                  available on the guest, or `nil` if none installed.
@@ -145,7 +145,7 @@ module VagrantVbguest
       # The message includes the host and installer version strings.
       def yield_installation_waring(path_to_installer)
         @env.ui.warn I18n.t("vagrant_vbguest.installing#{@options[:force] ? '_forced' : ''}",
-          :guest_version => guest_version,
+          :guest_version     => (guest_version || I18n.t("vagrant_vbguest.unknown")),
           :installer_version => installer_version(path_to_installer) || I18n.t("vagrant_vbguest.unknown"))
       end
 
@@ -181,7 +181,7 @@ module VagrantVbguest
       # @example Default upload
       #    upload(file)
       #
-      # @param [String] Path of the file to upload to the +tmp_path*
+      # @param file [String] Path of the file to upload to the +tmp_path*
       def upload(file)
         env.ui.info(I18n.t("vagrant_vbguest.start_copy_iso", :from => file, :to => tmp_path))
         communicate.upload(file, tmp_path)
@@ -190,9 +190,11 @@ module VagrantVbguest
       # A helper method to delete the uploaded GuestAdditions iso file
       # from the guest box
       def cleanup
-        @host.cleanup
-        communicate.execute("test -f #{tmp_path} && rm #{tmp_path}", :error_check => false) do |type, data|
-          env.ui.error(data.chomp, :prefix => false)
+        unless options[:no_cleanup]
+          @host.cleanup
+          communicate.execute("test -f #{tmp_path} && rm #{tmp_path}", :error_check => false) do |type, data|
+            env.ui.error(data.chomp, :prefix => false)
+          end
         end
       end
 

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

@@ -3,12 +3,12 @@ module VagrantVbguest
     class Debian < Linux
 
       def self.match?(vm)
-        :debian == self.distro(vm)
+        /\Adebian\d*\Z/ =~ self.distro(vm)
       end
 
       # installes the correct linux-headers package
       # installes `dkms` package for dynamic kernel module loading
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.

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

@@ -0,0 +1,28 @@
+module VagrantVbguest
+  module Installers
+    class Fedora < Linux
+
+      def self.match?(vm)
+        :fedora == self.distro(vm)
+      end
+
+      # Install missing deps and yield up to regular linux installation
+      def install(opts=nil, &block)
+        communicate.sudo(install_dependencies_cmd, opts, &block)
+        super
+      end
+
+      protected
+
+      def install_dependencies_cmd
+        "`which dnf || which yum` install -y #{dependencies}"
+      end
+
+      def dependencies
+        packages = ['kernel-devel-`uname -r`', 'gcc', 'dkms', 'make', 'perl', 'bzip2']
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Fedora, 5)

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

@@ -27,31 +27,37 @@ module VagrantVbguest
         communicate_to(vm).test("uname | grep 'Linux'")
       end
 
-      # defaults the temp path to "/tmp/VBoxGuestAdditions.iso" for all Linux based systems
+      # The temporary path where to upload the iso file to.
+      # Configurable via `config.vbguest.iso_upload_path`.
+      # Defaults the temp path to `/tmp/VBoxGuestAdditions.iso" for
+      # all Linux based systems
       def tmp_path
-        '/tmp/VBoxGuestAdditions.iso'
+        options[:iso_upload_path] || '/tmp/VBoxGuestAdditions.iso'
       end
 
-      # defaults the mount point to "/mnt" for all Linux based systems
+      # Mount point for the iso file.
+      # Configurable via `config.vbguest.iso_mount_point`.
+      #Ddefaults to "/mnt" for all Linux based systems.
       def mount_point
-        '/mnt'
+        options[:iso_mount_point] || '/mnt'
       end
 
       # a generic way of installing GuestAdditions assuming all
       # dependencies on the guest are installed
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      #
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def install(opts=nil, &block)
-        env.ui.warn I18n.t("vagrant_vbguest.errors.installer.generic_linux_installer") if self.class == Linux
+        env.ui.warn I18n.t("vagrant_vbguest.errors.installer.generic_linux_installer", distro: self.class.distro(vm)) if self.class == Linux
         upload(iso_file)
         mount_iso(opts, &block)
         execute_installer(opts, &block)
-        unmount_iso(opts, &block)
+        unmount_iso(opts, &block) unless options[:no_cleanup]
       end
 
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -84,29 +90,87 @@ module VagrantVbguest
         @guest_version
       end
 
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def rebuild(opts=nil, &block)
-        communicate.sudo('/etc/init.d/vboxadd setup', opts, &block)
+        communicate.sudo("#{vboxadd_tool} setup", opts, &block)
       end
 
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def start(opts=nil, &block)
         opts = {:error_check => false}.merge(opts || {})
-        communicate.sudo('/etc/init.d/vboxadd start', opts, &block)
+        systemd = systemd_tool
+        if systemd
+          communicate.sudo("#{systemd[:path]} vboxadd #{systemd[:up]}", opts, &block)
+        else
+          communicate.sudo("#{vboxadd_tool} start", opts, &block)
+        end
       end
 
+      # Check for the presence of 'systemd' chkconfg or service command.
+      #
+      #    systemd_tool # => {:path=>"/usr/sbin/service", :up=>"start"}
+      #
+      # @return [Hash|nil] Hash with an absolute +path+ to the tool and the
+      #                    command string for starting.
+      #                    +nil* if neither was found.
+      def systemd_tool
+        result = nil
+        communicate.sudo('(which chkconfg || which service) 2>/dev/null', {:error_check => false}) do |type, data|
+          path = data.to_s
+          case path
+          when /\bservice\b/
+            result = { path: path, up: "start" }
+          when /\chkconfg\b/
+            result = { path: path, up: "on" }
+          end
+        end
+        result
+      end
+
+      # Checks for the correct location of the 'vboxadd' tool.
+      # It checks for a given list of possible locations. This list got
+      # extracted from the 'VBoxLinuxAdditions.run' script.
+      #
+      # @return [String|nil] Absolute path to the +vboxadd+ tool,
+      #                      or +nil+ if none found.
+      def vboxadd_tool
+        candidates = [
+          "/usr/lib/i386-linux-gnu/VBoxGuestAdditions/vboxadd",
+          "/usr/lib/x86_64-linux-gnu/VBoxGuestAdditions/vboxadd",
+          "/usr/lib64/VBoxGuestAdditions/vboxadd",
+          "/usr/lib/VBoxGuestAdditions/vboxadd",
+          "/lib64/VBoxGuestAdditions/vboxadd",
+          "/lib/VBoxGuestAdditions/vboxadd",
+          "/etc/init.d/vboxadd",
+        ]
+        bin_path = ""
+        cmd = <<-SHELL
+        for c in #{candidates.join(" ")}; do
+          if test -x "$c"; then
+            echo $c
+            break
+          fi
+        done
+        SHELL
+
+        path = nil
+        communicate.sudo(cmd, {:error_check => false}) do |type, data|
+          path = data.strip unless data.empty?
+        end
+        path
+      end
 
       # 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.
       #
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -133,7 +197,7 @@ module VagrantVbguest
       # on most linux system.
       # Mounts the given uploaded file from +tmp_path+ on +mount_point+.
       #
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -145,7 +209,7 @@ module VagrantVbguest
       # on most linux system
       # Unmounts the +mount_point+.
       #
-      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @param opts [Hash] 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
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.

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

@@ -0,0 +1,32 @@
+module VagrantVbguest
+  module Installers
+    class OpenSuse < Linux
+      # OpenSuse shows up as "suse", check for presence of the zypper
+      # package manager as well.
+      def self.match?(vm)
+        :suse == self.distro(vm) && has_zypper?(vm)
+      end
+
+      # Install missing deps and yield up to regular linux installation
+      def install(opts=nil, &block)
+        communicate.sudo(install_dependencies_cmd, opts, &block)
+        super
+      end
+
+    protected
+      def self.has_zypper?(vm)
+        communicate_to(vm).test "which zypper"
+      end
+
+      def install_dependencies_cmd
+        "zypper --non-interactive install #{dependencies}"
+      end
+
+      def dependencies
+        packages = ['kernel-devel', 'gcc', 'make', 'tar']
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::OpenSuse, 5)

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

@@ -0,0 +1,19 @@
+module VagrantVbguest
+  module Installers
+    class Oracle < RedHat
+
+      def self.match?(vm)
+        :redhat == self.distro(vm) &&
+          communicate_to(vm).test('test -f /etc/oracle-release')
+      end
+
+      protected
+
+      def dependencies
+        packages = ['kernel-uek-devel-`uname -r`', 'gcc', 'make', 'perl', 'bzip2']
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Oracle, 6)

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

@@ -1,11 +1,11 @@
 module VagrantVbguest
   module Installers
     class RedHat < Linux
-      # Scientific Linux (and probably CentOS) both show up as :redhat
+      # Scientific Linux and CentOS show up as :redhat (or "centos7")
       # fortunately they're probably both similar enough to RHEL
       # (RedHat Enterprise Linux) not to matter.
       def self.match?(vm)
-        :redhat == self.distro(vm)
+        /\A(redhat|centos)\d*\Z/ =~ self.distro(vm)
       end
 
       # Install missing deps and yield up to regular linux installation

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.10.1"
+  VERSION = "0.11.0.beta0"
 end

data/locales/en.yml

@@ -52,7 +52,7 @@ en:
         no_installer_for_platform: |-
           Sorry, don't know how to %{method} Virtualbox Guest Additions on this platform. Stopping installation.
         generic_linux_installer: |-
-          The guest's platform is currently not supported, will try generic Linux method...
+          The guest's platform ("%{distro}") is currently not supported, will try generic Linux method...
         do_not_inherit_match_method: |-
           Installer classes must provide their own `match?` method.
 

data/testdrive/Vagrantfile

@@ -0,0 +1,76 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+require 'ipaddr'
+
+class NextIP
+  def initialize(start_ip)
+    @ip_addr = IPAddr.new start_ip
+  end
+
+  def get
+    @ip_addr = @ip_addr.succ
+    @ip_addr
+  end
+
+  def box vagrant_config, name, box, &block
+    ip_addr = get
+
+    vagrant_config.vm.define name do |config|
+      config.vm.box      = box
+      config.vm.hostname = name
+      config.vm.network :private_network, ip: ip_addr.to_s
+
+      config.vm.provider "virtualbox" do |vb, override|
+        # Display the VirtualBox GUI when booting the machine
+        vb.gui = false
+
+        # Customize the amount of memory on the VM:
+        vb.memory = "512"
+        vb.cpus = "4"
+
+        # Specify default provider configuration
+        #  - give the VM a name - can be better localized in the VirtualBox GUI
+        #  - make the DNS resolution faster
+        vb.customize [
+          "modifyvm", :id,
+          "--name", "vbguest_testdrive-#{name}",
+          "--natdnshostresolver1", "on",
+          "--natdnshostresolver2", "on"
+        ]
+      end
+
+      yield(config) if block
+    end
+  end
+end
+
+Vagrant.configure("2") do |config|
+  next_ip = NextIP.new("44.44.0.10/24")
+
+  next_ip.box config, "debian8", "oar-team/debian8"
+  next_ip.box config, "opensuse13", "bento/opensuse-13.2"
+  next_ip.box config, "ubuntu1404", "ubuntu/trusty64"
+  next_ip.box config, "centos7", "centos/7"
+  next_ip.box config, "oracle65", "tobyhferguson_oracle-65-x64" do |cfg|
+    cfg.vm.box_url = "http://tobyhferguson.org/boxes/oracle-6-5-x64-virtualbox.box"
+  end
+  next_ip.box config, "fedora22", "Fedora-Cloud-Base-Virtualbox-22" do |cfg|
+    cfg.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box"
+  end
+
+  config.vm.provider "virtualbox" do |v|
+    # v.gui = true
+  end
+
+  # config.vbguest.installer_arguments = "--nox11 -- --force"
+  # config.vbguest.auto_update = false
+  # config.vbguest.iso_path = '/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso'
+  # config.vbguest.iso_path = 'http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso' #% {version: '4.2.12'}
+  # config.vbguest.iso_path = "#{ENV["HOME"]}/Downloads/VBoxGuestAdditions_4.2.12.iso"
+  # config.vbguest.installer = My_Installer
+
+  # require 'Date'
+  # config.vm.provision :shell, :inline => "touch /vagrant/testrun-#{DateTime.now.strftime '%FT%T.%S%L'}"
+
+end

data/testdrive/bin/vagrant

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+TESTDRIVE=${VAGRANT_DEV:-$(dirname "$(cd "$(dirname "$0")" && pwd)")}
+
+VAGRANT_DEFAULT_PROVIDER=virtualbox \
+VAGRANT_HOME=${TESTDRIVE}/.vagrant.d \
+bundle exec vagrant $@

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.beta0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Vagrant plugin which automatically installs the host's VirtualBox Guest
@@ -88,7 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -105,7 +105,10 @@ files:
 - lib/vagrant-vbguest/installer.rb
 - lib/vagrant-vbguest/installers/base.rb
 - lib/vagrant-vbguest/installers/debian.rb
+- lib/vagrant-vbguest/installers/fedora.rb
 - lib/vagrant-vbguest/installers/linux.rb
+- lib/vagrant-vbguest/installers/opensuse.rb
+- lib/vagrant-vbguest/installers/oracle.rb
 - lib/vagrant-vbguest/installers/redhat.rb
 - lib/vagrant-vbguest/installers/ubuntu.rb
 - lib/vagrant-vbguest/machine.rb
@@ -131,6 +134,8 @@ files:
 - lib/vagrant-vbguest/version.rb
 - lib/vagrant_init.rb
 - locales/en.yml
+- testdrive/Vagrantfile
+- testdrive/bin/vagrant
 - vagrant-vbguest.gemspec
 homepage: https://github.com/dotless-de/vagrant-vbguest
 licenses:
@@ -142,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM