vagrant-vbguest 0.6.0.pre0 → 0.6.0.pre1

data/Readme.md

@@ -52,6 +52,7 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
 * `auto_reboot` (Boolean, dafult: `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
 
 #### Global Configuration
 
@@ -185,6 +186,30 @@ The VirtualBox GuestAdditions Installer will try to load the newly build kernel
 Hency, vbguest will check for a loaded kernel module after the installation has finished and reboots the box, if it could not find one.
 
 
+## Advanced Usage
+
+vagrant-vbguest provides installers for generic linux and debian/ubuntu.  
+Installers take care of the whole installation process, that includes where to save the iso file inside the guest and where to mount it.
+
+```ruby
+class MyInstaller < VagrantVbguest::Installers::Linux
+  # use /temp instead of /tmp
+  def tmp_path
+    '/temp/VBoxGuestAdditions.iso'
+  end
+
+  # use /media instead of /mnt
+  def mount_point
+    '/media'
+  end
+end
+
+Vagrant::Config.run do |config|
+  config.vbguest.installer = MyInstaller
+end
+```
+
+
 ## Knows 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 plattform. 

data/lib/vagrant-vbguest.rb

@@ -1,12 +1,19 @@
 require 'vagrant'
 require "vagrant-vbguest/errors"
-require "vagrant-vbguest/config"
-require "vagrant-vbguest/helpers"
-require "vagrant-vbguest/download"
-require "vagrant-vbguest/installer"
+require 'vagrant-vbguest/helpers'
+
+require 'vagrant-vbguest/installer'
+require 'vagrant-vbguest/installers/base'
+require 'vagrant-vbguest/installers/linux'
+require 'vagrant-vbguest/installers/debian'
+require 'vagrant-vbguest/installers/ubuntu'
+
+require 'vagrant-vbguest/config'
 require 'vagrant-vbguest/command'
 require 'vagrant-vbguest/middleware'
 
+require 'vagrant-vbguest/download'
+
 Vagrant.config_keys.register(:vbguest) { VagrantVbguest::Config }
 
 Vagrant.commands.register(:vbguest) { VagrantVbguest::Command }

data/lib/vagrant-vbguest/command.rb

@@ -58,8 +58,9 @@ module VagrantVbguest
     # Executes a command on a specific VM.
     def execute_on_vm(vm, options)
       options = vm.config.vbguest.to_hash.merge(options)
-      VagrantVbguest::Installer.new(vm, options).run!
-      reboot(vm, options) if need_reboot?(vm)
+      installer = VagrantVbguest::Installer.new(vm, options)
+      installer.run!
+      reboot(vm, options) if installer.need_reboot?
     end
 
     def reboot vm, options

data/lib/vagrant-vbguest/helpers.rb

@@ -1,43 +1,5 @@
 module VagrantVbguest
   module Helpers
-    class << self
-
-      def local_iso_path_for(vm, options = nil)
-        options ||= {}
-        @local_iso_paths ||= Hash.new
-        @local_iso_paths[vm.uuid] ||= media_manager_iso(vm) || guess_iso(vm)
-      end
-
-      def web_iso_path_for(vm, options = nil)
-        options ||= {}
-        "http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso"
-      end
-
-      def media_manager_iso(vm)
-        (m = vm.driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions.iso)$/i)) && m[1]
-      end
-
-      def guess_iso(vm)
-        path_platform = if Vagrant::Util::Platform.linux?
-          "/usr/share/virtualbox/VBoxGuestAdditions.iso"
-        elsif Vagrant::Util::Platform.darwin?
-          "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso"
-        elsif Vagrant::Util::Platform.windows?
-          if (p = ENV["VBOX_INSTALL_PATH"]) && !p.empty?
-            File.join(p, "VBoxGuestAdditions.iso")
-          else
-            File.join((ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]), "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
-          end
-        end
-        File.exists?(path_platform) ? path_platform : nil
-      end
-
-      def kernel_module_running?(vm, &block)
-        vm.channel.test('lsmod | grep vboxsf', :sudo => true, &block)
-      end
-
-    end
-
     module Rebootable
       @@rebooted = {}
 
@@ -45,10 +7,6 @@ module VagrantVbguest
         !!@@rebooted[vm.name]
       end
 
-      def need_reboot?(vm)
-        !VagrantVbguest::Helpers.kernel_module_running?(vm)
-      end
-
       def reboot(vm, options)
         if options[:auto_reboot]
           vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))

data/lib/vagrant-vbguest/installer.rb

@@ -4,6 +4,47 @@ module VagrantVbguest
 
   class Installer
 
+    class NoInstallerFoundError < Vagrant::Errors::VagrantError
+      error_namespace "vagrant.plugins.vbguest.errors.installer"
+      error_key "no_install_script_for_platform"
+    end
+
+    class << self
+
+      ##
+      # Register an Installer implementation.
+      # All Installer classes which wish to get picked automaticly
+      # using their `#match?` method have to register.
+      # Ad-hoc or small custom Installer meight not need to get
+      # registered, but need to get passed as an config option (`installer`)
+      #
+      # Registration takes a priority which defines how specific
+      # the Installer matches a system. Low level installers, like
+      # "linux" or "bsd" use a small priority (2), while distribution
+      # installers use higher priority (5). Installers matching a
+      # 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`)
+      def register(installer_class, prio = 5)
+        @installers ||= {}
+        @installers[prio] ||= []
+        @installers[prio] << installer_class
+      end
+
+      ##
+      # Returns an instance of the registrated Installer class which
+      # matches first (according to it's priority) or `nil` if none matches.
+      def detect(vm, options)
+        @installers.keys.sort.reverse.each do |prio|
+          klass = @installers[prio].detect { |k| k.match?(vm) }
+          return klass.new(vm, options) if klass
+        end
+        return nil
+      end
+    end
+
     def initialize(vm, options = {})
       @env = {
         :ui => vm.ui,
@@ -20,7 +61,6 @@ module VagrantVbguest
     end
 
     def run
-
       return unless @options[:auto_update]
 
       raise Vagrant::Errors::VMNotCreatedError if !@vm.created?
@@ -39,36 +79,46 @@ module VagrantVbguest
     end
 
     def install
-      # :TODO:
-      # the whole installation process should be put into own classes
-      # like the vagrant system loading
-      if (i_script = installer_script)
-        @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
-        @vm.channel.upload(iso_path, iso_destination)
-
-        @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(i_script), :to => installer_destination))
-        @vm.channel.upload(i_script, installer_destination)
-
-        @vm.channel.sudo("chmod 0755 #{installer_destination}") do |type, data|
-          @vm.ui.info(data, :prefix => false, :new_line => false)
-        end
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'install' if !installer
 
-        @vm.channel.sudo("#{installer_destination}") do |type, data|
-          @vm.ui.info(data, :prefix => false, :new_line => false)
-        end
+      # @vm.ui.info "Installing using #{installer.class.to_s}"
+      installer.install do |type, data|
+        @vm.ui.info(data, :prefix => false, :new_line => false)
+      end
+    end
 
-        @vm.channel.execute("rm #{installer_destination} #{iso_destination}") do |type, data|
-          @vm.ui.error(data.chomp, :prefix => false)
-        end
+    def rebuild
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'rebuild' if !installer
 
-        cleanup
+      installer.rebuild do |type, data|
+        @vm.ui.info(data, :prefix => false, :new_line => false)
       end
     end
 
+    def needs_rebuild?
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check installation of' if !installer
+
+      installer.needs_rebuild?
+    end
+
+    def need_reboot?
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check installation of' if !installer
+
+      installer.need_reboot?
+    end
+
     def needs_update?
       !(guest_version && vb_version == guest_version)
     end
 
+    ##
+    #
+    # @return [String] The version code of the VirtualBox Guest Additions
+    #                  available on the guest, or `nil` if none installed.
     def guest_version
       return @guest_version if @guest_version
 
@@ -85,59 +135,26 @@ module VagrantVbguest
       @guest_version = guest_version
     end
 
+    # Returns the version code of the Virtual Box *host*
     def vb_version
       @vm.driver.version
     end
 
-    def installer_script
-      platform = @vm.guest.distro_dispatch
-      case platform
-      when :debian, :ubuntu
-        File.expand_path("../../../files/setup_debian.sh", __FILE__)
-      when :gentoo, :redhat, :suse, :arch, :fedora, :linux
-        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.generic_install_script_for_platform", :platform => platform.to_s))
-        File.expand_path("../../../files/setup_linux.sh", __FILE__)
+    # Returns an installer instance for the current vm
+    # This is either the one configured via `installer` option or
+    # detected from all registered installers (see {Installer.detect})
+    #
+    # @return [Installers::Base]
+    def guest_installer
+      @guest_installer ||= if @options[:installer].is_a? Class
+        @options[:installer].new(@vm)
       else
-        @vm.ui.error(I18n.t("vagrant.plugins.vbguest.no_install_script_for_platform", :platform => platform.to_s))
-        nil
+        Installer.detect(@vm, @options)
       end
     end
 
-    def installer_destination
-      '/tmp/install_vbguest.sh'
-    end
-
-    def iso_destination
-      '/tmp/VBoxGuestAdditions.iso'
-    end
-
-    def iso_path
-      @iso_path ||= begin
-        @options[:iso_path] ||= VagrantVbguest::Helpers.local_iso_path_for @vm, @options
-        if !@options[:iso_path] || @options[:iso_path].empty? && !@options[:no_remote]
-          @options[:iso_path] = VagrantVbguest::Helpers.web_iso_path_for @vm, @options
-        end
-        raise VagrantVbguest::IsoPathAutodetectionError if !@options[:iso_path] || @options[:iso_path].empty?
-        @env[:iso_url] ||= @options[:iso_path].gsub '$VBOX_VERSION', vb_version
-
-        if local_iso?
-          @env[:iso_url]
-        else
-          # :TODO: This will also raise, if the iso_url points to an invalid local path
-          raise VagrantVbguest::DownloadingDisabledError.new(:from => @env[:iso_url]) if @options[:no_remote]
-          @download = VagrantVbguest::Download.new(@env)
-          @download.download
-          @download.temp_path
-        end
-      end
-    end
-
-    def local_iso?
-      ::File.file?(@env[:iso_url])
-    end
-
     def cleanup
-      @download.cleanup if @download
+      @guest_installer.cleanup if @guest_installer
     end
 
   end

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

@@ -0,0 +1,177 @@
+module VagrantVbguest
+  module Installers
+    class Error < Vagrant::Errors::VagrantError
+      error_namespace "vagrant.plugins.vbguest.errors.installer"
+    end
+
+    # This is the base class all installers must inherit from
+    # It defines the basic structure of an Installer and should
+    # never be used directly
+    class Base
+
+      # Tests whether this installer class is applicable to the
+      # current environment. Usually, testing for a specific OS.
+      # Subclasses must override this method and return `true` if
+      # they wish to handle.
+      #
+      # This method will be called only when an Installer detection
+      # is run. It is ignored, when passing an Installer class
+      # directly as an config (`installer`) option.
+      #
+      # @param [Vagrant::VM]
+      # @return [Boolean]
+      def self.match?(vm)
+        false
+      end
+
+      attr_reader :vm
+
+      def initialize(vm, options=nil)
+        @vm = vm
+        @options = options
+      end
+
+      # The absolute file path of the GuestAdditions iso file should
+      # be uploaded into the guest.
+      # Subclasses must override this method!
+      #
+      # @return [String]
+      def tmp_path
+      end
+
+      # The mountpoint path
+      # Subclasses shall override this method, if they need to mount the uploaded file!
+      #
+      # @retunn [String]
+      def mount_point
+      end
+
+      # Handles the installation process.
+      # All necessary steps for an installation must be defined here.
+      # This includes uploading the iso into the box, mounting,
+      # installing and cleaning up.
+      # Subclasses must override this method!
+      #
+      # @param [String] iso_file Optional path to the local GuestAdditions iso file
+      # @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
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
+      def install(iso_fileO=nil, opts=nil, &block)
+      end
+
+      # Handels the rebuild of allready installed GuestAdditions
+      # It may happen, that the guest has the correct GuestAdditions
+      # version installed, but not the kernel module is not loaded.
+      # This method should perform a rebuild or try to reload the
+      # kernel module _without_ the GuestAdditions iso file.
+      # If there is no way of rebuidling or reloading the
+      # GuestAdditions on a specific system, 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
+      # @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)
+      end
+
+      # Determinates if the GuestAdditions kernel module is loaded.
+      # This method tests if there is a working GuestAdditions
+      # kernel module. If there is none, {#rebuild} is beeing called.
+      # If there is no way of telling if there is a working
+      # GuestAddition for a specific system, this method should
+      # return `true`.
+      # Subclasses should override this method.
+      #
+      # @return [Boolean] `true` if the kernel module is loaded (and thus seems to work), `false` otherwise.
+      def installed?(opts=nil, &block)
+        true
+      end
+
+      def needs_rebuild?(opts=nil, &block)
+        !installed?(opts, &block)
+      end
+
+      def need_reboot?(opts=nil, &block)
+        !installed?(opts, &block)
+      end
+
+      def iso_file
+        @iso_file ||= begin
+          iso_path = @options[:iso_path] || local_iso_path
+
+          if !iso_path || iso_path.empty? && !@options[:no_remote]
+            iso_path = VagrantVbguest::Helpers.web_iso_path_for @vm, @options
+          end
+          raise VagrantVbguest::IsoPathAutodetectionError if !iso_path || iso_path.empty?
+
+          iso_path.gsub! '$VBOX_VERSION', vm.driver.version
+          if Vagrant::Downloaders::File.match? iso_path
+            iso_path
+          else
+            # :TODO: This will also raise, if the iso_url points to an invalid local path
+            raise VagrantVbguest::DownloadingDisabledError.new(:from => iso_url) if @options[:no_remote]
+            env = {
+              :ui => vm.ui,
+              :tmp_path => vm.env.tmp_path,
+              :iso_url => iso_url
+            }
+            @download = VagrantVbguest::Download.new(@env)
+            @download.download
+            @download.temp_path
+          end
+        end
+      end
+
+      def local_iso?
+        ::File.file?(@env[:iso_url])
+      end
+
+      def local_iso_path
+        media_manager_iso || guess_iso
+      end
+
+      def web_iso_path
+        "http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso"
+      end
+
+      def media_manager_iso
+        (m = vm.driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions.iso)$/i)) && m[1]
+      end
+
+      def guess_iso
+        path_platform = if Vagrant::Util::Platform.linux?
+          "/usr/share/virtualbox/VBoxGuestAdditions.iso"
+        elsif Vagrant::Util::Platform.darwin?
+          "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso"
+        elsif Vagrant::Util::Platform.windows?
+          if (p = ENV["VBOX_INSTALL_PATH"]) && !p.empty?
+            File.join(p, "VBoxGuestAdditions.iso")
+          else
+            File.join((ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]), "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
+          end
+        end
+        File.exists?(path_platform) ? path_platform : nil
+      end
+
+      # A helper method to handle the GuestAdditions iso file upload
+      def upload(file)
+        vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => file, :to => tmp_path))
+        vm.channel.upload(file, tmp_path)
+      end
+
+      # A helper method to delete the uploaded GuestAdditions iso file
+      # from the guest
+      def cleanup
+        @download.cleanup if @download
+
+        vm.channel.execute("rm #{tmp_path}", :error_check => false) do |type, data|
+          vm.ui.error(data.chomp, :prefix => false)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module VagrantVbguest
+  module Installers
+    class Debian < Linux
+
+      def self.match?(vm)
+        :debian == self.distro(vm)
+      end
+
+      # installes the correct linux-headers package
+      # installes `dkms` package for dynamic kernel module loading
+      def install(opts=nil, &block)
+        begin
+          vm.channel.sudo(install_dependencies_cmd, opts, &block)
+        rescue
+          vm.channel.sudo('apt-get update', opts, &block)
+          vm.channel.sudo(install_dependencies_cmd, opts, &block)
+        end
+        upload(iso_file)
+        vm.channel.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
+        vm.channel.sudo("#{mount_point}/VBoxLinuxAdditions.run --nox11", opts, &block)
+        vm.channel.sudo("umount #{mount_point}", opts, &block)
+      end
+
+    protected
+      def install_dependencies_cmd
+        "apt-get install -y #{dependencies}"
+      end
+
+      def dependencies
+        packages = ['linux-headers-`uname -r`']
+        # some Debian system (lenny) dont come with a dkms packe so we neet to skip that.
+        # apt-cache search will exit with 0 even if nothing was found, so we need to grep.
+        packages << 'dkmx' if vm.channel.test('apt-cache search --names-only \'^dkms$\' | grep dkms')
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Debian, 5)

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

@@ -0,0 +1,64 @@
+module VagrantVbguest
+  module Installers
+    # A basic Installer implementation for vanilla or
+    # unknown Linux based systems.
+    class Linux < Base
+
+      # A helper method to cache the result of {Vagrant::Guest::Base#distro_dispatch}
+      # which speeds up Installer detection runs a lot,
+      # when having lots of Linux based Installer classes
+      # to check.
+      #
+      # @see {Vagrant::Guest::Linux#distro_dispatch}
+      # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`
+      def self.distro(vm)
+        @@ditro ||= {}
+        @@ditro[vm.uuid] ||= vm.guest.distro_dispatch
+      end
+
+      # Matches if the operating system name prints "Linux"
+      # Raises an Error if this class is beeing subclassed but
+      # this method was not overridden. This is considered an
+      # error because, subclassed Installers usually indicate
+      # a more specific distributen like 'ubuntu' or 'arch' and
+      # therefore should do a more specific check.
+      def self.match?(vm)
+        raise Error, :_key => :do_not_inherit_match_method if self.class != Linux
+        vm.channel.test("uname | grep 'Linux'")
+      end
+
+      # defaults the temp path to "/tmp/VBoxGuestAdditions.iso" for all Linux based systems
+      def tmp_path
+        '/tmp/VBoxGuestAdditions.iso'
+      end
+
+      # defaults the mount point to "/mnt" for all Linux based systems
+      def mount_point
+        '/mnt'
+      end
+
+      # a generic way of installing GuestAdditions assuming all
+      # dependencies on the guest are installed
+      def install(iso_file = nil, opts=nil, &block)
+        vm.ui.warn I18n.t("vagrant.plugins.vbguest.installer.generic_linux_installer")
+        upload(iso_file)
+        vm.channel.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
+        vm.channel.sudo("#{mount_point}/VBoxLinuxAdditions.run --nox11", opts, &block)
+        vm.channel.sudo("umount #{mount_point}", opts, &block)
+      end
+
+      def installed?(opts=nil, &block)
+        opts = {
+          :sudo => true
+        }.merge(opts || {})
+        vm.channel.test('lsmod | grep vboxsf', opts, &block)
+      end
+
+      def rebuild(opts=nil, &block)
+        vm.channel.sudo('/etc/init.d/vboxadd setup', opts, &block)
+      end
+
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Linux, 2)

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

@@ -0,0 +1,12 @@
+module VagrantVbguest
+  module Installers
+    class Ubuntu < Debian
+
+      def self.match?(vm)
+        :ubuntu == self.distro(vm)
+      end
+
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Ubuntu, 5)

data/lib/vagrant-vbguest/middleware.rb

@@ -15,13 +15,14 @@ module VagrantVbguest
 
     def call(env)
       options = @vm.config.vbguest.to_hash
-      VagrantVbguest::Installer.new(@vm, options).run
+      installer = VagrantVbguest::Installer.new(@vm, options)
+      installer.run
 
-      if need_reboot?(@vm)
+      if installer.need_reboot?
         if rebooted?(@vm)
           @vm.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
         else
-          reboot(@vm, options) if need_reboot?(@vm)
+          reboot(@vm, options)
         end
       end
 

data/lib/vagrant-vbguest/version.rb

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

data/locales/en.yml

@@ -11,8 +11,6 @@ en:
         restart_vm: "Restarting VM to apply changes..."
         suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box runing `vagrant reload %{name}`"
         restart_loop_guard_activated: "Guest Additions will not load, even after reboot."
-        no_install_script_for_platform: "Sorry, don't know how to install on a %{platform} system. Stopping installation."
-        generic_install_script_for_platform: "%{platform} is currently not supported, will try generic Linux method..."
         guest_version_reports_differ: |-
           Got different reports about installed GuestAdditions version:
           Virtualbox on your host claims:   %{driver}
@@ -34,6 +32,14 @@ en:
             Please configure a local path to the iso using `config.vbguest.iso_path` 
             in your Vagrantfile or the `--iso` command line option.
 
+          installer:
+            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...
+            do_not_inherit_match_method: |-
+              Installer classes must proviode their own `match?` method.
+
         download:
           with: "Downloading VirtualBox Guest Additions ISO with %{class}..."
           cleaning: "Cleaning up downloaded VirtualBox Guest Additions ISO..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre0
+  version: 0.6.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,6 +50,10 @@ files:
 - lib/vagrant-vbguest/errors.rb
 - lib/vagrant-vbguest/helpers.rb
 - lib/vagrant-vbguest/installer.rb
+- lib/vagrant-vbguest/installers/base.rb
+- lib/vagrant-vbguest/installers/debian.rb
+- lib/vagrant-vbguest/installers/linux.rb
+- lib/vagrant-vbguest/installers/ubuntu.rb
 - lib/vagrant-vbguest/middleware.rb
 - lib/vagrant-vbguest/version.rb
 - lib/vagrant_init.rb