beaker-vagrant 1.2.0 → 1.3.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/.github/workflows/release.yml +2 -2
- data/.github/workflows/test.yml +1 -0
- data/.rubocop.yml +1 -0
- data/.rubocop_todo.yml +40 -164
- data/CHANGELOG.md +15 -0
- data/Gemfile +5 -1
- data/beaker-vagrant.gemspec +1 -1
- data/lib/beaker/hypervisor/vagrant.rb +16 -12
- data/lib/beaker/hypervisor/vagrant_custom.rb +1 -1
- data/lib/beaker/hypervisor/vagrant_virtualbox.rb +5 -5
- data/lib/beaker-vagrant/version.rb +1 -1
- data/spec/beaker/{hypervisor/vagrant_custom_spec.rb → vagrant_custom_spec.rb} +1 -1
- data/spec/beaker/{hypervisor/vagrant_desktop_spec.rb → vagrant_desktop_spec.rb} +1 -1
- data/spec/beaker/{hypervisor/vagrant_fusion_spec.rb → vagrant_fusion_spec.rb} +1 -1
- data/spec/beaker/{hypervisor/vagrant_libvirt_spec.rb → vagrant_libvirt_spec.rb} +5 -5
- data/spec/beaker/{hypervisor/vagrant_parallels_spec.rb → vagrant_parallels_spec.rb} +4 -3
- data/spec/beaker/{hypervisor/vagrant_spec.rb → vagrant_spec.rb} +38 -38
- data/spec/beaker/{hypervisor/vagrant_virtualbox_spec.rb → vagrant_virtualbox_spec.rb} +9 -8
- data/spec/beaker/{hypervisor/vagrant_workstation_spec.rb → vagrant_workstation_spec.rb} +1 -1
- metadata +13 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c46e26b66456dbc91b5458646e1e9fe57184b23b0c94d60e94f80391e161acbe
|
|
4
|
+
data.tar.gz: 38786118f734830631fe46392992a3f46668f1f282f4b2cc9a8ec4f37255bca5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8c0c72401b0d37fb457dce60b7b71e8bcbf1ecb2191f4d9549280a5d098d3f677adc97893e274b7cb34558078e26adddc71ffd8156766fa135f48c1a56ce05bc
|
|
7
|
+
data.tar.gz: c3cd786b9f57ae1fd147e171c779fdb69f9a980612e9e37ae32de7a522f6c507a7c1d8f4db15518e6116267b0ad0f81901499955cee3acb6eb98c1253bf12a9e
|
|
@@ -11,10 +11,10 @@ jobs:
|
|
|
11
11
|
if: github.repository_owner == 'voxpupuli'
|
|
12
12
|
steps:
|
|
13
13
|
- uses: actions/checkout@v3
|
|
14
|
-
- name: Install Ruby 3.
|
|
14
|
+
- name: Install Ruby 3.3
|
|
15
15
|
uses: ruby/setup-ruby@v1
|
|
16
16
|
with:
|
|
17
|
-
ruby-version: '3.
|
|
17
|
+
ruby-version: '3.3'
|
|
18
18
|
env:
|
|
19
19
|
BUNDLE_WITHOUT: release:development:rubocop
|
|
20
20
|
- name: Build gem
|
data/.github/workflows/test.yml
CHANGED
data/.rubocop.yml
CHANGED
data/.rubocop_todo.yml
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
1
1
|
# This configuration was generated by
|
|
2
2
|
# `rubocop --auto-gen-config`
|
|
3
|
-
# on
|
|
3
|
+
# on 2024-03-08 20:45:12 UTC using RuboCop version 1.61.0.
|
|
4
4
|
# The point is for the user to remove these configuration records
|
|
5
5
|
# one by one as the offenses are removed from the code base.
|
|
6
6
|
# Note that changes in the inspected code, or installation of new
|
|
7
7
|
# versions of RuboCop, may require this file to be generated again.
|
|
8
8
|
|
|
9
|
-
# Offense count: 7
|
|
10
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
11
|
-
Lint/AmbiguousRegexpLiteral:
|
|
12
|
-
Exclude:
|
|
13
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
14
|
-
|
|
15
9
|
# Offense count: 1
|
|
16
10
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
17
11
|
# Configuration parameters: AllowSafeAssignment.
|
|
@@ -20,6 +14,7 @@ Lint/AssignmentInCondition:
|
|
|
20
14
|
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
21
15
|
|
|
22
16
|
# Offense count: 1
|
|
17
|
+
# Configuration parameters: AllowedParentClasses.
|
|
23
18
|
Lint/MissingSuper:
|
|
24
19
|
Exclude:
|
|
25
20
|
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
@@ -30,32 +25,12 @@ Lint/NonDeterministicRequireOrder:
|
|
|
30
25
|
Exclude:
|
|
31
26
|
- 'spec/spec_helper.rb'
|
|
32
27
|
|
|
33
|
-
# Offense count: 3
|
|
34
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
35
|
-
Lint/RedundantStringCoercion:
|
|
36
|
-
Exclude:
|
|
37
|
-
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
38
|
-
- 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
|
|
39
|
-
|
|
40
|
-
# Offense count: 1
|
|
41
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
42
|
-
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
|
|
43
|
-
Lint/UnusedBlockArgument:
|
|
44
|
-
Exclude:
|
|
45
|
-
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
46
|
-
|
|
47
|
-
# Offense count: 3
|
|
48
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
49
|
-
# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
|
|
50
|
-
Lint/UnusedMethodArgument:
|
|
51
|
-
Exclude:
|
|
52
|
-
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
53
|
-
- 'lib/beaker/hypervisor/vagrant_custom.rb'
|
|
54
|
-
|
|
55
28
|
# Offense count: 2
|
|
29
|
+
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
30
|
+
# Configuration parameters: AutoCorrect.
|
|
56
31
|
Lint/UselessAssignment:
|
|
57
32
|
Exclude:
|
|
58
|
-
- 'spec/beaker/
|
|
33
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
59
34
|
|
|
60
35
|
# Offense count: 1
|
|
61
36
|
Naming/AccessorMethodName:
|
|
@@ -68,8 +43,8 @@ Naming/AccessorMethodName:
|
|
|
68
43
|
Naming/HeredocDelimiterNaming:
|
|
69
44
|
Exclude:
|
|
70
45
|
- 'Rakefile'
|
|
71
|
-
- 'spec/beaker/
|
|
72
|
-
- 'spec/beaker/
|
|
46
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
47
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
73
48
|
|
|
74
49
|
# Offense count: 1
|
|
75
50
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
@@ -77,26 +52,12 @@ Performance/InefficientHashSearch:
|
|
|
77
52
|
Exclude:
|
|
78
53
|
- 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
|
|
79
54
|
|
|
80
|
-
# Offense count: 4
|
|
81
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
82
|
-
Performance/RedundantMatch:
|
|
83
|
-
Exclude:
|
|
84
|
-
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
85
|
-
- 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
|
|
86
|
-
|
|
87
55
|
# Offense count: 1
|
|
88
56
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
89
57
|
# Configuration parameters: MaxKeyValuePairs.
|
|
90
58
|
Performance/RedundantMerge:
|
|
91
59
|
Exclude:
|
|
92
|
-
- 'spec/beaker/
|
|
93
|
-
|
|
94
|
-
# Offense count: 7
|
|
95
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
96
|
-
Performance/RegexpMatch:
|
|
97
|
-
Exclude:
|
|
98
|
-
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
99
|
-
- 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
|
|
60
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
100
61
|
|
|
101
62
|
# Offense count: 2
|
|
102
63
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
@@ -104,110 +65,45 @@ Performance/StringInclude:
|
|
|
104
65
|
Exclude:
|
|
105
66
|
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
106
67
|
|
|
107
|
-
# Offense count: 2
|
|
108
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
109
|
-
# Configuration parameters: EnforcedStyle.
|
|
110
|
-
# SupportedStyles: be, be_nil
|
|
111
|
-
RSpec/BeNil:
|
|
112
|
-
Exclude:
|
|
113
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
114
|
-
|
|
115
68
|
# Offense count: 14
|
|
116
69
|
# Configuration parameters: Prefixes, AllowedPatterns.
|
|
117
70
|
# Prefixes: when, with, without
|
|
118
71
|
RSpec/ContextWording:
|
|
119
72
|
Exclude:
|
|
120
|
-
- 'spec/beaker/
|
|
121
|
-
- 'spec/beaker/
|
|
122
|
-
- 'spec/beaker/
|
|
123
|
-
- 'spec/beaker/
|
|
124
|
-
- 'spec/beaker/
|
|
125
|
-
- 'spec/beaker/
|
|
126
|
-
- 'spec/beaker/
|
|
127
|
-
- 'spec/beaker/
|
|
73
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
74
|
+
- 'spec/beaker/vagrant_desktop_spec.rb'
|
|
75
|
+
- 'spec/beaker/vagrant_fusion_spec.rb'
|
|
76
|
+
- 'spec/beaker/vagrant_libvirt_spec.rb'
|
|
77
|
+
- 'spec/beaker/vagrant_parallels_spec.rb'
|
|
78
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
79
|
+
- 'spec/beaker/vagrant_virtualbox_spec.rb'
|
|
80
|
+
- 'spec/beaker/vagrant_workstation_spec.rb'
|
|
128
81
|
|
|
129
82
|
# Offense count: 3
|
|
130
83
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
131
|
-
# Configuration parameters: SkipBlocks, EnforcedStyle.
|
|
84
|
+
# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
|
|
132
85
|
# SupportedStyles: described_class, explicit
|
|
133
86
|
RSpec/DescribedClass:
|
|
134
87
|
Exclude:
|
|
135
|
-
- 'spec/beaker/
|
|
136
|
-
- 'spec/beaker/
|
|
137
|
-
- 'spec/beaker/
|
|
138
|
-
|
|
139
|
-
# Offense count: 2
|
|
140
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
141
|
-
RSpec/EmptyLineAfterFinalLet:
|
|
142
|
-
Exclude:
|
|
143
|
-
- 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
|
|
144
|
-
- 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
|
|
88
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
89
|
+
- 'spec/beaker/vagrant_parallels_spec.rb'
|
|
90
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
145
91
|
|
|
146
|
-
# Offense count:
|
|
92
|
+
# Offense count: 20
|
|
147
93
|
# Configuration parameters: CountAsOne.
|
|
148
94
|
RSpec/ExampleLength:
|
|
149
|
-
Max:
|
|
150
|
-
|
|
151
|
-
# Offense count: 1
|
|
152
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
153
|
-
# Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
|
|
154
|
-
# DisallowedExamples: works
|
|
155
|
-
RSpec/ExampleWording:
|
|
156
|
-
Exclude:
|
|
157
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
95
|
+
Max: 54
|
|
158
96
|
|
|
159
97
|
# Offense count: 10
|
|
160
98
|
RSpec/ExpectInHook:
|
|
161
99
|
Exclude:
|
|
162
|
-
- 'spec/beaker/
|
|
163
|
-
|
|
164
|
-
# Offense count: 7
|
|
165
|
-
# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
|
|
166
|
-
# Include: **/*_spec*rb*, **/spec/**/*
|
|
167
|
-
RSpec/FilePath:
|
|
168
|
-
Exclude:
|
|
169
|
-
- 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
|
|
170
|
-
- 'spec/beaker/hypervisor/vagrant_desktop_spec.rb'
|
|
171
|
-
- 'spec/beaker/hypervisor/vagrant_fusion_spec.rb'
|
|
172
|
-
- 'spec/beaker/hypervisor/vagrant_libvirt_spec.rb'
|
|
173
|
-
- 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
|
|
174
|
-
- 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
|
|
175
|
-
- 'spec/beaker/hypervisor/vagrant_workstation_spec.rb'
|
|
176
|
-
|
|
177
|
-
# Offense count: 5
|
|
178
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
179
|
-
# Configuration parameters: EnforcedStyle.
|
|
180
|
-
# SupportedStyles: implicit, each, example
|
|
181
|
-
RSpec/HookArgument:
|
|
182
|
-
Exclude:
|
|
183
|
-
- 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
|
|
184
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
185
|
-
|
|
186
|
-
# Offense count: 17
|
|
187
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
188
|
-
# Configuration parameters: EnforcedStyle.
|
|
189
|
-
# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
|
|
190
|
-
RSpec/ImplicitSubject:
|
|
191
|
-
Exclude:
|
|
192
|
-
- 'spec/beaker/hypervisor/vagrant_desktop_spec.rb'
|
|
193
|
-
- 'spec/beaker/hypervisor/vagrant_fusion_spec.rb'
|
|
194
|
-
- 'spec/beaker/hypervisor/vagrant_libvirt_spec.rb'
|
|
195
|
-
- 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
|
|
196
|
-
- 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
|
|
197
|
-
- 'spec/beaker/hypervisor/vagrant_workstation_spec.rb'
|
|
100
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
198
101
|
|
|
199
102
|
# Offense count: 4
|
|
200
103
|
# Configuration parameters: AssignmentOnly.
|
|
201
104
|
RSpec/InstanceVariable:
|
|
202
105
|
Exclude:
|
|
203
|
-
- 'spec/beaker/
|
|
204
|
-
|
|
205
|
-
# Offense count: 2
|
|
206
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
207
|
-
RSpec/LeadingSubject:
|
|
208
|
-
Exclude:
|
|
209
|
-
- 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
|
|
210
|
-
- 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
|
|
106
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
211
107
|
|
|
212
108
|
# Offense count: 73
|
|
213
109
|
# Configuration parameters: .
|
|
@@ -224,30 +120,28 @@ RSpec/MultipleExpectations:
|
|
|
224
120
|
RSpec/MultipleMemoizedHelpers:
|
|
225
121
|
Max: 6
|
|
226
122
|
|
|
227
|
-
# Offense count:
|
|
228
|
-
#
|
|
229
|
-
#
|
|
230
|
-
|
|
231
|
-
RSpec/NotToNot:
|
|
232
|
-
Exclude:
|
|
233
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
234
|
-
|
|
235
|
-
# Offense count: 2
|
|
236
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
237
|
-
RSpec/ReceiveNever:
|
|
123
|
+
# Offense count: 17
|
|
124
|
+
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
|
|
125
|
+
# SupportedStyles: always, named_only
|
|
126
|
+
RSpec/NamedSubject:
|
|
238
127
|
Exclude:
|
|
239
|
-
- 'spec/beaker/
|
|
128
|
+
- 'spec/beaker/vagrant_desktop_spec.rb'
|
|
129
|
+
- 'spec/beaker/vagrant_fusion_spec.rb'
|
|
130
|
+
- 'spec/beaker/vagrant_libvirt_spec.rb'
|
|
131
|
+
- 'spec/beaker/vagrant_parallels_spec.rb'
|
|
132
|
+
- 'spec/beaker/vagrant_virtualbox_spec.rb'
|
|
133
|
+
- 'spec/beaker/vagrant_workstation_spec.rb'
|
|
240
134
|
|
|
241
135
|
# Offense count: 3
|
|
242
136
|
RSpec/StubbedMock:
|
|
243
137
|
Exclude:
|
|
244
|
-
- 'spec/beaker/
|
|
138
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
245
139
|
|
|
246
140
|
# Offense count: 1
|
|
247
141
|
# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
|
|
248
142
|
RSpec/VerifiedDoubles:
|
|
249
143
|
Exclude:
|
|
250
|
-
- 'spec/beaker/
|
|
144
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
251
145
|
|
|
252
146
|
# Offense count: 3
|
|
253
147
|
# This cop supports safe autocorrection (--autocorrect).
|
|
@@ -260,8 +154,8 @@ Rake/Desc:
|
|
|
260
154
|
# Configuration parameters: AllowOnConstant, AllowOnSelfClass.
|
|
261
155
|
Style/CaseEquality:
|
|
262
156
|
Exclude:
|
|
263
|
-
- 'spec/beaker/
|
|
264
|
-
- 'spec/beaker/
|
|
157
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
158
|
+
- 'spec/beaker/vagrant_spec.rb'
|
|
265
159
|
|
|
266
160
|
# Offense count: 8
|
|
267
161
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
@@ -354,28 +248,10 @@ Style/StringConcatenation:
|
|
|
354
248
|
- 'lib/beaker/hypervisor/vagrant.rb'
|
|
355
249
|
- 'lib/beaker/hypervisor/vagrant_fusion.rb'
|
|
356
250
|
- 'lib/beaker/hypervisor/vagrant_libvirt.rb'
|
|
357
|
-
- 'spec/beaker/
|
|
251
|
+
- 'spec/beaker/vagrant_custom_spec.rb'
|
|
358
252
|
- 'spec/spec_helper.rb'
|
|
359
253
|
|
|
360
|
-
# Offense count:
|
|
361
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
362
|
-
# Configuration parameters: EnforcedStyleForMultiline.
|
|
363
|
-
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
|
|
364
|
-
Style/TrailingCommaInArrayLiteral:
|
|
365
|
-
Exclude:
|
|
366
|
-
- 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
|
|
367
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
368
|
-
|
|
369
|
-
# Offense count: 21
|
|
370
|
-
# This cop supports safe autocorrection (--autocorrect).
|
|
371
|
-
# Configuration parameters: EnforcedStyleForMultiline.
|
|
372
|
-
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
|
|
373
|
-
Style/TrailingCommaInHashLiteral:
|
|
374
|
-
Exclude:
|
|
375
|
-
- 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
|
|
376
|
-
- 'spec/beaker/hypervisor/vagrant_spec.rb'
|
|
377
|
-
|
|
378
|
-
# Offense count: 23
|
|
254
|
+
# Offense count: 24
|
|
379
255
|
# This cop supports safe autocorrection (--autocorrect).
|
|
380
256
|
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
|
|
381
257
|
# URISchemes: http, https
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.3.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.3.0) (2024-04-30)
|
|
4
|
+
|
|
5
|
+
[Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/1.2.0...1.3.0)
|
|
6
|
+
|
|
7
|
+
**Implemented enhancements:**
|
|
8
|
+
|
|
9
|
+
- Add Ruby 3.3 to CI [\#84](https://github.com/voxpupuli/beaker-vagrant/pull/84) ([bastelfreak](https://github.com/bastelfreak))
|
|
10
|
+
- Use shorter directory names for beaker-hostgenerator [\#80](https://github.com/voxpupuli/beaker-vagrant/pull/80) ([ekohl](https://github.com/ekohl))
|
|
11
|
+
|
|
12
|
+
**Merged pull requests:**
|
|
13
|
+
|
|
14
|
+
- Gemfile: add faraday as GCG dependency [\#85](https://github.com/voxpupuli/beaker-vagrant/pull/85) ([bastelfreak](https://github.com/bastelfreak))
|
|
15
|
+
- Use .each\_value when only the value is needed [\#82](https://github.com/voxpupuli/beaker-vagrant/pull/82) ([ekohl](https://github.com/ekohl))
|
|
16
|
+
- voxpupuli-rubocop: Update to 2.5.0 [\#81](https://github.com/voxpupuli/beaker-vagrant/pull/81) ([bastelfreak](https://github.com/bastelfreak))
|
|
17
|
+
|
|
3
18
|
## [1.2.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.2.0) (2023-04-28)
|
|
4
19
|
|
|
5
20
|
[Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/1.1.0...1.2.0)
|
data/Gemfile
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
|
2
4
|
|
|
3
5
|
gemspec
|
|
6
|
+
|
|
4
7
|
group :release do
|
|
5
|
-
gem '
|
|
8
|
+
gem 'faraday-retry', '~> 2.1', require: false
|
|
9
|
+
gem 'github_changelog_generator', '~> 1.16.4', require: false
|
|
6
10
|
end
|
data/beaker-vagrant.gemspec
CHANGED
|
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
|
|
|
28
28
|
s.add_development_dependency 'rake', '~> 13.0'
|
|
29
29
|
s.add_development_dependency 'rspec', '~> 3.0'
|
|
30
30
|
s.add_development_dependency 'simplecov'
|
|
31
|
-
s.add_development_dependency 'voxpupuli-rubocop', '~>
|
|
31
|
+
s.add_development_dependency 'voxpupuli-rubocop', '~> 2.5.0'
|
|
32
32
|
|
|
33
33
|
s.add_runtime_dependency 'beaker', '>= 4', '< 6'
|
|
34
34
|
end
|
|
@@ -19,7 +19,7 @@ module Beaker
|
|
|
19
19
|
end
|
|
20
20
|
|
|
21
21
|
def private_network_generator(host)
|
|
22
|
-
private_network_string = " v.vm.network :private_network, ip: \"#{host['ip']
|
|
22
|
+
private_network_string = " v.vm.network :private_network, ip: \"#{host['ip']}\", :netmask => \"#{host['netmask'] ||= '255.255.0.0'}\""
|
|
23
23
|
private_network_string << if host['network_mac']
|
|
24
24
|
", :mac => \"#{host['network_mac']}\"\n"
|
|
25
25
|
else
|
|
@@ -27,7 +27,7 @@ module Beaker
|
|
|
27
27
|
end
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
-
def connection_preference(
|
|
30
|
+
def connection_preference(_host)
|
|
31
31
|
[:hostname]
|
|
32
32
|
end
|
|
33
33
|
|
|
@@ -78,7 +78,7 @@ module Beaker
|
|
|
78
78
|
end
|
|
79
79
|
|
|
80
80
|
unless host['forwarded_ports'].nil?
|
|
81
|
-
host['forwarded_ports'].
|
|
81
|
+
host['forwarded_ports'].each_value do |port|
|
|
82
82
|
fwd = ' v.vm.network :forwarded_port,'
|
|
83
83
|
fwd << " protocol: '#{port[:protocol]}'," unless port[:protocol].nil?
|
|
84
84
|
fwd << " guest_ip: '#{port[:to_ip]}'," unless port[:to_ip].nil?
|
|
@@ -91,7 +91,7 @@ module Beaker
|
|
|
91
91
|
end
|
|
92
92
|
end
|
|
93
93
|
|
|
94
|
-
if /windows/i.match(host['platform'])
|
|
94
|
+
if /windows/i.match?(host['platform'])
|
|
95
95
|
# due to a regression bug in versions of vagrant 1.6.2, 1.6.3, 1.6.4, >= 1.7.3 ssh fails to forward
|
|
96
96
|
# automatically (note <=1.6.1, 1.6.5, 1.7.0 - 1.7.2 are uneffected)
|
|
97
97
|
# Explicitly setting SSH port forwarding due to this bug
|
|
@@ -102,12 +102,12 @@ module Beaker
|
|
|
102
102
|
v_file << " v.vm.communicator = 'winrm'\n"
|
|
103
103
|
end
|
|
104
104
|
|
|
105
|
-
if /osx/i.match(host['platform'])
|
|
105
|
+
if /osx/i.match?(host['platform'])
|
|
106
106
|
v_file << " v.vm.network 'private_network', ip: '10.0.1.10'\n"
|
|
107
107
|
v_file << " v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
|
|
108
108
|
end
|
|
109
109
|
|
|
110
|
-
if /freebsd/i.match(host['platform'])
|
|
110
|
+
if /freebsd/i.match?(host['platform'])
|
|
111
111
|
v_file << " v.ssh.shell = 'sh'\n"
|
|
112
112
|
v_file << " v.vm.guest = :freebsd\n"
|
|
113
113
|
|
|
@@ -146,7 +146,7 @@ module Beaker
|
|
|
146
146
|
def set_all_ssh_config
|
|
147
147
|
@logger.debug 'configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)'
|
|
148
148
|
@hosts.each do |host|
|
|
149
|
-
if host[:platform]
|
|
149
|
+
if /windows/.match?(host[:platform])
|
|
150
150
|
@logger.debug "skip ssh hacks on windows box #{host[:name]}"
|
|
151
151
|
set_ssh_config host, host['user']
|
|
152
152
|
next
|
|
@@ -204,8 +204,12 @@ module Beaker
|
|
|
204
204
|
@options = options
|
|
205
205
|
@logger = options[:logger]
|
|
206
206
|
@hosts = vagrant_hosts
|
|
207
|
-
|
|
208
|
-
|
|
207
|
+
vagrant_directory = if options[:hosts_file_generated]
|
|
208
|
+
"beaker_hostgenerator_#{@hosts.map(&:name).join('-')}"
|
|
209
|
+
else
|
|
210
|
+
"beaker_#{File.basename(options[:hosts_file])}"
|
|
211
|
+
end
|
|
212
|
+
@vagrant_path = File.expand_path(File.join('.vagrant', 'beaker_vagrant_files', vagrant_directory))
|
|
209
213
|
@vagrant_file = File.expand_path(File.join(@vagrant_path, 'Vagrantfile'))
|
|
210
214
|
@vagrant_env = {}
|
|
211
215
|
end
|
|
@@ -262,7 +266,7 @@ module Beaker
|
|
|
262
266
|
Dir.chdir(@vagrant_path) do
|
|
263
267
|
retries ||= 0
|
|
264
268
|
with_unbundled_env do
|
|
265
|
-
Open3.popen3(@vagrant_env, "vagrant #{args}") do |
|
|
269
|
+
Open3.popen3(@vagrant_env, "vagrant #{args}") do |_stdin, stdout, stderr, wait_thr|
|
|
266
270
|
while line = stdout.gets
|
|
267
271
|
@logger.info(line)
|
|
268
272
|
end
|
|
@@ -271,7 +275,7 @@ module Beaker
|
|
|
271
275
|
end
|
|
272
276
|
end
|
|
273
277
|
rescue StandardError => e
|
|
274
|
-
if
|
|
278
|
+
if /WinRM/m.match?(e.to_s)
|
|
275
279
|
sleep(10)
|
|
276
280
|
|
|
277
281
|
retry if (retries += 1) < 6
|
|
@@ -296,7 +300,7 @@ module Beaker
|
|
|
296
300
|
host['vagrant_memsize']
|
|
297
301
|
elsif options['vagrant_memsize']
|
|
298
302
|
options['vagrant_memsize']
|
|
299
|
-
elsif host['platform']
|
|
303
|
+
elsif /windows/.match?(host['platform'])
|
|
300
304
|
'2048'
|
|
301
305
|
else
|
|
302
306
|
'1024'
|
|
@@ -5,7 +5,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
|
|
|
5
5
|
LSILogic: ['--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off'],
|
|
6
6
|
IntelAHCI: ['--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off'],
|
|
7
7
|
PIIX4: ['--add', 'ide', '--portcount', '2', '--controller', 'PIIX4', '--bootable', 'off'],
|
|
8
|
-
USB: ['--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']
|
|
8
|
+
USB: ['--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off'],
|
|
9
9
|
}.freeze
|
|
10
10
|
|
|
11
11
|
def provision(provider = 'virtualbox')
|
|
@@ -14,12 +14,12 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
|
|
|
14
14
|
|
|
15
15
|
# Generate a VM customization string
|
|
16
16
|
def self.vb_customize(command, args)
|
|
17
|
-
" vb.customize ['#{command}', #{args.map { |a| "'#{a
|
|
17
|
+
" vb.customize ['#{command}', #{args.map { |a| "'#{a}'" }.join(', ')}]\n"
|
|
18
18
|
end
|
|
19
19
|
|
|
20
20
|
# Generate a VM customization string for the current VM
|
|
21
21
|
def self.vb_customize_vm(command, args)
|
|
22
|
-
" vb.customize ['#{command}', :id, #{args.map { |a| "'#{a
|
|
22
|
+
" vb.customize ['#{command}', :id, #{args.map { |a| "'#{a}'" }.join(', ')}]\n"
|
|
23
23
|
end
|
|
24
24
|
|
|
25
25
|
def self.provider_vfile_section(host, options)
|
|
@@ -44,7 +44,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
|
|
|
44
44
|
|
|
45
45
|
provider_section << vb_customize_vm('modifyvm', ['--usb', 'on']) if controller == 'USB'
|
|
46
46
|
provider_section << vb_customize_vm('storagectl', [
|
|
47
|
-
'--name', "Beaker #{controller} Controller"
|
|
47
|
+
'--name', "Beaker #{controller} Controller",
|
|
48
48
|
] + CONTROLLER_OPTIONS[controller.to_sym])
|
|
49
49
|
host['volumes'].keys.each_with_index do |volume, index|
|
|
50
50
|
volume_path = "#{host.name}-#{volume}.vdi"
|
|
@@ -72,7 +72,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
|
|
|
72
72
|
|
|
73
73
|
provider_section << " vb.gui = true\n" unless host['vb_gui'].nil?
|
|
74
74
|
|
|
75
|
-
if /osx/i.match(host['platform'])
|
|
75
|
+
if /osx/i.match?(host['platform'])
|
|
76
76
|
provider_section << " vb.customize ['modifyvm', :id, '--cpuidset', '1','000206a7','02100800','1fbae3bf','bfebfbff']\n"
|
|
77
77
|
end
|
|
78
78
|
|
|
@@ -28,7 +28,7 @@ describe Beaker::VagrantDesktop do
|
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
it 'for a set of hosts' do
|
|
31
|
-
|
|
31
|
+
expect(subject).to include(%( v.vm.provider :vmware_desktop do |v|\n v.vmx['memsize'] = '1024'\n end))
|
|
32
32
|
end
|
|
33
33
|
|
|
34
34
|
context 'with whitelist_verified' do
|
|
@@ -26,7 +26,7 @@ describe Beaker::VagrantFusion do
|
|
|
26
26
|
end
|
|
27
27
|
|
|
28
28
|
it 'has a provider section' do
|
|
29
|
-
|
|
29
|
+
expect(subject).to include(%( v.vm.provider :vmware_fusion do |v|\n v.vmx['memsize'] = '1024'\n end))
|
|
30
30
|
end
|
|
31
31
|
end
|
|
32
32
|
end
|
|
@@ -37,23 +37,23 @@ describe Beaker::VagrantLibvirt do
|
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
it 'has a provider section' do
|
|
40
|
-
|
|
40
|
+
expect(subject).to include(%( v.vm.provider :libvirt do |node|))
|
|
41
41
|
end
|
|
42
42
|
|
|
43
43
|
it 'has no private network' do
|
|
44
|
-
|
|
44
|
+
expect(subject).to include('v.vm.network :private_network')
|
|
45
45
|
end
|
|
46
46
|
|
|
47
47
|
it 'can specify the memory as an integer' do
|
|
48
|
-
|
|
48
|
+
expect(subject).to include('node.memory = 1024')
|
|
49
49
|
end
|
|
50
50
|
|
|
51
51
|
it 'can specify the number of cpus' do
|
|
52
|
-
|
|
52
|
+
expect(subject).to include('node.cpus = 2')
|
|
53
53
|
end
|
|
54
54
|
|
|
55
55
|
it 'can specify any libvirt option' do
|
|
56
|
-
|
|
56
|
+
expect(subject).to include("node.uri = 'qemu+ssh://root@host/system'")
|
|
57
57
|
end
|
|
58
58
|
end
|
|
59
59
|
end
|
|
@@ -26,16 +26,17 @@ describe Beaker::VagrantParallels do
|
|
|
26
26
|
end
|
|
27
27
|
|
|
28
28
|
it 'can make a Vagrantfile for a set of hosts' do
|
|
29
|
-
|
|
29
|
+
expect(subject).to include(%( v.vm.provider :parallels do |prl|\n prl.optimize_power_consumption = false\n prl.memory = '1024'\n end))
|
|
30
30
|
end
|
|
31
31
|
end
|
|
32
32
|
|
|
33
33
|
context 'disabled guest tools' do
|
|
34
|
-
let(:options) { super().merge({ prl_update_guest_tools: 'disable' }) }
|
|
35
34
|
subject { vagrant.class.provider_vfile_section(hosts.first, options) }
|
|
36
35
|
|
|
36
|
+
let(:options) { super().merge({ prl_update_guest_tools: 'disable' }) }
|
|
37
|
+
|
|
37
38
|
it 'can disable the auto-update functionality of the Parallels Guest Tools' do
|
|
38
|
-
|
|
39
|
+
expect(subject).to match(/prl.update_guest_tools = false/)
|
|
39
40
|
end
|
|
40
41
|
end
|
|
41
42
|
end
|
|
@@ -13,18 +13,18 @@ module Beaker
|
|
|
13
13
|
|
|
14
14
|
let(:vagrant) { Beaker::Vagrant.new(@hosts, options) }
|
|
15
15
|
|
|
16
|
-
before
|
|
16
|
+
before do
|
|
17
17
|
@hosts = make_hosts({
|
|
18
18
|
mount_folders: {
|
|
19
19
|
test_temp: { from: './', to: '/temp' },
|
|
20
|
-
test_tmp: { from: '../', to: '/tmp' }
|
|
20
|
+
test_tmp: { from: '../', to: '/tmp' },
|
|
21
21
|
},
|
|
22
22
|
forwarded_ports: {
|
|
23
23
|
http: { from: 10_080, to: 80 },
|
|
24
24
|
ssl: { from: 4443, to: 443 },
|
|
25
|
-
tomcat: { from: 8080, to: 8080 }
|
|
25
|
+
tomcat: { from: 8080, to: 8080 },
|
|
26
26
|
},
|
|
27
|
-
platform: Beaker::Platform.new('centos-8-x86_64')
|
|
27
|
+
platform: Beaker::Platform.new('centos-8-x86_64'),
|
|
28
28
|
})
|
|
29
29
|
end
|
|
30
30
|
|
|
@@ -107,7 +107,7 @@ module Beaker
|
|
|
107
107
|
path = vagrant.instance_variable_get(:@vagrant_path)
|
|
108
108
|
|
|
109
109
|
host = make_host('name-with_underscore', {})
|
|
110
|
-
vagrant.make_vfile([host
|
|
110
|
+
vagrant.make_vfile([host], options)
|
|
111
111
|
|
|
112
112
|
vagrantfile = File.read(File.expand_path(File.join(path, 'Vagrantfile')))
|
|
113
113
|
expect(vagrantfile).to match(/v.vm.hostname = .*name-with-underscore/)
|
|
@@ -140,7 +140,7 @@ module Beaker
|
|
|
140
140
|
test_invalid1: { host_path: '/invalid1', container_path: '/invalid1' },
|
|
141
141
|
test_invalid2: { from: '/invalid2', container_path: '/invalid2' },
|
|
142
142
|
test_invalid3: { host_path: '/invalid3', to: '/invalid3' },
|
|
143
|
-
test_valid: { from: '/valid', to: '/valid' }
|
|
143
|
+
test_valid: { from: '/valid', to: '/valid' },
|
|
144
144
|
} }, 1)
|
|
145
145
|
vagrant.make_vfile(hosts, options)
|
|
146
146
|
|
|
@@ -158,8 +158,8 @@ module Beaker
|
|
|
158
158
|
shell_path = '/path/to/shell/script'
|
|
159
159
|
hosts = make_hosts({
|
|
160
160
|
shell_provisioner: {
|
|
161
|
-
path: shell_path
|
|
162
|
-
}
|
|
161
|
+
path: shell_path,
|
|
162
|
+
},
|
|
163
163
|
}, 1)
|
|
164
164
|
vagrant.make_vfile(hosts, options)
|
|
165
165
|
|
|
@@ -175,8 +175,8 @@ module Beaker
|
|
|
175
175
|
hosts = make_hosts({
|
|
176
176
|
shell_provisioner: {
|
|
177
177
|
path: shell_path,
|
|
178
|
-
args: shell_args
|
|
179
|
-
}
|
|
178
|
+
args: shell_args,
|
|
179
|
+
},
|
|
180
180
|
}, 1)
|
|
181
181
|
vagrant.make_vfile(hosts, options)
|
|
182
182
|
|
|
@@ -199,8 +199,8 @@ module Beaker
|
|
|
199
199
|
empty_shell_path = ''
|
|
200
200
|
hosts = make_hosts({
|
|
201
201
|
shell_provisioner: {
|
|
202
|
-
path: empty_shell_path
|
|
203
|
-
}
|
|
202
|
+
path: empty_shell_path,
|
|
203
|
+
},
|
|
204
204
|
}, 1)
|
|
205
205
|
expect do
|
|
206
206
|
vagrant.make_vfile(hosts, options)
|
|
@@ -218,23 +218,23 @@ module Beaker
|
|
|
218
218
|
end
|
|
219
219
|
|
|
220
220
|
it 'has the proper port forwarding for RDP' do
|
|
221
|
-
expect(@generated_file).to match
|
|
221
|
+
expect(@generated_file).to match(/v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true/)
|
|
222
222
|
end
|
|
223
223
|
|
|
224
224
|
it 'has the proper port forwarding for WinRM' do
|
|
225
|
-
expect(@generated_file).to match
|
|
225
|
+
expect(@generated_file).to match(/v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/)
|
|
226
226
|
end
|
|
227
227
|
|
|
228
228
|
it 'configures the guest type to windows' do
|
|
229
|
-
expect(@generated_file).to match
|
|
229
|
+
expect(@generated_file).to match(/v.vm.guest = :windows/)
|
|
230
230
|
end
|
|
231
231
|
|
|
232
232
|
it 'configures the guest type to use winrm' do
|
|
233
|
-
expect(@generated_file).to match
|
|
233
|
+
expect(@generated_file).to match(/v.vm.communicator = 'winrm'/)
|
|
234
234
|
end
|
|
235
235
|
|
|
236
236
|
it 'sets a non-default memsize' do
|
|
237
|
-
expect(@generated_file).to match
|
|
237
|
+
expect(@generated_file).to match(/'--memory', '2048',/)
|
|
238
238
|
end
|
|
239
239
|
end
|
|
240
240
|
|
|
@@ -249,11 +249,11 @@ module Beaker
|
|
|
249
249
|
end
|
|
250
250
|
|
|
251
251
|
it 'has the proper ssh shell' do
|
|
252
|
-
expect(@generated_file).to match
|
|
252
|
+
expect(@generated_file).to match(/v.ssh.shell = 'sh'\n/)
|
|
253
253
|
end
|
|
254
254
|
|
|
255
255
|
it 'has the proper guest setting' do
|
|
256
|
-
expect(@generated_file).to match
|
|
256
|
+
expect(@generated_file).to match(/v.vm.guest = :freebsd\n/)
|
|
257
257
|
end
|
|
258
258
|
end
|
|
259
259
|
|
|
@@ -266,7 +266,7 @@ module Beaker
|
|
|
266
266
|
|
|
267
267
|
match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1', '--audio', 'none'\]/)
|
|
268
268
|
|
|
269
|
-
expect(match).
|
|
269
|
+
expect(match).not_to be_nil
|
|
270
270
|
end
|
|
271
271
|
|
|
272
272
|
it 'uses the cpus defined per vagrant host' do
|
|
@@ -278,7 +278,7 @@ module Beaker
|
|
|
278
278
|
|
|
279
279
|
match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!', '--audio', 'none'\]/)
|
|
280
280
|
|
|
281
|
-
expect(match).
|
|
281
|
+
expect(match).not_to be_nil
|
|
282
282
|
end
|
|
283
283
|
|
|
284
284
|
context 'port forwarding rules' do
|
|
@@ -293,9 +293,9 @@ module Beaker
|
|
|
293
293
|
from_ip: '127.0.0.1',
|
|
294
294
|
to: 80,
|
|
295
295
|
to_ip: '0.0.0.0',
|
|
296
|
-
protocol: 'udp'
|
|
297
|
-
}
|
|
298
|
-
}
|
|
296
|
+
protocol: 'udp',
|
|
297
|
+
},
|
|
298
|
+
},
|
|
299
299
|
}, 1
|
|
300
300
|
)
|
|
301
301
|
vagrant.make_vfile(hosts, options)
|
|
@@ -314,8 +314,8 @@ module Beaker
|
|
|
314
314
|
from: 10_080,
|
|
315
315
|
from_ip: '127.0.0.1',
|
|
316
316
|
to: 80,
|
|
317
|
-
}
|
|
318
|
-
}
|
|
317
|
+
},
|
|
318
|
+
},
|
|
319
319
|
}, 1
|
|
320
320
|
)
|
|
321
321
|
vagrant.make_vfile(hosts, options)
|
|
@@ -334,8 +334,8 @@ module Beaker
|
|
|
334
334
|
from: 10_080,
|
|
335
335
|
to: 80,
|
|
336
336
|
to_ip: '0.0.0.0',
|
|
337
|
-
}
|
|
338
|
-
}
|
|
337
|
+
},
|
|
338
|
+
},
|
|
339
339
|
}, 1
|
|
340
340
|
)
|
|
341
341
|
vagrant.make_vfile(hosts, options)
|
|
@@ -353,9 +353,9 @@ module Beaker
|
|
|
353
353
|
http: {
|
|
354
354
|
from: 10_080,
|
|
355
355
|
to: 80,
|
|
356
|
-
protocol: 'udp'
|
|
357
|
-
}
|
|
358
|
-
}
|
|
356
|
+
protocol: 'udp',
|
|
357
|
+
},
|
|
358
|
+
},
|
|
359
359
|
}, 1
|
|
360
360
|
)
|
|
361
361
|
vagrant.make_vfile(hosts, options)
|
|
@@ -392,7 +392,7 @@ module Beaker
|
|
|
392
392
|
host[:platform] = 'windows'
|
|
393
393
|
expect(host).to receive(:is_cygwin?).and_return(true)
|
|
394
394
|
|
|
395
|
-
expect(Command).
|
|
395
|
+
expect(Command).not_to receive(:new).with('sudo fixfiles restore /root')
|
|
396
396
|
expect(Command).to receive(:new).with('cp -r .ssh /cygdrive/c/Users/Administrator/.').once
|
|
397
397
|
expect(Command).to receive(:new).with('chown -R Administrator /cygdrive/c/Users/Administrator/.ssh').once
|
|
398
398
|
|
|
@@ -425,7 +425,7 @@ module Beaker
|
|
|
425
425
|
let(:name) { host.name }
|
|
426
426
|
let(:override_options) { {} }
|
|
427
427
|
|
|
428
|
-
before
|
|
428
|
+
before do
|
|
429
429
|
# FakeFS is just broken with Tempfile
|
|
430
430
|
FakeFS.deactivate!
|
|
431
431
|
Dir.mktmpdir do |dir|
|
|
@@ -457,7 +457,7 @@ module Beaker
|
|
|
457
457
|
{ forward_ssh_agent: false }
|
|
458
458
|
end
|
|
459
459
|
|
|
460
|
-
it '
|
|
460
|
+
it 'keeps IdentitiesOnly to yes' do
|
|
461
461
|
expect(host['ssh'][:keys_only]).to be === true
|
|
462
462
|
end
|
|
463
463
|
end
|
|
@@ -516,7 +516,7 @@ module Beaker
|
|
|
516
516
|
end
|
|
517
517
|
|
|
518
518
|
describe 'provisioning and cleanup' do
|
|
519
|
-
before
|
|
519
|
+
before do
|
|
520
520
|
expect(vagrant).to receive(:vagrant_cmd).with('up').once
|
|
521
521
|
@hosts.each do |host|
|
|
522
522
|
host_prev_name = host['user']
|
|
@@ -530,7 +530,7 @@ module Beaker
|
|
|
530
530
|
it 'can provision a set of hosts' do
|
|
531
531
|
options = vagrant.instance_variable_get(:@options)
|
|
532
532
|
expect(vagrant).to receive(:make_vfile).with(@hosts, options).once
|
|
533
|
-
expect(vagrant).
|
|
533
|
+
expect(vagrant).not_to receive(:vagrant_cmd).with('destroy --force')
|
|
534
534
|
vagrant.provision
|
|
535
535
|
end
|
|
536
536
|
|
|
@@ -557,7 +557,7 @@ module Beaker
|
|
|
557
557
|
end
|
|
558
558
|
|
|
559
559
|
describe 'provisioning and cleanup on windows' do
|
|
560
|
-
before
|
|
560
|
+
before do
|
|
561
561
|
expect(vagrant).to receive(:vagrant_cmd).with('up').once
|
|
562
562
|
@hosts.each do |host|
|
|
563
563
|
host[:platform] = 'windows'
|
|
@@ -572,7 +572,7 @@ module Beaker
|
|
|
572
572
|
it 'can provision a set of hosts' do
|
|
573
573
|
options = vagrant.instance_variable_get(:@options)
|
|
574
574
|
expect(vagrant).to receive(:make_vfile).with(@hosts, options).once
|
|
575
|
-
expect(vagrant).
|
|
575
|
+
expect(vagrant).not_to receive(:vagrant_cmd).with('destroy --force')
|
|
576
576
|
vagrant.provision
|
|
577
577
|
end
|
|
578
578
|
|
|
@@ -27,7 +27,7 @@ describe Beaker::VagrantVirtualbox do
|
|
|
27
27
|
end
|
|
28
28
|
|
|
29
29
|
it 'can make a Vagrantfile for a set of hosts' do
|
|
30
|
-
|
|
30
|
+
expect(subject).to include(%( v.vm.provider :virtualbox do |vb|\n vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n end))
|
|
31
31
|
end
|
|
32
32
|
|
|
33
33
|
context 'with ioapic(multiple cores)' do
|
|
@@ -49,13 +49,13 @@ describe Beaker::VagrantVirtualbox do
|
|
|
49
49
|
it { is_expected.to include(" vb.customize ['modifyvm', :id, '--usb', 'on']") }
|
|
50
50
|
|
|
51
51
|
it {
|
|
52
|
-
|
|
52
|
+
expect(subject).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']")
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
it { is_expected.to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']") }
|
|
56
56
|
|
|
57
57
|
it {
|
|
58
|
-
|
|
58
|
+
expect(subject).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
|
|
59
59
|
}
|
|
60
60
|
end
|
|
61
61
|
|
|
@@ -65,13 +65,13 @@ describe Beaker::VagrantVirtualbox do
|
|
|
65
65
|
end
|
|
66
66
|
|
|
67
67
|
it {
|
|
68
|
-
|
|
68
|
+
expect(subject).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']")
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
it { is_expected.to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']") }
|
|
72
72
|
|
|
73
73
|
it {
|
|
74
|
-
|
|
74
|
+
expect(subject).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
|
|
75
75
|
}
|
|
76
76
|
end
|
|
77
77
|
|
|
@@ -79,21 +79,22 @@ describe Beaker::VagrantVirtualbox do
|
|
|
79
79
|
let(:hosts) { make_hosts({ volumes: { 'test_disk' => { size: '5120' } } }) }
|
|
80
80
|
|
|
81
81
|
it {
|
|
82
|
-
|
|
82
|
+
expect(subject).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']")
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
it { is_expected.to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']") }
|
|
86
86
|
|
|
87
87
|
it {
|
|
88
|
-
|
|
88
|
+
expect(subject).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
|
|
89
89
|
}
|
|
90
90
|
end
|
|
91
91
|
end
|
|
92
92
|
|
|
93
93
|
context 'disabled vb guest plugin' do
|
|
94
|
-
let(:options) { super().merge({ vbguest_plugin: 'disable' }) }
|
|
95
94
|
subject { vagrant.class.provider_vfile_section(hosts.first, options) }
|
|
96
95
|
|
|
96
|
+
let(:options) { super().merge({ vbguest_plugin: 'disable' }) }
|
|
97
|
+
|
|
97
98
|
it { is_expected.to match(/vb\.vbguest\.auto_update = false/) }
|
|
98
99
|
end
|
|
99
100
|
end
|
|
@@ -28,7 +28,7 @@ describe Beaker::VagrantWorkstation do
|
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
it 'for a set of hosts' do
|
|
31
|
-
|
|
31
|
+
expect(subject).to include(%( v.vm.provider :vmware_workstation do |v|\n v.vmx['memsize'] = '1024'\n end))
|
|
32
32
|
end
|
|
33
33
|
|
|
34
34
|
context 'with whitelist_verified' do
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beaker-vagrant
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vox Pupuli
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: bin
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date:
|
|
14
|
+
date: 2024-04-30 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: fakefs
|
|
@@ -95,14 +95,14 @@ dependencies:
|
|
|
95
95
|
requirements:
|
|
96
96
|
- - "~>"
|
|
97
97
|
- !ruby/object:Gem::Version
|
|
98
|
-
version:
|
|
98
|
+
version: 2.5.0
|
|
99
99
|
type: :development
|
|
100
100
|
prerelease: false
|
|
101
101
|
version_requirements: !ruby/object:Gem::Requirement
|
|
102
102
|
requirements:
|
|
103
103
|
- - "~>"
|
|
104
104
|
- !ruby/object:Gem::Version
|
|
105
|
-
version:
|
|
105
|
+
version: 2.5.0
|
|
106
106
|
- !ruby/object:Gem::Dependency
|
|
107
107
|
name: beaker
|
|
108
108
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -159,14 +159,14 @@ files:
|
|
|
159
159
|
- lib/beaker/hypervisor/vagrant_parallels.rb
|
|
160
160
|
- lib/beaker/hypervisor/vagrant_virtualbox.rb
|
|
161
161
|
- lib/beaker/hypervisor/vagrant_workstation.rb
|
|
162
|
-
- spec/beaker/
|
|
163
|
-
- spec/beaker/
|
|
164
|
-
- spec/beaker/
|
|
165
|
-
- spec/beaker/
|
|
166
|
-
- spec/beaker/
|
|
167
|
-
- spec/beaker/
|
|
168
|
-
- spec/beaker/
|
|
169
|
-
- spec/beaker/
|
|
162
|
+
- spec/beaker/vagrant_custom_spec.rb
|
|
163
|
+
- spec/beaker/vagrant_desktop_spec.rb
|
|
164
|
+
- spec/beaker/vagrant_fusion_spec.rb
|
|
165
|
+
- spec/beaker/vagrant_libvirt_spec.rb
|
|
166
|
+
- spec/beaker/vagrant_parallels_spec.rb
|
|
167
|
+
- spec/beaker/vagrant_spec.rb
|
|
168
|
+
- spec/beaker/vagrant_virtualbox_spec.rb
|
|
169
|
+
- spec/beaker/vagrant_workstation_spec.rb
|
|
170
170
|
- spec/spec_helper.rb
|
|
171
171
|
homepage: https://github.com/puppetlabs/beaker-vagrant
|
|
172
172
|
licenses:
|
|
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
187
187
|
- !ruby/object:Gem::Version
|
|
188
188
|
version: '0'
|
|
189
189
|
requirements: []
|
|
190
|
-
rubygems_version: 3.
|
|
190
|
+
rubygems_version: 3.5.9
|
|
191
191
|
signing_key:
|
|
192
192
|
specification_version: 4
|
|
193
193
|
summary: Beaker DSL Extension Helpers!
|