vagrant-vbguest 0.6.0.pre1 → 0.6.0.pre2

data/lib/vagrant-vbguest.rb

@@ -2,6 +2,8 @@ require 'vagrant'
 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'

data/lib/vagrant-vbguest/command.rb

@@ -11,22 +11,44 @@ module VagrantVbguest
     # by this environment.
     def execute
       options = {
+        :_method => :run,
+        :_rebootable => true,
         :auto_reboot => false
       }
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: vagrant vbguest [vm-name] [-f|--force] [--auto-reboot] [-I|--no-install] [-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]"
         opts.separator ""
 
-        opts.on("-f", "--force", "Whether to force the installation") do
-          options[:force] = true
+        opts.on("--do COMMAND", [:start, :rebuild, :install], "Manually `start`, `rebuild` or `install` GueastAdditions.") do |command|
+          options[:_method] = command
         end
 
-        opts.on("--auto-reboot", "Reboot VM after installation") do
-          options[:auto_reboot] = true
+        opts.on("--status", "Print current GuestAdditions status and exit.") do
+          options[:_method] = :status
+          options[:_rebootable] = false
+        end
+
+        # opts.on("--start", "Try to start the GuestAdditions servcice manually.") do
+        #   options[:_method] = :start
+        #   options[:_rebootable] = false
+        # end
+
+        # opts.on("--rebuild", "Rebuild the existing GuestAdditions.") do
+        #   options[:_method] = :rebuild
+        #   options[:force] = true
+        # end
+
+        # opts.on("--install", "Install GuestAdditions matching your host system.") do
+        #   options[:_method] = :install
+        #   options[:force] = true
+        # end
+
+        opts.on("-f", "--force", "Whether to force the installation. (Implied by --install and --rebuild)") do
+          options[:force] = true
         end
 
-        opts.on("--no-install", "-I", "Only check for the installed version. Do not attempt to install anything") do
-          options[:no_install] = true
+        opts.on("--auto-reboot", "-b", "Allow rebooting the VM after installation. (when GuestAdditions won't start)") do
+          options[:auto_reboot] = true
         end
 
         opts.on("--no-remote", "-R", "Do not attempt do download the iso file from a webserver") do
@@ -40,6 +62,7 @@ module VagrantVbguest
         build_start_options(opts, options)
       end
 
+
       argv = parse_options(opts)
       return if !argv
 
@@ -57,10 +80,21 @@ module VagrantVbguest
 
     # Executes a command on a specific VM.
     def execute_on_vm(vm, options)
+      options     = options.clone
+      _method     = options.delete(:_method)
+      _rebootable = options.delete(:_rebootable)
+
+
       options = vm.config.vbguest.to_hash.merge(options)
-      installer = VagrantVbguest::Installer.new(vm, options)
-      installer.run!
-      reboot(vm, options) if installer.need_reboot?
+      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)
+
+      if _method != :status
+        machine.send(_method)
+      end
+
+      reboot(vm, options) if _rebootable && machine.reboot?
     end
 
     def reboot vm, options
@@ -69,4 +103,5 @@ module VagrantVbguest
       end
     end
   end
+
 end

data/lib/vagrant-vbguest/helpers.rb

@@ -8,10 +8,12 @@ module VagrantVbguest
       end
 
       def reboot(vm, options)
-        if options[:auto_reboot]
+        if rebooted?(vm)
+          vm.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
+          false
+        elsif options[:auto_reboot]
           vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
           @@rebooted[vm.name] = true
-          true
         else
           @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
           false

data/lib/vagrant-vbguest/installer.rb

@@ -46,46 +46,24 @@ module VagrantVbguest
     end
 
     def initialize(vm, options = {})
+      @vm = vm
+      @options = options
+      @iso_path = nil
       @env = {
         :ui => vm.ui,
         :tmp_path => vm.env.tmp_path
       }
-      @vm = vm
-      @iso_path = nil
-      @options = options
-    end
-
-    def run!
-      @options[:auto_update] = true
-      run
-    end
-
-    def run
-      return unless @options[:auto_update]
-
-      raise Vagrant::Errors::VMNotCreatedError if !@vm.created?
-      raise Vagrant::Errors::VMInaccessible if !@vm.state == :inaccessible
-      raise Vagrant::Errors::VMNotRunningError if @vm.state != :running
-
-      @vm.ui.success(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version)) unless needs_update?
-      @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.check_failed", :host => vb_version, :guest => guest_version)) if @options[:no_install]
-
-      if @options[:force] || (!@options[:no_install] && needs_update?)
-        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}", :host => vb_version, :guest => guest_version))
-        install
-      end
-    ensure
-      cleanup
     end
 
     def install
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'install' if !installer
 
-      # @vm.ui.info "Installing using #{installer.class.to_s}"
       installer.install do |type, data|
         @vm.ui.info(data, :prefix => false, :new_line => false)
       end
+    ensure
+      cleanup
     end
 
     def rebuild
@@ -97,47 +75,31 @@ module VagrantVbguest
       end
     end
 
-    def needs_rebuild?
+    def start
       installer = guest_installer
-      raise NoInstallerFoundError, :method => 'check installation of' if !installer
+      raise NoInstallerFoundError, :method => 'manual start' if !installer
 
-      installer.needs_rebuild?
+      installer.start do |type, data|
+        @vm.ui.info(data, :prefix => false, :new_line => false)
+      end
     end
 
-    def need_reboot?
+    def guest_version(reload=false)
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'check installation of' if !installer
-
-      installer.need_reboot?
+      installer.guest_version(reload)
     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
-
-      guest_version = @vm.driver.read_guest_additions_version
-      guest_version = !guest_version ? nil : guest_version.gsub(/[-_]ose/i, '')
-
-      @vm.channel.sudo('VBoxService --version', :error_check => false) do |type, data|
-        if (v = data.to_s.match(/^(\d+\.\d+.\d+)/)) && guest_version != v[1]
-          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.guest_version_reports_differ", :driver => guest_version, :service => v[1]))
-          guest_version = v[1]
-        end
-      end
-
-      @guest_version = guest_version
+    def host_version
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check installation of' if !installer
+      installer.host_version
     end
 
-    # Returns the version code of the Virtual Box *host*
-    def vb_version
-      @vm.driver.version
+    def running?
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check installation of' if !installer
+      installer.running?
     end
 
     # Returns an installer instance for the current vm
@@ -146,6 +108,10 @@ module VagrantVbguest
     #
     # @return [Installers::Base]
     def guest_installer
+      raise Vagrant::Errors::VMNotCreatedError if !@vm.created?
+      raise Vagrant::Errors::VMInaccessible if !@vm.state == :inaccessible
+      raise Vagrant::Errors::VMNotRunningError if @vm.state != :running
+
       @guest_installer ||= if @options[:installer].is_a? Class
         @options[:installer].new(@vm)
       else

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

@@ -24,7 +24,7 @@ module VagrantVbguest
         false
       end
 
-      attr_reader :vm
+      attr_reader :vm, :options
 
       def initialize(vm, options=nil)
         @vm = vm
@@ -60,9 +60,9 @@ module VagrantVbguest
       def install(iso_fileO=nil, opts=nil, &block)
       end
 
-      # Handels the rebuild of allready installed GuestAdditions
+      # Handels the rebuild of allready running GuestAdditions
       # It may happen, that the guest has the correct GuestAdditions
-      # version installed, but not the kernel module is not loaded.
+      # version running, but not the kernel module is not running.
       # 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
@@ -77,6 +77,22 @@ module VagrantVbguest
       def rebuild(opts=nil, &block)
       end
 
+      # Restarts the allready installed GuestAdditions
+      # It may happen, that the guest has the correct GuestAdditions
+      # version installed, but for some reason are not (yet) runnig.
+      # This method should execute the GuestAdditions system specific
+      # init script in order to start it manually.
+      # If there is no way of doing this 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 start(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.
@@ -86,33 +102,71 @@ module VagrantVbguest
       # 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)
+      def running?(opts=nil, &block)
         true
       end
 
-      def needs_rebuild?(opts=nil, &block)
-        !installed?(opts, &block)
+      # Determinates the GuestAdditions version installed on the
+      # guest system.
+      #
+      # @param [Boolean] reload 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.
+      def guest_version(reload=false)
+        return @guest_version if @guest_version && !reload
+
+        guest_version = vm.driver.read_guest_additions_version
+        guest_version = !guest_version ? nil : guest_version.gsub(/[-_]ose/i, '')
+
+        @guest_version = guest_version
+      end
+
+      # Determinates the host's version
+      #
+      # @return [String] The version code of the Virtual Box *host*
+      def host_version
+        vm.driver.version
       end
 
-      def need_reboot?(opts=nil, &block)
-        !installed?(opts, &block)
+      def installer_version(path_to_installer)
+        version = nil
+        @vm.channel.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
+        end
+        version
+      end
+
+      def yield_installation_waring(path_to_installer)
+        @vm.ui.warn I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}",
+          :guest_version => guest_version,
+          :installer_version => installer_version(path_to_installer) || "unknown")
+      end
+
+      def yield_rebuild_warning
+        @vm.ui.warn I18n.t("vagrant.plugins.vbguest.rebuild#{@options[:force] ? '_forced' : ''}",
+          :guest_version => guest_version(true),
+          :host_version => host_version)
       end
 
       def iso_file
         @iso_file ||= begin
-          iso_path = @options[:iso_path] || local_iso_path
+          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
+          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
+          version = host_version
+          iso_path = iso_path.gsub('$VBOX_VERSION', version) % {:version => 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]
+            raise VagrantVbguest::DownloadingDisabledError.new(:from => iso_url) if options[:no_remote]
             env = {
               :ui => vm.ui,
               :tmp_path => vm.env.tmp_path,
@@ -125,18 +179,14 @@ module VagrantVbguest
         end
       end
 
-      def local_iso?
-        ::File.file?(@env[:iso_url])
+      def web_iso_path
+        "http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso"
       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
@@ -166,8 +216,7 @@ module VagrantVbguest
       # from the guest
       def cleanup
         @download.cleanup if @download
-
-        vm.channel.execute("rm #{tmp_path}", :error_check => false) do |type, data|
+        vm.channel.execute("test -f #{tmp_path} && rm #{tmp_path}", :error_check => false) do |type, data|
           vm.ui.error(data.chomp, :prefix => false)
         end
       end

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

@@ -17,7 +17,12 @@ module VagrantVbguest
         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)
+
+        installer = File.join(mount_point, 'VBoxLinuxAdditions.run')
+        yield_installation_waring(installer)
+
+        vm.channel.sudo("#{installer} --nox11", opts, &block)
+
         vm.channel.sudo("umount #{mount_point}", opts, &block)
       end
 
@@ -30,7 +35,7 @@ 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 << 'dkmx' if vm.channel.test('apt-cache search --names-only \'^dkms$\' | grep dkms')
+        packages << 'dkms' if vm.channel.test('apt-cache search --names-only \'^dkms$\' | grep dkms')
         packages.join ' '
       end
     end

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

@@ -47,17 +47,37 @@ module VagrantVbguest
         vm.channel.sudo("umount #{mount_point}", opts, &block)
       end
 
-      def installed?(opts=nil, &block)
+      def running?(opts=nil, &block)
         opts = {
           :sudo => true
         }.merge(opts || {})
         vm.channel.test('lsmod | grep vboxsf', opts, &block)
       end
 
+      # @return [String] The version code of the VirtualBox Guest Additions
+      #                  available on the guest, or `nil` if none installed.
+      def guest_version(reload = false)
+        return @guest_version if @guest_version && !reload
+        driver_version = super
+
+        @vm.channel.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]))
+            @guest_version = v[1]
+          end
+        end
+      end
+
+
       def rebuild(opts=nil, &block)
         vm.channel.sudo('/etc/init.d/vboxadd setup', opts, &block)
       end
 
+      def start(opts=nil, &block)
+        opts = {:error_check => false}.merge(opts || {})
+        vm.channel.sudo('/etc/init.d/vboxadd start', opts, &block)
+      end
+
     end
   end
 end

data/lib/vagrant-vbguest/machine.rb

@@ -0,0 +1,83 @@
+module VagrantVbguest
+  class Machine
+
+    require 'micromachine'
+
+    attr_reader :installer, :vm, :options
+
+    def initialize vm, options
+      @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
+    end
+
+    def run
+      runlist = steps
+      current_state = state
+      while (command = runlist.shift)
+        self.send(command)
+        return run if current_state != state
+      end
+    end
+
+    def install
+      return @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.skiped_installation")) if options[:no_install] && !options[:force]
+      @ga_machine.trigger :install
+    end
+
+    def rebuild
+      return @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.skiped_rebuild")) if options[:no_install] && !options[:force]
+      @ga_machine.trigger :rebuild
+    end
+
+    def start
+      @ga_machine.trigger :start
+    end
+
+    def installation_ran?; @ga_machine == :installed end
+    def started?; @ga_machine == :started end
+    def rebuilt?; @ga_machine == :rebuilt end
+
+    def reboot;  @box_machine.trigger :reboot end
+    def reboot?; @box_machine.state == :rebooted end
+
+    def steps
+      case state
+      when :clean, :unmatched
+        [:install]
+      when :not_running
+        installation_ran? ? [:reboot] : [:start, :rebuild, :reboot]
+      else
+        []
+      end
+    end
+
+    def state
+      guest_version = installer.guest_version(true)
+
+      return :clean       if !guest_version
+      return :unmatched   if installer.host_version != guest_version
+      return :not_running if !installer.running?
+      return :ok
+    end
+
+    def info
+      {
+        :host_version => installer.host_version,
+        :guest_version => installer.guest_version
+      }
+    end
+  end
+end

data/lib/vagrant-vbguest/middleware.rb

@@ -15,17 +15,13 @@ module VagrantVbguest
 
     def call(env)
       options = @vm.config.vbguest.to_hash
-      installer = VagrantVbguest::Installer.new(@vm, options)
-      installer.run
-
-      if installer.need_reboot?
-        if rebooted?(@vm)
-          @vm.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
-        else
-          reboot(@vm, options)
-        end
+      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)
+        machine.run
+        reboot(@vm, options) if machine.reboot?
       end
-
       @app.call(env)
     end
 

data/lib/vagrant-vbguest/version.rb

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

data/locales/en.yml

@@ -2,12 +2,13 @@ en:
   vagrant:
     plugins:
       vbguest:
-        guest_ok: "Detected Virtualbox Guest Additions %{version} --- OK."
-        check_failed: "Virtualbox Guest Additions on host: %{host} - guest's version is %{guest}"
-        installing: "Installing Virtualbox Guest Additions %{host} - guest's version is %{guest}"
-        installing_forced: "Forcing installation of Virtualbox Guest Additions %{host} - guest's version is %{guest}"
+        skiped_installation: "Updating GuestAdditions skipped."
+        skiped_rebuild: "Rebuilding GuestAdditions skipped."
+        installing: "Installing Virtualbox Guest Additions %{installer_version} - guest's version is %{guest_version}"
+        installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest's version is %{guest_version}"
+        rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host's version is %{host_version})"
+        rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host's version is %{host_version})"
         start_copy_iso: "Copy iso file %{from} into the box %{to}"
-        start_copy_script: "Copy installer file %{from} into the box %{to}"
         restart_vm: "Restarting VM to apply changes..."
         suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box runing `vagrant reload %{name}`"
         restart_loop_guard_activated: "Guest Additions will not load, even after reboot."
@@ -17,6 +18,12 @@ en:
           VBoxService inside the vm claims: %{service}
           Going on, assuming VBoxService is correct...
 
+        status:
+          clean: "No installation found."
+          unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) does not match."
+          not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but don't run."
+          ok: "GuestAdditions %{guest_version} running --- OK."
+
         errors:
           autodetect_iso_path: |-
             Could not autodetect a local of the Virtualbox Guest Additions iso file.

data/vagrant-vbguest.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "micromachine"
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "bundler", ">= 1.2.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre1
+  version: 0.6.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: micromachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 description: A Vagrant plugin which automatically installs the host's VirtualBox Guest
   Additions on the guest system.
 email:
@@ -41,8 +57,6 @@ files:
 - LICENSE
 - Rakefile
 - Readme.md
-- files/setup_debian.sh
-- files/setup_linux.sh
 - lib/vagrant-vbguest.rb
 - lib/vagrant-vbguest/command.rb
 - lib/vagrant-vbguest/config.rb
@@ -54,6 +68,7 @@ files:
 - lib/vagrant-vbguest/installers/debian.rb
 - lib/vagrant-vbguest/installers/linux.rb
 - lib/vagrant-vbguest/installers/ubuntu.rb
+- lib/vagrant-vbguest/machine.rb
 - lib/vagrant-vbguest/middleware.rb
 - lib/vagrant-vbguest/version.rb
 - lib/vagrant_init.rb

data/files/setup_debian.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-function do_install {
-	apt-get install -y linux-headers-`uname -r` dkms
-}
-
-do_install || (apt-get update && do_install) || exit 1
-
-mount /tmp/VBoxGuestAdditions.iso -o loop /mnt
-/mnt/VBoxLinuxAdditions.run --nox11
-umount /mnt
-
-exit 0

data/files/setup_linux.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-mount /tmp/VBoxGuestAdditions.iso -o loop /mnt
-/mnt/VBoxLinuxAdditions.run --nox11
-umount /mnt