vagrant-vbguest 0.6.3 → 0.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 0.6.4 (2013-01-24)
2
+
3
+ - Fix passing a installer class as an config option [GH-40]
4
+
1
5
  ## 0.6.3 (2013-01-19)
2
6
 
3
7
  - Fix generic linux installer for not explicitly supported
@@ -3,7 +3,7 @@ module VagrantVbguest
3
3
  class Config < Vagrant::Config::Base
4
4
 
5
5
  module Attributes
6
- attr_accessor :iso_path, :auto_update, :auto_reboot, :no_install, :no_remote
6
+ attr_accessor :iso_path, :auto_update, :auto_reboot, :no_install, :no_remote, :installer
7
7
  end
8
8
 
9
9
  class << self
@@ -35,6 +35,7 @@ module VagrantVbguest
35
35
  # explicit hash, to get symbols in hash keys
36
36
  def to_hash
37
37
  {
38
+ :installer => installer,
38
39
  :iso_path => iso_path,
39
40
  :auto_update => auto_update,
40
41
  :auto_reboot => auto_reboot,
@@ -110,7 +110,7 @@ module VagrantVbguest
110
110
  # @return [Installers::Base]
111
111
  def guest_installer
112
112
  @guest_installer ||= if @options[:installer].is_a? Class
113
- @options[:installer].new(@vm)
113
+ @options[:installer].new(@vm, @options)
114
114
  else
115
115
  Installer.detect(@vm, @options)
116
116
  end
@@ -62,6 +62,13 @@ module VagrantVbguest
62
62
  vm.channel.test('lsmod | grep vboxsf', opts, &block)
63
63
  end
64
64
 
65
+ # This overrides {VagrantVbguest::Installers::Base#guest_version}
66
+ # to also query the `VBoxService` on the host system (if available)
67
+ # for it's version.
68
+ # In some scenarios the results of the VirtualBox driver and the
69
+ # additions installed on the host may differ. If this happens, we
70
+ # assume, that the host binaries are right and yield a warning message.
71
+ #
65
72
  # @return [String] The version code of the VirtualBox Guest Additions
66
73
  # available on the guest, or `nil` if none installed.
67
74
  def guest_version(reload = false)
@@ -1,3 +1,3 @@
1
1
  module VagrantVbguest
2
- VERSION = "0.6.3"
2
+ VERSION = "0.6.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-vbguest
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.3
4
+ version: 0.6.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-18 00:00:00.000000000 Z
12
+ date: 2013-01-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: micromachine