vagrant-vbguest 0.14.2 → 0.15.0
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -1
- data/Gemfile +2 -3
- data/Readme.md +3 -2
- data/lib/vagrant-vbguest/config.rb +5 -2
- data/lib/vagrant-vbguest/installers/linux.rb +13 -1
- data/lib/vagrant-vbguest/version.rb +1 -1
- data/locales/en.yml +2 -0
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7395a0d81b5db0680c43be0e2f2fa2da32119f04
|
4
|
+
data.tar.gz: 663911f4c047ac27dd6bf584f94abfc390bccbb5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8c0d679c68794172a9cc38510f267285c0bbeaf3345da803952ebad9be991e592df06affc2e6aeb896c2771fe9d4fbe1263584287ef51c1e092f5eacdf04942e
|
7
|
+
data.tar.gz: 77d86630ec438895c93dc4c4531d0ad7c62a1b2444372bc87b8b4fa5ac92705a9c03aba877e303d816ed02767be5894545f47cb505036de7d97beb440c839482
|
data/CHANGELOG.md
CHANGED
@@ -1,4 +1,10 @@
|
|
1
|
-
## 0.
|
1
|
+
## 0.15.0 (2017-09-21)
|
2
|
+
|
3
|
+
- Interactive userinputs from the installer run will be answered with "yes" by default. Thanks @jerr0328 [GH-268], [GH-267]
|
4
|
+
- Added logging of mounting/umounting VBoxGuestAdditions.iso file. Thanks @m03 [GH-249]
|
5
|
+
- Updates remote location of develeopment dependencies.
|
6
|
+
|
7
|
+
## 0.14.2 (2017-05-09)
|
2
8
|
|
3
9
|
- Fix Debian installer. Thanks @chrisko [GH-255], [GH-256]
|
4
10
|
|
data/Gemfile
CHANGED
@@ -4,11 +4,10 @@ group :development do
|
|
4
4
|
# We depend on Vagrant for development, but we don't add it as a
|
5
5
|
# gem dependency because we expect to be installed within the
|
6
6
|
# Vagrant environment itself using `vagrant plugin`.
|
7
|
-
gem "vagrant", :git => "
|
7
|
+
gem "vagrant", :git => "https://github.com/hashicorp/vagrant.git"
|
8
|
+
gem "rake", "~> 10.0"
|
8
9
|
end
|
9
10
|
|
10
11
|
group :plugins do
|
11
12
|
gem "vagrant-vbguest", path: "."
|
12
13
|
end
|
13
|
-
|
14
|
-
gem "rake", "~> 10.0"
|
data/Readme.md
CHANGED
@@ -75,10 +75,11 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
|
|
75
75
|
* `no_remote` (Boolean, default: `false`) : Whether to _not_ download the iso file from a remote location. This includes any `http` location!
|
76
76
|
* `installer` (`VagrantVbguest::Installers::Base`, optional) : Reference to a (custom) installer class
|
77
77
|
* `installer_arguments` (Array, default: `['--nox11']`) : List of additional arguments to pass to the installer. eg: `%w{--nox11 --force}` would execute `VBoxLinuxAdditions.run install --nox11 --force`
|
78
|
+
* `yes` (Boolean or String, default: `true`): Wheter to pipe `yes` to the installer. If `true`, executes `yes | VBoxLinuxAdditions.run install`. With `false`, the command is executed without `yes`. You can also put in a string here for `yes` (e.g. `no` to refuse all messages)
|
78
79
|
|
79
80
|
#### Global Configuration
|
80
81
|
|
81
|
-
Using [Vagrantfile Load Order](
|
82
|
+
Using [Vagrantfile Load Order](https://www.vagrantup.com/docs/vagrantfile/#load-order-and-merging) you may change default configuration values.
|
82
83
|
Edit (create, if missing) your `~/.vagrant.d/Vagrantfile` like this:
|
83
84
|
|
84
85
|
For Vagrant >= 1.1.0 use:
|
@@ -223,7 +224,7 @@ When running the install step manually like this: `vagrant vbguest --do install`
|
|
223
224
|
*vagrant-vbguest* will try to autodetect a VirtualBox GuestAdditions iso file on your system, which usually matches your installed version of VirtualBox. If it cannot find one, it downloads one from the web (virtualbox.org).
|
224
225
|
Those places will be checked in order:
|
225
226
|
|
226
|
-
1. Checks your VirtualBox "Virtual Media
|
227
|
+
1. Checks your VirtualBox "Virtual Media Manager" for a DVD called "VBoxGuestAdditions.iso"
|
227
228
|
2. Guess by your host operating system:
|
228
229
|
* for linux : `/usr/share/virtualbox/VBoxGuestAdditions.iso`
|
229
230
|
* for Mac : `/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso`
|
@@ -5,7 +5,7 @@ module VagrantVbguest
|
|
5
5
|
module Attributes
|
6
6
|
attr_accessor :auto_update, :auto_reboot, :no_install, :no_remote,
|
7
7
|
:installer, :installer_arguments,
|
8
|
-
:iso_path, :iso_upload_path, :iso_mount_point
|
8
|
+
:iso_path, :iso_upload_path, :iso_mount_point, :yes
|
9
9
|
end
|
10
10
|
|
11
11
|
class << self
|
@@ -16,6 +16,7 @@ module VagrantVbguest
|
|
16
16
|
def no_install; @no_install.nil? ? false : @no_install end
|
17
17
|
def no_remote; @no_remote.nil? ? false : @no_remote end
|
18
18
|
def installer_arguments; @installer_arguments.nil? ? '--nox11' : @installer_arguments end
|
19
|
+
def yes; @yes.nil? ? true : @yes end
|
19
20
|
|
20
21
|
def iso_path
|
21
22
|
return nil if !@iso_path || @iso_path == :auto
|
@@ -30,6 +31,7 @@ module VagrantVbguest
|
|
30
31
|
def no_install; @no_install.nil? ? self.class.no_install : @no_install end
|
31
32
|
def no_remote; @no_remote.nil? ? self.class.no_remote : @no_remote end
|
32
33
|
def installer_arguments; @installer_arguments.nil? ? self.class.installer_arguments : @installer_arguments end
|
34
|
+
def yes; @yes.nil? ? self.class.yes : @yes end
|
33
35
|
|
34
36
|
def iso_path
|
35
37
|
return self.class.iso_path if !@iso_path || @iso_path == :auto
|
@@ -47,7 +49,8 @@ module VagrantVbguest
|
|
47
49
|
:auto_update => auto_update,
|
48
50
|
:auto_reboot => auto_reboot,
|
49
51
|
:no_install => no_install,
|
50
|
-
:no_remote => no_remote
|
52
|
+
:no_remote => no_remote,
|
53
|
+
:yes => yes
|
51
54
|
}
|
52
55
|
end
|
53
56
|
|
@@ -205,7 +205,7 @@ module VagrantVbguest
|
|
205
205
|
def execute_installer(opts=nil, &block)
|
206
206
|
yield_installation_warning(installer)
|
207
207
|
opts = {:error_check => false}.merge(opts || {})
|
208
|
-
exit_status = communicate.sudo("#{installer} #{installer_arguments}", opts, &block)
|
208
|
+
exit_status = communicate.sudo("#{yes}#{installer} #{installer_arguments}", opts, &block)
|
209
209
|
yield_installation_error_warning(installer) unless exit_status == 0
|
210
210
|
exit_status
|
211
211
|
end
|
@@ -221,6 +221,16 @@ module VagrantVbguest
|
|
221
221
|
@installer_arguments ||= Array(options[:installer_arguments]).join " "
|
222
222
|
end
|
223
223
|
|
224
|
+
# Determine if yes needs to be called or not
|
225
|
+
def yes
|
226
|
+
# Simple yes if explicity boolean true
|
227
|
+
return "yes | " if !!@yes == @yes && @yes
|
228
|
+
# Nothing if set to false
|
229
|
+
return "" if !@yes
|
230
|
+
# Otherwise pass input string to yes
|
231
|
+
"yes @#{yes} | "
|
232
|
+
end
|
233
|
+
|
224
234
|
# A generic helper method for mounting the GuestAdditions iso file
|
225
235
|
# on most linux system.
|
226
236
|
# Mounts the given uploaded file from +tmp_path+ on +mount_point+.
|
@@ -230,6 +240,7 @@ module VagrantVbguest
|
|
230
240
|
# @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
|
231
241
|
# @yieldparam [String] data Data for the given output.
|
232
242
|
def mount_iso(opts=nil, &block)
|
243
|
+
env.ui.info(I18n.t("vagrant_vbguest.mounting_iso", :mount_point => mount_point))
|
233
244
|
communicate.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
|
234
245
|
end
|
235
246
|
|
@@ -242,6 +253,7 @@ module VagrantVbguest
|
|
242
253
|
# @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
|
243
254
|
# @yieldparam [String] data Data for the given output.
|
244
255
|
def unmount_iso(opts=nil, &block)
|
256
|
+
env.ui.info(I18n.t("vagrant_vbguest.unmounting_iso", :mount_point => mount_point))
|
245
257
|
communicate.sudo("umount #{mount_point}", opts, &block)
|
246
258
|
end
|
247
259
|
end
|
data/locales/en.yml
CHANGED
@@ -2,6 +2,8 @@ en:
|
|
2
2
|
vagrant_vbguest:
|
3
3
|
skipped_installation: "Updating GuestAdditions skipped."
|
4
4
|
skipped_rebuild: "Rebuilding GuestAdditions skipped."
|
5
|
+
mounting_iso: "Mounting Virtualbox Guest Additions ISO to: %{mount_point}"
|
6
|
+
unmounting_iso: "Unmounting Virtualbox Guest Additions ISO from: %{mount_point}"
|
5
7
|
installing: "Installing Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
|
6
8
|
installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
|
7
9
|
rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-vbguest
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.15.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Schulze
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-09-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: micromachine
|
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
131
131
|
version: 1.3.6
|
132
132
|
requirements: []
|
133
133
|
rubyforge_project:
|
134
|
-
rubygems_version: 2.
|
134
|
+
rubygems_version: 2.5.2
|
135
135
|
signing_key:
|
136
136
|
specification_version: 4
|
137
137
|
summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM
|