Skip to content

Commit cd70122

Browse files
author
Jos Houtman
committed
Pin public_suffix and upgrade puppet.
public_suffix is pinned to a version that supports ruby 1.9.3 puppet is updated to 3.8.4 since that is the minimal version for the tests
1 parent 208f322 commit cd70122

File tree

2 files changed

+71
-67
lines changed

2 files changed

+71
-67
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ group :test do
1616
gem "json_pure", '~> 1.8.3'
1717

1818
gem "rake"
19-
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
19+
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.4'
2020
gem "puppet-lint"
2121

2222
gem "rspec"
@@ -28,4 +28,6 @@ group :test do
2828
gem "hiera"
2929
gem "hiera-puppet-helper"
3030
gem "webmock", "~> 2.3.0"
31+
#pin for 1.9.3 compatability for now
32+
gem "public_suffix", '~> 1.4.6'
3133
end

Gemfile.lock

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.1)
4+
CFPropertyList (2.3.5)
55
addressable (2.4.0)
6-
aws-sdk-v1 (1.66.0)
6+
aws-sdk-v1 (1.67.0)
77
json (~> 1.4)
8-
nokogiri (>= 1.4.4)
9-
beaker (2.51.0)
8+
nokogiri (~> 1)
9+
beaker (2.52.0)
1010
aws-sdk-v1 (~> 1.57)
1111
beaker-answers (~> 0.0)
1212
beaker-hiera (~> 0.0)
@@ -26,42 +26,43 @@ GEM
2626
net-scp (~> 1.2)
2727
net-ssh (~> 2.9)
2828
open_uri_redirections (~> 0.2.1)
29+
public_suffix (< 1.5.0)
2930
rbvmomi (~> 1.8, < 1.9.0)
3031
rsync (~> 1.0.9)
3132
stringify-hash (~> 0.0)
3233
unf (~> 0.1)
33-
beaker-answers (0.11.0)
34+
beaker-answers (0.17.0)
3435
hocon (~> 1.0)
3536
require_all (~> 1.3.2)
3637
stringify-hash (~> 0.0.0)
3738
beaker-hiera (0.1.1)
3839
stringify-hash (~> 0.0.0)
39-
beaker-hostgenerator (0.7.3)
40+
beaker-hostgenerator (1.1.0)
4041
deep_merge (~> 1.0)
4142
stringify-hash (~> 0.0.0)
42-
beaker-pe (0.12.0)
43+
beaker-pe (0.12.2)
4344
stringify-hash (~> 0.0.0)
44-
beaker-puppet_install_helper (0.4.4)
45-
beaker (~> 2.0)
45+
beaker-puppet_install_helper (0.7.1)
46+
beaker (>= 2.0)
4647
beaker-rspec (5.6.0)
4748
beaker (~> 2.0)
4849
rspec
4950
serverspec (~> 2)
5051
specinfra (~> 2)
51-
builder (3.2.2)
52-
coderay (1.1.1)
52+
builder (3.2.3)
53+
coderay (1.1.2)
5354
crack (0.4.3)
5455
safe_yaml (~> 1.0.0)
5556
deep_merge (1.1.1)
56-
diff-lcs (1.2.5)
57-
docker-api (1.31.0)
57+
diff-lcs (1.3)
58+
docker-api (1.33.6)
5859
excon (>= 0.38.0)
5960
json
60-
domain_name (0.5.20160826)
61+
domain_name (0.5.20170404)
6162
unf (>= 0.0.5, < 1.0.0)
62-
excon (0.52.0)
63-
facter (2.4.6)
64-
faraday (0.9.2)
63+
excon (0.59.0)
64+
facter (2.5.1)
65+
faraday (0.13.1)
6566
multipart-post (>= 1.2, < 3)
6667
fission (0.5.0)
6768
CFPropertyList (~> 2.2)
@@ -92,18 +93,18 @@ GEM
9293
fog-atmos (0.1.0)
9394
fog-core
9495
fog-xml
95-
fog-aws (0.12.0)
96+
fog-aws (1.4.1)
9697
fog-core (~> 1.38)
9798
fog-json (~> 1.0)
9899
fog-xml (~> 0.1)
99100
ipaddress (~> 0.8)
100-
fog-brightbox (0.11.0)
101+
fog-brightbox (0.13.0)
101102
fog-core (~> 1.22)
102103
fog-json
103104
inflecto (~> 0.0.2)
104-
fog-core (1.42.0)
105+
fog-core (1.45.0)
105106
builder
106-
excon (~> 0.49)
107+
excon (~> 0.58)
107108
formatador (~> 0.2)
108109
fog-dynect (0.0.3)
109110
fog-core
@@ -119,13 +120,13 @@ GEM
119120
fog-json (1.0.2)
120121
fog-core (~> 1.0)
121122
multi_json (~> 1.10)
122-
fog-local (0.3.0)
123+
fog-local (0.4.0)
123124
fog-core (~> 1.27)
124125
fog-powerdns (0.1.1)
125126
fog-core (~> 1.27)
126127
fog-json (~> 1.0)
127128
fog-xml (~> 0.1)
128-
fog-profitbricks (2.0.1)
129+
fog-profitbricks (4.0.0)
129130
fog-core (~> 1.42)
130131
fog-json (~> 1.0)
131132
fog-radosgw (0.0.5)
@@ -157,9 +158,9 @@ GEM
157158
fog-voxel (0.1.0)
158159
fog-core
159160
fog-xml
160-
fog-xml (0.1.2)
161+
fog-xml (0.1.3)
161162
fog-core
162-
nokogiri (~> 1.5, >= 1.5.11)
163+
nokogiri (>= 1.5.11, < 2.0.0)
163164
formatador (0.2.5)
164165
google-api-client (0.9.4)
165166
addressable (~> 2.3)
@@ -171,8 +172,8 @@ GEM
171172
representable (~> 2.3.0)
172173
retriable (~> 2.0)
173174
thor (~> 0.19)
174-
googleauth (0.5.1)
175-
faraday (~> 0.9)
175+
googleauth (0.5.3)
176+
faraday (~> 0.12)
176177
jwt (~> 1.4)
177178
logging (~> 2.0)
178179
memoist (~> 0.12)
@@ -183,63 +184,62 @@ GEM
183184
hiera (1.3.4)
184185
json_pure
185186
hiera-puppet-helper (1.0.1)
186-
hocon (1.1.2)
187-
http-cookie (1.0.2)
187+
hocon (1.2.5)
188+
http-cookie (1.0.3)
188189
domain_name (~> 0.5)
189-
httpclient (2.8.2.4)
190+
httpclient (2.8.3)
190191
hurley (0.2)
191-
in-parallel (0.1.15)
192+
in-parallel (0.1.17)
192193
inflecto (0.0.2)
193194
inifile (2.0.2)
194195
ipaddress (0.8.3)
195-
json (1.8.3)
196-
json_pure (1.8.3)
196+
json (1.8.6)
197+
json_pure (1.8.6)
197198
jwt (1.5.6)
198199
little-plugger (1.1.4)
199-
logging (2.1.0)
200+
logging (2.2.2)
200201
little-plugger (~> 1.1)
201202
multi_json (~> 1.10)
202-
memoist (0.15.0)
203+
memoist (0.16.0)
203204
metaclass (0.0.4)
204205
method_source (0.8.2)
205206
mime-types (2.99.3)
206207
mini_portile2 (2.1.0)
207-
minitest (5.9.0)
208-
mocha (1.1.0)
208+
minitest (5.10.3)
209+
mocha (1.3.0)
209210
metaclass (~> 0.0.1)
210-
multi_json (1.12.1)
211+
multi_json (1.12.2)
211212
multipart-post (2.0.0)
212213
net-scp (1.2.1)
213214
net-ssh (>= 2.6.5)
214215
net-ssh (2.9.4)
215216
net-telnet (0.1.1)
216217
netrc (0.11.0)
217-
nokogiri (1.6.8)
218+
nokogiri (1.6.8.1)
218219
mini_portile2 (~> 2.1.0)
219-
pkg-config (~> 1.1.7)
220220
open_uri_redirections (0.2.1)
221221
os (0.9.6)
222-
pkg-config (1.1.7)
223222
pry (0.10.4)
224223
coderay (~> 1.1.0)
225224
method_source (~> 0.8.1)
226225
slop (~> 3.4)
227-
puppet (3.7.5)
226+
public_suffix (1.4.6)
227+
puppet (3.8.7)
228228
facter (> 1.6, < 3)
229229
hiera (~> 1.0)
230230
json_pure
231231
puppet-blacksmith (3.4.0)
232232
puppet (>= 2.7.16)
233233
rest-client (~> 1.8.0)
234-
puppet-lint (2.0.2)
235-
puppet-syntax (2.1.0)
234+
puppet-lint (2.3.0)
235+
puppet-syntax (2.4.1)
236236
rake
237-
puppetlabs_spec_helper (1.2.2)
237+
puppetlabs_spec_helper (2.3.2)
238238
mocha (~> 1.0)
239239
puppet-lint (~> 2.0)
240240
puppet-syntax (~> 2.0)
241241
rspec-puppet (~> 2.0)
242-
rake (10.5.0)
242+
rake (12.0.0)
243243
rbvmomi (1.8.2)
244244
builder
245245
nokogiri (>= 1.4.1)
@@ -252,49 +252,50 @@ GEM
252252
mime-types (>= 1.16, < 3.0)
253253
netrc (~> 0.7)
254254
retriable (2.1.0)
255-
rspec (3.1.0)
256-
rspec-core (~> 3.1.0)
257-
rspec-expectations (~> 3.1.0)
258-
rspec-mocks (~> 3.1.0)
259-
rspec-core (3.1.7)
260-
rspec-support (~> 3.1.0)
261-
rspec-expectations (3.1.2)
255+
rspec (3.6.0)
256+
rspec-core (~> 3.6.0)
257+
rspec-expectations (~> 3.6.0)
258+
rspec-mocks (~> 3.6.0)
259+
rspec-core (3.6.0)
260+
rspec-support (~> 3.6.0)
261+
rspec-expectations (3.6.0)
262262
diff-lcs (>= 1.2.0, < 2.0)
263-
rspec-support (~> 3.1.0)
263+
rspec-support (~> 3.6.0)
264264
rspec-its (1.2.0)
265265
rspec-core (>= 3.0.0)
266266
rspec-expectations (>= 3.0.0)
267-
rspec-mocks (3.1.3)
268-
rspec-support (~> 3.1.0)
269-
rspec-puppet (2.4.0)
267+
rspec-mocks (3.6.0)
268+
diff-lcs (>= 1.2.0, < 2.0)
269+
rspec-support (~> 3.6.0)
270+
rspec-puppet (2.6.8)
270271
rspec
271-
rspec-support (3.1.2)
272+
rspec-support (3.6.0)
272273
rsync (1.0.9)
273274
safe_yaml (1.0.4)
274-
serverspec (2.36.1)
275+
serverspec (2.40.0)
275276
multi_json
276277
rspec (~> 3.0)
277278
rspec-its
278-
specinfra (~> 2.53)
279-
sfl (2.2)
279+
specinfra (~> 2.68)
280+
sfl (2.3)
280281
signet (0.7.3)
281282
addressable (~> 2.3)
282283
faraday (~> 0.9)
283284
jwt (~> 1.5)
284285
multi_json (~> 1.10)
285286
slop (3.6.0)
286-
specinfra (2.63.1)
287+
specinfra (2.71.2)
287288
net-scp
288-
net-ssh (>= 2.7, < 4.0)
289+
net-ssh (>= 2.7, < 5.0)
289290
net-telnet
290291
sfl
291292
stringify-hash (0.0.2)
292-
thor (0.19.1)
293+
thor (0.20.0)
293294
trollop (2.1.2)
294295
uber (0.0.15)
295296
unf (0.1.4)
296297
unf_ext
297-
unf_ext (0.0.7.2)
298+
unf_ext (0.0.7.4)
298299
vagrant-wrapper (2.0.3)
299300
webmock (2.3.2)
300301
addressable (>= 2.3.6)
@@ -313,7 +314,8 @@ DEPENDENCIES
313314
json (~> 1.8.3)
314315
json_pure (~> 1.8.3)
315316
pry
316-
puppet (~> 3.7.0)
317+
public_suffix (~> 1.4.6)
318+
puppet (~> 3.8.4)
317319
puppet-blacksmith
318320
puppet-lint
319321
puppet-syntax

0 commit comments

Comments
 (0)