kitchen-vagrant 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/README.md +10 -6
- data/lib/kitchen/driver/vagrant.rb +7 -7
- data/lib/kitchen/driver/vagrant_version.rb +1 -1
- data/spec/kitchen/driver/vagrant_spec.rb +11 -1
- 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: 2ee72d57d556a167ee66c7d6e9feab387a26568d
|
4
|
+
data.tar.gz: 73b264e1d64ca412181265fb9823f52b5a77a992
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b7eebf2687a97c3b7b7b6af8f7047e3ddb166887a5012d47bad1c495902df3751cb84a6f39a6def15a27140925482f269fca6e6678c558ce15cafd42a661aabb
|
7
|
+
data.tar.gz: 3aee9e2aba2d2cc138be17e623d75d3941dabd5cfbb90db8483c78a0fcda9b391687a6deb91fc573e74dca86e38b955275107c57126f9db17aad480dc9d7ba89
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
## [v1.0.1](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.0.1) (2017-02-10)
|
2
|
+
[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.0...v1.0.1)
|
3
|
+
|
4
|
+
**Fixed bugs:**
|
5
|
+
|
6
|
+
- Fixed cache folder disable for FreeBSD and MacOS/OSX [\#281](https://github.com/test-kitchen/kitchen-vagrant/pull/281) ([brentm5](https://github.com/brentm5)) [\#283](https://github.com/test-kitchen/kitchen-vagrant/pull/283) ([cheeseplus](https://github.com/cheeseplus))
|
7
|
+
|
1
8
|
## [1.0.0](https://github.com/test-kitchen/kitchen-vagrant/tree/1.0.0) (2017-01-10)
|
2
9
|
[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.21.1...v1.0.0)
|
3
10
|
|
data/README.md
CHANGED
@@ -254,20 +254,23 @@ and [VMware][vagrant_config_vmware] for more details.
|
|
254
254
|
#### <a name="config-customize-virtualbox-disk"></a> VirtualBox additional disk
|
255
255
|
|
256
256
|
Adding the `createhd` and `storageattach` keys in `customize` allows for creation
|
257
|
-
of an additional disk in VirtualBox.
|
257
|
+
of an additional disk in VirtualBox. Full paths must be used as required by VirtualBox.
|
258
|
+
|
259
|
+
*NOTE*: IDE Controller based drives always show up in the boot order first, regardless of if they
|
260
|
+
are [bootable][vbox_ide_boot].
|
258
261
|
|
259
262
|
```yaml
|
260
263
|
driver:
|
261
264
|
customize:
|
262
265
|
createhd:
|
263
|
-
filename:
|
266
|
+
filename: /tmp/disk1.vmdk
|
264
267
|
size: 1024
|
265
268
|
storageattach:
|
266
|
-
storagectl:
|
269
|
+
storagectl: SATA Controller
|
267
270
|
port: 1
|
268
271
|
device: 0
|
269
272
|
type: hdd
|
270
|
-
medium:
|
273
|
+
medium: /tmp/disk1.vmdk
|
271
274
|
```
|
272
275
|
|
273
276
|
will generate a Vagrantfile configuration similar to:
|
@@ -278,7 +281,7 @@ Vagrant.configure("2") do |config|
|
|
278
281
|
|
279
282
|
config.vm.provider :virtualbox do |virtualbox|
|
280
283
|
virtualbox.customize ["createhd", "--filename", "./tmp/disk1.vmdk", "--size", 1024]
|
281
|
-
virtualbox.customize ["storageattach", :id, "--storagectl", "IDE Controller", "--port", "1", "device", 0, "--type", "hdd", "--medium", "./tmp/disk1.vmdk"]
|
284
|
+
virtualbox.customize ["storageattach", :id, "--storagectl", "IDE Controller", "--port", "1", "--device", 0, "--type", "hdd", "--medium", "./tmp/disk1.vmdk"]
|
282
285
|
end
|
283
286
|
end
|
284
287
|
```
|
@@ -574,4 +577,5 @@ Apache 2.0 (see [LICENSE][license])
|
|
574
577
|
[atlas]: https://atlas.hashicorp.com/
|
575
578
|
[parallels_dl]: http://www.parallels.com/products/desktop/download/
|
576
579
|
[vagrant_parallels]: https://github.com/Parallels/vagrant-parallels
|
577
|
-
[vagrant_cachier]:
|
580
|
+
[vagrant_cachier]: https://github.com/fgrehm/vagrant-cachier
|
581
|
+
[vbox_ide_boot]: https://www.virtualbox.org/ticket/6979
|
@@ -219,8 +219,7 @@ module Kitchen
|
|
219
219
|
def disable_cache?
|
220
220
|
# Disable for Windows not using Virtualbox
|
221
221
|
if windows_host? && config[:provider] != "virtualbox" ||
|
222
|
-
|
223
|
-
instance.platform.name == "freebsd" ||
|
222
|
+
instance.platform.name =~ /(freebsd|macos|osx)/ ||
|
224
223
|
# Disable if cache_directory is set to "false" on .kitchen.yml
|
225
224
|
!config[:cache_directory]
|
226
225
|
return true
|
@@ -260,9 +259,10 @@ module Kitchen
|
|
260
259
|
#
|
261
260
|
# @api private
|
262
261
|
def finalize_ca_cert!
|
263
|
-
config[:box_download_ca_cert]
|
264
|
-
config[:box_download_ca_cert]
|
265
|
-
config[:box_download_ca_cert]
|
262
|
+
unless config[:box_download_ca_cert].nil?
|
263
|
+
config[:box_download_ca_cert] = File.expand_path(
|
264
|
+
config[:box_download_ca_cert], config[:kitchen_root])
|
265
|
+
end
|
266
266
|
end
|
267
267
|
|
268
268
|
# Replaces any `{{vagrant_root}}` tokens in the pre create command.
|
@@ -469,10 +469,10 @@ module Kitchen
|
|
469
469
|
# instance's Vagrantfile
|
470
470
|
# @api private
|
471
471
|
def vagrant_root
|
472
|
-
|
473
|
-
config[:kitchen_root], %w{.kitchen kitchen-vagrant},
|
472
|
+
root = File.join(config[:kitchen_root], %w{.kitchen kitchen-vagrant},
|
474
473
|
"kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
|
475
474
|
)
|
475
|
+
@vagrant_root ||= instance.nil? ? nil : root
|
476
476
|
end
|
477
477
|
|
478
478
|
# @param type [Symbol] either `:ssh` or `:winrm`
|
@@ -348,7 +348,17 @@ describe Kitchen::Driver::Vagrant do
|
|
348
348
|
end
|
349
349
|
|
350
350
|
it "does not set :synced_folders to cache_directory on freebsd systems" do
|
351
|
-
allow(platform).to receive(:name).and_return("freebsd")
|
351
|
+
allow(platform).to receive(:name).and_return("freebsd-99")
|
352
|
+
expect(driver[:synced_folders]).to eq([])
|
353
|
+
end
|
354
|
+
|
355
|
+
it "does not set :synced_folders to cache_directory on macos systems" do
|
356
|
+
allow(platform).to receive(:name).and_return("macos")
|
357
|
+
expect(driver[:synced_folders]).to eq([])
|
358
|
+
end
|
359
|
+
|
360
|
+
it "does not set :synced_folders to cache_directory on osx systems" do
|
361
|
+
allow(platform).to receive(:name).and_return("osx-99")
|
352
362
|
expect(driver[:synced_folders]).to eq([])
|
353
363
|
end
|
354
364
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-vagrant
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fletcher Nichol
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-02-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
164
164
|
version: '0'
|
165
165
|
requirements: []
|
166
166
|
rubyforge_project:
|
167
|
-
rubygems_version: 2.
|
167
|
+
rubygems_version: 2.6.10
|
168
168
|
signing_key:
|
169
169
|
specification_version: 4
|
170
170
|
summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
|