vagrant-vbguest 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26c659fdb3d64cb8762476dcfb7b77440dbbf66
-  data.tar.gz: e0633e922f2568df8a77f7e549b6dbc01850d375
+  metadata.gz: fc1f6f2bd15b21df77135855d0e54bdcb9fd55fe
+  data.tar.gz: a061a813e16a494c9326d0a2f075dfde2a249541
 SHA512:
-  metadata.gz: 79ab5f8ec55de357540e9353a9deec3e37c64996852a2552a4c96da1c66b1018289858c8671434f7ec028e1f3c7184a108567220ae8cbdd8eebbec02796cb69a
-  data.tar.gz: a6a30d9213c879c7d1f1740abcc41db695ee6f322218911c510fd011e5986354897b458faaf18c84fa4b4861fc0ea0a03674022ed07ae28fc7171dddcb165904
+  metadata.gz: 8da979cc83735bbcca444ca81c35e0fd9b14fc0d1e0cd22b9f9bc1b9b5c5103d69036b81e2f9189d24ba0de169cbeb0a522c91c4c0e540a249705c2570e5c14d
+  data.tar.gz: fd8f2ffad4995dc674d3fe8e63609b2f62bd86c738735c6cff1c2794113a679c0ad84e89c0778b7949085ad38256c6b736bb4494ad1d7a58b30da879b583b62d

data/CHANGELOG.md

@@ -1,7 +1,26 @@
-## 0.11.0 (unreleased)
+## 0.12.0 (2016-06-16)
+
+- Fix version comparison when version is reported with revision. Thanks @apeabody for [GH-179], [GH-201]
+- Fix package manager detection on Fedora. Thanks @robnagler for [GH-185]
+- Fix missing `binutils` dependency for RedHat. Thanks @andy-maier for [GH-188]
+- Fix detecting of `chkconfg` or `service` command. Thanks @jherre for [GH-191]
+- Fix cleaning up temp files on Windows. Thanks @JexCheng for [GH-212]
+- Fix ubuntu removing packaged_additions for old installations. [GH-199] Also thanks @thpang67 for [GH-208]
+- Fix driver and service version comparison. Big thanks to @NeMO84 for [GH-213] and [GH-214]
+- Improve installing dependencies on openSUSE. Thanks @vpereira for [GH-190]
+- Improve detection of the VBoxGuestAdditions.iso file. Thanks @Raskil for [GH-206]
+- Add the vm name to log outputs. Thanks @Tomohiro for [GH-210]
+
+
+For those who want to create their own (or overwrite existing) installers, this sample for a vbguest driver plugin might help you to get started: https://github.com/dotless-de/vagrant-vbguest/tree/master/testdrive/vagrant-vbguest-unikorn
+
+For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11.0...v0.12.0
+
+## 0.11.0 (2015-10-29)
 
   - Add installer for opensuse. Thanks @darnells for [GH-163]
   - Add installer for fedora. Thanks @jamesgecko and @PatrickCoffey for [GH-158]
+  - Add installer for oracle. Thanks @TobyHFerguson for [GH-145]
   - Add redhat installer support for centos7. Thanks @roidelapluie for [GH-162]
   - Add debian installer support for debian8. Thanks @ubermuda for [GH-171]
   - Add ISO autodetection on Archlinux hosts. [GH-135]

data/Gemfile

@@ -10,3 +10,5 @@ end
 group :plugins do
   gem "vagrant-vbguest", path: "."
 end
+
+gem "rake", "~> 10.0"

data/Readme.md

@@ -2,7 +2,11 @@
 
 *vagrant-vbguest* is a [Vagrant](http://vagrantup.com) plugin which automatically installs the host's VirtualBox Guest Additions on the guest system.
 
-[![Code Climate](https://codeclimate.com/github/dotless-de/vagrant-vbguest.png)](https://codeclimate.com/github/dotless-de/vagrant-vbguest) [![Dependency Status](https://gemnasium.com/dotless-de/vagrant-vbguest.png)](https://gemnasium.com/dotless-de/vagrant-vbguest) [![Inline docs](http://inch-ci.org/github/dotless-de/vagrant-vbguest.svg?branch=master)](http://inch-ci.org/github/dotless-de/vagrant-vbguest)
+[![Join the chat at https://gitter.im/dotless-de/vagrant-vbguest](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotless-de/vagrant-vbguest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Code Climate](https://codeclimate.com/github/dotless-de/vagrant-vbguest.png)](https://codeclimate.com/github/dotless-de/vagrant-vbguest)
+[![Dependency Status](https://gemnasium.com/dotless-de/vagrant-vbguest.png)](https://gemnasium.com/dotless-de/vagrant-vbguest)
+[![Inline docs](http://inch-ci.org/github/dotless-de/vagrant-vbguest.svg?branch=master)](http://inch-ci.org/github/dotless-de/vagrant-vbguest)
+[![Gem Version](https://badge.fury.io/rb/vagrant-vbguest.svg)](https://badge.fury.io/rb/vagrant-vbguest)
 
 
 ## Installation
@@ -42,8 +46,10 @@ Vagrant::Config.run do |config|
   # we will try to autodetect this path. 
   # However, if we cannot or you have a special one you may pass it like:
   # config.vbguest.iso_path = "#{ENV['HOME']}/Downloads/VBoxGuestAdditions.iso"
-  # or
+  # or an URL:
   # config.vbguest.iso_path = "http://company.server/VirtualBox/%{version}/VBoxGuestAdditions.iso"
+  # or relative to the Vagrantfile:
+  # config.vbguest.iso_path = File.expand_path("../relative/path/to/VBoxGuestAdditions.iso", __FILE__)
   
   # set auto_update to false, if you do NOT want to check the correct 
   # additions version when booting this machine
@@ -58,6 +64,7 @@ end
 
 * `iso_path` : The full path or URL to the VBoxGuestAdditions.iso file. <br/>
 The `iso_path` may contain the optional placeholder `%{version}` replaced with detected VirtualBox version (e.g. `4.1.8`).
+Relative paths are tricky, try to use an absolute path where possible. If not, the path is relative to the current working directory, that is where the `vagrant` command is issued. You can make sure to always be relative to the `Vagrantfile` with a little bit of ruby: `File.expand_path("../relative/path/to/VBoxGuestAdditions.iso", __FILE__)`
 The default URI for the actual iso download is: `http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso`<br/>
 vbguest will try to autodetect the best option for your system. WTF? see below.
 * `iso_upload_path` (String, default: `/tmp`): A writeable directory where to put the VBoxGuestAdditions.iso file on the guest system.

data/lib/vagrant-vbguest/download.rb

@@ -20,7 +20,18 @@ module VagrantVbguest
     def cleanup
       if destination && File.exist?(destination)
         @ui.info I18n.t("vagrant_vbguest.download.cleaning")
-        File.unlink(destination)
+        # Unlinking the downloaded file might crash on Windows
+        # see: https://github.com/dotless-de/vagrant-vbguest/issues/189
+        begin
+          # Even if delete failed on Windows, we still can clean this file to save disk space
+          File.open(destination,'wb') do |f|
+            f.write('')
+            f.close()
+          end
+          File.unlink(destination)
+        rescue Errno::EACCES => e
+          @ui.warn I18n.t("vagrant_vbguest.download.cleaning_failed", message: e.message, destination: destination)
+        end
       end
     end
   end

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

@@ -87,7 +87,7 @@ module VagrantVbguest
         # Makes an educated guess where the GuestAdditions iso file
         # on windows systems
         def windows_path
-          if (p = ENV["VBOX_INSTALL_PATH"]) && !p.empty?
+          if (p = ENV["VBOX_INSTALL_PATH"] || ENV["VBOX_MSI_INSTALL_PATH"]) && !p.empty?
             File.join(p, "VBoxGuestAdditions.iso")
           elsif (p = ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]) && !p.empty?
             File.join(p, "/Oracle/VirtualBox/VBoxGuestAdditions.iso")

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

@@ -15,7 +15,7 @@ module VagrantVbguest
       protected
 
       def install_dependencies_cmd
-        "`which dnf || which yum` install -y #{dependencies}"
+        "`bash -c 'type -p dnf || type -p yum'` install -y #{dependencies}"
       end
 
       def dependencies

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

@@ -79,12 +79,15 @@ module VagrantVbguest
       #                  available on the guest, or `nil` if none installed.
       def guest_version(reload = false)
         return @guest_version if @guest_version && !reload
-        driver_version = super
+        driver_version = super.to_s[/^(\d+\.\d+.\d+)/, 1]
 
         communicate.sudo('VBoxService --version', :error_check => false) do |type, data|
-          if (v = data.to_s.match(/^(\d+\.\d+.\d+)/)) && driver_version != v[1]
-            @env.ui.warn(I18n.t("vagrant_vbguest.guest_version_reports_differ", :driver => driver_version, :service => v[1]))
-            @guest_version = v[1]
+          service_version = data.to_s[/^(\d+\.\d+.\d+)/, 1]
+          if service_version 
+            if driver_version != service_version
+              @env.ui.warn(I18n.t("vagrant_vbguest.guest_version_reports_differ", :driver => driver_version, :service => service_version))
+            end
+            @guest_version = service_version
           end
         end
         @guest_version
@@ -104,9 +107,8 @@ module VagrantVbguest
       # @yieldparam [String] data Data for the given output.
       def start(opts=nil, &block)
         opts = {:error_check => false}.merge(opts || {})
-        systemd = systemd_tool
-        if systemd
-          communicate.sudo("#{systemd[:path]} vboxadd #{systemd[:up]}", opts, &block)
+        if systemd_tool
+          communicate.sudo("#{systemd_tool[:path]} vboxadd #{systemd_tool[:up]}", opts, &block)
         else
           communicate.sudo("#{vboxadd_tool} start", opts, &block)
         end
@@ -120,17 +122,25 @@ module VagrantVbguest
       #                    command string for starting.
       #                    +nil* if neither was found.
       def systemd_tool
+        return nil if @systemd_tool == false
+
         result = nil
         communicate.sudo('(which chkconfg || which service) 2>/dev/null', {:error_check => false}) do |type, data|
-          path = data.to_s
+          path = data.to_s.strip
           case path
           when /\bservice\b/
-            result = { path: path, up: "start" }
-          when /\chkconfg\b/
-            result = { path: path, up: "on" }
+            result = { path: path, up: "start", down: "stop" }
+          when /\bchkconfg\b/
+            result = { path: path, up: "on", down: "off" }
           end
         end
-        result
+
+        if result.nil?
+          @systemd_tool = false
+          nil
+        else
+          @systemd_tool = result
+        end
       end
 
       # Checks for the correct location of the 'vboxadd' tool.
@@ -149,7 +159,6 @@ module VagrantVbguest
           "/lib/VBoxGuestAdditions/vboxadd",
           "/etc/init.d/vboxadd",
         ]
-        bin_path = ""
         cmd = <<-SHELL
         for c in #{candidates.join(" ")}; do
           if test -x "$c"; then

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

@@ -19,11 +19,11 @@ module VagrantVbguest
       end
 
       def install_dependencies_cmd
-        "zypper --non-interactive install #{dependencies}"
+        "zypper --non-interactive install -t pattern #{dependencies}"
       end
 
       def dependencies
-        packages = ['kernel-devel', 'gcc', 'make', 'tar']
+        packages = ['devel_C_C++', 'devel_basis', 'devel_kernel']
         packages.join ' '
       end
     end

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

@@ -20,7 +20,9 @@ module VagrantVbguest
       end
 
       def dependencies
-        packages = ['kernel-devel-`uname -r`', 'gcc', 'make', 'perl', 'bzip2']
+        packages = [
+          'kernel-devel-`uname -r`', 'gcc', 'binutils', 'make', 'perl', 'bzip2'
+        ]
         packages.join ' '
       end
     end

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

@@ -9,7 +9,12 @@ module VagrantVbguest
       def install(opts=nil, &block)
         if packaged_additions?
           unload_packaged_additions(opts, &block)
-          remove_packaged_additions(opts, &block)
+          begin
+            remove_packaged_additions(opts, &block)
+          rescue
+            communicate.sudo('apt-get update', opts, &block)
+            remove_packaged_additions(opts, &block)
+          end
         end
         super
       end
@@ -28,7 +33,7 @@ module VagrantVbguest
 
       def unload_packaged_additions(opts=nil, &block)
         commands = [
-          "service virtualbox-guest-utils stop",
+          "#{systemd_tool[:path]} virtualbox-guest-utils #{systemd_tool[:down]}",
           "umount -a -t vboxsf",
           "rmmod vboxsf",
           "rmmod vboxguest"

data/lib/vagrant-vbguest/machine.rb

@@ -77,6 +77,7 @@ module VagrantVbguest
 
     def info
       {
+        :vm_name => vm.name,
         :host_version => installer.host_version,
         :guest_version => installer.guest_version
       }

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/locales/en.yml

@@ -25,10 +25,10 @@ en:
     unknown: unknown
 
     status:
-      clean: "No installation found."
-      unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
-      not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
-      ok: "GuestAdditions %{guest_version} running --- OK."
+      clean: "[%{vm_name}] No installation found."
+      unmatched: "[%{vm_name}] GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
+      not_running: "[%{vm_name}] GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
+      ok: "[%{vm_name}] GuestAdditions %{guest_version} running --- OK."
 
     errors:
       autodetect_iso_path: |-
@@ -60,4 +60,7 @@ en:
       started: "Downloading VirtualBox Guest Additions ISO from %{source}"
       with: "Downloading VirtualBox Guest Additions ISO with %{class}..."
       cleaning: "Cleaning up downloaded VirtualBox Guest Additions ISO..."
+      cleaning_failed: |-
+        FAILED: %{message}
+        You might want to delete this file manually: %{destination}
       unknown_type: "Unknown or unsupported URI type given for VirtualBox Guest Additions ISO download."

data/vagrant-vbguest.gemspec

@@ -14,17 +14,15 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "micromachine", "~> 1.1.0"
-  s.add_development_dependency "bundler", ">= 1.2.0"
+  s.add_dependency "micromachine", "~> 2.0.0"
 
   # those should be satisfied by vagrant
   s.add_dependency "i18n"
   s.add_dependency "log4r"
-  s.add_development_dependency "rake"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|testdrive)/}) }
+  s.bindir        = "exe"
+  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
 end

metadata

@@ -1,83 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Vagrant plugin which automatically installs the host's VirtualBox Guest
@@ -88,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -134,8 +106,6 @@ files:
 - lib/vagrant-vbguest/version.rb
 - lib/vagrant_init.rb
 - locales/en.yml
-- testdrive/Vagrantfile
-- testdrive/bin/vagrant
 - vagrant-vbguest.gemspec
 homepage: https://github.com/dotless-de/vagrant-vbguest
 licenses:
@@ -147,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM

data/testdrive/Vagrantfile

@@ -1,76 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-require 'ipaddr'
-
-class NextIP
-  def initialize(start_ip)
-    @ip_addr = IPAddr.new start_ip
-  end
-
-  def get
-    @ip_addr = @ip_addr.succ
-    @ip_addr
-  end
-
-  def box vagrant_config, name, box, &block
-    ip_addr = get
-
-    vagrant_config.vm.define name do |config|
-      config.vm.box      = box
-      config.vm.hostname = name
-      config.vm.network :private_network, ip: ip_addr.to_s
-
-      config.vm.provider "virtualbox" do |vb, override|
-        # Display the VirtualBox GUI when booting the machine
-        vb.gui = false
-
-        # Customize the amount of memory on the VM:
-        vb.memory = "512"
-        vb.cpus = "4"
-
-        # Specify default provider configuration
-        #  - give the VM a name - can be better localized in the VirtualBox GUI
-        #  - make the DNS resolution faster
-        vb.customize [
-          "modifyvm", :id,
-          "--name", "vbguest_testdrive-#{name}",
-          "--natdnshostresolver1", "on",
-          "--natdnshostresolver2", "on"
-        ]
-      end
-
-      yield(config) if block
-    end
-  end
-end
-
-Vagrant.configure("2") do |config|
-  next_ip = NextIP.new("44.44.0.10/24")
-
-  next_ip.box config, "debian8", "oar-team/debian8"
-  next_ip.box config, "opensuse13", "bento/opensuse-13.2"
-  next_ip.box config, "ubuntu1404", "ubuntu/trusty64"
-  next_ip.box config, "centos7", "centos/7"
-  next_ip.box config, "oracle65", "tobyhferguson_oracle-65-x64" do |cfg|
-    cfg.vm.box_url = "http://tobyhferguson.org/boxes/oracle-6-5-x64-virtualbox.box"
-  end
-  next_ip.box config, "fedora22", "Fedora-Cloud-Base-Virtualbox-22" do |cfg|
-    cfg.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box"
-  end
-
-  config.vm.provider "virtualbox" do |v|
-    # v.gui = true
-  end
-
-  # config.vbguest.installer_arguments = "--nox11 -- --force"
-  # config.vbguest.auto_update = false
-  # config.vbguest.iso_path = '/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso'
-  # config.vbguest.iso_path = 'http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso' #% {version: '4.2.12'}
-  # config.vbguest.iso_path = "#{ENV["HOME"]}/Downloads/VBoxGuestAdditions_4.2.12.iso"
-  # config.vbguest.installer = My_Installer
-
-  # require 'Date'
-  # config.vm.provision :shell, :inline => "touch /vagrant/testrun-#{DateTime.now.strftime '%FT%T.%S%L'}"
-
-end

data/testdrive/bin/vagrant

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-TESTDRIVE=${VAGRANT_DEV:-$(dirname "$(cd "$(dirname "$0")" && pwd)")}
-
-VAGRANT_DEFAULT_PROVIDER=virtualbox \
-VAGRANT_HOME=${TESTDRIVE}/.vagrant.d \
-bundle exec vagrant $@