Skip to content
This repository was archived by the owner on Mar 28, 2019. It is now read-only.

Commit 608a100

Browse files
author
Daniel Dreier
committed
Update default puppet version to 3.7.3
I had trouble using 'rake build' with the default 3.4 we'd been using
1 parent 75658c0 commit 608a100

File tree

2 files changed

+89
-71
lines changed

2 files changed

+89
-71
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "http://rubygems.org"
22

33
group :test do
44
gem "rake"
5-
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
5+
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.3'
66
gem "puppet-lint"
77
gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
88
gem "rspec", '< 3.0.0'

Gemfile.lock

Lines changed: 88 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/rodjek/rspec-puppet.git
3-
revision: 389f99ef666521fec1b4530fe69dc1ab84a060a8
3+
revision: 6ac97993fa972a15851a73d55fe3d1c0a85172b5
44
specs:
55
rspec-puppet (1.0.1)
66
rspec
@@ -18,61 +18,73 @@ GEM
1818
aws-sdk (1.42.0)
1919
json (~> 1.4)
2020
nokogiri (>= 1.4.4)
21-
backports (3.6.0)
22-
beaker (1.12.1)
23-
aws-sdk (~> 1.38)
21+
backports (3.6.4)
22+
beaker (1.20.1)
23+
aws-sdk (= 1.42.0)
2424
blimpy (~> 0.6)
2525
docker-api
2626
fission (~> 0.4)
27+
fog (~> 1.22.1)
2728
google-api-client (~> 0.7.1)
29+
hocon (~> 0.0.4)
2830
inifile (~> 2.0)
2931
json (~> 1.8)
3032
mime-types (~> 1.25)
3133
net-scp (~> 1.1)
3234
net-ssh (~> 2.6)
33-
nokogiri (= 1.5.10)
35+
nokogiri (~> 1.5.10)
3436
rbvmomi (= 1.8.1)
3537
unf (~> 0.1)
36-
beaker-rspec (2.2.4)
38+
beaker-rspec (3.0.0)
3739
beaker (~> 1.10)
38-
rspec (~> 2.14)
40+
rspec
3941
serverspec (~> 1.0)
4042
specinfra (~> 1.0)
4143
blimpy (0.6.7)
4244
fog
4345
minitar
4446
thor
4547
builder (3.2.2)
46-
celluloid (0.15.2)
47-
timers (~> 1.1.0)
48+
celluloid (0.16.0)
49+
timers (~> 4.0.0)
4850
coderay (1.1.0)
4951
diff-lcs (1.2.5)
50-
docker-api (1.11.0)
52+
docker-api (1.15.0)
5153
archive-tar-minitar
52-
excon (>= 0.34.0)
54+
excon (>= 0.38.0)
5355
json
54-
ethon (0.7.0)
56+
ethon (0.7.1)
5557
ffi (>= 1.3.0)
56-
excon (0.35.0)
58+
excon (0.41.0)
5759
extlib (0.9.16)
58-
facter (1.7.5)
60+
facter (2.3.0)
61+
CFPropertyList (~> 2.2.6)
5962
faraday (0.9.0)
6063
multipart-post (>= 1.2, < 3)
6164
faraday_middleware (0.9.1)
6265
faraday (>= 0.7.4, < 0.10)
63-
ffi (1.9.3)
66+
ffi (1.9.6)
6467
fission (0.5.0)
6568
CFPropertyList (~> 2.2)
66-
fog (1.11.1)
69+
fog (1.22.1)
70+
fog-brightbox
71+
fog-core (~> 1.22)
72+
fog-json
73+
ipaddress (~> 0.5)
74+
nokogiri (~> 1.5, >= 1.5.11)
75+
fog-brightbox (0.7.0)
76+
fog-core (~> 1.22)
77+
fog-json
78+
inflecto (~> 0.0.2)
79+
fog-core (1.25.0)
6780
builder
68-
excon (~> 0.20)
69-
formatador (~> 0.2.0)
70-
json (~> 1.7)
81+
excon (~> 0.38)
82+
formatador (~> 0.2)
7183
mime-types
7284
net-scp (~> 1.1)
7385
net-ssh (>= 2.1.3)
74-
nokogiri (~> 1.5.0)
75-
ruby-hmac
86+
fog-json (1.0.0)
87+
multi_json (~> 1.0)
7688
formatador (0.2.5)
7789
gh (0.13.2)
7890
addressable
@@ -92,30 +104,33 @@ GEM
92104
retriable (>= 1.4)
93105
signet (>= 0.5.0)
94106
uuidtools (>= 2.1.0)
95-
guard (2.6.1)
107+
guard (2.9.0)
96108
formatador (>= 0.2.4)
97109
listen (~> 2.7)
98110
lumberjack (~> 1.0)
99111
pry (>= 0.9.12)
100112
thor (>= 0.18.1)
101-
guard-rake (0.0.9)
113+
guard-rake (1.0.0)
102114
guard
103115
rake
104-
hashr (0.0.22)
105-
hiera (1.3.3)
116+
hiera (1.3.4)
106117
json_pure
107118
highline (1.6.21)
119+
hitimes (1.2.2)
120+
hocon (0.0.6)
121+
inflecto (0.0.2)
108122
inifile (2.0.2)
123+
ipaddress (0.8.0)
109124
json (1.8.1)
110125
json_pure (1.8.1)
111-
jwt (1.0.0)
112-
launchy (2.4.2)
126+
jwt (1.2.0)
127+
launchy (2.4.3)
113128
addressable (~> 2.3)
114-
listen (2.7.6)
129+
listen (2.8.3)
115130
celluloid (>= 0.15.2)
116131
rb-fsevent (>= 0.9.3)
117132
rb-inotify (>= 0.9)
118-
lumberjack (1.0.6)
133+
lumberjack (1.0.9)
119134
metaclass (0.0.4)
120135
metadata-json-lint (0.0.2)
121136
method_source (0.8.2)
@@ -130,90 +145,93 @@ GEM
130145
net-scp (1.2.1)
131146
net-ssh (>= 2.6.5)
132147
net-ssh (2.9.1)
133-
nokogiri (1.5.10)
148+
netrc (0.8.0)
149+
nokogiri (1.5.11)
134150
pry (0.9.12.6)
135151
coderay (~> 1.0)
136152
method_source (~> 0.8)
137153
slop (~> 3.4)
138-
puppet (3.4.3)
139-
facter (~> 1.6)
154+
puppet (3.7.3)
155+
facter (> 1.6, < 3)
140156
hiera (~> 1.0)
141-
rgen (~> 0.6.5)
142-
puppet-blacksmith (2.0.2)
143-
nokogiri
157+
json_pure
158+
puppet-blacksmith (3.0.3)
144159
puppet (>= 2.7.16)
145160
rest-client
146-
puppet-lint (0.3.2)
147-
puppet-syntax (1.2.0)
148-
puppet (>= 2.7.0)
161+
puppet-lint (1.1.0)
162+
puppet-syntax (1.3.0)
149163
rake
150-
puppetlabs_spec_helper (0.4.1)
151-
mocha (>= 0.10.5)
164+
puppetlabs_spec_helper (0.8.2)
165+
mocha
166+
puppet-lint
167+
puppet-syntax
152168
rake
153-
rspec (>= 2.9.0)
154-
rspec-puppet (>= 0.1.1)
169+
rspec
170+
rspec-puppet
155171
pusher-client (0.6.0)
156172
json
157173
websocket (~> 1.0)
158-
rake (10.3.2)
174+
rake (10.4.0)
159175
rb-fsevent (0.9.4)
160-
rb-inotify (0.9.4)
176+
rb-inotify (0.9.5)
161177
ffi (>= 0.5.0)
162178
rbvmomi (1.8.1)
163179
builder
164180
nokogiri (>= 1.4.1)
165181
trollop
166-
rest-client (1.6.7)
167-
mime-types (>= 1.16)
182+
rest-client (1.7.2)
183+
mime-types (>= 1.16, < 3.0)
184+
netrc (~> 0.7)
168185
retriable (1.4.1)
169-
rgen (0.6.6)
170186
rspec (2.99.0)
171187
rspec-core (~> 2.99.0)
172188
rspec-expectations (~> 2.99.0)
173189
rspec-mocks (~> 2.99.0)
174-
rspec-core (2.99.0)
175-
rspec-expectations (2.99.0)
190+
rspec-core (2.99.2)
191+
rspec-expectations (2.99.2)
176192
diff-lcs (>= 1.1.3, < 2.0)
177-
rspec-mocks (2.99.0)
178-
ruby-hmac (0.4.0)
179-
safe_yaml (0.9.7)
180-
serverspec (1.7.0)
193+
rspec-its (1.0.1)
194+
rspec-core (>= 2.99.0.beta1)
195+
rspec-expectations (>= 2.99.0.beta1)
196+
rspec-mocks (2.99.2)
197+
serverspec (1.16.0)
181198
highline
182199
net-ssh
183-
rspec (~> 2.13)
184-
specinfra (~> 1.13)
185-
signet (0.5.0)
200+
rspec (~> 2.99)
201+
rspec-its
202+
specinfra (~> 1.27)
203+
signet (0.5.1)
186204
addressable (>= 2.2.3)
187205
faraday (>= 0.9.0.rc5)
188206
jwt (>= 0.1.5)
189207
multi_json (>= 1.0.0)
190-
slop (3.5.0)
191-
specinfra (1.15.0)
208+
slop (3.6.0)
209+
specinfra (1.27.5)
192210
thor (0.19.1)
193-
timers (1.1.0)
194-
travis (1.6.11)
211+
timers (4.0.1)
212+
hitimes
213+
travis (1.7.4)
195214
addressable (~> 2.3)
196215
backports
197216
faraday (~> 0.9)
198-
faraday_middleware (~> 0.9)
217+
faraday_middleware (~> 0.9, >= 0.9.1)
199218
gh (~> 0.13)
200219
highline (~> 1.6)
201220
launchy (~> 2.1)
202-
pry (~> 0.9)
221+
pry (~> 0.9, < 0.10)
203222
pusher-client (~> 0.4)
204223
typhoeus (~> 0.6, >= 0.6.8)
205-
travis-lint (1.8.0)
206-
hashr (~> 0.0.22)
207-
safe_yaml (~> 0.9.0)
224+
travis-lint (2.0.0)
225+
json
208226
trollop (2.0)
209-
typhoeus (0.6.8)
210-
ethon (>= 0.7.0)
227+
typhoeus (0.6.9)
228+
ethon (>= 0.7.1)
211229
unf (0.1.4)
212230
unf_ext
213231
unf_ext (0.0.6)
214-
uuidtools (2.1.4)
232+
uuidtools (2.1.5)
215233
vagrant-wrapper (1.2.1.1)
216-
websocket (1.1.4)
234+
websocket (1.2.1)
217235

218236
PLATFORMS
219237
ruby
@@ -223,7 +241,7 @@ DEPENDENCIES
223241
beaker-rspec
224242
guard-rake
225243
metadata-json-lint
226-
puppet (~> 3.4.0)
244+
puppet (~> 3.7.3)
227245
puppet-blacksmith
228246
puppet-lint
229247
puppet-syntax

0 commit comments

Comments
 (0)