vagrant-vbguest 0.5.1 → 0.6.0.pre0

data/lib/vagrant-vbguest/installer.rb

@@ -70,8 +70,19 @@ module VagrantVbguest
     end
 
     def guest_version
+      return @guest_version if @guest_version
+
       guest_version = @vm.driver.read_guest_additions_version
-      !guest_version ? nil : guest_version.gsub(/[-_]ose/i, '')
+      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
     end
 
     def vb_version

data/lib/vagrant-vbguest/version.rb

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

data/locales/en.yml

@@ -13,6 +13,11 @@ en:
         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}
+          VBoxService inside the vm claims: %{service}
+          Going on, assuming VBoxService is correct...
 
         errors:
           autodetect_iso_path: |-

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0.pre0
+  prerelease: 6
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler