vagrant-vbguest 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb25d03160ec1b36b8b60132da7843717f655a2b9aece5e32f0630804fe12ac
-  data.tar.gz: 9825820822c15385bd8f084cb1010280216959f2a305eb017ba5fb63ce7b9b80
+  metadata.gz: b7a6d0a4fb842515ecb1dd74ecb969b916c9673aaefabad4f866e84a4fadcdd5
+  data.tar.gz: c799100151565c5bced4e1efdc1af7e833fb8e01b1ab6ec74ec94d01e7f05676
 SHA512:
-  metadata.gz: 6d2fbea83019796220c4e8a95198c4f566099a17e4f11be8f028c1d44e0f40f27af441fa9dc0fac36510898fc988b44d4acef7be9bead801ae8b0984c8cf0fc1
-  data.tar.gz: 25f5e66b4216af12cf0af8c66066dee42106505ef8285e7ed164bf9add052818a26efacf1fb67bd95f4d551a605be7c51631696151939fad83bb01a31d347cb2
+  metadata.gz: 14ae4c8c9751d61040c7658d487271a2fdcd7f55f734a1487921c15d05cc97f175aafafde2e1787cadd48c05259f4dcfde4aac3e810c0b1723dd228d3e41af8f
+  data.tar.gz: 5791807d0b50e929402798b41647306c1edb40e434b25c9264c633bb2c76f8c4b02e18012488a5ef136fee0616777c46daaee044fcdaca066241f8d9372f1a06

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 0.25.0 (unreleased)
+## 0.26.0 (2020-10-30)
+
+- Add a new configuration `installer_hooks` allows to configure arbitrary scripts to be run on the guest before/after installer steps are executed.
+- Fix RHEL8 perl vs. perl-interpreter [GH-368]
+- On RedHad, use `dnf` instead of `yum` if available. [GH-368]
+- Fix incorrect re-use of installer_* options.
+
+## 0.25.0 (2020-09-26)
 
 - Renames mainline branch from "master" to "main"
 - Fix not detecting running GuestAdditions on some systems [GH-347], [GH-376]. Thanks @Morac2 for [GH-377]

data/Readme.md

@@ -59,6 +59,7 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
 * `installer` (`VagrantVbguest::Installers::Base`, optional) : Reference to a (custom) installer class
 * `installer_arguments` (Array, default: `['--nox11']`) : List of additional arguments to pass to the installer. eg: `%w{--nox11 --force}` would execute `VBoxLinuxAdditions.run install --nox11 --force`
 * `installer_options` (Hash, default: `{}`) : Configure how a Installer internally works. Should be set on a `vm` level.
+* `installer_hooks` (Hash, default: `{}`) : Configure scripts to be run before/after installer steps.
 * `yes` (Boolean or String, default: `true`): Wheter to pipe `yes` to the installer. If `true`, executes `yes | VBoxLinuxAdditions.run install`. With `false`, the command is executed without `yes`. You can also put in a string here for `yes` (e.g. `no` to refuse all messages)
 
 
@@ -128,6 +129,26 @@ VagrantVbguest::Config.auto_update = false
 Settings in a project's `Vagrantfile` will overwrite those setting. When executed as a command, command line arguments will overwrite all of the above.
 
 
+#### Installer Hooks (`installer_hooks`)
+
+Additionally to the build-in `installer_options`, you can configure to execute scripts around the install steps `install`, `rebuild` and `start`.
+Accepts either a single command or and array of commands. Box-specific settings overwrite earlier settings, just like with `installer_options`.
+
+Use this make changes to the guest, for example to install specific dependencies or tweak the network setup.
+
+* `before_install`/`after_install`: Runs before/after the install step. That is before uploading the iso file into the guest and after unmounting the iso file.
+* `before_rebuild`/`after_rebuild`: Runs before/after the installer runs a command to let the GuestAdditions rebuild itself.
+* `before_start`/`after_start`: Runs before/after the installer runs a command to start the GuestAdditions service.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "my_cent_os_box" do |c|
+    c.vbguest.installer_hooks[:before_install] = ["yum install -y epel-release", "sleep 1"]
+  end
+end
+```
+
+
 ### Running as a middleware
 
 Running as a middleware is the default way of using *vagrant-vbguest*. 

data/VERSION

@@ -1 +1 @@
-0.25.0
+0.26.0

data/lib/vagrant-vbguest/config.rb

@@ -5,7 +5,7 @@ module VagrantVbguest
     module Attributes
       attr_accessor :auto_update, :auto_reboot, :no_install, :no_remote,
                     :installer, :installer_arguments, :installer_options,
-                    :allow_downgrade,
+                    :installer_hooks, :allow_downgrade,
                     :iso_path, :iso_upload_path, :iso_mount_point, :yes
     end
 
@@ -18,6 +18,7 @@ module VagrantVbguest
       def no_remote;   @no_remote.nil?   ? false : @no_remote   end
       def installer_arguments; @installer_arguments.nil? ? '--nox11' : @installer_arguments end
       def installer_options; @installer_options ||= {} end
+      def installer_hooks; @installer_hooks ||= {} end
       def yes; @yes.nil? ? true : @yes end
 
       def iso_path
@@ -34,8 +35,9 @@ module VagrantVbguest
     def auto_reboot; @auto_reboot.nil? ? self.class.auto_reboot : @auto_reboot end
     def no_install;  @no_install.nil?  ? self.class.no_install  : @no_install  end
     def no_remote;   @no_remote.nil?   ? self.class.no_remote   : @no_remote   end
-    def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments : @installer_arguments end
-    def installer_options; @installer_options ||= self.class.installer_options end
+    def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments.dup : @installer_arguments end
+    def installer_options; @installer_options ||= self.class.installer_options.dup end
+    def installer_hooks; @installer_hooks ||= self.class.installer_hooks.dup end
     def yes; @yes.nil? ? self.class.yes : @yes end
 
     def iso_path
@@ -51,6 +53,7 @@ module VagrantVbguest
         :installer => installer,
         :installer_arguments => installer_arguments,
         :installer_options => installer_options,
+        :installer_hooks => installer_hooks,
         :iso_path => iso_path,
         :iso_upload_path => iso_upload_path,
         :iso_mount_point => iso_mount_point,

data/lib/vagrant-vbguest/installer.rb

@@ -60,8 +60,10 @@ module VagrantVbguest
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'install' if !installer
 
-      installer.install do |type, data|
-        @env.ui.info(data, :prefix => false, :new_line => false)
+      with_hooks(:install) do
+        installer.install do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
       end
     ensure
       cleanup
@@ -71,8 +73,10 @@ module VagrantVbguest
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'rebuild' if !installer
 
-      installer.rebuild do |type, data|
-        @env.ui.info(data, :prefix => false, :new_line => false)
+      with_hooks(:rebuild) do
+        installer.rebuild do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
       end
     end
 
@@ -80,8 +84,10 @@ module VagrantVbguest
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'manual start' if !installer
 
-      installer.start do |type, data|
-        @env.ui.info(data, :prefix => false, :new_line => false)
+      with_hooks(:start) do
+        installer.start do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
       end
     end
 
@@ -148,5 +154,25 @@ module VagrantVbguest
       @guest_installer.cleanup if @guest_installer
     end
 
+    def with_hooks(step_name)
+      run_hook(:"before_#{step_name}")
+      ret = yield
+      run_hook(:"after_#{step_name}")
+
+      ret
+    end
+
+    def run_hook(hook_name)
+      hooks = @options.dig(:installer_hooks, hook_name)
+
+      return if !hooks || hooks.empty?
+
+      @vm.ui.info I18n.t("vagrant_vbguest.installer_hooks.#{hook_name}")
+      Array(hooks).each do |l|
+        @vm.communicate.sudo(l) do |type, data|
+          @env.ui.info(data, :prefix => false, :new_line => false)
+        end
+      end
+    end
   end
 end

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

@@ -16,7 +16,11 @@ module VagrantVbguest
 
     protected
       def install_dependencies_cmd
-        "yum install -y #{dependencies}"
+        "#{package_manager_cmd} install -y #{dependencies}"
+      end
+
+      def package_manager_cmd
+        "`bash -c 'type -p dnf || type -p yum'`"
       end
 
       def dependencies
@@ -26,11 +30,22 @@ module VagrantVbguest
           'gcc',
           'binutils',
           'make',
-          'perl',
+          perl_dependency,
           'bzip2',
           'elfutils-libelf-devel'
         ].join(' ')
       end
+
+      def perl_dependency
+        unless instance_variable_defined?(:@perl_dependency)
+          @perl_dependency = if communicate.test("#{package_manager_cmd} list perl-interpreter")
+            "perl-interpreter"
+          else
+            "perl"
+          end
+        end
+        @perl_dependency
+      end
     end
   end
 end

data/locales/en.yml

@@ -34,6 +34,14 @@ en:
       ok: "[%{vm_name}] GuestAdditions %{guest_version} running --- OK."
       skipped_downgrade: "GuestAdditions are newer than your host but, downgrades are disabled. Skipping."
 
+    installer_hooks:
+      before_install: "Executing pre-install hooks"
+      after_install: "Executing post-install hooks"
+      before_rebuild: "Executing pre-rebuild hooks"
+      after_rebuild: "Executing post-rebuild hooks"
+      before_start: "Executing pre-start hooks"
+      after_start: "Executing post-start hooks"
+
     errors:
       autodetect_iso_path: |-
         Could not locate a local Virtualbox Guest Additions iso file.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine