vagrant-vbguest 0.8.0 → 0.9.0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.9.0
+
+  - 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]
+
+### heads-up
+
+  - Be lax about missing installer for guest OS.
+    No longer throws an error when no Installer class
+    for the guest os was found. Keep the error message,
+    stop vbguest workflow, but keep vagrant running.
+    [GH-65]
+
+
 ## 0.8.0
 
   - Adds Vagrant 1.2 compatibility [GH-59], [GH-60], [GH-62] /
@@ -136,7 +152,7 @@
 
 ## 0.3.0
 
-  - Removed dependency to the `virtualbox` gem by using 
+  - Removed dependency to the `virtualbox` gem by using
     `vagrant`s vm driver [GH-8]
 
 ## 0.2.1

data/Readme.md

@@ -2,11 +2,13 @@
 
 *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)
+
 ## Installation
 
-Requires vagrant 0.9.4 or later (including 1.0 and 1.1)    
+Requires vagrant 0.9.4 or later (including 1.x)
 
-### Vagrant 1.1
+### Vagrant ≥ 1.1
 
 ```bash
 $ vagrant plugin install vagrant-vbguest
@@ -58,7 +60,7 @@ The `iso_path` may contain the optional placeholder `%{version}` for the detecte
 The URI for the actual iso download reads: `http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso`<br/>
 vbguest will try to autodetect the best option for your system. WTF? see below.
 * `auto_update` (Boolean, default: `true`) : Whether to check the correct additions version on each start (where start is _not_ resuming a box).
-* `auto_reboot` (Boolean, dafult: `true` when running as a middleware, `false` when running as a command) : Whether to reboot the box after GuestAdditions has been installed, but not loaded.
+* `auto_reboot` (Boolean, default: `true` when running as a middleware, `false` when running as a command) : Whether to reboot the box after GuestAdditions has been installed, but not loaded.
 * `no_install` (Boolean, default: `false`) : Whether to check the correct additions version only. This will warn you about version mis-matches, but will not try to install anything.
 * `no_remote` (Boolean, default: `false`) : Whether to _not_ download the iso file from a remote location. This includes any `http` location!
 * `installer` (`VagrantVbguest::Installers::Base`, optional) : Reference to a (custom) installer class

data/lib/vagrant-vbguest/command.rb

@@ -4,6 +4,9 @@ module VagrantVbguest
 
   module CommandCommons
     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.
@@ -80,6 +83,8 @@ module VagrantVbguest
       end
 
       reboot!(vm, options) if _rebootable && machine.reboot?
+    rescue VagrantVbguest::Installer::NoInstallerFoundError => e
+      vm.env.ui.error e.message
     end
 
     def check_runable_on(vm)

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

@@ -38,12 +38,14 @@ module VagrantVbguest
       private
 
         # Helper method which queries the VirtualBox media manager
-        # for a +VBoxGuestAdditions.iso+ file.
-        # Returns +nil+ if none found.
+        # for the first existing path that looks like a
+        # +VBoxGuestAdditions.iso+ file.
         #
         # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
         def media_manager_iso
-          (m = driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions(?:_#{version})?\.iso)$/i)) && m[1]
+          driver.execute('list', 'dvds').scan(/^.+:\s+(.*VBoxGuestAdditions(?:_#{version})?\.iso)$/i).map { |path, _|
+            path if File.exist?(path)
+          }.compact.first
         end
 
         # Find the first GuestAdditions iso file which exists on the host system

data/lib/vagrant-vbguest/installer.rb

@@ -7,7 +7,7 @@ module VagrantVbguest
 
     class NoInstallerFoundError < Vagrant::Errors::VagrantError
       error_namespace "vagrant_vbguest.errors.installer"
-      error_key "no_install_script_for_platform"
+      error_key "no_installer_for_platform"
     end
 
     class << self

data/lib/vagrant-vbguest/middleware.rb

@@ -25,7 +25,9 @@ module VagrantVbguest
         machine.run
         reboot(vm, options) if machine.reboot?
       end
-
+    rescue VagrantVbguest::Installer::NoInstallerFoundError => e
+      vm.env.ui.error e.message
+    ensure
       @app.call(env)
     end
 

data/lib/vagrant-vbguest/vagrant_compat.rb

@@ -2,7 +2,8 @@ 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.2.0" => "1_2",
+  "~> 1.3.0" => "1_3",
 }
 compat_version = supported_version.find { |requirement, version|
   Gem::Requirement.new(requirement).satisfied_by?(vagrant_version)

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

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

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

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

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

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

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

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

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/vagrant-vbguest.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "micromachine", "~> 1.0.4"
+  s.add_dependency "micromachine", "~> 1.1.0"
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "log4r", "~> 1.1.9"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,10 @@ files:
 - 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
@@ -136,9 +140,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1570498090693693149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM