vagrant-vbguest 0.13.0 → 0.14.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec63b20919df037edfd5cc748964d9285308c0f9
-  data.tar.gz: 7c1c9a39baa48fd06d6a63849f278759bf437125
+  metadata.gz: 935cbab1bfa4e2bd7f6f5b303f3e2ffab882d2e3
+  data.tar.gz: f950bd3b43ca7df20a1be89f36b09b2e5a5b2056
 SHA512:
-  metadata.gz: 08db7ea5d28c561e1d7020e49d2c156fb79a7f92f0a9cda5cd88b2eddb223f962ad12c813e9a1105408239ec2d9987f2fdd6933823969e89148407fa2b79c78e
-  data.tar.gz: 66df0d6f87b027c563bd9a4167402510170ac527180e6d0e32b399289e621f59c879f55d1790c7cf74c4ced1f51a94c4c1cf59c74f647cf99c2433640d117d8d
+  metadata.gz: b1ac88bee5274010f40affce9eb364439dabeee1307208895b91532ad7f97e438c6ae2bc52306906262ac60d3c6eab17e78d67930be0b2b1a2dfef931b3fdb6b
+  data.tar.gz: 04fd62c2c2ee0a304bde68e561e088fedf50470c957b3ee16e93af2cf6d0db80b19dd3d1b3b7fb4b5aef8030dcf8a5213f826c8aa6efd44fc57ab5236c699a19

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.14.0-beta1 (2017-02-24)
+
+- Added support for VirtualBox 5.1. Thanks @cdloh [GH-238], [GH-230]
+  + Waring: The helper method `vboxadd_tool` was replaced by `find_tool(tool)`
+- The installers `distro(vm)` helper method got moved from the `Linux` class down the `Base` class which should make implementing non-linux installers easier. This change was purposed by @fabriciocolombo back in [GH-129]
+- The debian installer added support for proxmox VE. Thanks @maninga [GH-246]
+- The debian installer now calls `apt-get update` with `-y --force-yes` options. Thanks @podarok [GH-237]
+- Add synopsis for help/list-commands. Thanks @m03 [GH-235], [GH-236]
+- Fix typo in the `Installers::Base#yield_installation_warning` method name (keeping the incorrect `yield_installation_waring` as an alias for backward compatibility. This alias will be removed in a future version) Thanks @m03 [GH-234]
+
 ## 0.13.0 (2016-08-12)
 
 - Fix a bug introduced by upgrading "micormachine". Thanks @omenlabs for [GH-225]

data/Readme.md

@@ -270,6 +270,12 @@ end
 ```
 
 
+### Extending vbguest (aka Very Advanced Usage)
+
+If you find yourself copying the same installer in each of your vagrant project, it might be a good idea to make it a plugin itself. Like vagrant-vbguest itself, installers can be [distributed as ruby gems](http://guides.rubygems.org/publishing/)
+
+This poroject contains a [sample installer gem](https://github.com/dotless-de/vagrant-vbguest/tree/master/testdrive/vagrant-vbguest-unikorn) which might serve as an boilerplate. 
+
 ## Known Issues
 
 * The installer script, which mounts and runs the GuestAdditions Installer Binary, works on Linux only. Most likely it will run on most Unix-like platforms.

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

@@ -25,6 +25,18 @@ module VagrantVbguest
         false
       end
 
+      # A helper method to cache the result of {Vagrant::Guest::Base#distro_dispatch}
+      # which speeds up Installer detection runs a lot,
+      # when having lots of Linux based Installer classes
+      # to check.
+      #
+      # @see {Vagrant::Guest::Linux#distro_dispatch}
+      # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`, `:windows`
+      def self.distro(vm)
+        @@distro ||= {}
+        @@distro[ vm_id(vm) ] ||= distro_name vm
+      end
+
       attr_reader :env, :vm, :options, :host
 
       def initialize(vm, options=nil)
@@ -143,7 +155,7 @@ module VagrantVbguest
       # Helper to yield a warning message to the user, that the installation
       # will start _now_.
       # The message includes the host and installer version strings.
-      def yield_installation_waring(path_to_installer)
+      def yield_installation_warning(path_to_installer)
         @env.ui.warn I18n.t("vagrant_vbguest.installing#{@options[:force] ? '_forced' : ''}",
           :guest_version     => (guest_version || I18n.t("vagrant_vbguest.unknown")),
           :installer_version => installer_version(path_to_installer) || I18n.t("vagrant_vbguest.unknown"))
@@ -168,6 +180,8 @@ module VagrantVbguest
         @env.ui.warn I18n.t("vagrant_vbguest.install_error",
           :installer_version => installer_version(path_to_installer) || I18n.t("vagrant_vbguest.unknown"))
       end
+      # alias to old method name (containing a typo) for backwards compatibility
+      alias_method :yield_installation_waring, :yield_installation_error_warning
 
       def iso_file
         @host.additions_file

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

@@ -16,7 +16,7 @@ module VagrantVbguest
         begin
           communicate.sudo(install_dependencies_cmd, opts, &block)
         rescue
-          communicate.sudo('apt-get update', opts, &block)
+          communicate.sudo('apt-get -y --force-yes update', opts.merge(:error_check => false), &block)
           communicate.sudo(install_dependencies_cmd, opts, &block)
         end
         super
@@ -28,7 +28,12 @@ module VagrantVbguest
       end
 
       def dependencies
-        packages = ['linux-headers-`uname -r`']
+        # In case of PVE kernel, kernel modules and headers prefix is pve and not linux, so we need to check that.
+        packages = if communicate.test('uname -r | grep pve')
+          ['pve-headers-`uname -r`']
+        else
+          ['linux-headers-`uname -r`']
+        end
         # some Debian system (lenny) don't come with a dkms package so we need to skip that.
         # apt-cache search will exit with 0 even if nothing was found, so we need to grep.
         packages << 'dkms' if communicate.test('apt-cache search --names-only \'^dkms$\' | grep dkms')

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

@@ -3,19 +3,6 @@ module VagrantVbguest
     # A basic Installer implementation for vanilla or
     # unknown Linux based systems.
     class Linux < Base
-
-      # A helper method to cache the result of {Vagrant::Guest::Base#distro_dispatch}
-      # which speeds up Installer detection runs a lot,
-      # when having lots of Linux based Installer classes
-      # to check.
-      #
-      # @see {Vagrant::Guest::Linux#distro_dispatch}
-      # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`
-      def self.distro(vm)
-        @@distro ||= {}
-        @@distro[ vm_id(vm) ] ||= distro_name vm
-      end
-
       # Matches if the operating system name prints "Linux"
       # Raises an Error if this class is beeing subclassed but
       # this method was not overridden. This is considered an
@@ -77,6 +64,7 @@ module VagrantVbguest
         upload(iso_file)
         mount_iso(opts, &block)
         execute_installer(opts, &block)
+        start(opts, &block)
         unmount_iso(opts, &block) unless options[:no_cleanup]
       end
 
@@ -121,7 +109,7 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def rebuild(opts=nil, &block)
-        communicate.sudo("#{vboxadd_tool} setup", opts, &block)
+        communicate.sudo("#{find_tool('vboxadd')} setup", opts, &block)
       end
 
       # @param opts [Hash] Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
@@ -133,7 +121,15 @@ module VagrantVbguest
         if systemd_tool
           communicate.sudo("#{systemd_tool[:path]} vboxadd #{systemd_tool[:up]}", opts, &block)
         else
-          communicate.sudo("#{vboxadd_tool} start", opts, &block)
+          communicate.sudo("#{find_tool('vboxadd')} start", opts, &block)
+        end
+
+        if Gem::Version.new("#{guest_version}") >= Gem::Version.new('5.1')
+          if systemd_tool
+            communicate.sudo("#{systemd_tool[:path]} vboxadd-service #{systemd_tool[:up]}", opts, &block)
+          else
+            communicate.sudo("#{find_tool('vboxadd-service')} start", opts, &block)
+          end
         end
       end
 
@@ -166,21 +162,21 @@ module VagrantVbguest
         end
       end
 
-      # Checks for the correct location of the 'vboxadd' tool.
+      # Checks for the correct location of the tool provided.
       # It checks for a given list of possible locations. This list got
       # extracted from the 'VBoxLinuxAdditions.run' script.
       #
-      # @return [String|nil] Absolute path to the +vboxadd+ tool,
+      # @return [String|nil] Absolute path to the tool,
       #                      or +nil+ if none found.
-      def vboxadd_tool
+      def find_tool(tool)
         candidates = [
-          "/usr/lib/i386-linux-gnu/VBoxGuestAdditions/vboxadd",
-          "/usr/lib/x86_64-linux-gnu/VBoxGuestAdditions/vboxadd",
-          "/usr/lib64/VBoxGuestAdditions/vboxadd",
-          "/usr/lib/VBoxGuestAdditions/vboxadd",
-          "/lib64/VBoxGuestAdditions/vboxadd",
-          "/lib/VBoxGuestAdditions/vboxadd",
-          "/etc/init.d/vboxadd",
+          "/usr/lib/i386-linux-gnu/VBoxGuestAdditions/#{tool}",
+          "/usr/lib/x86_64-linux-gnu/VBoxGuestAdditions/#{tool}",
+          "/usr/lib64/VBoxGuestAdditions/#{tool}",
+          "/usr/lib/VBoxGuestAdditions/#{tool}",
+          "/lib64/VBoxGuestAdditions/#{tool}",
+          "/lib/VBoxGuestAdditions/#{tool}",
+          "/etc/init.d/#{tool}",
         ]
         cmd = <<-SHELL
         for c in #{candidates.join(" ")}; do
@@ -207,7 +203,7 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def execute_installer(opts=nil, &block)
-        yield_installation_waring(installer)
+        yield_installation_warning(installer)
         opts = {:error_check => false}.merge(opts || {})
         exit_status = communicate.sudo("#{installer} #{installer_arguments}", opts, &block)
         yield_installation_error_warning(installer) unless exit_status == 0

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/command.rb

@@ -7,6 +7,11 @@ module VagrantVbguest
     include CommandCommons
     include VagrantPlugins::CommandUp::StartMixins
 
+    # Show description when `vagrant list-commands` is triggered
+    def self.synopsis
+      "plugin: vagrant-vbguest: install VirtualBox Guest Additions to the machine"
+    end 
+
     def check_runable_on(vm)
       raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
       raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.13.0"
+  VERSION = "0.14.0-beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0.pre.beta1
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-02-24 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.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM