kitchen-vagrant 1.1.0 → 1.1.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 +9 -0
- data/README.md +27 -0
- data/Rakefile +1 -7
- data/kitchen-vagrant.gemspec +0 -1
- data/lib/kitchen/driver/vagrant.rb +9 -8
- data/lib/kitchen/driver/vagrant_version.rb +1 -1
- data/spec/kitchen/driver/vagrant_spec.rb +10 -1
- data/templates/Vagrantfile.erb +1 -1
- metadata +3 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 863f689f3db93659089b9fab42bc68af9a95ad4b
|
4
|
+
data.tar.gz: 6dd5c1895f937db1365989ee58f63d5a26ca7c37
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ba910a7a30032b94668729e5624bfbe982432dff9e92d73f01e13b598a5b907a03c7b803306e4f46d039a2caf8a90667ee267f46b0680d28eb3dcc2846f795f3
|
7
|
+
data.tar.gz: fe28cb8b5d772713b2d9f79afc4010cd73a8d1bcd946a50be31004bce921a2318fd0e4540c89b08c958772eed52d8c4e18674393c1c3e9621517d5c60f03f7e7
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,14 @@
|
|
1
1
|
# Change Log
|
2
2
|
|
3
|
+
## [v1.1.1](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.1.1) (2017-07-26)
|
4
|
+
[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.1.0...v1.1.1)
|
5
|
+
|
6
|
+
**Fixed Bugs**
|
7
|
+
|
8
|
+
- Fix detection of vagrant-winrm plugin. [\#309](https://github.com/test-kitchen/kitchen-vagrant/pull/309) ([silverl](https://github.com/silverl))
|
9
|
+
- Fix bug in Vagrantfile template related to WinRM options. [\#306](https://github.com/test-kitchen/kitchen-vagrant/pull/306) ([aleksey-hariton](https://github.com/aleksey-hariton))
|
10
|
+
- Disable caching, even for bento boxes. [\#313](https://github.com/test-kitchen/kitchen-vagrant/pull/313) ([robbkidd](https://github.com/robbkidd))
|
11
|
+
|
3
12
|
## [v1.1.0](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.1.0) (2017-03-31)
|
4
13
|
[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.2...v1.1.0)
|
5
14
|
|
data/README.md
CHANGED
@@ -56,6 +56,21 @@ If you would like to use Parallels Desktop you must also purchase the software b
|
|
56
56
|
|
57
57
|
[Vagrant Parallels Provider][vagrant_parallels]
|
58
58
|
|
59
|
+
#### <a name="unmaintained-virtualization"></a> Unmaintained Virtualization Hypervisors
|
60
|
+
|
61
|
+
Some additional hypervisors may be used with this driver but are not officially supported:
|
62
|
+
|
63
|
+
[CloudStack][cloudstack] using the unofficial [vagrant-cloudstack][vagrant_cloudstack] plugin for Vagrant.
|
64
|
+
|
65
|
+
[KVM][kvm]/[Libvirt][libvirt] using the unofficial [vagrant-libvirt][vagrant_libvirt] plugin for Vagrant.
|
66
|
+
|
67
|
+
[LXC][lxc] using the unofficial [vagrant-lxc][vagrant_lxc] plugin for Vagrant.
|
68
|
+
|
69
|
+
[OpenStack][openstack] using an unofficial provider plugin for Vagrant.
|
70
|
+
|
71
|
+
[RackSpace][rackspace] using the official [vagrant-rackspace][vagrant_rackspace] plugin for Vagrant.
|
72
|
+
|
73
|
+
[SoftLayer][softlayer] using the unofficial [vagrant-softlayer][vagrant_softlayer] plugin for Vagrant.
|
59
74
|
|
60
75
|
## <a name="installation"></a> Installation and Setup
|
61
76
|
|
@@ -598,3 +613,15 @@ Apache 2.0 (see [LICENSE][license])
|
|
598
613
|
[vagrant_parallels]: https://github.com/Parallels/vagrant-parallels
|
599
614
|
[vagrant_cachier]: https://github.com/fgrehm/vagrant-cachier
|
600
615
|
[vbox_ide_boot]: https://www.virtualbox.org/ticket/6979
|
616
|
+
[cloudstack]: https://cloudstack.apache.org/
|
617
|
+
[kvm]: https://www.linux-kvm.org/page/Main_Page
|
618
|
+
[libvirt]: https://libvirt.org/
|
619
|
+
[lxc]: https://linuxcontainers.org/
|
620
|
+
[openstack]: https://cloudstack.apache.org/
|
621
|
+
[rackspace]: https://www.rackspace.com/
|
622
|
+
[softlayer]: http://www.softlayer.com/
|
623
|
+
[vagrant_cloudstack]: https://github.com/MissionCriticalCloud/vagrant-cloudstack
|
624
|
+
[vagrant_libvirt]: https://github.com/vagrant-libvirt/vagrant-libvirt
|
625
|
+
[vagrant_lxc]: https://github.com/fgrehm/vagrant-lxc
|
626
|
+
[vagrant_rackspace]: https://github.com/mitchellh/vagrant-rackspace
|
627
|
+
[vagrant_softlayer]: https://github.com/audiolize/vagrant-softlayer
|
data/Rakefile
CHANGED
@@ -11,12 +11,6 @@ end
|
|
11
11
|
desc "Run all test suites"
|
12
12
|
task :test => [:spec]
|
13
13
|
|
14
|
-
require "cane/rake_task"
|
15
|
-
desc "Run cane to check quality metrics"
|
16
|
-
Cane::RakeTask.new do |cane|
|
17
|
-
cane.canefile = "./.cane"
|
18
|
-
end
|
19
|
-
|
20
14
|
require "chefstyle"
|
21
15
|
require "rubocop/rake_task"
|
22
16
|
RuboCop::RakeTask.new(:style) do |task|
|
@@ -32,7 +26,7 @@ task :stats do
|
|
32
26
|
end
|
33
27
|
|
34
28
|
desc "Run all quality tasks"
|
35
|
-
task :quality => [:
|
29
|
+
task :quality => [:style, :stats]
|
36
30
|
|
37
31
|
task :default => [:test, :quality]
|
38
32
|
|
data/kitchen-vagrant.gemspec
CHANGED
@@ -86,7 +86,9 @@ module Kitchen
|
|
86
86
|
driver.windows_os? ? nil : "#{driver.instance.name}.vagrantup.com"
|
87
87
|
end
|
88
88
|
|
89
|
-
default_config
|
89
|
+
default_config(:cache_directory) do |driver|
|
90
|
+
driver.windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
|
91
|
+
end
|
90
92
|
|
91
93
|
default_config :kitchen_cache_directory,
|
92
94
|
File.expand_path("~/.kitchen/cache")
|
@@ -197,10 +199,10 @@ module Kitchen
|
|
197
199
|
# and share a local folder to that directory so that we don't pull them
|
198
200
|
# down every single time
|
199
201
|
def cache_directory
|
200
|
-
if enable_cache?
|
201
|
-
windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
|
202
|
-
else
|
202
|
+
if enable_cache?
|
203
203
|
config[:cache_directory]
|
204
|
+
else
|
205
|
+
false
|
204
206
|
end
|
205
207
|
end
|
206
208
|
|
@@ -244,9 +246,8 @@ module Kitchen
|
|
244
246
|
# Return true if we found the criteria to enable the cache_directory
|
245
247
|
# functionality
|
246
248
|
def enable_cache?
|
247
|
-
|
248
|
-
|
249
|
-
end
|
249
|
+
return false unless config[:cache_directory]
|
250
|
+
return true if safe_share?(config[:box])
|
250
251
|
# Otherwise
|
251
252
|
false
|
252
253
|
end
|
@@ -561,7 +562,7 @@ module Kitchen
|
|
561
562
|
|
562
563
|
self.class.winrm_plugin_passed = run_silently(
|
563
564
|
"#{config[:vagrant_binary]} plugin list", :cwd => Dir.pwd).
|
564
|
-
split("\n").find { |line| line =~
|
565
|
+
split("\n").find { |line| line =~ /vagrant-winrm\s+/ }
|
565
566
|
end
|
566
567
|
end
|
567
568
|
end
|
@@ -345,6 +345,12 @@ describe Kitchen::Driver::Vagrant do
|
|
345
345
|
expect(driver[:synced_folders]).to eq([cache_directory_array])
|
346
346
|
end
|
347
347
|
|
348
|
+
it "does not set :synced_folders when cache_directory is false" do
|
349
|
+
config[:box] = "bento/centos-99"
|
350
|
+
config[:cache_directory] = false
|
351
|
+
expect(driver[:synced_folders]).to eq([])
|
352
|
+
end
|
353
|
+
|
348
354
|
it "does not set :synced_folders to cache_directory on freebsd systems" do
|
349
355
|
allow(platform).to receive(:name).and_return("freebsd-99")
|
350
356
|
expect(driver[:synced_folders]).to eq([])
|
@@ -484,7 +490,10 @@ describe Kitchen::Driver::Vagrant do
|
|
484
490
|
]
|
485
491
|
end
|
486
492
|
|
487
|
-
before
|
493
|
+
before do
|
494
|
+
config[:box] = "bento/centos-99"
|
495
|
+
config[:cache_directory] = "Z:\\awesome\\cache"
|
496
|
+
end
|
488
497
|
|
489
498
|
it "sets :synced_folders with the custom cache_directory" do
|
490
499
|
expect(driver[:synced_folders]).to eq([custom_cache_directory_array])
|
data/templates/Vagrantfile.erb
CHANGED
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.1.
|
4
|
+
version: 1.1.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-07-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|
@@ -108,20 +108,6 @@ dependencies:
|
|
108
108
|
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '0'
|
111
|
-
- !ruby/object:Gem::Dependency
|
112
|
-
name: cane
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
114
|
-
requirements:
|
115
|
-
- - '='
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: 3.0.0
|
118
|
-
type: :development
|
119
|
-
prerelease: false
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
requirements:
|
122
|
-
- - '='
|
123
|
-
- !ruby/object:Gem::Version
|
124
|
-
version: 3.0.0
|
125
111
|
description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
|
126
112
|
email:
|
127
113
|
- fnichol@nichol.ca
|
@@ -164,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
164
150
|
version: '0'
|
165
151
|
requirements: []
|
166
152
|
rubyforge_project:
|
167
|
-
rubygems_version: 2.
|
153
|
+
rubygems_version: 2.5.1
|
168
154
|
signing_key:
|
169
155
|
specification_version: 4
|
170
156
|
summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
|