vagrant-vbguest 0.7.0.pre0 → 0.7.0.pre1

data/.gitignore

@@ -1,4 +1,17 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/CHANGELOG.md

@@ -1,9 +1,20 @@
 ## 0.7.0
 
+  - When looking for a GuestAdditions iso file in media manager
+    allow version number in filename. [GH-48], [GH-49] /
+    (thanks @neerolyte)
+  - Support multiple locations to be searched while "guessing"
+    GuestAdditions iso file
+  - On Linux guests also search "$HOME/.VirtualBox" for
+    GuestAdditions iso file. [GH-48]
   - 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)
+  - Reworked bunch of internals, particularly how vagrants's
+    environemnt is passed arround
+  - Intodruce a vagrant 1.0 compatibility layer for Installers and
+    other vbguest internals
 
 ### heads-up
 
@@ -11,6 +22,17 @@
     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.
+  - The environment (`env`) in custom installers is no longer the
+    actions environment `Hash`, but the `Environment` instance.
+    Which has some implications on how you can access e.g. the `ui`:
+    instead of `env[:ui]` use `env.ui`
+  - To achieve compatibility to both vagrant 1.0 and 1.1, custom
+    Installers, when executing shell commands on the guest system,
+    should use vbguests `communicate` wrapper. e.g.:
+        A call like `vm.channel.sudo 'apt-get update'` should be
+        changed to `channel.sudo 'apt-get update'`
+    The old `vm.channel` syntax will continue to work on vagrant 1.0.x
+    but will fail on vagrant 1.1.x.
 
 ## 0.6.4 (2013-01-24)
 
@@ -121,4 +143,4 @@
 
 ## Previous (≤ 0.0.3)
 
-  - Vagrant 0.8 support
+  - Vagrant 0.8 support

data/Gemfile

@@ -1,3 +1,11 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gemspec
+# 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", :tag => 'v1.1.2'
+end

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'bundler/setup'
+
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
+$stdout.sync = true
+$stderr.sync = true
+
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks

data/Readme.md

@@ -4,8 +4,17 @@
 
 ## Installation
 
-Requires vagrant 0.9.4 or later (including 1.0)    
-Since vagrant v1.0.0 the preferred installation method for vagrant is using the provided packages or installers. 
+Requires vagrant 0.9.4 or later (including 1.0 and 1.1)    
+
+On Vagrant 1.1.x use:
+
+```bash
+$ vagrant plugin install vagrant-vbguest
+```
+
+### Vagrant 1.0 and older
+
+Since vagrant v1.0.0 the preferred installation method for vagrant is using the provided packages or installers.
 If you installed vagrant that way, you need to use vagrant's gem wrapper:
 
 ```bash
@@ -213,10 +222,6 @@ Installers take care of the whole installation process, that includes where to s
 ```ruby
 class MyInstaller < VagrantVbguest::Installers::Linux
 
-  def self.match?(vm)
-    super && vm.channel.test("test -d /temp")
-  end
-
   # use /temp instead of /tmp
   def tmp_path
     '/temp/VBoxGuestAdditions.iso'
@@ -226,6 +231,14 @@ class MyInstaller < VagrantVbguest::Installers::Linux
   def mount_point
     '/media'
   end
+
+  def install(opts=nil, &block)
+    communicate.sudo('my_distos_way_of_preparing_guestadditions_installation', opts, &block)
+    # calling `super` will run the installation
+    # also it takes care of uploading the right iso file into the box
+    # and cleaning up afterward
+    super
+  end
 end
 
 Vagrant::Config.run do |config|

data/lib/vagrant-vbguest.rb

@@ -1,6 +1,12 @@
-require 'vagrant-vbguest/core_ext/string/interpolate'
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant VBGuest plugin must be run within Vagrant."
+end
+
+# Add our custom translations to the load path
+I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
 
-require 'vagrant'
 require "vagrant-vbguest/errors"
 require 'vagrant-vbguest/helpers'
 
@@ -13,17 +19,34 @@ require 'vagrant-vbguest/installers/debian'
 require 'vagrant-vbguest/installers/ubuntu'
 require 'vagrant-vbguest/installers/redhat'
 
-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 }
-
-Vagrant.actions[:start].use VagrantVbguest::Middleware
-
-# Add our custom translations to the load path
-I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
+module VagrantVbguest
+
+  class Plugin < Vagrant.plugin("2")
+
+    name "vbguest management"
+    description <<-DESC
+    Provides automatic and/or manual management of the
+    VirtualBox Guest Additions inside the Vagrant environment.
+    DESC
+
+    config('vbguest') do
+      require File.expand_path("../vagrant-vbguest/config", __FILE__)
+      Config
+    end
+
+    command('vbguest') do
+      require File.expand_path("../vagrant-vbguest/command", __FILE__)
+      Command
+    end
+
+    # hook after anything that boots:
+    # that's all middlewares which will run the buildin "VM::Boot" action
+    action_hook(self::ALL_ACTIONS) do |hook|
+      hook.after(VagrantPlugins::ProviderVirtualBox::Action::Boot, VagrantVbguest::Middleware)
+    end
+  end
+end

data/lib/vagrant-vbguest/command.rb

@@ -1,10 +1,8 @@
 require 'optparse'
-require 'vagrant/command/start_mixins'
 
 module VagrantVbguest
 
-  class Command < Vagrant::Command::Base
-    include Vagrant::Command::StartMixins
+  module CommandCommons
     include VagrantVbguest::Helpers::Rebootable
 
     # Runs the vbguest installer on the VMs that are represented
@@ -66,9 +64,7 @@ module VagrantVbguest
 
     # Executes a command on a specific VM.
     def execute_on_vm(vm, options)
-      raise Vagrant::Errors::VMNotCreatedError if !vm.created?
-      raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
-      raise Vagrant::Errors::VMNotRunningError if vm.state != :running
+      check_runable_on(vm)
 
       options     = options.clone
       _method     = options.delete(:_method)
@@ -77,7 +73,7 @@ module VagrantVbguest
       options = vm.config.vbguest.to_hash.merge(options)
       machine = VagrantVbguest::Machine.new(vm, options)
       status  = machine.state
-      vm.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info))
+      vm.env.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info))
 
       if _method != :status
         machine.send(_method)
@@ -91,6 +87,40 @@ module VagrantVbguest
         vm.reload(options)
       end
     end
+
+    def check_runable_on(vm); end
+  end
+
+
+  if Vagrant::VERSION < "1.1.0"
+    require 'vagrant/command/start_mixins'
+
+    class Command < Vagrant::Command::Base
+      include CommandCommons
+      include Vagrant::Command::StartMixins
+
+      def check_runable_on(vm)
+        raise Vagrant::Errors::VMNotCreatedError if !vm.created?
+        raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
+        raise Vagrant::Errors::VMNotRunningError if vm.state != :running
+      end
+    end
+
+  else
+    require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+
+    class Command < Vagrant.plugin("2", :command)
+      include CommandCommons
+      include VagrantPlugins::CommandUp::StartMixins
+
+      def check_runable_on(vm)
+        raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
+        raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible
+        raise Vagrant::Errors::VMNotRunningError if vm.state.id != :running
+        raise VagrantVbguest::NoVirtualBoxMachineError if vm.provider.class != VagrantPlugins::ProviderVirtualBox::Provider
+      end
+    end
+
   end
 
 end

data/lib/vagrant-vbguest/config.rb

@@ -1,6 +1,6 @@
 module VagrantVbguest
 
-  class Config < Vagrant::Config::Base
+  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

data/lib/vagrant-vbguest/errors.rb

@@ -3,7 +3,7 @@ module VagrantVbguest
   class VbguestError < Vagrant::Errors::VagrantError
     def error_namespace; "vagrant.plugins.vbguest.errors"; end
   end
-  
+
   class IsoPathAutodetectionError < VagrantVbguest::VbguestError
     error_key :autodetect_iso_path
   end
@@ -11,4 +11,8 @@ module VagrantVbguest
   class DownloadingDisabledError < VagrantVbguest::VbguestError
     error_key :downloading_disabled
   end
-end
+
+  class NoVirtualBoxMachineError < VagrantVbguest::VbguestError
+    error_key :no_virtualbox_machine
+  end
+end

data/lib/vagrant-vbguest/helpers.rb

@@ -1,10 +1,11 @@
 module VagrantVbguest
   module Helpers
+
     module Rebootable
       @@rebooted = {}
 
       def rebooted?(vm)
-        !!@@rebooted[vm.uuid]
+        !!@@rebooted[ VmCompatible.vm_id(vm) ]
       end
 
       def reboot(vm, options)
@@ -13,7 +14,7 @@ module VagrantVbguest
           false
         elsif options[:auto_reboot]
           vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
-          @@rebooted[vm.uuid] = true
+          @@rebooted[ VmCompatible.vm_id(vm) ] = true
         else
           vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
           false
@@ -21,5 +22,33 @@ module VagrantVbguest
       end
     end
 
+    module VmCompatible
+
+      if Vagrant::VERSION < '1.1.0'
+        def communicate
+          vm.channel
+        end
+
+        def driver
+          vm.driver
+        end
+
+        def self.vm_id(vm)
+          vm.uuid
+        end
+      else # Vagrant 1.1, and hopefully upwards
+        def communicate
+          vm.communicate
+        end
+
+        def driver
+          vm.provider.driver
+        end
+
+        def self.vm_id(vm)
+          vm.id
+        end
+      end
+    end
   end
-end
+end

data/lib/vagrant-vbguest/installer.rb

@@ -35,12 +35,12 @@ module VagrantVbguest
       end
 
       ##
-      # Returns an instance of the registrated Installer class which
+      # Returns the class 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
+          return klass if klass
         end
         return nil
       end
@@ -48,12 +48,9 @@ module VagrantVbguest
 
     def initialize(vm, options = {})
       @vm = vm
+      @env = vm.env
       @options = options
       @iso_path = nil
-      @env = {
-        :ui => vm.ui,
-        :tmp_path => vm.env.tmp_path
-      }
     end
 
     def install
@@ -61,7 +58,7 @@ module VagrantVbguest
       raise NoInstallerFoundError, :method => 'install' if !installer
 
       installer.install do |type, data|
-        @vm.ui.info(data, :prefix => false, :new_line => false)
+        @env.ui.info(data, :prefix => false, :new_line => false)
       end
     ensure
       cleanup
@@ -72,7 +69,7 @@ module VagrantVbguest
       raise NoInstallerFoundError, :method => 'rebuild' if !installer
 
       installer.rebuild do |type, data|
-        @vm.ui.info(data, :prefix => false, :new_line => false)
+        @env.ui.info(data, :prefix => false, :new_line => false)
       end
     end
 
@@ -81,7 +78,7 @@ module VagrantVbguest
       raise NoInstallerFoundError, :method => 'manual start' if !installer
 
       installer.start do |type, data|
-        @vm.ui.info(data, :prefix => false, :new_line => false)
+        @env.ui.info(data, :prefix => false, :new_line => false)
       end
     end
 
@@ -112,7 +109,7 @@ module VagrantVbguest
       @guest_installer ||= if @options[:installer].is_a? Class
         @options[:installer].new(@vm, @options)
       else
-        Installer.detect(@vm, @options)
+        installer_klass = Installer.detect(@vm, @options) and installer_klass.new(@vm, @options)
       end
     end
 

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

@@ -8,6 +8,7 @@ module VagrantVbguest
     # It defines the basic structure of an Installer and should
     # never be used directly
     class Base
+      include VagrantVbguest::Helpers::VmCompatible
 
       # Tests whether this installer class is applicable to the
       # current environment. Usually, testing for a specific OS.
@@ -24,10 +25,11 @@ module VagrantVbguest
         false
       end
 
-      attr_reader :vm, :options
+      attr_reader :env, :vm, :options
 
       def initialize(vm, options=nil)
         @vm = vm
+        @env = vm.env
         @options = options
       end
 
@@ -42,7 +44,7 @@ module VagrantVbguest
       # The mountpoint path
       # Subclasses shall override this method, if they need to mount the uploaded file!
       #
-      # @retunn [String]
+      # @return [String]
       def mount_point
       end
 
@@ -116,7 +118,7 @@ module VagrantVbguest
       def guest_version(reload=false)
         return @guest_version if @guest_version && !reload
 
-        guest_version = vm.driver.read_guest_additions_version
+        guest_version = driver.read_guest_additions_version
         guest_version = !guest_version ? nil : guest_version.gsub(/[-_]ose/i, '')
 
         @guest_version = guest_version
@@ -126,7 +128,7 @@ module VagrantVbguest
       #
       # @return [String] The version code of the Virtual Box *host*
       def host_version
-        vm.driver.version
+        driver.version
       end
 
       # Determinates the version of the GuestAdditions installer in use
@@ -134,7 +136,7 @@ module VagrantVbguest
       # @return [String] The version code of the GuestAdditions installer
       def installer_version(path_to_installer)
         version = nil
-        @vm.channel.sudo("#{path_to_installer} --info", :error_check => false) do |type, data|
+        communicate.sudo("#{path_to_installer} --info", :error_check => false) do |type, data|
           if (v = data.to_s.match(/\AIdentification.*\s(\d+\.\d+.\d+)/i))
             version = v[1]
           end
@@ -146,7 +148,7 @@ module VagrantVbguest
       # will start _now_.
       # The message includes the host and installer version strings.
       def yield_installation_waring(path_to_installer)
-        @vm.ui.warn I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}",
+        @env.ui.warn I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}",
           :guest_version => guest_version,
           :installer_version => installer_version(path_to_installer) || I18n.t("vagrant.plugins.vbguest.unknown"))
       end
@@ -155,7 +157,7 @@ module VagrantVbguest
       # will be rebuild using the installed GuestAdditions.
       # The message includes the host and installer version strings.
       def yield_rebuild_warning
-        @vm.ui.warn I18n.t("vagrant.plugins.vbguest.rebuild#{@options[:force] ? '_forced' : ''}",
+        @env.ui.warn I18n.t("vagrant.plugins.vbguest.rebuild#{@options[:force] ? '_forced' : ''}",
           :guest_version => guest_version(true),
           :host_version => host_version)
       end
@@ -167,7 +169,7 @@ module VagrantVbguest
       # 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",
+        @env.ui.warn I18n.t("vagrant.plugins.vbguest.install_error",
           :installer_version => installer_version(path_to_installer) || I18n.t("vagrant.plugins.vbguest.unknown"))
       end
 
@@ -202,12 +204,12 @@ module VagrantVbguest
           else
             # :TODO: This will also raise, if the iso_url points to an invalid local path
             raise VagrantVbguest::DownloadingDisabledError.new(:from => iso_path) if options[:no_remote]
-            env = {
-              :ui => vm.ui,
-              :tmp_path => vm.env.tmp_path,
+            downloader_env = {
+              :ui => @env.ui,
+              :tmp_path => @env.tmp_path,
               :iso_url => iso_path
             }
-            @download = VagrantVbguest::Download.new(env)
+            @download = VagrantVbguest::Download.new(downloader_env)
             @download.download
             @download.temp_path
           end
@@ -235,7 +237,7 @@ module VagrantVbguest
       #
       # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
       def media_manager_iso
-        (m = vm.driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions.iso)$/i)) && m[1]
+        (m = driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions(?:_#{guest_version})?\.iso)$/i)) && m[1]
       end
 
       # Makes an educated guess where the GuestAdditions iso file
@@ -244,42 +246,45 @@ module VagrantVbguest
       #
       # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
       def guess_iso
-        path_platform = if Vagrant::Util::Platform.linux?
-          "/usr/share/virtualbox/VBoxGuestAdditions.iso"
+        paths = if Vagrant::Util::Platform.linux?
+          [
+            (File.join(ENV['HOME'], '.VirtualBox', "VBoxGuestAdditions_#{guest_version}.iso") if ENV['HOME']),
+            "/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
+          elsif ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]
             File.join((ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]), "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
           end
         end
-        File.exists?(path_platform) ? path_platform : nil
+        Array(paths).find { |path| path && File.exists?(path) }
       end
 
       # A helper method to handle the GuestAdditions iso file upload
       # into the guest box.
-      # The file will uploaded to the location given by the +tmp_path+ method.
+      # The file will uploaded to the location given by the +temp_path+ method.
       #
       # @example Default upload
       #    upload(iso_file)
       #
       # @param [String] Path of the file to upload to the +tmp_path*
       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)
+        env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => file, :to => tmp_path))
+        communicate.upload(file, tmp_path)
       end
 
       # A helper method to delete the uploaded GuestAdditions iso file
       # from the guest box
       def cleanup
         @download.cleanup if @download
-        vm.channel.execute("test -f #{tmp_path} && rm #{tmp_path}", :error_check => false) do |type, data|
-          vm.ui.error(data.chomp, :prefix => false)
+        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
   end
-end
+end

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

@@ -14,10 +14,10 @@ module VagrantVbguest
       # @yieldparam [String] data Data for the given output.
       def install(opts=nil, &block)
         begin
-          vm.channel.sudo(install_dependencies_cmd, opts, &block)
+          communicate.sudo(install_dependencies_cmd, opts, &block)
         rescue
-          vm.channel.sudo('apt-get update', opts, &block)
-          vm.channel.sudo(install_dependencies_cmd, opts, &block)
+          communicate.sudo('apt-get update', opts, &block)
+          communicate.sudo(install_dependencies_cmd, opts, &block)
         end
         super
       end
@@ -31,10 +31,10 @@ module VagrantVbguest
         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 << 'dkms' if vm.channel.test('apt-cache search --names-only \'^dkms$\' | grep dkms')
+        packages << 'dkms' if communicate.test('apt-cache search --names-only \'^dkms$\' | grep dkms')
         packages.join ' '
       end
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Debian, 5)
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Debian, 5)

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

@@ -13,7 +13,7 @@ module VagrantVbguest
       # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`
       def self.distro(vm)
         @@ditro ||= {}
-        @@ditro[vm.uuid] ||= vm.guest.distro_dispatch
+        @@ditro[ VagrantVbguest::Helpers::VmCompatible.vm_id(vm) ] ||= vm.guest.distro_dispatch
       end
 
       # Matches if the operating system name prints "Linux"
@@ -24,7 +24,7 @@ module VagrantVbguest
       # therefore should do a more specific check.
       def self.match?(vm)
         raise Error, :_key => :do_not_inherit_match_method if self != Linux
-        vm.channel.test("uname | grep 'Linux'")
+        communicate.test("uname | grep 'Linux'")
       end
 
       # defaults the temp path to "/tmp/VBoxGuestAdditions.iso" for all Linux based systems
@@ -44,7 +44,7 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def install(opts=nil, &block)
-        vm.ui.warn I18n.t("vagrant.plugins.vbguest.errors.installer.generic_linux_installer") if self.class == Linux
+        env.ui.warn I18n.t("vagrant.plugins.vbguest.errors.installer.generic_linux_installer") if self.class == Linux
         upload(iso_file)
         mount_iso(opts, &block)
         execute_installer(opts, &block)
@@ -59,7 +59,7 @@ module VagrantVbguest
         opts = {
           :sudo => true
         }.merge(opts || {})
-        vm.channel.test('lsmod | grep vboxsf', opts, &block)
+        communicate.test('lsmod | grep vboxsf', opts, &block)
       end
 
       # This overrides {VagrantVbguest::Installers::Base#guest_version}
@@ -75,9 +75,9 @@ module VagrantVbguest
         return @guest_version if @guest_version && !reload
         driver_version = super
 
-        @vm.channel.sudo('VBoxService --version', :error_check => false) do |type, data|
+        communicate.sudo('VBoxService --version', :error_check => false) do |type, data|
           if (v = data.to_s.match(/^(\d+\.\d+.\d+)/)) && driver_version != v[1]
-            @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.guest_version_reports_differ", :driver => driver_version, :service => v[1]))
+            @env.ui.warn(I18n.t("vagrant.plugins.vbguest.guest_version_reports_differ", :driver => driver_version, :service => v[1]))
             @guest_version = v[1]
           end
         end
@@ -89,7 +89,7 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def rebuild(opts=nil, &block)
-        vm.channel.sudo('/etc/init.d/vboxadd setup', opts, &block)
+        communicate.sudo('/etc/init.d/vboxadd setup', opts, &block)
       end
 
       # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
@@ -98,7 +98,7 @@ module VagrantVbguest
       # @yieldparam [String] data Data for the given output.
       def start(opts=nil, &block)
         opts = {:error_check => false}.merge(opts || {})
-        vm.channel.sudo('/etc/init.d/vboxadd start', opts, &block)
+        communicate.sudo('/etc/init.d/vboxadd start', opts, &block)
       end
 
 
@@ -115,7 +115,7 @@ module VagrantVbguest
         installer = File.join(mount_point, 'VBoxLinuxAdditions.run')
         yield_installation_waring(installer)
         opts = {:error_check => false}.merge(opts || {})
-        exit_status = vm.channel.sudo("#{installer} --nox11", opts, &block)
+        exit_status = communicate.sudo("#{installer} --nox11", opts, &block)
         yield_installation_error_warning(installer) unless exit_status == 0
         exit_status
       end
@@ -129,7 +129,7 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def mount_iso(opts=nil, &block)
-        vm.channel.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
+        communicate.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
       end
 
       # A generic helper method for un-mounting the GuestAdditions iso file
@@ -141,9 +141,9 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def unmount_iso(opts=nil, &block)
-        vm.channel.sudo("umount #{mount_point}", opts, &block)
+        communicate.sudo("umount #{mount_point}", opts, &block)
       end
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Linux, 2)
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Linux, 2)

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

@@ -10,7 +10,7 @@ module VagrantVbguest
 
       # Install missing deps and yield up to regular linux installation
       def install(opts=nil, &block)
-        vm.channel.sudo(install_dependencies_cmd, opts, &block)
+        communicate.sudo(install_dependencies_cmd, opts, &block)
         super
       end
 

data/lib/vagrant-vbguest/machine.rb

@@ -3,26 +3,31 @@ module VagrantVbguest
 
     require 'micromachine'
 
-    attr_reader :installer, :vm, :options
+    attr_reader :installer, :env, :vm, :options
 
     def initialize vm, options
+      @vm       = vm
+      @env      = vm.env
+      @options  = options
+
       @logger = Log4r::Logger.new("vagrant::plugins::vbguest-machine")
-      @logger.debug("initialize vbguest machine for VM '#{vm.name}' (#{vm.uuid})")
-      @vm = vm
-      @options = options
-      @installer = Installer.new @vm, @options
-
-      @ga_machine = MicroMachine.new :pending
-      @ga_machine.when :install, :pending => :installed
-      @ga_machine.when :start, :pending => :started
-      @ga_machine.when :rebuild, :pending => :rebuilt, :started => :rebuilt
-
-      @ga_machine.on(:installed) { installer.install }
-      @ga_machine.on(:started)   { installer.start }
-      @ga_machine.on(:rebuilt)   { installer.rebuild }
-
-      @box_machine = MicroMachine.new :first_boot
-      @box_machine.when :reboot, :first_boot => :rebooted
+      @logger.debug("initialize vbguest machine for VM '#{vm.name}' (#{vm.to_s})")
+
+      @installer = Installer.new vm, options
+
+      @ga_machine = MicroMachine.new(:pending).tap { |m|
+        m.when :install, :pending => :installed
+        m.when :start,   :pending => :started
+        m.when :rebuild, :pending => :rebuilt, :started => :rebuilt
+
+        m.on(:installed) { installer.install }
+        m.on(:started)   { installer.start }
+        m.on(:rebuilt)   { installer.rebuild }
+      }
+
+      @box_machine = MicroMachine.new(:first_boot).tap { |m|
+        m.when :reboot, :first_boot => :rebooted
+      }
     end
 
     def run
@@ -32,7 +37,7 @@ module VagrantVbguest
       while (command = runlist.shift)
         @logger.debug("Running command #{command} from runlist")
         if !self.send(command)
-          vm.ui.error('vagrant.plugins.vbguest.machine_loop_guard', :command => command, :state => current_state)
+          env.ui.error('vagrant.plugins.vbguest.machine_loop_guard', :command => command, :state => current_state)
           return false
         end
         return run if current_state != state
@@ -41,12 +46,12 @@ module VagrantVbguest
     end
 
     def install
-      return @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_installation")) if options[:no_install] && !options[:force]
+      return env.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_installation")) if options[:no_install] && !options[:force]
       @ga_machine.trigger :install
     end
 
     def rebuild
-      return @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_rebuild")) if options[:no_install] && !options[:force]
+      return env.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_rebuild")) if options[:no_install] && !options[:force]
       @ga_machine.trigger :rebuild
     end
 
@@ -91,4 +96,4 @@ module VagrantVbguest
       }
     end
   end
-end
+end

data/lib/vagrant-vbguest/middleware.rb

@@ -14,13 +14,14 @@ module VagrantVbguest
 
     def call(env)
       @env    = env
-      vm      = env[:vm]
-      options = vm.config.vbguest.to_hash
+      vm      = env[:vm] || env[:machine]
+
+      options = vm.config.vbguest.to_hash.freeze
 
       if options[:auto_update]
         machine = VagrantVbguest::Machine.new vm, options
         status  = machine.state
-        vm.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info))
+        vm.env.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info))
         machine.run
         reboot(vm, options) if machine.reboot?
       end

data/lib/vagrant-vbguest/version.rb

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

data/lib/vagrant_init.rb

@@ -1,3 +1,37 @@
-# This file is automatically loaded by Vagrant to load any
-# plugins. This file kicks off this plugin.
-require 'vagrant-vbguest'
+# This file is automatically loaded by Vagrant < 1.1
+# to load any plugins. This file kicks off this plugin.
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant VBGuest plugin must be run within Vagrant."
+end
+
+require 'vagrant-vbguest/core_ext/string/interpolate'
+
+require "vagrant-vbguest/errors"
+require 'vagrant-vbguest/helpers'
+
+require 'vagrant-vbguest/machine'
+
+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/installers/redhat'
+
+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 }
+
+Vagrant.actions[:start].use VagrantVbguest::Middleware
+
+# Add our custom translations to the load path
+I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
+

data/locales/en.yml

@@ -42,6 +42,9 @@ en:
             Please configure a local path to the iso using `config.vbguest.iso_path`
             in your Vagrantfile or the `--iso` command line option.
 
+          no_virtualbox_machine: |-
+            The VBGuest plugin must be used with VirtualBox Machines only.
+
           installer:
             no_installer_for_platform: |-
               Sorry, don't know how to %{method} Virtualbox Guest Additions on this platform. Stopping installation.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre0
+  version: 0.7.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -121,6 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1097977286854134739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: