vagrant-r10k 0.4.0 → 0.4.1
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/.rebuildbot.sh +13 -0
- data/.ruby-version +1 -1
- data/CHANGES.md +7 -1
- data/Gemfile.lock +1 -1
- data/README.md +30 -0
- data/lib/vagrant-r10k/action/deploy.rb +0 -2
- data/lib/vagrant-r10k/helpers.rb +4 -4
- data/lib/vagrant-r10k/version.rb +1 -1
- data/spec/acceptance/skeletons/puppet4/Vagrantfile +21 -0
- data/spec/acceptance/skeletons/puppet4/environments/myenv/NOTmodules/.gitkeep +0 -0
- data/spec/acceptance/skeletons/puppet4/environments/myenv/Puppetfile +12 -0
- data/spec/acceptance/skeletons/puppet4/environments/myenv/manifests/site.pp +1 -0
- data/spec/acceptance/skeletons/puppet4/environments/myenv/modules/.gitkeep +0 -0
- data/spec/acceptance/skeletons/puppet4/gitcheck.sh +20 -0
- data/spec/acceptance/vagrant-r10k/vagrant-r10k_spec.rb +43 -8
- data/spec/unit/action_deploy_spec.rb +0 -3
- data/spec/unit/helpers_spec.rb +11 -4
- metadata +29 -16
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 832c82e8cc28d0527c5eb770d1928fa904f5cd93
|
4
|
+
data.tar.gz: 20e8afc884734cdf20f97e2a80e7c447ab31cb42
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 080cd666399c238c2050f1a7f3c12a23c98981d0f90d68c2256d0aa7a083e30f13e83d92e9ae4178e5edde20e4a7ad1b3e1882c9df011584ae4299d9cb784ba6
|
7
|
+
data.tar.gz: f7fe83deef3e5c7ffeae0aa0aec07bc7c516469e489328190732c54d02b6e57c800e54e9d8f021c68dd83f0ab7767e5bd4afcce4b263979914e8e2cf7435b88f
|
data/.rebuildbot.sh
ADDED
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.1.
|
1
|
+
2.1.1
|
data/CHANGES.md
CHANGED
@@ -2,9 +2,15 @@
|
|
2
2
|
|
3
3
|
## master (unreleased)
|
4
4
|
|
5
|
+
## 0.4.1 2015-11-18 Jason Antman <jason@jasonantman.com>
|
6
|
+
|
7
|
+
* [#36](https://github.com/jantman/vagrant-r10k/issues/36) - Fix "no implicit conversion of nil into String" issue with puppet4, caused by ``config.r10k.manifest_file`` and/or ``config.r10k.manifests_path`` not being specified. This removes all use of these parameters, which were only used in log messages. It also removes validation that the Puppet provisioner's ``module_path`` matches that specified for r10k.
|
8
|
+
* Fix ``.ruby-version`` (2.1.0 to 2.1.1)
|
9
|
+
* Add ``.rebuildbot.sh`` for [rebuildbot](https://github.com/jantman/rebuildbot) testing
|
10
|
+
|
5
11
|
## 0.4.0 2015-10-29 Jason Antman <jason@jasonantman.com>
|
6
12
|
|
7
|
-
* [#13]() / [PR #34/35](https://github.com/jantman/vagrant-r10k/pull/35) - Upgrade r10k dependency to 1.5.1 (thanks to [@cdenneen](https://github.com/cdenneen) for the work).
|
13
|
+
* [#13](https://github.com/jantman/vagrant-r10k/issues/13) / [PR #34/35](https://github.com/jantman/vagrant-r10k/pull/35) - Upgrade r10k dependency to 1.5.1 (thanks to [@cdenneen](https://github.com/cdenneen) for the work).
|
8
14
|
|
9
15
|
## 0.3.0 2015-09-04 Jason Antman <jason@jasonantman.com>
|
10
16
|
|
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
@@ -132,6 +132,36 @@ The configuration for r10k and puppet would look like:
|
|
132
132
|
puppet.module_path = ["puppet/modules", "puppet/vendor"]
|
133
133
|
end
|
134
134
|
|
135
|
+
### Usage With Puppet4 Environment-Based Provisioner
|
136
|
+
|
137
|
+
Puppet4 discontinues use of the ``manifest_file`` and ``manifests_path`` parameters, and also makes the ``module_path`` parameter optional
|
138
|
+
for Puppet. In cases where only ``environment`` and ``environment_path`` are specified, ``module_path`` will be parsed from the environment's
|
139
|
+
``environment.conf``.
|
140
|
+
|
141
|
+
vagrant-r10k does not handle parsing ``environment.conf``; you __must__ still specify the ``module_path`` for r10k to deploy modules into.
|
142
|
+
|
143
|
+
Here is an example Vagrantfile (taken from vagrant-r10k's [acceptance tests](https://github.com/jantman/vagrant-r10k/blob/master/spec/acceptance/skeletons/puppet4/Vagrantfile))
|
144
|
+
for use with environment-based configuration. Note that ``config.r10k.module_path`` is still specified. You can see the directory structure of this example
|
145
|
+
[here](https://github.com/jantman/vagrant-r10k/tree/master/spec/acceptance/skeletons/puppet4).
|
146
|
+
|
147
|
+
```
|
148
|
+
Vagrant.configure("2") do |config|
|
149
|
+
config.vm.box = "vagrantr10kspec"
|
150
|
+
config.vm.network "private_network", type: "dhcp"
|
151
|
+
|
152
|
+
# r10k plugin to deploy puppet modules
|
153
|
+
config.r10k.puppet_dir = "environments/myenv"
|
154
|
+
config.r10k.puppetfile_path = "environments/myenv/Puppetfile"
|
155
|
+
config.r10k.module_path = "environments/myenv/modules"
|
156
|
+
|
157
|
+
# Provision the machine with the appliction
|
158
|
+
config.vm.provision "puppet" do |puppet|
|
159
|
+
puppet.environment = "myenv"
|
160
|
+
puppet.environment_path = "environments"
|
161
|
+
end
|
162
|
+
end
|
163
|
+
```
|
164
|
+
|
135
165
|
## Getting Help
|
136
166
|
|
137
167
|
Bug reports, feature requests, and pull requests are always welcome. At this time, the
|
@@ -29,8 +29,6 @@ module VagrantPlugins
|
|
29
29
|
@logger.debug("vagrant::r10k::deploy: env_dir_path=#{config[:env_dir_path]}")
|
30
30
|
@logger.debug("vagrant::r10k::deploy: puppetfile_path=#{config[:puppetfile_path]}")
|
31
31
|
@logger.debug("vagrant::r10k::deploy: module_path=#{config[:module_path]}")
|
32
|
-
@logger.debug("vagrant::r10k::deploy: manifests=#{config[:manifests]}")
|
33
|
-
@logger.debug("vagrant::r10k::deploy: manifest_file=#{config[:manifest_file]}")
|
34
32
|
@logger.debug("vagrant::r10k::deploy: puppet_dir=#{config[:puppet_dir]}")
|
35
33
|
|
36
34
|
deploy(env, config)
|
data/lib/vagrant-r10k/helpers.rb
CHANGED
@@ -97,15 +97,13 @@ module VagrantPlugins
|
|
97
97
|
#
|
98
98
|
# @return [Hash]
|
99
99
|
def r10k_config(env)
|
100
|
-
ret = { :
|
100
|
+
ret = { :module_path => nil }
|
101
101
|
ret[:env_dir_path] = env_dir(env)
|
102
102
|
ret[:puppetfile_path] = puppetfile_path(env)
|
103
103
|
prov = puppet_provisioner(env)
|
104
104
|
return nil if prov.nil?
|
105
105
|
ret[:module_path] = module_path(env, prov, ret[:env_dir_path])
|
106
106
|
return nil if ret[:module_path].nil?
|
107
|
-
ret[:manifest_file] = File.join(ret[:env_dir_path], prov.config.manifest_file)
|
108
|
-
ret[:manifests] = File.join(ret[:env_dir_path], prov.config.manifests_path[1])
|
109
107
|
ret[:puppet_dir] = File.join(ret[:env_dir_path], env[:machine].config.r10k.puppet_dir)
|
110
108
|
ret
|
111
109
|
end
|
@@ -123,8 +121,10 @@ module VagrantPlugins
|
|
123
121
|
module_path = env[:machine].config.r10k.module_path
|
124
122
|
if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path)
|
125
123
|
raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; please correct this condition"))
|
124
|
+
elsif prov.config.module_path.nil?
|
125
|
+
env[:ui].info "vagrant-r10k: Puppet provisioner module_path is nil, assuming puppet4 environment mode"
|
126
126
|
elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
|
127
|
-
raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; please correct this condition"))
|
127
|
+
raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner (#{prov.config.module_path}); please correct this condition"))
|
128
128
|
end
|
129
129
|
# no modulepath explict set in config, build one from the provisioner config
|
130
130
|
else
|
data/lib/vagrant-r10k/version.rb
CHANGED
@@ -0,0 +1,21 @@
|
|
1
|
+
# -*- mode: ruby -*-
|
2
|
+
# vi: set ft=ruby :
|
3
|
+
|
4
|
+
#require 'vagrant-vmware-workstation'
|
5
|
+
puts ENV
|
6
|
+
|
7
|
+
Vagrant.configure("2") do |config|
|
8
|
+
config.vm.box = "vagrantr10kspec"
|
9
|
+
config.vm.network "private_network", type: "dhcp"
|
10
|
+
|
11
|
+
# r10k plugin to deploy puppet modules
|
12
|
+
config.r10k.puppet_dir = "environments/myenv"
|
13
|
+
config.r10k.puppetfile_path = "environments/myenv/Puppetfile"
|
14
|
+
config.r10k.module_path = "environments/myenv/modules"
|
15
|
+
|
16
|
+
# Provision the machine with the appliction
|
17
|
+
config.vm.provision "puppet" do |puppet|
|
18
|
+
puppet.environment = "myenv"
|
19
|
+
puppet.environment_path = "environments"
|
20
|
+
end
|
21
|
+
end
|
File without changes
|
@@ -0,0 +1,12 @@
|
|
1
|
+
# This is currently a noop but will be supported in the future.
|
2
|
+
forge 'forge.puppetlabs.com'
|
3
|
+
|
4
|
+
# v1.0.1 -> cdb8d7a186846b49326cec1cfb4623bd77529b04
|
5
|
+
mod 'reviewboard',
|
6
|
+
:git => 'https://github.com/jantman/puppet-reviewboard.git',
|
7
|
+
:ref => 'v1.0.1'
|
8
|
+
|
9
|
+
# 0.1.0 -> 3a504b5f66ebe1853bda4ee065fce18118958d84
|
10
|
+
mod 'nodemeister',
|
11
|
+
:git => 'https://github.com/jantman/puppet-nodemeister.git',
|
12
|
+
:ref => '0.1.0'
|
@@ -0,0 +1 @@
|
|
1
|
+
notify {'vagrant-r10k puppet run': }
|
File without changes
|
@@ -0,0 +1,20 @@
|
|
1
|
+
#!/bin/bash
|
2
|
+
# helper script to determine if a git clone is checked out to a
|
3
|
+
# PR, tag, or branch, and then output some information about the status
|
4
|
+
if [ $# -gt 0 ]; then
|
5
|
+
cd $1
|
6
|
+
fi
|
7
|
+
origin=$(git remote show -n origin | grep 'Fetch URL:' | awk '{print $3}')
|
8
|
+
if tmp=$(git status | grep "refs/pull/origin"); then
|
9
|
+
foo=$(echo "$tmp" | awk '{print $4}' | awk -F / '{print $4}')
|
10
|
+
echo "PR: ${foo} @ $(git rev-parse HEAD) (origin: ${origin})"
|
11
|
+
elif tagname=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null); then
|
12
|
+
echo "tag: ${tagname} @ $(git rev-parse HEAD) (origin: ${origin})"
|
13
|
+
elif git symbolic-ref -q HEAD &>/dev/null; then
|
14
|
+
branch_name=$(git symbolic-ref -q HEAD)
|
15
|
+
branch_name=${branch_name##refs/heads/}
|
16
|
+
branch_name=${branch_name:-HEAD}
|
17
|
+
echo "branch: ${branch_name} @ $(git rev-parse HEAD) (origin: ${origin})"
|
18
|
+
else
|
19
|
+
echo "sha: $(git rev-parse HEAD) (origin: ${origin})"
|
20
|
+
fi
|
@@ -50,6 +50,37 @@ shared_examples 'provider/vagrant-r10k' do |provider, options|
|
|
50
50
|
end
|
51
51
|
end
|
52
52
|
|
53
|
+
describe 'configured correctly - puppet4 environment' do
|
54
|
+
before do
|
55
|
+
setup_before('puppet4', options)
|
56
|
+
end
|
57
|
+
after do
|
58
|
+
assert_execute("vagrant", "destroy", "--force")
|
59
|
+
end
|
60
|
+
|
61
|
+
it 'deploys Puppetfile modules in an environment' do
|
62
|
+
status("Test: vagrant up")
|
63
|
+
up_result = assert_execute('vagrant', 'up', "--provider=#{provider}", '--debug')
|
64
|
+
ensure_successful_run(up_result, environment.workdir, expect_building=false, moddir='environments/myenv/modules', pupfile='environments/myenv/Puppetfile', do_ensure_ran=false)
|
65
|
+
expect(up_result.stdout).to include('Running provisioner: puppet')
|
66
|
+
expect(up_result.stdout).to include('Running Puppet with environment myenv')
|
67
|
+
expect(up_result.stdout).to include('vagrant-r10k puppet run')
|
68
|
+
status("Test: reviewboard module")
|
69
|
+
rb_dir = File.join(environment.workdir, 'environments', 'myenv', 'modules', 'reviewboard')
|
70
|
+
expect(File.directory?(rb_dir)).to be_truthy
|
71
|
+
rb_result = assert_execute('bash', 'gitcheck.sh', 'environments/myenv/modules/reviewboard')
|
72
|
+
expect(rb_result).to exit_with(0)
|
73
|
+
expect(rb_result.stdout).to match(/tag: v1\.0\.1 @ cdb8d7a186846b49326cec1cfb4623bd77529b04 \(origin: https:\/\/github\.com\/jantman\/puppet-reviewboard\.git\)/)
|
74
|
+
|
75
|
+
status("Test: nodemeister module")
|
76
|
+
nm_dir = File.join(environment.workdir, 'environments', 'myenv', 'modules', 'nodemeister')
|
77
|
+
expect(File.directory?(nm_dir)).to be_truthy
|
78
|
+
nm_result = assert_execute('bash', 'gitcheck.sh', 'environments/myenv/modules/nodemeister')
|
79
|
+
expect(nm_result).to exit_with(0)
|
80
|
+
expect(nm_result.stdout).to match(/tag: 0\.1\.0 @ 3a504b5f66ebe1853bda4ee065fce18118958d84 \(origin: https:\/\/github\.com\/jantman\/puppet-nodemeister\.git\)/)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
53
84
|
describe 'destroy when configured correctly' do
|
54
85
|
before do
|
55
86
|
setup_before('correct', options)
|
@@ -103,7 +134,7 @@ shared_examples 'provider/vagrant-r10k' do |provider, options|
|
|
103
134
|
status("Test: vagrant up")
|
104
135
|
up_result = execute('vagrant', 'up', "--provider=#{provider}")
|
105
136
|
expect(up_result).to exit_with(1)
|
106
|
-
expect(up_result.stderr).to match(
|
137
|
+
expect(up_result.stderr).to match(/RuntimeError: vagrant-r10k: module_path "puppet\/NOTmodules" is not the same as in puppet provisioner \(puppet\/modules\); please correct this condition/)
|
107
138
|
ensure_r10k_didnt_run(up_result, environment.workdir)
|
108
139
|
ensure_puppet_didnt_run(up_result)
|
109
140
|
end
|
@@ -190,7 +221,7 @@ shared_examples 'provider/vagrant-r10k' do |provider, options|
|
|
190
221
|
end
|
191
222
|
|
192
223
|
# checks for a successful up run with r10k deployment and puppet provisioning
|
193
|
-
def ensure_successful_run(up_result, workdir)
|
224
|
+
def ensure_successful_run(up_result, workdir, expect_building=true, moddir='puppet/modules', pupfile='puppet/Puppetfile', do_ensure_ran=true)
|
194
225
|
expect(up_result).to exit_with(0)
|
195
226
|
# version checks
|
196
227
|
expect(up_result.stderr).to include('global: - r10k = 1.5.1')
|
@@ -207,16 +238,20 @@ shared_examples 'provider/vagrant-r10k' do |provider, options|
|
|
207
238
|
# modulegetter BEFORE ConfigValidate
|
208
239
|
expect(up_result.stderr).to match(%r"(?!ConfigValidate)+default: vagrant-r10k: Deploy finished.*Vagrant::Action::Builtin::ConfigValidate"m), "modulegetter runs before ConfigValidate"
|
209
240
|
# other checks
|
210
|
-
|
211
|
-
|
241
|
+
if expect_building then
|
242
|
+
expect(up_result.stdout).to include('vagrant-r10k: Building the r10k module path with puppet provisioner module_path "puppet/modules"')
|
243
|
+
end
|
244
|
+
expect(up_result.stdout).to include("vagrant-r10k: Beginning r10k deploy of puppet modules into #{workdir}/#{moddir} using #{workdir}/#{pupfile}")
|
212
245
|
expect(up_result.stdout).to include('vagrant-r10k: Deploy finished')
|
213
246
|
# file tests
|
214
|
-
expect(File).to exist("#{workdir}/
|
215
|
-
expect(File).to exist("#{workdir}/
|
216
|
-
expect(File).to exist("#{workdir}/
|
247
|
+
expect(File).to exist("#{workdir}/#{moddir}/reviewboard/Modulefile")
|
248
|
+
expect(File).to exist("#{workdir}/#{moddir}/nodemeister/Modulefile")
|
249
|
+
expect(File).to exist("#{workdir}/#{moddir}/nodemeister/manifests/init.pp")
|
217
250
|
|
218
251
|
# ensure puppet ran
|
219
|
-
|
252
|
+
if do_ensure_ran then
|
253
|
+
ensure_puppet_ran(up_result)
|
254
|
+
end
|
220
255
|
end
|
221
256
|
|
222
257
|
# ensure that r10k didnt run
|
@@ -145,7 +145,6 @@ EOF
|
|
145
145
|
:puppetfile_path => 'puppetfile/path',
|
146
146
|
:module_path => 'module/path',
|
147
147
|
:manifests => 'manifests',
|
148
|
-
:manifest_file => 'manifest/file',
|
149
148
|
:puppet_dir => 'puppet/dir',
|
150
149
|
}}
|
151
150
|
let(:pf_dbl) { double }
|
@@ -184,8 +183,6 @@ EOF
|
|
184
183
|
expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy: env_dir_path=env/dir/path")
|
185
184
|
expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy: puppetfile_path=puppetfile/path")
|
186
185
|
expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy: module_path=module/path")
|
187
|
-
expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy: manifests=manifests")
|
188
|
-
expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy: manifest_file=manifest/file")
|
189
186
|
expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy: puppet_dir=puppet/dir")
|
190
187
|
expect(subject).to receive(:deploy).with(env, config).once
|
191
188
|
expect(app).to receive(:call).once.with(env)
|
data/spec/unit/helpers_spec.rb
CHANGED
@@ -214,7 +214,6 @@ describe VagrantPlugins::R10k::Helpers do
|
|
214
214
|
context 'no methods return nil' do
|
215
215
|
before do
|
216
216
|
prov_dbl = double
|
217
|
-
prov_dbl.stub_chain(:config, :manifest_file).and_return('manifest/file')
|
218
217
|
prov_dbl.stub_chain(:config, :manifests_path).and_return([0, 'manifests/path'])
|
219
218
|
allow_any_instance_of(VagrantPlugins::R10k::Helpers).to receive(:env_dir).and_return('/my/env/dir')
|
220
219
|
allow_any_instance_of(VagrantPlugins::R10k::Helpers).to receive(:puppetfile_path).and_return('puppet/file/path')
|
@@ -228,8 +227,6 @@ describe VagrantPlugins::R10k::Helpers do
|
|
228
227
|
:env_dir_path => '/my/env/dir',
|
229
228
|
:puppetfile_path => 'puppet/file/path',
|
230
229
|
:module_path => 'module/path',
|
231
|
-
:manifest_file => '/my/env/dir/manifest/file',
|
232
|
-
:manifests => '/my/env/dir/manifests/path',
|
233
230
|
:puppet_dir => '/my/env/dir/puppet/dir',
|
234
231
|
})
|
235
232
|
end
|
@@ -284,7 +281,17 @@ describe VagrantPlugins::R10k::Helpers do
|
|
284
281
|
env = {:machine => double, :ui => double}
|
285
282
|
allow(env[:ui]).to receive(:info).with("vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"\". (if module_path is an array, first element is used)")
|
286
283
|
env[:machine].stub_chain(:config, :r10k, :module_path).and_return('r10kmodule/path')
|
287
|
-
expect { module_path(env, prov_dbl, '/env/dir/path') }.to raise_error(VagrantPlugins::R10k::Helpers::ErrorWrapper, /module_path "r10kmodule\/path" is not the same as in puppet provisioner; please correct this condition/)
|
284
|
+
expect { module_path(env, prov_dbl, '/env/dir/path') }.to raise_error(VagrantPlugins::R10k::Helpers::ErrorWrapper, /module_path "r10kmodule\/path" is not the same as in puppet provisioner \(module\/path\); please correct this condition/)
|
285
|
+
end
|
286
|
+
end
|
287
|
+
context 'config.r10k.module_path set and provisioner module_path nil' do
|
288
|
+
it 'returns the joined module_path' do
|
289
|
+
prov_dbl = double
|
290
|
+
prov_dbl.stub_chain(:config, :module_path).and_return(nil)
|
291
|
+
env = {:machine => double, :ui => double}
|
292
|
+
allow(env[:ui]).to receive(:info).with("vagrant-r10k: Puppet provisioner module_path is nil, assuming puppet4 environment mode")
|
293
|
+
env[:machine].stub_chain(:config, :r10k, :module_path).and_return('module/path')
|
294
|
+
expect(module_path(env, prov_dbl, '/env/dir/path')).to eq('/env/dir/path/module/path')
|
288
295
|
end
|
289
296
|
end
|
290
297
|
end
|
metadata
CHANGED
@@ -1,55 +1,55 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-r10k
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jason Antman
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-11-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: r10k
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - ~>
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 1.5.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - ~>
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 1.5.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: bundler
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - ~>
|
31
|
+
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '1.5'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - ~>
|
38
|
+
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '1.5'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: rake
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '0'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '0'
|
55
55
|
description: Vagrant middleware plugin to allow you to have just a Puppetfile and
|
@@ -60,11 +60,12 @@ executables: []
|
|
60
60
|
extensions: []
|
61
61
|
extra_rdoc_files: []
|
62
62
|
files:
|
63
|
-
- .gitignore
|
64
|
-
- .pullreview.yml
|
65
|
-
- .
|
66
|
-
- .
|
67
|
-
- .
|
63
|
+
- ".gitignore"
|
64
|
+
- ".pullreview.yml"
|
65
|
+
- ".rebuildbot.sh"
|
66
|
+
- ".rspec"
|
67
|
+
- ".ruby-version"
|
68
|
+
- ".travis.yml"
|
68
69
|
- CHANGES.md
|
69
70
|
- Gemfile
|
70
71
|
- Gemfile.lock
|
@@ -111,6 +112,12 @@ files:
|
|
111
112
|
- spec/acceptance/skeletons/no_vagrant_r10k/puppet/Puppetfile
|
112
113
|
- spec/acceptance/skeletons/no_vagrant_r10k/puppet/manifests/default.pp
|
113
114
|
- spec/acceptance/skeletons/no_vagrant_r10k/puppet/modules/.gitkeep
|
115
|
+
- spec/acceptance/skeletons/puppet4/Vagrantfile
|
116
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/NOTmodules/.gitkeep
|
117
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/Puppetfile
|
118
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/manifests/site.pp
|
119
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/modules/.gitkeep
|
120
|
+
- spec/acceptance/skeletons/puppet4/gitcheck.sh
|
114
121
|
- spec/acceptance/skeletons/puppetfile_syntax_error/Vagrantfile
|
115
122
|
- spec/acceptance/skeletons/puppetfile_syntax_error/gitcheck.sh
|
116
123
|
- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/Puppetfile
|
@@ -139,17 +146,17 @@ require_paths:
|
|
139
146
|
- lib
|
140
147
|
required_ruby_version: !ruby/object:Gem::Requirement
|
141
148
|
requirements:
|
142
|
-
- -
|
149
|
+
- - ">="
|
143
150
|
- !ruby/object:Gem::Version
|
144
151
|
version: '0'
|
145
152
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
146
153
|
requirements:
|
147
|
-
- -
|
154
|
+
- - ">="
|
148
155
|
- !ruby/object:Gem::Version
|
149
156
|
version: '0'
|
150
157
|
requirements: []
|
151
158
|
rubyforge_project:
|
152
|
-
rubygems_version: 2.
|
159
|
+
rubygems_version: 2.2.2
|
153
160
|
signing_key:
|
154
161
|
specification_version: 4
|
155
162
|
summary: Vagrant middleware plugin to retrieve puppet modules using r10k.
|
@@ -186,6 +193,12 @@ test_files:
|
|
186
193
|
- spec/acceptance/skeletons/no_vagrant_r10k/puppet/Puppetfile
|
187
194
|
- spec/acceptance/skeletons/no_vagrant_r10k/puppet/manifests/default.pp
|
188
195
|
- spec/acceptance/skeletons/no_vagrant_r10k/puppet/modules/.gitkeep
|
196
|
+
- spec/acceptance/skeletons/puppet4/Vagrantfile
|
197
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/NOTmodules/.gitkeep
|
198
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/Puppetfile
|
199
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/manifests/site.pp
|
200
|
+
- spec/acceptance/skeletons/puppet4/environments/myenv/modules/.gitkeep
|
201
|
+
- spec/acceptance/skeletons/puppet4/gitcheck.sh
|
189
202
|
- spec/acceptance/skeletons/puppetfile_syntax_error/Vagrantfile
|
190
203
|
- spec/acceptance/skeletons/puppetfile_syntax_error/gitcheck.sh
|
191
204
|
- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/Puppetfile
|