vagrant-vbguest 0.16.0 → 0.17.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044db5528f1ea0683ca52451c14a80ebdd49aa28
-  data.tar.gz: 35e0dcd9dd9bfb065ed3805f3af10ee9237a6e71
+  metadata.gz: 274176f24515e91e436ad3ccdc2429ecccfa0fc3
+  data.tar.gz: da52c08f02526cec644e12be290eef75d0afd9d2
 SHA512:
-  metadata.gz: 6425c2a85455370d496403bf8f4472685a610678a0710616caca28bfee4e547af9a15128a94bf511d508ece54548be11df664684df31afb74783aeb81adc809b
-  data.tar.gz: 06d426a4047f5509ba591966c5fa392ecf0ec576f68b85b281de36f05562496818b9e6575f6af41f4ff4ae63f1f25a00987b10ea45614eee74b77205b7e2f890
+  metadata.gz: e15a74c8de223bba2724d108937918d4c50e6ae3a0566c790918e8751cd430511acda663a139ef4b4c0141bce8c8cbd35b91b1efb8a61068e74342d6d6256906
+  data.tar.gz: 4de7babe91837d6b56feb479e86f9ccab9f63409d3ce323820ff37276b01ace3c016b542d36803a7bb47b101aeb1f99f172e3c0ed94a5e48fe12b3ded8b1b55f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.17.0.beta1 (2018-12-07)
+
+- New CentOS specific installer. Thanks @bstopp [GH-314]
+- Big cleanup, dropping support for Vagrant < 1.3. [GH-313]
+- Changes the status message for "No Virtualbox Guest Additions installation found". Thanks @SchnWalter [GH-308]
+
 ## 0.16.0 (2018-09-04)
 
 No changes to 0.16.0.beta1
@@ -19,7 +25,7 @@ See discussion in [GH-300]. Thanks @cbj4074 for asking the right questions.
 
 ## 0.15.0 (2017-09-21)
 
-- Interactive userinputs from the installer run will be answered with "yes" by default. Thanks @jerr0328 [GH-268], [GH-267]
+- Interactive user inputs from the installer run will be answered with "yes" by default. Thanks @jerr0328 [GH-268], [GH-267]
 - Added logging of mounting/umounting VBoxGuestAdditions.iso file. Thanks @m03 [GH-249]
 - Updates remote location of development dependencies.
 
@@ -49,7 +55,7 @@ No changes.
 
 - Fix a bug introduced by upgrading "micormachine". Thanks @omenlabs for [GH-225]
 - Fix a typo in a local variable. Thanks @vdloo for [GH-227]
-- Add a Arch Linux specific installer. Thanks @vdloo, also for fixing some typos in [GH-229]
+- Add an Arch Linux specific installer. Thanks @vdloo, also for fixing some typos in [GH-229]
 - Add a SUSE Linux Enterprise Server (sles) specific installer to address [GH-219] and [GH-216]. Thanks @vpereira, @glookie1 for the hard digging. Thanks @vpereira for [GH-219]. Thanks @bkeepers for the dontenv project, from which I stole it's parser.
 
 ## 0.12.0 (2016-06-16)
@@ -77,9 +83,9 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
   - 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]
+  - Add ISO auto-detection on Archlinux hosts. [GH-135]
   - Add lookup for the `vboxadd` tool, instead of assuming it in `/etc/init.d`
-  - And systemd-ish startup methods if available, instead of assuming `/etc/init.d/vboxadd` beeing useable.
+  - And systemd-ish startup methods if available, instead of assuming `/etc/init.d/vboxadd` being useable.
   - Add configuration options for iso upload path and mount point.
   - Add a `--no-cleanup` command-line switch to make debugging a bit more convenient.
 
@@ -119,7 +125,7 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
   - Adds support for vagrant 1.3 [GH-71], [GH-72]
   - Fix crash when using as a command [GH-68].
   - Don't trust VirtualBox Media Manager informations when
-    looking for a iso file. [GH-70]
+    looking for an iso file. [GH-70]
 
 ### heads-up
 
@@ -136,15 +142,15 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
     (thanks @Andrew8xx8 for pointing directions)
   - Fix basic/fallback linux installer [GH-56]
   - Guard auto-reload on broken vagrant builds.
-    Some varant 1.1.x versions have a bug regarding ssh and cleaning
-    up old connections, which results in varant crashing when a box
+    Some vagrant 1.1.x versions have a bug regarding ssh and cleaning
+    up old connections, which results in vagrant crashing when a box
     is reloaded.
 
 ## 0.7.1
 
   - Fix auto-reloading for vagrant 1.1 [GH-52]
     Also changes the reload method for vagrant 1.0 when ran
-    as middleware (to not run buildin actions manually).
+    as middleware (to not run build-in actions manually).
 
 ## 0.7.0
 
@@ -160,14 +166,14 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
   - Fix an issue with VirtualBox GuestAdditions 4.2.8 [GH-44] /
     (thanks @jimmycuadra)
   - Reworked bunch of internals, particularly how vagrants's
-    environemnt is passed arround. Also decoupled GuestAdditions
-    finder into a seperate class.
-  - Intodruce a vagrant 1.0 compatibility layer for Installers and
+    environment is passed around. Also decoupled GuestAdditions
+    finder into a separate class.
+  - Introduce a vagrant 1.0 compatibility layer for Installers and
     other vbguest internals
 
 ### heads-up
 
-  - [GH-44] changes the behavior of vbguest to that effect, that it
+  - [GH-44] changes the behaviour of vbguest to that effect, that it
     will no longer halt vagrant workflow if running the VirtualBox
     GuestAdditions Installer returns an error-code.
     Instead it will print a human readable waring message.
@@ -206,7 +212,7 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
 ## 0.6.0 (2013-01-13)
 
  - Debian installer now cope with missing `dkms` package [GH-30]
- - Fixed some issues when runnig on just creating boxes [GH-31]
+ - Fixed some issues when running on just creating boxes [GH-31]
  - Fixed workding (thx @scalp42) [GH-32]
  - Add debug logging
  - Installers no longer are shell scripts, but ruby classes
@@ -233,7 +239,7 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
   - Box will be rebooted if the GuestAdditions installation
     process does not load the kernel module [GH-25], [GH-24]
   - Add `--auto-reboot` argument to allow rebooting when running as a
-    command (which is disabled by default when runnind as command)
+    command (which is disabled by default when running as command)
   - Adds this Changelog
 
 ## 0.4.0 (2012-10-21)
@@ -252,7 +258,7 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
 
 ## 0.3.3
 
-  - Add Fedora to the list of supported plattforms [GH-17]
+  - Add Fedora to the list of supported platforms [GH-17]
   - Add system package update (`apt-get update`) to the
     debian installer if package installation fails [GH-16]
   - Drop dependency on `vagrant` gem [GH-15]
@@ -260,7 +266,7 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
 ## 0.3.2
 
   - Stop GuestAdditions installation and fail with an error
-    when installation of dependency packes fails [GH-13]
+    when installation of dependency packages fails [GH-13]
 
 ## 0.3.1
 
@@ -273,7 +279,7 @@ For a full diff see: https://github.com/dotless-de/vagrant-vbguest/compare/v0.11
 
 ## 0.2.1
 
-  - Typo fixes in readme and internal renamings. [GH-9], [GH-7]
+  - Typo fixes in readme and internal renaming. [GH-9], [GH-7]
 
 ## 0.2.0
 

data/Readme.md

@@ -4,38 +4,20 @@
 
 [![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.svg)](https://codeclimate.com/github/dotless-de/vagrant-vbguest)
-[![Dependency Status](https://gemnasium.com/dotless-de/vagrant-vbguest.svg)](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
 
-Requires vagrant 0.9.4 or later (including 1.x)
+Requires vagrant 1.3 or later
 
-### Vagrant ≥ 1.1
+### Vagrant ≥ 1.3
 
 ```bash
 $ vagrant plugin install vagrant-vbguest
 ```
 
-### Vagrant 1.0 and older
-
-Since vagrant v1.0.0 the preferred installation method for vagrant is using the provided packages or installers.
-If you installed vagrant that way, you need to use vagrant's gem wrapper:
-
-```bash
-$ vagrant gem install vagrant-vbguest
-```
-
-If you installed vagrant using RubyGems, use:
-
-```bash
-$ gem install vagrant-vbguest
-```
-
-Compatibly for vagrant 0.8 is provided by version 0.0.3 (which lacks a bunch of new options)
-
 ## Configuration / Usage
 
 If you're lucky, *vagrant-vbguest* does not require any configuration. 

data/lib/vagrant-vbguest/command.rb

@@ -1,12 +1,11 @@
 require 'optparse'
+require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+require 'vagrant-vbguest/helpers/rebootable'
 
 module VagrantVbguest
-
-  module CommandCommons
+  class Command < Vagrant.plugin("2", :command)
+    include VagrantPlugins::CommandUp::StartMixins
     include VagrantVbguest::Helpers::Rebootable
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
 
     # Runs the vbguest installer on the VMs that are represented
     # by this environment.
@@ -72,7 +71,11 @@ module VagrantVbguest
           with_target_vms(vm_name) { |vm| execute_on_vm(vm, options) }
         end
       end
+    end
 
+    # Show description when `vagrant list-commands` is triggered
+    def self.synopsis
+      "plugin: vagrant-vbguest: install VirtualBox Guest Additions to the machine"
     end
 
     protected
@@ -103,8 +106,10 @@ module VagrantVbguest
     end
 
     def check_runable_on(vm)
-      raise NotImplementedError
+      raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
+      raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible
+      raise Vagrant::Errors::VMNotRunningError if vm.state.id != :running
+      raise VagrantVbguest::NoVirtualBoxMachineError if vm.provider.class != VagrantPlugins::ProviderVirtualBox::Provider
     end
   end
-
 end

data/lib/vagrant-vbguest/config.rb

@@ -1,6 +1,6 @@
 module VagrantVbguest
 
-  class Config <( Vagrant::VERSION < "1.1.0" ? Vagrant::Config::Base : Vagrant.plugin("2", :config) )
+  class Config < Vagrant.plugin("2", :config)
 
     module Attributes
       attr_accessor :auto_update, :auto_reboot, :no_install, :no_remote,

data/lib/vagrant-vbguest/download.rb

@@ -1,6 +1,5 @@
 module VagrantVbguest
-
-  class DownloadBase
+  class Download
     attr_reader :source, :destination, :downloader
 
     def initialize(source, destination, options=nil)
@@ -14,7 +13,11 @@ module VagrantVbguest
     end
 
     def download!
-      raise NotImplementedError
+      downloader_options = {}
+      downloader_options[:ui] = @ui
+      @ui.info(I18n.t("vagrant_vbguest.download.started", :source => @source))
+      @downloader = Vagrant::Util::Downloader.new(@source, @destination, downloader_options)
+      @downloader.download!
     end
 
     def cleanup
@@ -35,5 +38,4 @@ module VagrantVbguest
       end
     end
   end
-
 end

data/lib/vagrant-vbguest/{vagrant_compat/vagrant_1_1 → helpers}/rebootable.rb

@@ -1,9 +1,33 @@
-require 'vagrant-vbguest/rebootable'
+require 'vagrant-vbguest/helpers/vm_compatible'
 
 module VagrantVbguest
   module Helpers
-
     module Rebootable
+      include VmCompatible
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      @@rebooted = {}
+
+      def rebooted?(vm)
+        !!@@rebooted[ self.class.vm_id(vm) ]
+      end
+
+      def reboot?(vm, options)
+        if rebooted?(vm)
+          vm.env.ui.error(I18n.t("vagrant_vbguest.restart_loop_guard_activated"))
+          false
+        elsif options[:auto_reboot]
+          vm.env.ui.warn(I18n.t("vagrant_vbguest.restart_vm"))
+          @@rebooted[ self.class.vm_id(vm) ] = true
+        else
+          vm.env.ui.warn(I18n.t("vagrant_vbguest.suggest_restart", :name => vm.name))
+          false
+        end
+      end
+
       def reboot(vm, options)
         if reboot? vm, options
           simple_reboot = Vagrant::Action::Builder.new.tap do |b|
@@ -28,6 +52,5 @@ module VagrantVbguest
         end
       end
     end
-
   end
 end

data/lib/vagrant-vbguest/{vagrant_compat/vagrant_1_1 → helpers}/vm_compatible.rb

@@ -23,7 +23,7 @@ module VagrantVbguest
         end
 
         def distro_name(vm)
-          vm.guest.distro_dispatch
+          vm.guest.name
         end
       end
     end

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

@@ -1,4 +1,5 @@
 require 'uri'
+require 'vagrant-vbguest/helpers/vm_compatible'
 
 module VagrantVbguest
   module Hosts

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

@@ -1,3 +1,5 @@
+require 'vagrant-vbguest/helpers/vm_compatible'
+
 module VagrantVbguest
   module Installers
     class Error < Vagrant::Errors::VagrantError

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

@@ -0,0 +1,56 @@
+module VagrantVbguest
+  module Installers
+    class CentOS < RedHat
+
+      def self.match?(vm)
+        super && communicate_to(vm).test('test -f /etc/centos-release')
+      end
+
+      # Install missing deps and yield up to regular linux installation
+      def install(opts=nil, &block)
+        install_kernel_deps(opts, &block)
+        super(opts=nil, &block)
+      end
+
+      protected
+      def install_kernel_deps(opts=nil, &block)
+        unless check_devel_info
+          release = release_version
+          update_release_repos(opts=nil, &block)
+          install_kernel_devel(release)
+        end
+      end
+
+      def check_devel_info
+        communicate.test('yum info kernel-devel-`uname -r`', { sudo: true })
+      end
+
+      def release_version
+        release = nil
+        communicate.sudo('cat /etc/centos-release') do |type, data|
+         release = data.to_s[/(\d+\.\d+\.\d+)/, 1]
+        end
+        release
+      end
+
+      def update_release_repos(opts=nil, &block)
+        communicate.sudo('yum install -y centos-release', opts=nil, &block)
+      end
+
+      def install_kernel_devel(rel, opts=nil, &block)
+        communicate.sudo(
+            "yum install -y kernel-devel-`uname -r` --enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates",
+            opts=nil,
+            &block
+        )
+      end
+
+      def dependencies
+        packages = [ 'gcc', 'binutils', 'make', 'perl', 'bzip2' ]
+        packages.join ' '
+      end
+    end
+  end
+end
+# Load this before the RedHat one, as we want it to be picked up first. (The higher the sooner its checked).
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::CentOS, 6)

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

@@ -1,3 +1,5 @@
+require 'vagrant-vbguest/helpers/os_release'
+
 module VagrantVbguest
   module Installers
     # A basic Installer implementation for vanilla or

data/lib/vagrant-vbguest/middleware.rb

@@ -1,9 +1,9 @@
-module VagrantVbguest
+require 'vagrant-vbguest/helpers/rebootable'
 
+module VagrantVbguest
   # A Vagrant middleware which checks the installed VirtualBox Guest
   # Additions to match the installed VirtualBox installation on the
   # host system.
-
   class Middleware
     include VagrantVbguest::Helpers::Rebootable
 
@@ -38,6 +38,5 @@ module VagrantVbguest
       end
       opts
     end
-
   end
 end

data/lib/vagrant-vbguest/version.rb

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

data/lib/vagrant-vbguest.rb

@@ -9,10 +9,8 @@ I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
 I18n.reload!
 
 require "vagrant-vbguest/errors"
-require 'vagrant-vbguest/vagrant_compat'
-
-require 'vagrant-vbguest/helpers'
-
+require 'vagrant-vbguest/download'
+require 'vagrant-vbguest/command'
 require 'vagrant-vbguest/machine'
 
 require 'vagrant-vbguest/hosts/base'
@@ -24,6 +22,7 @@ require 'vagrant-vbguest/installers/linux'
 require 'vagrant-vbguest/installers/debian'
 require 'vagrant-vbguest/installers/ubuntu'
 require 'vagrant-vbguest/installers/redhat'
+require 'vagrant-vbguest/installers/centos'
 require 'vagrant-vbguest/installers/oracle'
 require 'vagrant-vbguest/installers/fedora'
 require 'vagrant-vbguest/installers/opensuse'

data/locales/en.yml

@@ -27,7 +27,7 @@ en:
     unknown: unknown
 
     status:
-      clean: "[%{vm_name}] No installation found."
+      clean: "[%{vm_name}] No Virtualbox Guest Additions 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."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0.beta1
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -69,16 +69,17 @@ files:
 - lib/vagrant-vbguest.rb
 - lib/vagrant-vbguest/command.rb
 - lib/vagrant-vbguest/config.rb
-- lib/vagrant-vbguest/core_ext/string/interpolate.rb
 - lib/vagrant-vbguest/download.rb
 - lib/vagrant-vbguest/errors.rb
-- lib/vagrant-vbguest/helpers.rb
 - lib/vagrant-vbguest/helpers/os_release.rb
+- lib/vagrant-vbguest/helpers/rebootable.rb
+- lib/vagrant-vbguest/helpers/vm_compatible.rb
 - lib/vagrant-vbguest/hosts/base.rb
 - lib/vagrant-vbguest/hosts/virtualbox.rb
 - lib/vagrant-vbguest/installer.rb
 - lib/vagrant-vbguest/installers/archlinux.rb
 - lib/vagrant-vbguest/installers/base.rb
+- lib/vagrant-vbguest/installers/centos.rb
 - lib/vagrant-vbguest/installers/debian.rb
 - lib/vagrant-vbguest/installers/fedora.rb
 - lib/vagrant-vbguest/installers/linux.rb
@@ -89,26 +90,7 @@ files:
 - lib/vagrant-vbguest/installers/ubuntu.rb
 - lib/vagrant-vbguest/machine.rb
 - lib/vagrant-vbguest/middleware.rb
-- lib/vagrant-vbguest/rebootable.rb
-- lib/vagrant-vbguest/vagrant_compat.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/command.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/download.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/rebootable.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/vm_compatible.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/command.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/download.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/rebootable.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/vm_compatible.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/command.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/download.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/rebootable.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/vm_compatible.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/command.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/download.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/rebootable.rb
-- lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/vm_compatible.rb
 - lib/vagrant-vbguest/version.rb
-- lib/vagrant_init.rb
 - locales/en.yml
 - vagrant-vbguest.gemspec
 homepage: https://github.com/dotless-de/vagrant-vbguest
@@ -131,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM

data/lib/vagrant-vbguest/core_ext/string/interpolate.rb

@@ -1,110 +0,0 @@
-# This backports the Ruby 1.9 String interpolation syntax to Ruby 1.8.
-#
-# This file is a copy from I18n
-# https://github.com/mattetti/i18n/blob/master/lib/i18n/core_ext/string/interpolate.rb
-# Copyright (c) 2008 The Ruby I18n team
-# It's copied here for the resons given below:
-#
-# This backport has been shipped with I18n for a number of versions. Meanwhile
-# Rails has started to rely on it and we are going to move it to ActiveSupport.
-# See https://rails.lighthouseapp.com/projects/8994/tickets/6013-move-19-string-interpolation-syntax-backport-from-i18n-to-activesupport
-#
-# Once the above patch has been applied to Rails the following code will be
-# removed from I18n.
-
-=begin
-  heavily based on Masao Mutoh's gettext String interpolation extension
-  http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
-  Copyright (C) 2005-2009 Masao Mutoh
-  You may redistribute it and/or modify it under the same license terms as Ruby.
-=end
-
-begin
-  raise ArgumentError if ("a %{x}" % {:x=>'b'}) != 'a b'
-rescue ArgumentError
-  # KeyError is raised by String#% when the string contains a named placeholder
-  # that is not contained in the given arguments hash. Ruby 1.9 includes and
-  # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
-  # in Ruby 1.8.x
-  class KeyError < IndexError
-    def initialize(message = nil)
-      super(message || "key not found")
-    end
-  end unless defined?(KeyError)
-
-  # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
-  #
-  # String#% method which accept "named argument". The translator can know
-  # the meaning of the msgids using "named argument" instead of %s/%d style.
-  class String
-    # For older ruby versions, such as ruby-1.8.5
-    alias :bytesize :size unless instance_methods.find {|m| m.to_s == 'bytesize'}
-    alias :interpolate_without_ruby_19_syntax :% # :nodoc:
-
-    INTERPOLATION_PATTERN = Regexp.union(
-      /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
-      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
-    )
-
-    INTERPOLATION_PATTERN_WITH_ESCAPE = Regexp.union(
-      /%%/,
-      INTERPOLATION_PATTERN
-    )
-
-    # % uses self (i.e. the String) as a format specification and returns the
-    # result of applying it to the given arguments. In other words it interpolates
-    # the given arguments to the string according to the formats the string
-    # defines.
-    #
-    # There are three ways to use it:
-    #
-    # * Using a single argument or Array of arguments.
-    #
-    #   This is the default behaviour of the String class. See Kernel#sprintf for
-    #   more details about the format string.
-    #
-    #   Example:
-    #
-    #     "%d %s" % [1, "message"]
-    #     # => "1 message"
-    #
-    # * Using a Hash as an argument and unformatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %{foo}
-    #   it will interpret the hash values as named arguments.
-    #
-    #   Example:
-    #
-    #     "%{firstname}, %{lastname}" % {:firstname => "Masao", :lastname => "Mutoh"}
-    #     # => "Masao Mutoh"
-    #
-    # * Using a Hash as an argument and formatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %<foo>d
-    #   it will interpret the hash values as named arguments and format the value
-    #   according to the formatting instruction appended to the closing >.
-    #
-    #   Example:
-    #
-    #     "%<integer>d, %<float>.1f" % { :integer => 10, :float => 43.4 }
-    #     # => "10, 43.3"
-    def %(args)
-      if args.kind_of?(Hash)
-        dup.gsub(INTERPOLATION_PATTERN_WITH_ESCAPE) do |match|
-          if match == '%%'
-            '%'
-          else
-            key = ($1 || $2).to_sym
-            raise KeyError unless args.has_key?(key)
-            $3 ? sprintf("%#{$3}", args[key]) : args[key]
-          end
-        end
-      elsif self =~ INTERPOLATION_PATTERN
-        raise ArgumentError.new('one hash required')
-      else
-        result = gsub(/%([{<])/, '%%\1')
-        result.send :'interpolate_without_ruby_19_syntax', args
-      end
-    end
-  end
-end

data/lib/vagrant-vbguest/helpers.rb

@@ -1,6 +0,0 @@
-module VagrantVbguest
-  module Helpers
-  end
-end
-
-require 'vagrant-vbguest/helpers/os_release'

data/lib/vagrant-vbguest/rebootable.rb

@@ -1,39 +0,0 @@
-module VagrantVbguest
-  module Helpers
-
-    module Rebootable
-      include VmCompatible
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      @@rebooted = {}
-
-      def rebooted?(vm)
-        !!@@rebooted[ self.class.vm_id(vm) ]
-      end
-
-      def reboot?(vm, options)
-        if rebooted?(vm)
-          vm.env.ui.error(I18n.t("vagrant_vbguest.restart_loop_guard_activated"))
-          false
-        elsif options[:auto_reboot]
-          vm.env.ui.warn(I18n.t("vagrant_vbguest.restart_vm"))
-          @@rebooted[ self.class.vm_id(vm) ] = true
-        else
-          vm.env.ui.warn(I18n.t("vagrant_vbguest.suggest_restart", :name => vm.name))
-          false
-        end
-      end
-
-      def reboot(vm, options)
-        raise NotImplementedError
-      end
-
-      def reboot!(vm, options)
-        raise NotImplementedError
-      end
-    end
-
-  end
-end

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

@@ -1,17 +0,0 @@
-require 'vagrant-vbguest/command'
-require 'vagrant/command/start_mixins'
-
-module VagrantVbguest
-
-  class Command < Vagrant::Command::Base
-    include CommandCommons
-    include Vagrant::Command::StartMixins
-
-    def check_runable_on(vm)
-      raise Vagrant::Errors::VMNotCreatedError if !vm.created?
-      raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
-      raise Vagrant::Errors::VMNotRunningError if vm.state != :running
-    end
-  end
-
-end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/download.rb

@@ -1,51 +0,0 @@
-require 'vagrant-vbguest/download'
-module VagrantVbguest
-  # This implementation is based on Action::Box::Download by vagrant
-  #
-  # This adoption does not run as a action/middleware, but is called manually
-  #
-  # MIT License - Mitchell Hashimoto and John Bender - https://github.com/mitchellh/vagrant
-  #
-  #
-  #
-  class Download < DownloadBase
-
-    include Vagrant::Util
-
-    def download!
-      if instantiate_downloader
-        File.open(@destination, Platform.tar_file_options) do |destination_file|
-          @downloader.download!(@source, destination_file)
-        end
-      end
-      @destination
-    end
-
-    def instantiate_downloader
-      # Assign to a temporary variable since this is easier to type out,
-      # since it is used so many times.
-      classes = [Vagrant::Downloaders::HTTP, Vagrant::Downloaders::File]
-
-      # Find the class to use.
-      classes.each_index do |i|
-        klass = classes[i]
-
-        # Use the class if it matches the given URI or if this
-        # is the last class...
-        if classes.length == (i + 1) || klass.match?(@source)
-          @ui.info I18n.t("vagrant_vbguest.download.with", :class => klass.to_s)
-          @downloader = klass.new(@ui)
-          break
-        end
-      end
-
-      # This line should never be reached, but we'll keep this here
-      # just in case for now.
-      raise Errors::BoxDownloadUnknownType if !@downloader
-
-      @downloader.prepare(@source) if @downloader.respond_to?(:prepare)
-      true
-    end
-
-  end
-end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/rebootable.rb

@@ -1,23 +0,0 @@
-require 'vagrant-vbguest/rebootable'
-
-module VagrantVbguest
-  module Helpers
-
-    module Rebootable
-      def reboot(vm, options)
-        if reboot? vm, options
-          @env[:action_runner].run(Vagrant::Action::VM::Halt, @env)
-          @env[:action_runner].run(Vagrant::Action::VM::Boot, @env)
-        end
-      end
-
-      # executes the whole reboot process
-      def reboot!(vm, options)
-        if reboot? vm, options
-          vm.reload(options)
-        end
-      end
-    end
-
-  end
-end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/vm_compatible.rb

@@ -1,31 +0,0 @@
-module VagrantVbguest
-  module Helpers
-    module VmCompatible
-      def communicate
-        vm.channel
-      end
-
-      def driver
-        vm.driver
-      end
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def vm_id(vm)
-          vm.uuid
-        end
-
-        def communicate_to(vm)
-          vm.channel
-        end
-
-        def distro_name(vm)
-          vm.guest.distro_dispatch
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-require 'vagrant-vbguest/command'
-require Vagrant.source_root.join("plugins/commands/up/start_mixins")
-
-module VagrantVbguest
-
-  class Command < Vagrant.plugin("2", :command)
-    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
-      raise Vagrant::Errors::VMNotRunningError if vm.state.id != :running
-      raise VagrantVbguest::NoVirtualBoxMachineError if vm.provider.class != VagrantPlugins::ProviderVirtualBox::Provider
-    end
-  end
-
-end

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

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_0/download", __FILE__)

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

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_1/command", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/download.rb

@@ -1,18 +0,0 @@
-require 'vagrant-vbguest/download'
-require "vagrant/util/downloader"
-
-module VagrantVbguest
-
-  class Download < DownloadBase
-
-    def download!
-      downloader_options = {}
-      downloader_options[:ui] = @ui
-      @ui.info(I18n.t("vagrant_vbguest.download.started", :source => @source))
-      @downloader = Vagrant::Util::Downloader.new(@source, @destination, downloader_options)
-      @downloader.download!
-    end
-
-  end
-
-end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/rebootable.rb

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_1/rebootable", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/vm_compatible.rb

@@ -1,15 +0,0 @@
-require File.expand_path("../../vagrant_1_1/vm_compatible", __FILE__)
-module VagrantVbguest
-  module Helpers
-    module VmCompatible
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-      module ClassMethods
-        def distro_name(vm)
-          vm.guest.name
-        end
-      end
-    end
-  end
-end

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

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_2/command", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/download.rb

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_2/download", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/rebootable.rb

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_2/rebootable", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_3/vm_compatible.rb

@@ -1 +0,0 @@
-require File.expand_path("../../vagrant_1_2/vm_compatible", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat.rb

@@ -1,21 +0,0 @@
-vagrant_version = Gem::Version.new(Vagrant::VERSION)
-supported_version = {
-  "< 1.1.0"  => "1_0",
-  "~> 1.1.0" => "1_1",
-  "~> 1.2.0" => "1_2",
-  "~> 1.3.0" => "1_3",
-}
-compat_version = supported_version.find { |requirement, version|
-  Gem::Requirement.new(requirement).satisfied_by?(vagrant_version)
-}
-
-if compat_version
-  compat_version = compat_version[1]
-else
-  # @TODO: yield warning
-  compat_version = supported_version.to_a.last[1]
-end
-
-%w{vm_compatible rebootable command download}.each do |r|
-  require File.expand_path("../vagrant_compat/vagrant_#{compat_version}/#{r}", __FILE__)
-end

data/lib/vagrant_init.rb

@@ -1,38 +0,0 @@
-# This file is automatically loaded by Vagrant < 1.1
-# to load any plugins. This file kicks off this plugin.
-begin
-  require "vagrant"
-rescue LoadError
-  raise "The Vagrant VBGuest plugin must be run within Vagrant."
-end
-
-require 'vagrant-vbguest/core_ext/string/interpolate'
-
-require "vagrant-vbguest/errors"
-require 'vagrant-vbguest/vagrant_compat'
-
-require 'vagrant-vbguest/machine'
-
-require 'vagrant-vbguest/hosts/base'
-require 'vagrant-vbguest/hosts/virtualbox'
-
-require 'vagrant-vbguest/installer'
-require 'vagrant-vbguest/installers/base'
-require 'vagrant-vbguest/installers/linux'
-require 'vagrant-vbguest/installers/debian'
-require 'vagrant-vbguest/installers/ubuntu'
-require 'vagrant-vbguest/installers/redhat'
-
-require 'vagrant-vbguest/config'
-require 'vagrant-vbguest/command'
-require 'vagrant-vbguest/middleware'
-
-Vagrant.config_keys.register(:vbguest) { VagrantVbguest::Config }
-
-Vagrant.commands.register(:vbguest) { VagrantVbguest::Command }
-
-Vagrant.actions[:start].use VagrantVbguest::Middleware
-
-# Add our custom translations to the load path
-I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
-