vagrant-puppet-install 4.1.0 → 7.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.github/workflows/datadog_ci_visibility.yml +26 -0
- data/.github/workflows/docker_acceptance.yml +12 -0
- data/.github/workflows/rspec.yml +12 -0
- data/.gitignore +1 -1
- data/CHANGELOG.md +59 -39
- data/Gemfile +2 -15
- data/README.md +0 -5
- data/Rakefile +35 -1
- data/lib/vagrant-puppet-install/action/install_puppet.rb +7 -1
- data/lib/vagrant-puppet-install/version.rb +1 -1
- data/test/acceptance/docker/Vagrantfile +22 -0
- data/test/acceptance/virtualbox/Vagrantfile +5 -4
- data/test/unit/spec_helper.rb +9 -2
- data/test/unit/vagrant-puppet-install/config_spec.rb +1 -1
- data/test/unit/vagrant-puppet-install/plugin_spec.rb +6 -6
- data/vagrant-puppet-install.gemspec +9 -5
- metadata +78 -20
- data/.travis.yml +0 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: b82fe117056b2e4a5fb79d801c28a193ff1449c096b7418a55bd26f400d58646
|
|
4
|
+
data.tar.gz: fd467f19856f310f9aa38bb3344fbdd752c34180746efaf779001a35b6f7e751
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 42465b2c2567a4065b0e12e50935e2228199122f74cd1ffdcf99d1c4728e5e83b848973a2b643c0cda82839a1ee67ea20ccbf015d95fb198d1ea17b7d700f8a7
|
|
7
|
+
data.tar.gz: 2f5faf32256f6dee0ef325a3775869d44def58bc817642d83231fcfd08e7093055abf19e59fe878cec916471562639d9ca96ff6fab3f8f92d1b087a80e8588cb
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
name: "Datadog CI Visibility"
|
|
2
|
+
on: [push, pull_request]
|
|
3
|
+
jobs:
|
|
4
|
+
datadog_ci_visibility:
|
|
5
|
+
runs-on: ubuntu-latest
|
|
6
|
+
services:
|
|
7
|
+
datadog-agent:
|
|
8
|
+
image: gcr.io/datadoghq/agent:latest
|
|
9
|
+
ports:
|
|
10
|
+
- 8126:8126
|
|
11
|
+
env:
|
|
12
|
+
DD_API_KEY: ${{ secrets.DD_API_KEY }}
|
|
13
|
+
DD_INSIDE_CI: "true"
|
|
14
|
+
DD_HOSTNAME: "none"
|
|
15
|
+
steps:
|
|
16
|
+
- name: Install vault
|
|
17
|
+
run: |
|
|
18
|
+
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
|
|
19
|
+
sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
|
|
20
|
+
sudo apt-get update && sudo apt-get install vault
|
|
21
|
+
- uses: actions/checkout@v2
|
|
22
|
+
- uses: ruby/setup-ruby@v1
|
|
23
|
+
with:
|
|
24
|
+
ruby-version: "2.7"
|
|
25
|
+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
|
26
|
+
- run: bundle exec rake test:unit
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
name: "Docker Acceptance Tests"
|
|
2
|
+
on: [push, pull_request]
|
|
3
|
+
jobs:
|
|
4
|
+
docker_acceptance:
|
|
5
|
+
runs-on: ubuntu-latest
|
|
6
|
+
steps:
|
|
7
|
+
- uses: actions/checkout@v2
|
|
8
|
+
- uses: ruby/setup-ruby@v1
|
|
9
|
+
with:
|
|
10
|
+
ruby-version: "2.7"
|
|
11
|
+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
|
12
|
+
- run: bundle exec rake test:docker_acceptance
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
name: "Rspec Unit Tests"
|
|
2
|
+
on: [push, pull_request]
|
|
3
|
+
jobs:
|
|
4
|
+
rspec:
|
|
5
|
+
runs-on: ubuntu-latest
|
|
6
|
+
steps:
|
|
7
|
+
- uses: actions/checkout@v2
|
|
8
|
+
- uses: ruby/setup-ruby@v1
|
|
9
|
+
with:
|
|
10
|
+
ruby-version: "2.7"
|
|
11
|
+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
|
12
|
+
- run: bundle exec rake test:unit
|
data/.gitignore
CHANGED
data/CHANGELOG.md
CHANGED
|
@@ -1,27 +1,80 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
All notable changes to this project will be documented in this file.
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
## [v6.0.1](https://github.com/petems/vagrant-puppet-install/tree/v6.0.1) (2019-04-10)
|
|
7
|
+
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v6.0.1...v6.0.1)
|
|
8
|
+
|
|
9
|
+
**Fixed bugs:**
|
|
10
|
+
|
|
11
|
+
- Syntax error since Puppet 6 support added [\#64](https://github.com/petems/vagrant-puppet-install/issues/64)
|
|
12
|
+
|
|
13
|
+
## [v6.0.1](https://github.com/petems/vagrant-puppet-install/tree/v6.0.1) (2019-04-10)
|
|
14
|
+
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v6.0.0...v6.0.1)
|
|
15
|
+
|
|
16
|
+
**Closed issues:**
|
|
17
|
+
|
|
18
|
+
- Issues with Ubuntu 17.10? [\#60](https://github.com/petems/vagrant-puppet-install/issues/60)
|
|
19
|
+
|
|
20
|
+
## [v6.0.0](https://github.com/petems/vagrant-puppet-install/tree/v6.0.0) (2019-04-07)
|
|
21
|
+
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v5.0.0...v6.0.0)
|
|
22
|
+
|
|
23
|
+
**Closed issues:**
|
|
24
|
+
|
|
25
|
+
- '4.9.10' is not a valid version of Puppet [\#56](https://github.com/petems/vagrant-puppet-install/issues/56)
|
|
26
|
+
- Incorrect install script used for default\_install\_url when version is latest [\#55](https://github.com/petems/vagrant-puppet-install/issues/55)
|
|
27
|
+
|
|
28
|
+
**Merged pull requests:**
|
|
29
|
+
|
|
30
|
+
- Add support for Puppet 6 [\#61](https://github.com/petems/vagrant-puppet-install/pull/61) ([dhoppe](https://github.com/dhoppe))
|
|
31
|
+
- Bump version to 5.0.1 [\#59](https://github.com/petems/vagrant-puppet-install/pull/59) ([petems](https://github.com/petems))
|
|
32
|
+
- Fixes Travis config [\#58](https://github.com/petems/vagrant-puppet-install/pull/58) ([petems](https://github.com/petems))
|
|
33
|
+
- Fixes security issues detected by Github [\#57](https://github.com/petems/vagrant-puppet-install/pull/57) ([petems](https://github.com/petems))
|
|
34
|
+
|
|
35
|
+
## [v5.0.0](https://github.com/petems/vagrant-puppet-install/tree/v5.0.0) (2017-07-11)
|
|
36
|
+
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v4.1.0...v5.0.0)
|
|
4
37
|
|
|
38
|
+
**Closed issues:**
|
|
39
|
+
|
|
40
|
+
- Please document the config.puppet\_install.install\_url parameter [\#53](https://github.com/petems/vagrant-puppet-install/issues/53)
|
|
41
|
+
- PuppetLabs repository install is skipped [\#52](https://github.com/petems/vagrant-puppet-install/issues/52)
|
|
42
|
+
- Ubuntu 16.04 [\#51](https://github.com/petems/vagrant-puppet-install/issues/51)
|
|
43
|
+
- \[Debian\] Version '3.7.2-1puppetlabs1' for 'puppet-common' was not found [\#48](https://github.com/petems/vagrant-puppet-install/issues/48)
|
|
44
|
+
|
|
45
|
+
**Merged pull requests:**
|
|
46
|
+
|
|
47
|
+
- Adding puppet5 support [\#54](https://github.com/petems/vagrant-puppet-install/pull/54) ([attachmentgenie](https://github.com/attachmentgenie))
|
|
48
|
+
- Update vagrant examples [\#50](https://github.com/petems/vagrant-puppet-install/pull/50) ([petems](https://github.com/petems))
|
|
49
|
+
|
|
50
|
+
## [v4.1.0](https://github.com/petems/vagrant-puppet-install/tree/v4.1.0) (2016-04-23)
|
|
51
|
+
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v4.0.1...v4.1.0)
|
|
52
|
+
|
|
53
|
+
**Closed issues:**
|
|
54
|
+
|
|
55
|
+
- "offline" mode? [\#37](https://github.com/petems/vagrant-puppet-install/issues/37)
|
|
56
|
+
|
|
57
|
+
**Merged pull requests:**
|
|
58
|
+
|
|
59
|
+
- Update Vagrantfile [\#49](https://github.com/petems/vagrant-puppet-install/pull/49) ([gesinn-it](https://github.com/gesinn-it))
|
|
60
|
+
- Add validation option [\#46](https://github.com/petems/vagrant-puppet-install/pull/46) ([petems](https://github.com/petems))
|
|
61
|
+
|
|
62
|
+
## [v4.0.1](https://github.com/petems/vagrant-puppet-install/tree/v4.0.1) (2016-04-04)
|
|
5
63
|
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v4.0.0...v4.0.1)
|
|
6
64
|
|
|
7
65
|
**Closed issues:**
|
|
8
66
|
|
|
9
67
|
- Machine is force to shutdown and destroyed after puppet is installed [\#42](https://github.com/petems/vagrant-puppet-install/issues/42)
|
|
10
|
-
|
|
11
68
|
- How to install the latest available version of puppet? [\#41](https://github.com/petems/vagrant-puppet-install/issues/41)
|
|
12
69
|
|
|
13
70
|
**Merged pull requests:**
|
|
14
71
|
|
|
15
72
|
- Adds acceptance test for Fedora 23 [\#47](https://github.com/petems/vagrant-puppet-install/pull/47) ([petems](https://github.com/petems))
|
|
16
|
-
|
|
17
73
|
- Fixes Vagrant on Puppet \> 4 for acceptance [\#45](https://github.com/petems/vagrant-puppet-install/pull/45) ([petems](https://github.com/petems))
|
|
18
|
-
|
|
19
74
|
- Rubocop fixes [\#44](https://github.com/petems/vagrant-puppet-install/pull/44) ([petems](https://github.com/petems))
|
|
20
|
-
|
|
21
75
|
- Fixes unlink code to work on Windows machines [\#43](https://github.com/petems/vagrant-puppet-install/pull/43) ([petems](https://github.com/petems))
|
|
22
76
|
|
|
23
77
|
## [v4.0.0](https://github.com/petems/vagrant-puppet-install/tree/v4.0.0) (2016-01-25)
|
|
24
|
-
|
|
25
78
|
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v3.1.0...v4.0.0)
|
|
26
79
|
|
|
27
80
|
**Closed issues:**
|
|
@@ -31,75 +84,50 @@
|
|
|
31
84
|
**Merged pull requests:**
|
|
32
85
|
|
|
33
86
|
- Removes pessimistic reference from docs [\#40](https://github.com/petems/vagrant-puppet-install/pull/40) ([petems](https://github.com/petems))
|
|
34
|
-
|
|
35
87
|
- Fix nil errors [\#39](https://github.com/petems/vagrant-puppet-install/pull/39) ([petems](https://github.com/petems))
|
|
36
88
|
|
|
37
89
|
## [v3.1.0](https://github.com/petems/vagrant-puppet-install/tree/v3.1.0) (2016-01-21)
|
|
38
|
-
|
|
39
90
|
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v3.0.0...v3.1.0)
|
|
40
91
|
|
|
41
92
|
**Closed issues:**
|
|
42
93
|
|
|
43
94
|
- rake beaker errors with vagrant-puppet-install loaded [\#35](https://github.com/petems/vagrant-puppet-install/issues/35)
|
|
44
|
-
|
|
45
95
|
- apt repo issue \(no puppet-agent found\) trying to install puppet 4.3.1 [\#32](https://github.com/petems/vagrant-puppet-install/issues/32)
|
|
46
|
-
|
|
47
96
|
- The package is just called puppet-agent [\#31](https://github.com/petems/vagrant-puppet-install/issues/31)
|
|
48
|
-
|
|
49
97
|
- Vagrant Puppet Install does not work on Puppet \>= 4 [\#29](https://github.com/petems/vagrant-puppet-install/issues/29)
|
|
50
|
-
|
|
51
98
|
- Cannot install 'vagrant-puppet-install' on Windows 7 [\#25](https://github.com/petems/vagrant-puppet-install/issues/25)
|
|
52
|
-
|
|
53
99
|
- Allow installing Facter [\#17](https://github.com/petems/vagrant-puppet-install/issues/17)
|
|
54
100
|
|
|
55
101
|
**Merged pull requests:**
|
|
56
102
|
|
|
57
103
|
- Don't do anything with puppet\_version is not set. [\#36](https://github.com/petems/vagrant-puppet-install/pull/36) ([glenjamin](https://github.com/glenjamin))
|
|
58
|
-
|
|
59
104
|
- .idea folder exclude \(all jetbrains IDEs\). [\#34](https://github.com/petems/vagrant-puppet-install/pull/34) ([MikeCaspar](https://github.com/MikeCaspar))
|
|
60
|
-
|
|
61
105
|
- Add a new Vagrant box to test Ubuntu machines [\#33](https://github.com/petems/vagrant-puppet-install/pull/33) ([petems](https://github.com/petems))
|
|
62
106
|
|
|
63
107
|
## [v3.0.0](https://github.com/petems/vagrant-puppet-install/tree/v3.0.0) (2015-12-15)
|
|
64
|
-
|
|
65
108
|
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v2.7.0...v3.0.0)
|
|
66
109
|
|
|
67
110
|
**Closed issues:**
|
|
68
111
|
|
|
69
112
|
- pessimistic version constraint [\#26](https://github.com/petems/vagrant-puppet-install/issues/26)
|
|
70
|
-
|
|
71
113
|
- 2.7.\* is not a valid version of puppet [\#23](https://github.com/petems/vagrant-puppet-install/issues/23)
|
|
72
|
-
|
|
73
114
|
- Puppet installation@Centos7.0@Parallels10.1.1@OS X 10.10.1 cannot find the rpm file [\#20](https://github.com/petems/vagrant-puppet-install/issues/20)
|
|
74
|
-
|
|
75
115
|
- Fails on Utopic Unicorn [\#16](https://github.com/petems/vagrant-puppet-install/issues/16)
|
|
76
|
-
|
|
77
116
|
- https://raw2.github.com/petems/puppet-install-shell/master/install\_puppet.sh Not found [\#15](https://github.com/petems/vagrant-puppet-install/issues/15)
|
|
78
|
-
|
|
79
117
|
- Works on CentOS with VMware Fusion [\#8](https://github.com/petems/vagrant-puppet-install/issues/8)
|
|
80
|
-
|
|
81
118
|
- Doesn't work on Ubuntu 12.04 Baseboxes :-\( [\#6](https://github.com/petems/vagrant-puppet-install/issues/6)
|
|
82
119
|
|
|
83
120
|
**Merged pull requests:**
|
|
84
121
|
|
|
85
122
|
- Fix to allow Puppet 4 install [\#30](https://github.com/petems/vagrant-puppet-install/pull/30) ([petems](https://github.com/petems))
|
|
86
|
-
|
|
87
123
|
- Corrects \#26 pessimistic version constraint and passes unit tests [\#28](https://github.com/petems/vagrant-puppet-install/pull/28) ([srhopkins](https://github.com/srhopkins))
|
|
88
|
-
|
|
89
124
|
- Adds spec to check using ~\> resolution for version [\#24](https://github.com/petems/vagrant-puppet-install/pull/24) ([petems](https://github.com/petems))
|
|
90
|
-
|
|
91
125
|
- New test for \#6 [\#22](https://github.com/petems/vagrant-puppet-install/pull/22) ([petems](https://github.com/petems))
|
|
92
|
-
|
|
93
126
|
- Add plugin spec [\#19](https://github.com/petems/vagrant-puppet-install/pull/19) ([petems](https://github.com/petems))
|
|
94
|
-
|
|
95
127
|
- Bump Vagrant to v1.7.0 [\#18](https://github.com/petems/vagrant-puppet-install/pull/18) ([scottsuch](https://github.com/scottsuch))
|
|
96
|
-
|
|
97
128
|
- Make badges pretty [\#12](https://github.com/petems/vagrant-puppet-install/pull/12) ([scottsuch](https://github.com/scottsuch))
|
|
98
129
|
|
|
99
|
-
- All puppet\_version are passed to retrieve\_latest\_puppet\_version [\#27](https://github.com/petems/vagrant-puppet-install/pull/27) ([srhopkins](https://github.com/srhopkins))
|
|
100
|
-
|
|
101
130
|
## [v2.7.0](https://github.com/petems/vagrant-puppet-install/tree/v2.7.0) (2014-11-21)
|
|
102
|
-
|
|
103
131
|
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v2.6.0...v2.7.0)
|
|
104
132
|
|
|
105
133
|
**Closed issues:**
|
|
@@ -109,33 +137,25 @@
|
|
|
109
137
|
**Merged pull requests:**
|
|
110
138
|
|
|
111
139
|
- Close \#10 Updates location for installer script [\#14](https://github.com/petems/vagrant-puppet-install/pull/14) ([petems](https://github.com/petems))
|
|
112
|
-
|
|
113
140
|
- Need Vagrant to be ok with bundler 1.7 [\#13](https://github.com/petems/vagrant-puppet-install/pull/13) ([petems](https://github.com/petems))
|
|
114
141
|
|
|
115
|
-
- Close \#10 [\#11](https://github.com/petems/vagrant-puppet-install/pull/11) ([scottsuch](https://github.com/scottsuch))
|
|
116
|
-
|
|
117
142
|
## [v2.6.0](https://github.com/petems/vagrant-puppet-install/tree/v2.6.0) (2014-08-04)
|
|
118
|
-
|
|
119
143
|
[Full Changelog](https://github.com/petems/vagrant-puppet-install/compare/v2.5.0...v2.6.0)
|
|
120
144
|
|
|
121
145
|
**Closed issues:**
|
|
122
146
|
|
|
123
147
|
- Plugin should be disabled if `config.puppet\_install.puppet\_version` is not present [\#7](https://github.com/petems/vagrant-puppet-install/issues/7)
|
|
124
|
-
|
|
125
148
|
- Does not work on CentOS 32-bit BaseBox [\#5](https://github.com/petems/vagrant-puppet-install/issues/5)
|
|
126
149
|
|
|
127
150
|
## [v2.5.0](https://github.com/petems/vagrant-puppet-install/tree/v2.5.0) (2014-08-03)
|
|
128
|
-
|
|
129
151
|
**Closed issues:**
|
|
130
152
|
|
|
131
153
|
- "Not a valid version of Puppet" error [\#3](https://github.com/petems/vagrant-puppet-install/issues/3)
|
|
132
|
-
|
|
133
154
|
- 1.4 / 1.5 vagrant compatibility [\#1](https://github.com/petems/vagrant-puppet-install/issues/1)
|
|
134
155
|
|
|
135
156
|
**Merged pull requests:**
|
|
136
157
|
|
|
137
158
|
- Install url tests and readme [\#4](https://github.com/petems/vagrant-puppet-install/pull/4) ([petems](https://github.com/petems))
|
|
138
|
-
|
|
139
159
|
- Pulling from omnibus [\#2](https://github.com/petems/vagrant-puppet-install/pull/2) ([petems](https://github.com/petems))
|
|
140
160
|
|
|
141
161
|
|
data/Gemfile
CHANGED
|
@@ -6,18 +6,5 @@ group :development do
|
|
|
6
6
|
# We depend on Vagrant for development, but we don't add it as a
|
|
7
7
|
# gem dependency because we expect to be installed within the
|
|
8
8
|
# Vagrant environment itself using `vagrant plugin`.
|
|
9
|
-
gem 'vagrant', git: '
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
group :acceptance do
|
|
13
|
-
gem 'vagrant-digitalocean', '~> 0.5.3'
|
|
14
|
-
gem 'vagrant-aws', '~> 0.4.0'
|
|
15
|
-
gem 'vagrant-rackspace', '~> 0.1.4'
|
|
16
|
-
gem 'vagrant-vbguest', '~> 0.11.0'
|
|
17
|
-
end
|
|
18
|
-
|
|
19
|
-
group :docs do
|
|
20
|
-
gem 'yard', '~> 0.8.5'
|
|
21
|
-
gem 'redcarpet', '~> 2.2.2'
|
|
22
|
-
gem 'github-markup', '~> 0.7.5'
|
|
23
|
-
end
|
|
9
|
+
gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v2.2.14'
|
|
10
|
+
end
|
data/README.md
CHANGED
|
@@ -2,14 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
[][gem]
|
|
4
4
|
[][travis]
|
|
5
|
-
[][gemnasium]
|
|
6
|
-
[][codeclimate]
|
|
7
5
|
|
|
8
6
|
[gem]: https://rubygems.org/gems/vagrant-puppet-install
|
|
9
7
|
[travis]: http://travis-ci.org/petems/vagrant-puppet-install
|
|
10
|
-
[gemnasium]: https://gemnasium.com/petems/vagrant-puppet-install
|
|
11
|
-
[codeclimate]: https://codeclimate.com/github/petems/vagrant-puppet-install
|
|
12
|
-
|
|
13
8
|
|
|
14
9
|
A Vagrant plugin that ensures the desired version of Puppet is installed via the
|
|
15
10
|
Puppet Labs package repo. This proves very useful when using Vagrant
|
data/Rakefile
CHANGED
|
@@ -1,11 +1,32 @@
|
|
|
1
1
|
require 'bundler/setup'
|
|
2
|
-
require '
|
|
2
|
+
require 'rubygems/tasks'
|
|
3
3
|
require 'rspec/core/rake_task'
|
|
4
4
|
require 'rubocop/rake_task'
|
|
5
5
|
require 'yard'
|
|
6
6
|
|
|
7
7
|
YARD::Rake::YardocTask.new
|
|
8
8
|
|
|
9
|
+
Gem::Tasks.new
|
|
10
|
+
|
|
11
|
+
begin
|
|
12
|
+
require 'github_changelog_generator/task'
|
|
13
|
+
require 'vagrant-puppet-install/version'
|
|
14
|
+
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
|
15
|
+
version = VagrantPlugins::PuppetInstall::VERSION
|
|
16
|
+
config.future_release = "v#{version}"
|
|
17
|
+
config.header = "# Change Log\n\nAll notable changes to this project will be documented in this file.\n"
|
|
18
|
+
config.exclude_labels = %w{duplicate question invalid wontfix modulesync}
|
|
19
|
+
end
|
|
20
|
+
rescue LoadError
|
|
21
|
+
end
|
|
22
|
+
|
|
23
|
+
desc 'Validate ruby files'
|
|
24
|
+
task :validate do
|
|
25
|
+
Dir['test/**/*.rb', 'lib/**/*.rb'].each do |ruby_file|
|
|
26
|
+
sh "ruby -c #{ruby_file}" unless ruby_file =~ %r{spec/fixtures}
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
|
|
9
30
|
namespace :test do
|
|
10
31
|
RSpec::Core::RakeTask.new(:unit) do |t|
|
|
11
32
|
t.pattern = 'test/unit/**/*_spec.rb'
|
|
@@ -46,6 +67,19 @@ namespace :test do
|
|
|
46
67
|
end
|
|
47
68
|
end
|
|
48
69
|
end
|
|
70
|
+
|
|
71
|
+
desc 'Run docker acceptance test - Used in CI'
|
|
72
|
+
task :docker_acceptance do |_t, args|
|
|
73
|
+
puts '=================================================================='
|
|
74
|
+
puts "Running acceptance tests against Docker provider..."
|
|
75
|
+
puts '=================================================================='
|
|
76
|
+
|
|
77
|
+
Dir.chdir("test/acceptance/docker") do
|
|
78
|
+
system('vagrant destroy -f')
|
|
79
|
+
system("vagrant up --provider=docker --provision")
|
|
80
|
+
system('vagrant destroy -f')
|
|
81
|
+
end
|
|
82
|
+
end
|
|
49
83
|
end
|
|
50
84
|
|
|
51
85
|
task default: 'test:unit'
|
|
@@ -63,7 +63,13 @@ module VagrantPlugins
|
|
|
63
63
|
elsif windows_guest?
|
|
64
64
|
# No Windows Version yet
|
|
65
65
|
else
|
|
66
|
-
if @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^
|
|
66
|
+
if @machine.config.puppet_install.puppet_version == 'latest' || @machine.config.puppet_install.puppet_version.match(/^7\..+/)
|
|
67
|
+
'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_7_agent.sh'
|
|
68
|
+
elsif @machine.config.puppet_install.puppet_version.match(/^6\..+/)
|
|
69
|
+
'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_6_agent.sh'
|
|
70
|
+
elsif @machine.config.puppet_install.puppet_version.match(/^5\..+/)
|
|
71
|
+
'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_5_agent.sh'
|
|
72
|
+
elsif @machine.config.puppet_install.puppet_version.match(/^4\..+/)
|
|
67
73
|
'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_agent.sh'
|
|
68
74
|
else
|
|
69
75
|
'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet.sh'
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
# -*- mode: ruby -*-
|
|
2
|
+
# vi: set ft=ruby :
|
|
3
|
+
|
|
4
|
+
# plugins don't seem to be auto-loaded from the bundle
|
|
5
|
+
require 'vagrant-puppet-install'
|
|
6
|
+
|
|
7
|
+
Vagrant.configure('2') do |config|
|
|
8
|
+
config.puppet_install.puppet_version = :latest
|
|
9
|
+
|
|
10
|
+
config.vm.provider "docker" do |d|
|
|
11
|
+
d.image = "petems/centos-7-docker-vagrant-insecure-key"
|
|
12
|
+
d.name = "vagrant-puppet-install-centos-7"
|
|
13
|
+
d.has_ssh = true
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
config.ssh.username = "vagrant"
|
|
17
|
+
|
|
18
|
+
config.vm.provision :puppet do |puppet|
|
|
19
|
+
puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
|
|
20
|
+
puppet.manifest_file = 'base.pp'
|
|
21
|
+
end
|
|
22
|
+
end
|
|
@@ -37,8 +37,8 @@ Vagrant.configure('2') do |config|
|
|
|
37
37
|
trusty_361.vm.provision 'shell', inline: 'puppet --version'
|
|
38
38
|
end
|
|
39
39
|
|
|
40
|
-
config.vm.define :fedora_23 do |
|
|
41
|
-
fedora_23.vm.box = "fedora/
|
|
40
|
+
config.vm.define :fedora_23 do |fedora_25|
|
|
41
|
+
fedora_23.vm.box = "fedora/25-cloud-base"
|
|
42
42
|
fedora_23.puppet_install.puppet_version = :latest
|
|
43
43
|
|
|
44
44
|
fedora_23.vm.provision :puppet do |puppet|
|
|
@@ -51,7 +51,7 @@ Vagrant.configure('2') do |config|
|
|
|
51
51
|
|
|
52
52
|
config.vm.define :fedora_384 do |fedora_384|
|
|
53
53
|
fedora_384.vm.box = "fedora/23-cloud-base"
|
|
54
|
-
fedora_384.puppet_install.puppet_version = '3.8.
|
|
54
|
+
fedora_384.puppet_install.puppet_version = '3.8.1'
|
|
55
55
|
|
|
56
56
|
fedora_384.vm.provision :puppet do |puppet|
|
|
57
57
|
puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
|
|
@@ -63,7 +63,8 @@ Vagrant.configure('2') do |config|
|
|
|
63
63
|
|
|
64
64
|
config.vm.define :debian_jessie_372 do |debian_jessie_372|
|
|
65
65
|
debian_jessie_372.vm.box = "debian/jessie64"
|
|
66
|
-
debian_jessie_372.puppet_install.puppet_version = '3.7.2'
|
|
66
|
+
debian_jessie_372.puppet_install.puppet_version = '3.7.2-4'
|
|
67
|
+
debian_jessie_372.puppet_install.validate_version = false
|
|
67
68
|
|
|
68
69
|
debian_jessie_372.vm.provision :puppet do |puppet|
|
|
69
70
|
puppet.environment_path = File.expand_path('../../../support/environments', __FILE__)
|
data/test/unit/spec_helper.rb
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
|
|
2
2
|
|
|
3
|
+
require 'rspec/its'
|
|
3
4
|
require 'rspec/core'
|
|
4
5
|
require 'vagrant-puppet-install'
|
|
6
|
+
require 'datadog/ci'
|
|
5
7
|
|
|
6
8
|
RSpec.configure do |config|
|
|
7
9
|
config.formatter = :documentation
|
|
@@ -10,7 +12,7 @@ RSpec.configure do |config|
|
|
|
10
12
|
config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
|
|
11
13
|
|
|
12
14
|
# Use color in STDOUT
|
|
13
|
-
config.
|
|
15
|
+
config.color = true
|
|
14
16
|
|
|
15
17
|
# Use color not only in STDOUT but also in pagers and files
|
|
16
18
|
config.tty = true
|
|
@@ -19,7 +21,12 @@ RSpec.configure do |config|
|
|
|
19
21
|
config.order = :rand
|
|
20
22
|
|
|
21
23
|
# specify metadata with symobls only (ie no '=> true' required)
|
|
22
|
-
config.treat_symbols_as_metadata_keys_with_true_values = true
|
|
23
24
|
config.filter_run focus: true
|
|
24
25
|
config.run_all_when_everything_filtered = true
|
|
25
26
|
end
|
|
27
|
+
|
|
28
|
+
Datadog.configure do |c|
|
|
29
|
+
c.ci_mode.enabled = true
|
|
30
|
+
c.service = 'vagrant-puppet-install'
|
|
31
|
+
c.use :rspec
|
|
32
|
+
end
|
|
@@ -101,7 +101,7 @@ describe VagrantPlugins::PuppetInstall::Config do
|
|
|
101
101
|
let(:puppet_version) { '9.9.9' }
|
|
102
102
|
|
|
103
103
|
it 'fails' do
|
|
104
|
-
expect { subject.validate!(machine) }.to raise_error
|
|
104
|
+
expect { subject.validate!(machine) }.to raise_error(Vagrant::Errors::ConfigInvalid)
|
|
105
105
|
end
|
|
106
106
|
end # validate_version set to true with an invalid version should not raise error
|
|
107
107
|
end
|
|
@@ -25,18 +25,18 @@ describe VagrantPlugins::PuppetInstall::Plugin do
|
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
it 'accepts single String argument' do
|
|
28
|
-
expect(described_class.check_vagrant_version('~> 1.1')).to
|
|
29
|
-
expect(described_class.check_vagrant_version('1.2')).to
|
|
28
|
+
expect(described_class.check_vagrant_version('~> 1.1')).to be_truthy
|
|
29
|
+
expect(described_class.check_vagrant_version('1.2')).to be_falsey
|
|
30
30
|
end
|
|
31
31
|
|
|
32
32
|
it 'accepts an Array argument' do
|
|
33
|
-
expect(described_class.check_vagrant_version(['>= 1.1', '< 1.3.0.beta'])).to
|
|
34
|
-
expect(described_class.check_vagrant_version(['>= 1.3'])).to
|
|
33
|
+
expect(described_class.check_vagrant_version(['>= 1.1', '< 1.3.0.beta'])).to be_truthy
|
|
34
|
+
expect(described_class.check_vagrant_version(['>= 1.3'])).to be_falsey
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
it 'accepts multiple arguments' do
|
|
38
|
-
expect(described_class.check_vagrant_version('>= 1.0', '<= 1.3')).to
|
|
39
|
-
expect(described_class.check_vagrant_version('~> 1.2', '>= 1.2.5')).to
|
|
38
|
+
expect(described_class.check_vagrant_version('>= 1.0', '<= 1.3')).to be_truthy
|
|
39
|
+
expect(described_class.check_vagrant_version('~> 1.2', '>= 1.2.5')).to be_falsey
|
|
40
40
|
end
|
|
41
41
|
end
|
|
42
42
|
|
|
@@ -18,9 +18,13 @@ Gem::Specification.new do |spec|
|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
|
19
19
|
spec.require_paths = ['lib']
|
|
20
20
|
|
|
21
|
-
spec.add_development_dependency '
|
|
22
|
-
spec.add_development_dependency '
|
|
23
|
-
spec.add_development_dependency 'rspec', '~>
|
|
24
|
-
spec.add_development_dependency 'rubocop', '~> 0.
|
|
25
|
-
spec.add_development_dependency 'pry'
|
|
21
|
+
spec.add_development_dependency 'rake', '~> 13.0.1'
|
|
22
|
+
spec.add_development_dependency 'rspec', '~> 3'
|
|
23
|
+
spec.add_development_dependency 'rspec-its', '~> 1.3'
|
|
24
|
+
spec.add_development_dependency 'rubocop', '~> 0.49.0'
|
|
25
|
+
spec.add_development_dependency 'pry', '~> 0.11.3'
|
|
26
|
+
spec.add_development_dependency 'github_changelog_generator', '~> 1.13.1'
|
|
27
|
+
spec.add_development_dependency 'yard'
|
|
28
|
+
spec.add_development_dependency 'ddtrace', ">=0.51.0"
|
|
29
|
+
spec.add_development_dependency 'rubygems-tasks'
|
|
26
30
|
end
|
metadata
CHANGED
|
@@ -1,75 +1,131 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-puppet-install
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version:
|
|
4
|
+
version: 7.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Seth Chisamore
|
|
8
8
|
- Patrick Connolly
|
|
9
9
|
- Peter Souter
|
|
10
|
-
autorequire:
|
|
10
|
+
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date:
|
|
13
|
+
date: 2021-12-16 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
|
-
name:
|
|
16
|
+
name: rake
|
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
|
18
18
|
requirements:
|
|
19
19
|
- - "~>"
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
|
-
version:
|
|
21
|
+
version: 13.0.1
|
|
22
22
|
type: :development
|
|
23
23
|
prerelease: false
|
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
|
25
25
|
requirements:
|
|
26
26
|
- - "~>"
|
|
27
27
|
- !ruby/object:Gem::Version
|
|
28
|
-
version:
|
|
28
|
+
version: 13.0.1
|
|
29
29
|
- !ruby/object:Gem::Dependency
|
|
30
|
-
name:
|
|
30
|
+
name: rspec
|
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
|
32
32
|
requirements:
|
|
33
33
|
- - "~>"
|
|
34
34
|
- !ruby/object:Gem::Version
|
|
35
|
-
version:
|
|
35
|
+
version: '3'
|
|
36
36
|
type: :development
|
|
37
37
|
prerelease: false
|
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
|
39
39
|
requirements:
|
|
40
40
|
- - "~>"
|
|
41
41
|
- !ruby/object:Gem::Version
|
|
42
|
-
version:
|
|
42
|
+
version: '3'
|
|
43
43
|
- !ruby/object:Gem::Dependency
|
|
44
|
-
name: rspec
|
|
44
|
+
name: rspec-its
|
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
|
46
46
|
requirements:
|
|
47
47
|
- - "~>"
|
|
48
48
|
- !ruby/object:Gem::Version
|
|
49
|
-
version:
|
|
49
|
+
version: '1.3'
|
|
50
50
|
type: :development
|
|
51
51
|
prerelease: false
|
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
|
53
53
|
requirements:
|
|
54
54
|
- - "~>"
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
|
-
version:
|
|
56
|
+
version: '1.3'
|
|
57
57
|
- !ruby/object:Gem::Dependency
|
|
58
58
|
name: rubocop
|
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
|
60
60
|
requirements:
|
|
61
61
|
- - "~>"
|
|
62
62
|
- !ruby/object:Gem::Version
|
|
63
|
-
version: 0.
|
|
63
|
+
version: 0.49.0
|
|
64
64
|
type: :development
|
|
65
65
|
prerelease: false
|
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
|
67
67
|
requirements:
|
|
68
68
|
- - "~>"
|
|
69
69
|
- !ruby/object:Gem::Version
|
|
70
|
-
version: 0.
|
|
70
|
+
version: 0.49.0
|
|
71
71
|
- !ruby/object:Gem::Dependency
|
|
72
72
|
name: pry
|
|
73
|
+
requirement: !ruby/object:Gem::Requirement
|
|
74
|
+
requirements:
|
|
75
|
+
- - "~>"
|
|
76
|
+
- !ruby/object:Gem::Version
|
|
77
|
+
version: 0.11.3
|
|
78
|
+
type: :development
|
|
79
|
+
prerelease: false
|
|
80
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
81
|
+
requirements:
|
|
82
|
+
- - "~>"
|
|
83
|
+
- !ruby/object:Gem::Version
|
|
84
|
+
version: 0.11.3
|
|
85
|
+
- !ruby/object:Gem::Dependency
|
|
86
|
+
name: github_changelog_generator
|
|
87
|
+
requirement: !ruby/object:Gem::Requirement
|
|
88
|
+
requirements:
|
|
89
|
+
- - "~>"
|
|
90
|
+
- !ruby/object:Gem::Version
|
|
91
|
+
version: 1.13.1
|
|
92
|
+
type: :development
|
|
93
|
+
prerelease: false
|
|
94
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
95
|
+
requirements:
|
|
96
|
+
- - "~>"
|
|
97
|
+
- !ruby/object:Gem::Version
|
|
98
|
+
version: 1.13.1
|
|
99
|
+
- !ruby/object:Gem::Dependency
|
|
100
|
+
name: yard
|
|
101
|
+
requirement: !ruby/object:Gem::Requirement
|
|
102
|
+
requirements:
|
|
103
|
+
- - ">="
|
|
104
|
+
- !ruby/object:Gem::Version
|
|
105
|
+
version: '0'
|
|
106
|
+
type: :development
|
|
107
|
+
prerelease: false
|
|
108
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
109
|
+
requirements:
|
|
110
|
+
- - ">="
|
|
111
|
+
- !ruby/object:Gem::Version
|
|
112
|
+
version: '0'
|
|
113
|
+
- !ruby/object:Gem::Dependency
|
|
114
|
+
name: ddtrace
|
|
115
|
+
requirement: !ruby/object:Gem::Requirement
|
|
116
|
+
requirements:
|
|
117
|
+
- - ">="
|
|
118
|
+
- !ruby/object:Gem::Version
|
|
119
|
+
version: 0.51.0
|
|
120
|
+
type: :development
|
|
121
|
+
prerelease: false
|
|
122
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
123
|
+
requirements:
|
|
124
|
+
- - ">="
|
|
125
|
+
- !ruby/object:Gem::Version
|
|
126
|
+
version: 0.51.0
|
|
127
|
+
- !ruby/object:Gem::Dependency
|
|
128
|
+
name: rubygems-tasks
|
|
73
129
|
requirement: !ruby/object:Gem::Requirement
|
|
74
130
|
requirements:
|
|
75
131
|
- - ">="
|
|
@@ -92,10 +148,12 @@ executables: []
|
|
|
92
148
|
extensions: []
|
|
93
149
|
extra_rdoc_files: []
|
|
94
150
|
files:
|
|
151
|
+
- ".github/workflows/datadog_ci_visibility.yml"
|
|
152
|
+
- ".github/workflows/docker_acceptance.yml"
|
|
153
|
+
- ".github/workflows/rspec.yml"
|
|
95
154
|
- ".gitignore"
|
|
96
155
|
- ".rspec"
|
|
97
156
|
- ".rubocop.yml"
|
|
98
|
-
- ".travis.yml"
|
|
99
157
|
- ".yardopts"
|
|
100
158
|
- CHANGELOG.md
|
|
101
159
|
- Gemfile
|
|
@@ -110,6 +168,7 @@ files:
|
|
|
110
168
|
- locales/en.yml
|
|
111
169
|
- test/acceptance/aws/Vagrantfile
|
|
112
170
|
- test/acceptance/digital_ocean/Vagrantfile
|
|
171
|
+
- test/acceptance/docker/Vagrantfile
|
|
113
172
|
- test/acceptance/rackspace/Vagrantfile
|
|
114
173
|
- test/acceptance/virtualbox/Vagrantfile
|
|
115
174
|
- test/support/environments/vagrant/manifests/site.pp
|
|
@@ -123,7 +182,7 @@ homepage: https://github.com/patcon/vagrant-puppet-install
|
|
|
123
182
|
licenses:
|
|
124
183
|
- Apache 2.0
|
|
125
184
|
metadata: {}
|
|
126
|
-
post_install_message:
|
|
185
|
+
post_install_message:
|
|
127
186
|
rdoc_options: []
|
|
128
187
|
require_paths:
|
|
129
188
|
- lib
|
|
@@ -138,15 +197,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
138
197
|
- !ruby/object:Gem::Version
|
|
139
198
|
version: '0'
|
|
140
199
|
requirements: []
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
signing_key:
|
|
200
|
+
rubygems_version: 3.1.6
|
|
201
|
+
signing_key:
|
|
144
202
|
specification_version: 4
|
|
145
203
|
summary: A Vagrant plugin that ensures the desired version of Puppet is installed
|
|
146
204
|
via the Puppet Labs package repos.
|
|
147
205
|
test_files:
|
|
148
206
|
- test/acceptance/aws/Vagrantfile
|
|
149
207
|
- test/acceptance/digital_ocean/Vagrantfile
|
|
208
|
+
- test/acceptance/docker/Vagrantfile
|
|
150
209
|
- test/acceptance/rackspace/Vagrantfile
|
|
151
210
|
- test/acceptance/virtualbox/Vagrantfile
|
|
152
211
|
- test/support/environments/vagrant/manifests/site.pp
|
|
@@ -155,4 +214,3 @@ test_files:
|
|
|
155
214
|
- test/unit/spec_helper.rb
|
|
156
215
|
- test/unit/vagrant-puppet-install/config_spec.rb
|
|
157
216
|
- test/unit/vagrant-puppet-install/plugin_spec.rb
|
|
158
|
-
has_rdoc:
|