vagrant-vbguest 0.0.2 → 0.0.3

data/files/setup_debian.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+apt-get install -y linux-headers-`uname -r` dkms
 mount /tmp/VBoxGuestAdditions.iso -o loop /mnt
 /mnt/VBoxLinuxAdditions.run --nox11
 umount /mnt

data/files/setup_linux.sh

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

data/lib/vagrant-vbguest/command.rb

@@ -2,6 +2,7 @@ module VagrantVbguest
   
   class Command < Vagrant::Command::Base
     register "vbguest", "Check and Update the VirtualBox Guest Additions"
+    class_option :force, :type => :boolean, :required => false, :default => false, :desc => "Whether to force the installation"
 
     # Executes the given rake command on the VMs that are represented
     # by this environment.
@@ -13,7 +14,7 @@ module VagrantVbguest
 
     # Executes a command on a specific VM.
     def execute_on_vm(vm)
-      vm.env.actions.run(:vbguest)
+      vm.env.actions.run(:vbguest, "vbguest.force.install" => options[:force])
     end
   end
 end

data/lib/vagrant-vbguest/middleware.rb

@@ -8,58 +8,76 @@ module VagrantVbguest
     def initialize(app, env, options = {})
       @app = app
       @env = env
+      @vm = version = env["vm"]
       @run_level = options.delete(:run_level)
+      @force = options.delete(:force) || env["vbguest.force.install"]
     end
 
     def call(env)
-
-      if shall_run?
-        version = env["vm"].vm.interface.get_guest_property_value("/VirtualBox/GuestAdd/Version")
-        guest_version = version.empty?() ? I18n.t("vagrant.plugins.vbguest.additions_missing_on_guest") : version.gsub(/[-_]ose/i, '');
-        needs_update = version.empty? || (VirtualBox.version != guest_version)
-
-        if needs_update
-          env.ui.warn(I18n.t("vagrant.plugins.vbguest.installing", :host => VirtualBox.version, :guest => guest_version))
       
-          env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
-          env["vm"].ssh.upload!(iso_path, iso_destination)
-      
-          env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(installer_script), :to => installer_destination))
-          env["vm"].ssh.upload!(installer_script, installer_destination)
+      if shall_run? 
         
-          env["vm"].ssh.execute do |ssh|
-            ssh.sudo!("sh /tmp/install_vbguest.sh") do |channel, type, data|
-              # Print the data directly to STDOUT, not doing any newlines
-              # or any extra formatting of our own
-              $stdout.print(data) if type != :exit_status
-            end
+        env.ui.confirm(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version)) unless needs_update?
+        
+        if forced_run? || needs_update?
+          env.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{forced_run? ? '_forced' : ''}", :host => VirtualBox.version, :guest => guest_version))
           
-            ssh.exec!("rm /tmp/install_vbguest.sh /tmp/VBoxGuestAdditions.iso") do |channel, type, data|
-              # Print the data directly to STDOUT, not doing any newlines
-              # or any extra formatting of our own
-              $stdout.print(data) if type != :exit_status
+          # :TODO: 
+          # the whole istallation process should be put into own classes
+          # like the vagrant system loading
+          if i_script = installer_script
+            env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
+            @vm.ssh.upload!(iso_path, iso_destination)
+            
+            env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(i_script), :to => installer_destination))
+            @vm.ssh.upload!(i_script, installer_destination)
+            
+            @vm.ssh.execute do |ssh|
+              ssh.sudo!("sh /tmp/install_vbguest.sh") do |channel, type, data|
+                # Print the data directly to STDOUT, not doing any newlines
+                # or any extra formatting of our own
+                $stdout.print(data) if type != :exit_status
+              end
+              
+              ssh.exec!("rm /tmp/install_vbguest.sh /tmp/VBoxGuestAdditions.iso") do |channel, type, data|
+                # Print the data directly to STDOUT, not doing any newlines
+                # or any extra formatting of our own
+                $stdout.print(data) if type != :exit_status
+              end
+              
+              # Puts out an ending newline just to make sure we end on a new
+              # line.
+              $stdout.puts
             end
-          
-            # Puts out an ending newline just to make sure we end on a new
-            # line.
-            $stdout.puts
           end
-        else
-          env.ui.info(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version))
         end
       end
-
+      
       @app.call(env)
     end
     
     protected
 
+    def forced_run?
+      @force
+    end
+    
+    def needs_update?
+      gv = guest_version
+      !(gv && VirtualBox.version == gv)
+    end
+
     def vm_up?
-      @env["vm"].created? && @env["vm"].vm.running?
+      @vm.created? && @env["vm"].vm.running?
     end
     
     def shall_run?
-      vm_up? && (!@run_level || @env["config"].vbguest.auto_update)
+      vm_up? && (forced_run? || !@run_level || @env["config"].vbguest.auto_update)
+    end
+    
+    def guest_version
+      guest_version = @vm.vm.interface.get_guest_property_value("/VirtualBox/GuestAdd/Version")
+      guest_version.empty? ? nil : guest_version.gsub(/[-_]ose/i, '')
     end
 
     def iso_path
@@ -71,7 +89,16 @@ module VagrantVbguest
     end
     
     def installer_script
-      File.expand_path("../../../files/setup_debian.sh", __FILE__)
+      plattform = @env["vm"].system.distro_dispatch
+      case @env["vm"].system.distro_dispatch
+      when :debian, :ubuntu
+        return File.expand_path("../../../files/setup_debian.sh", __FILE__)
+      when :gentoo, :redhat, :suse, :arch, :linux
+        @env.ui.error(I18n.t("vagrant.plugins.vbguest.generic_install_script_for_plattform", :plattform => plattform.to_s))
+        return File.expand_path("../../../files/setup_linux.sh", __FILE__)
+      end
+      @env.ui.error(I18n.t("vagrant.plugins.vbguest.no_install_script_for_plattform", :plattform => plattform.to_s))
+      nil
     end
     
     def installer_destination

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/locales/en.yml

@@ -2,8 +2,11 @@ en:
   vagrant:
     plugins:
       vbguest:
-        guest_ok: "Guests Virtualbox Guest Additions %{version} --- OK."
+        guest_ok: "Detected Virtualbox Guest Additions %{version} --- OK."
         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}"
         missing_iso_path: "Could not autodetect the correct location of the Virtualbox Guest Additions ISO File. Or the Path provided is not correct. \nPlease configure using `config.vbguest.iso_path`. \nOn Mac this is most likely: '/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso' "
         start_copy_iso: "Copy iso file %{from} into the box %{to}"
         start_copy_script: "Copy installer file %{from} into the box %{to}"
+        no_install_script_for_plattform: "Sorry, not shure how to install on a %{plattform} system. Stopping installation."
+        generic_install_script_for_plattform: "%{plattform} is currently not supported, but i'll try generic linux way ... "

metadata

@@ -2,7 +2,7 @@
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Robert Schulze
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +02:00
+date: 2011-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - 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