vagrant-vbguest 0.15.2 → 0.16.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd766b875cf2bb9c92e850a046011649eec465d
-  data.tar.gz: 4bdc188ae83862280e34e76462c729b1cac1ed4a
+  metadata.gz: 80654f414135674846613d27f808377827f213d2
+  data.tar.gz: 790b992fc39851b8989b4ad6563f0e757f8a4cff
 SHA512:
-  metadata.gz: deb10ef9bbc91075af6b2518543fd091d41c2973f25386fdaa1ab15f88f31c5e91c73592525bd2b589d888668e00af57e4b40c8552d81ecb5e9a89c87ca4e1d9
-  data.tar.gz: 63227c7e469f706b242c7ea4d91b66ba6b82d9e2d1f1468dbda5a7582dbe1372c88feea70e5c92802c29b0c31fb1c3e2bb6cfe243e40765e2da5693abbdb6c23
+  metadata.gz: 2da8eb1062acd3f6a230d98d17a2a8806a4923fccd785ef4dee6d756d7fbcf489a5b47149b217369201fe75e3a77702c79c5aebe88945ed8978443e51dca2096
+  data.tar.gz: b2859f70a4ba83fb2271b5a06d285bf5b5720e0833f4d13d6b1a01490cfa3128b7ca39a333845d08b7759bc3b193d38919776e3b612dfffad2b8819fb4092236

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 0.15.02 (2018-05-22)
+## 0.16.0.beta1 (2018-08-29)
+
+- Refactoring of reading the GuestAdditions version. For VirtualBox >= 4.2, we'll try `VBoxManage showvminfo` first, and use Vagrant as a fallback.  
+This should fix a lot of those "Got different reports about installed GuestAdditions version" error messages.  
+See discussion in [GH-300]. Thanks @cbj4074 for asking the right questions.
+- Add support for Amazon 2. Thanks @ghoneycutt [GH-304], [GH-303]
+
+## 0.15.2 (2018-05-22)
 
 - On RedHad based guest, the installer will now try to install the 'kernel-devel' package additionally to 'kernel-devel-`uname -r`' Thanks @ghoneycutt [GH-299]
 

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

@@ -20,6 +20,9 @@ module VagrantVbguest
         @version ||= driver.version
       end
 
+      def read_guest_additions_version
+        driver.read_guest_additions_version
+      end
 
       # Additions-file-detection-magig.
       #

data/lib/vagrant-vbguest/hosts/virtualbox.rb

@@ -2,6 +2,34 @@ module VagrantVbguest
   module Hosts
     class VirtualBox < Base
 
+      def read_guest_additions_version
+        # this way of checking for the GuestAdditionsVersion is taken from Vagrant's
+        # `read_guest_additions_version` method introduced via
+        # https://github.com/hashicorp/vagrant/commit/d8ff2cb5adca25d7eba2bdd334919770316c91be
+        # for VirtualBox 4.2 and carries on for later versons until now
+        # We are vendoring it here, since Vagrant uses it is only a fallback
+        # for when `guestproperty` won't work. But `guestproperty` seems to be prone
+        # to return incorrect values.
+        if Gem::Requirement.new(">= 4.2").satisfied_by? Gem::Version.new(version)
+          uuid = self.class.vm_id(vm)
+          begin
+            info = driver.execute("showvminfo", uuid, "--machinereadable", retryable: true)
+            info.split("\n").each do |line|
+              return $1.to_s if line =~ /^GuestAdditionsVersion="(.+?)"$/
+            end
+          rescue Vagrant::Errors::VBoxManageError => e
+            if e.message =~ /Invalid command.*showvminfo/i
+              vm.env.ui.warn("Cannot read GuestAdditionsVersion using 'showvminfo'")
+              vm.env.ui.debug(e.message)
+            else
+              raise e
+            end
+          end
+        end
+
+        super
+      end
+
       protected
 
         # Default web URI, where GuestAdditions iso file can be downloaded.

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

@@ -31,7 +31,7 @@ module VagrantVbguest
       # to check.
       #
       # @see {Vagrant::Guest::Linux#distro_dispatch}
-      # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`, `:windows`
+      # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`, `:windows`, `:amazon`
       def self.distro(vm)
         @@distro ||= {}
         @@distro[ vm_id(vm) ] ||= distro_name vm
@@ -132,7 +132,7 @@ module VagrantVbguest
       def guest_version(reload=false)
         return @guest_version if @guest_version && !reload
 
-        guest_version = driver.read_guest_additions_version
+        guest_version = @host.read_guest_additions_version
         guest_version = !guest_version ? nil : guest_version[/\d+\.\d+\.\d+/]
 
         @guest_version = guest_version
@@ -211,7 +211,6 @@ module VagrantVbguest
           end
         end
       end
-
     end
   end
 end

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

@@ -5,7 +5,7 @@ module VagrantVbguest
       # fortunately they're probably both similar enough to RHEL
       # (RedHat Enterprise Linux) not to matter.
       def self.match?(vm)
-        /\A(redhat|centos)\d*\Z/ =~ self.distro(vm)
+        /\A(redhat|centos|amazon)\d*\Z/ =~ self.distro(vm)
       end
 
       # Install missing deps and yield up to regular linux installation

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.15.2"
+  VERSION = "0.16.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0.beta1
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM