vagrant-vbguest 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd46d6d0e7bfff66a287572bbe41c9c20375a03b14c0a70122670935bd87c1b4
-  data.tar.gz: 67f4ad8b493ac4a16d45df782e7ab4785e9092444911a3a78f356a8a87ec47cd
+  metadata.gz: da79bc0ea1de83aaff4441411b30ccdda0d2e340a4b9005ba3881f3e99663b46
+  data.tar.gz: c417bfc0b198f54de1c1c310ebcc4cbadd0a1cd81547a45de0e959ff3eac8126
 SHA512:
-  metadata.gz: 1e41145e1eacf6aaad2d4bf17e506b408ef2be2d1f1cb3ed66b5c4a77654e69bebf5f1d99204b81c80b2b15ca5fd4c9372dbd8b6e62c3fc0482582bc89cc3d19
-  data.tar.gz: c1e19268ec2cab24a19ff5479dcfae3c4088673db2cb620d8b1c68a0db6f55cf95be170d6add8192db7c631b51eb795d9cb379c898f668ba107257dfce22d7f5
+  metadata.gz: 8470f53fcf0e23be79343e1a6660c94ea5fec4d731d90df5aced9f5e2f4de6791a3f99caf2872043280892e254def2d7003b125c2008c444a9852bc95d9ab3f5
+  data.tar.gz: 8591bff9dabf621cbc8ad3a6e92f6b3a0eaa25a8630a713085dd1f2ae21a5d06cf52993058af9cae3d5e186b75c88d3f1678a55d5ffb0a88d23f0cebcfe0843d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.22.0 (2019-12-06)
+
+- Fix checking for `vboxadd` tools. [GH-362]
+
 ## 0.22.0 (2019-12-01)
 
 - Opensuse installer now uninstalls packaged guest additions

data/VERSION

@@ -1 +1 @@
-0.22.0
+0.22.1

data/lib/vagrant-vbguest/installer.rb

@@ -104,16 +104,21 @@ module VagrantVbguest
     end
 
     def reboot_after_install?
-      if (installer = guest_installer)
-        installer.reboot_after_install?
-      end
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check if we need to reboot after installing' if !installer
+      installer.reboot_after_install?
     end
 
-    # Does the guest installer provide service tooling to manually start or rebuild guest additions?
-    def has_service_tools?
-      if (installer = guest_installer)
-        installer.has_vboxadd_tools?
-      end
+    def provides_vboxadd_tools?
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check platform support for vboxadd tools of' if !installer
+      installer.provides_vboxadd_tools?
+    end
+
+    def vboxadd_tools_available?
+      installer = guest_installer
+      raise NoInstallerFoundError, :method => 'check for existing vboxadd tools of' if !installer
+      installer.vboxadd_tools_available?
     end
 
     # Returns an installer instance for the current vm

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

@@ -125,15 +125,26 @@ module VagrantVbguest
       end
 
       # This manipulate the run-list of a the vbguest machine.
-      def reboot_after_install?(opts=nil, &block)
+      #
+      # @return [Boolean]
+      def reboot_after_install?
         false
       end
 
       # Does the guest installer provide tooling to manually start or rebuild guest additions?
-      def has_vboxadd_tools?(opts=nil, &block)
+      #
+      # @return [Boolean]
+      def provides_vboxadd_tools?
         false
       end
 
+      # Is the tooling to manually start or rebuild guest additions installed on the guest?
+      #
+      # @return [Boolean]
+      def vboxadd_tools_available?
+        raise NotImplementedError
+      end
+
       # Determinates the GuestAdditions version installed on the
       # guest system.
       #

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

@@ -135,7 +135,11 @@ module VagrantVbguest
         end
       end
 
-      def has_service_tools?(opts=nil, &block)
+      def provides_vboxadd_tools?
+        true
+      end
+
+      def vboxadd_tools_available?
         !!find_tool('vboxadd') || communicate.test('systemctl list-units --type service | grep -q vboxadd', {:sudo => true})
       end
 

data/lib/vagrant-vbguest/machine.rb

@@ -22,8 +22,11 @@ module VagrantVbguest
       @logger.debug("Runlist for state #{current_state} is: #{runlist}")
       while (command = runlist.shift)
         @logger.debug("Running command #{command} from runlist")
-        if !self.send(command)
-          env.ui.error('vagrant_vbguest.machine_loop_guard', :command => command, :state => current_state)
+        case self.send(command)
+        when nil # skipped
+          return false
+        when false # machine state change error
+          env.ui.error(I18n.t('vagrant_vbguest.machine_loop_guard', :command => command, :state => guest_additions_state.state))
           return false
         end
         return run if current_state != state
@@ -71,8 +74,8 @@ module VagrantVbguest
 
       return :clean if !guest_version
 
-      # some sort of distro installation bot no `vboxadd` tools to trgger rebuilds or manual starts
-      return :dirty if !installer.has_service_tools?
+      # some sort of distro installation bot no `vboxadd` tools to trigger rebuilds or manual starts
+      return :dirty if installer.provides_vboxadd_tools? && !installer.vboxadd_tools_available?
 
       if host_version != guest_version
         return :unmatched if host_version > guest_version || options[:allow_downgrade] || options[:force]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine