berkshelf 6.1.1 → 6.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +82 -7
- data/README.md +5 -1
- data/berkshelf.gemspec +1 -1
- data/features/json_formatter.feature +2 -2
- data/lib/berkshelf.rb +9 -0
- data/lib/berkshelf/version.rb +1 -1
- metadata +4 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f3af5dee0897d2bd3bab1e43ed463ddf49de5e7d
|
4
|
+
data.tar.gz: 345cc6d30d16d004d56d4cf129e7ebfdbfb8336a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f822b150ce8ba9a45c5d471ac6432ba88c6585c0883a98501397fcbe0e65decaef4e25c52a9b46ce2493a3831ed4e00ac5cbcc8cafa5fe96a5e2178465e69bbc
|
7
|
+
data.tar.gz: 7795f3dbd3c70e456214c2e7c5b9b6163bc542a35dd70c50c421dd1317fc499d7bfecb6df2d4e5a07cb4a254a959f4a9d8af65b84ad6aa4793343f256d32d29e
|
data/Gemfile.lock
CHANGED
@@ -20,9 +20,9 @@ GIT
|
|
20
20
|
PATH
|
21
21
|
remote: .
|
22
22
|
specs:
|
23
|
-
berkshelf (6.
|
23
|
+
berkshelf (6.2.0)
|
24
24
|
addressable (~> 2.3, >= 2.3.4)
|
25
|
-
berkshelf-api-client (>=
|
25
|
+
berkshelf-api-client (>= 4.0.0)
|
26
26
|
buff-config (~> 2.0)
|
27
27
|
buff-extensions (~> 2.0)
|
28
28
|
cleanroom (~> 1.0)
|
@@ -62,10 +62,8 @@ GEM
|
|
62
62
|
descendants_tracker (~> 0.0.4)
|
63
63
|
ice_nine (~> 0.11.0)
|
64
64
|
thread_safe (~> 0.3, >= 0.3.1)
|
65
|
-
berkshelf-api-client (
|
66
|
-
|
67
|
-
httpclient (~> 2.7)
|
68
|
-
ridley (>= 4.5, < 6.0)
|
65
|
+
berkshelf-api-client (4.0.0)
|
66
|
+
chef (>= 12.0)
|
69
67
|
buff-config (2.0.0)
|
70
68
|
buff-extensions (~> 2.0)
|
71
69
|
varia_model (~> 0.6)
|
@@ -80,6 +78,36 @@ GEM
|
|
80
78
|
celluloid-io (0.16.2)
|
81
79
|
celluloid (>= 0.16.0)
|
82
80
|
nio4r (>= 1.1.0)
|
81
|
+
chef (13.1.31)
|
82
|
+
addressable
|
83
|
+
bundler (>= 1.10)
|
84
|
+
chef-config (= 13.1.31)
|
85
|
+
chef-zero (>= 13.0)
|
86
|
+
diff-lcs (~> 1.2, >= 1.2.4)
|
87
|
+
erubis (~> 2.7)
|
88
|
+
ffi-yajl (~> 2.2)
|
89
|
+
highline (~> 1.6, >= 1.6.9)
|
90
|
+
iniparse (~> 1.4)
|
91
|
+
iso8601 (~> 0.9.1)
|
92
|
+
mixlib-archive (~> 0.4)
|
93
|
+
mixlib-authentication (~> 1.4)
|
94
|
+
mixlib-cli (~> 1.7)
|
95
|
+
mixlib-log (~> 1.3)
|
96
|
+
mixlib-shellout (~> 2.0)
|
97
|
+
net-sftp (~> 2.1, >= 2.1.2)
|
98
|
+
net-ssh (>= 2.9, < 5.0)
|
99
|
+
net-ssh-multi (~> 1.2, >= 1.2.1)
|
100
|
+
ohai (~> 13.0)
|
101
|
+
plist (~> 3.2)
|
102
|
+
proxifier (~> 1.0)
|
103
|
+
rspec-core (~> 3.5)
|
104
|
+
rspec-expectations (~> 3.5)
|
105
|
+
rspec-mocks (~> 3.5)
|
106
|
+
rspec_junit_formatter (~> 0.2.0)
|
107
|
+
serverspec (~> 2.7)
|
108
|
+
specinfra (~> 2.10)
|
109
|
+
syslog-logger (~> 1.6)
|
110
|
+
uuidtools (~> 2.1.5)
|
83
111
|
chef-config (13.1.31)
|
84
112
|
addressable
|
85
113
|
fuzzyurl
|
@@ -129,7 +157,7 @@ GEM
|
|
129
157
|
faraday-http-cache (2.0.0)
|
130
158
|
faraday (~> 0.8)
|
131
159
|
ffi (1.9.18)
|
132
|
-
ffi-yajl (2.3.
|
160
|
+
ffi-yajl (2.3.1)
|
133
161
|
libyajl2 (~> 1.2)
|
134
162
|
fuubar (2.2.0)
|
135
163
|
rspec-core (~> 3.0)
|
@@ -159,6 +187,7 @@ GEM
|
|
159
187
|
msgpack (>= 0.7.4)
|
160
188
|
hashdiff (0.3.4)
|
161
189
|
hashie (3.5.5)
|
190
|
+
highline (1.7.8)
|
162
191
|
hitimes (1.2.5)
|
163
192
|
http (2.2.2)
|
164
193
|
addressable (~> 2.3)
|
@@ -172,6 +201,9 @@ GEM
|
|
172
201
|
httpclient (2.8.3)
|
173
202
|
i18n (0.8.4)
|
174
203
|
ice_nine (0.11.2)
|
204
|
+
iniparse (1.4.3)
|
205
|
+
ipaddress (0.8.3)
|
206
|
+
iso8601 (0.9.1)
|
175
207
|
json (2.1.0)
|
176
208
|
libyajl2 (1.2.0)
|
177
209
|
minitar (0.6.1)
|
@@ -180,6 +212,7 @@ GEM
|
|
180
212
|
mixlib-log
|
181
213
|
mixlib-authentication (1.4.1)
|
182
214
|
mixlib-log
|
215
|
+
mixlib-cli (1.7.0)
|
183
216
|
mixlib-config (2.2.4)
|
184
217
|
mixlib-log (1.7.1)
|
185
218
|
mixlib-shellout (2.2.7)
|
@@ -192,13 +225,38 @@ GEM
|
|
192
225
|
mustermann (1.0.0)
|
193
226
|
mustermann-grape (1.0.0)
|
194
227
|
mustermann (~> 1.0.0)
|
228
|
+
net-scp (1.2.1)
|
229
|
+
net-ssh (>= 2.6.5)
|
230
|
+
net-sftp (2.1.2)
|
231
|
+
net-ssh (>= 2.6.5)
|
232
|
+
net-ssh (4.1.0)
|
233
|
+
net-ssh-gateway (2.0.0)
|
234
|
+
net-ssh (>= 4.0.0)
|
235
|
+
net-ssh-multi (1.2.1)
|
236
|
+
net-ssh (>= 2.6.5)
|
237
|
+
net-ssh-gateway (>= 1.2.0)
|
238
|
+
net-telnet (0.1.1)
|
195
239
|
nio4r (2.1.0)
|
196
240
|
octokit (4.7.0)
|
197
241
|
sawyer (~> 0.8.0, >= 0.5.3)
|
242
|
+
ohai (13.1.0)
|
243
|
+
chef-config (>= 12.5.0.alpha.1, < 14)
|
244
|
+
ffi (~> 1.9)
|
245
|
+
ffi-yajl (~> 2.2)
|
246
|
+
ipaddress
|
247
|
+
mixlib-cli
|
248
|
+
mixlib-config (~> 2.0)
|
249
|
+
mixlib-log (>= 1.7.1, < 2.0)
|
250
|
+
mixlib-shellout (~> 2.0)
|
251
|
+
plist (~> 3.1)
|
252
|
+
systemu (~> 2.6.4)
|
253
|
+
wmi-lite (~> 1.0)
|
198
254
|
parallel (1.11.2)
|
199
255
|
parser (2.4.0.0)
|
200
256
|
ast (~> 2.2)
|
257
|
+
plist (3.3.0)
|
201
258
|
powerpack (0.1.1)
|
259
|
+
proxifier (1.0.3)
|
202
260
|
public_suffix (2.0.5)
|
203
261
|
rack (2.0.3)
|
204
262
|
rack-accept (0.4.5)
|
@@ -248,6 +306,9 @@ GEM
|
|
248
306
|
diff-lcs (>= 1.2.0, < 2.0)
|
249
307
|
rspec-support (~> 3.6.0)
|
250
308
|
rspec-support (3.6.0)
|
309
|
+
rspec_junit_formatter (0.2.3)
|
310
|
+
builder (< 4)
|
311
|
+
rspec-core (>= 2, < 4, != 2.12.0)
|
251
312
|
rubocop (0.49.1)
|
252
313
|
parallel (~> 1.10)
|
253
314
|
parser (>= 2.3.3.1, < 3.0)
|
@@ -261,9 +322,22 @@ GEM
|
|
261
322
|
addressable (>= 2.3.5, < 2.6)
|
262
323
|
faraday (~> 0.8, < 1.0)
|
263
324
|
semverse (2.0.0)
|
325
|
+
serverspec (2.39.1)
|
326
|
+
multi_json
|
327
|
+
rspec (~> 3.0)
|
328
|
+
rspec-its
|
329
|
+
specinfra (~> 2.68)
|
330
|
+
sfl (2.3)
|
264
331
|
solve (3.1.0)
|
265
332
|
molinillo (>= 0.5)
|
266
333
|
semverse (>= 1.1, < 3.0)
|
334
|
+
specinfra (2.68.0)
|
335
|
+
net-scp
|
336
|
+
net-ssh (>= 2.7, < 5.0)
|
337
|
+
net-telnet
|
338
|
+
sfl
|
339
|
+
syslog-logger (1.6.8)
|
340
|
+
systemu (2.6.5)
|
267
341
|
thor (0.19.1)
|
268
342
|
thread_safe (0.3.6)
|
269
343
|
timers (4.0.4)
|
@@ -290,6 +364,7 @@ GEM
|
|
290
364
|
websocket-driver (0.6.5)
|
291
365
|
websocket-extensions (>= 0.1.0)
|
292
366
|
websocket-extensions (0.1.2)
|
367
|
+
wmi-lite (1.0.0)
|
293
368
|
yard (0.9.9)
|
294
369
|
|
295
370
|
PLATFORMS
|
data/README.md
CHANGED
@@ -33,9 +33,13 @@ $ gem install berkshelf
|
|
33
33
|
|
34
34
|
See [docs.chef.io](https://docs.chef.io/berkshelf.html) for up-to-date usage instructions.
|
35
35
|
|
36
|
+
## CLI Usage
|
37
|
+
|
38
|
+
Berkshelf is intended to be used as a CLI tool. It is not intended to be used as a library. Other ruby code should shell out to the command line tool to use it.
|
39
|
+
|
36
40
|
## Supported Platforms
|
37
41
|
|
38
|
-
Berkshelf is tested and supported on Ruby 2.
|
42
|
+
Berkshelf is tested and supported on Ruby 2.3 and 2.4.
|
39
43
|
|
40
44
|
## Configuration
|
41
45
|
|
data/berkshelf.gemspec
CHANGED
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
|
|
31
31
|
s.required_rubygems_version = ">= 2.0.0"
|
32
32
|
|
33
33
|
s.add_dependency "addressable", "~> 2.3", ">= 2.3.4"
|
34
|
-
s.add_dependency "berkshelf-api-client", ">=
|
34
|
+
s.add_dependency "berkshelf-api-client", ">= 4.0.0"
|
35
35
|
s.add_dependency "buff-config", "~> 2.0"
|
36
36
|
s.add_dependency "buff-extensions", "~> 2.0"
|
37
37
|
s.add_dependency "mixlib-shellout", "~> 2.0"
|
@@ -18,7 +18,7 @@ Feature: --format json
|
|
18
18
|
{
|
19
19
|
"cookbooks": [
|
20
20
|
{
|
21
|
-
"api_source": "http://127.0.0.1:26210
|
21
|
+
"api_source": "http://127.0.0.1:26210",
|
22
22
|
"location_path": "http://localhost:26310/",
|
23
23
|
"version": "1.0.0",
|
24
24
|
"name": "berkshelf"
|
@@ -149,7 +149,7 @@ Feature: --format json
|
|
149
149
|
{
|
150
150
|
"local": "0.1.0",
|
151
151
|
"remote": {
|
152
|
-
"http://127.0.0.1:26210
|
152
|
+
"http://127.0.0.1:26210": "0.2.9"
|
153
153
|
},
|
154
154
|
"name": "seth"
|
155
155
|
}
|
data/lib/berkshelf.rb
CHANGED
@@ -29,6 +29,15 @@ require_relative "berkshelf/thor_ext"
|
|
29
29
|
module Berkshelf
|
30
30
|
Encoding.default_external = Encoding::UTF_8
|
31
31
|
|
32
|
+
def self.fix_proxies
|
33
|
+
ENV["http_proxy"] = ENV["HTTP_PROXY"] if ENV["HTTP_PROXY"] && !ENV["http_proxy"]
|
34
|
+
ENV["https_proxy"] = ENV["HTTPS_PROXY"] if ENV["HTTPS_PROXY"] && !ENV["https_proxy"]
|
35
|
+
ENV["ftp_proxy"] = ENV["FTP_PROXY"] if ENV["FTP_PROXY"] && !ENV["ftp_proxy"]
|
36
|
+
ENV["no_proxy"] = ENV["NO_PROXY"] if ENV["NO_PROXY"] && !ENV["no_proxy"]
|
37
|
+
end
|
38
|
+
|
39
|
+
fix_proxies
|
40
|
+
|
32
41
|
require_relative "berkshelf/version"
|
33
42
|
require_relative "berkshelf/errors"
|
34
43
|
|
data/lib/berkshelf/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: berkshelf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.
|
4
|
+
version: 6.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jamie Winsor
|
@@ -12,7 +12,7 @@ authors:
|
|
12
12
|
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date: 2017-06-
|
15
|
+
date: 2017-06-22 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: addressable
|
@@ -40,20 +40,14 @@ dependencies:
|
|
40
40
|
requirements:
|
41
41
|
- - ">="
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version:
|
44
|
-
- - "<"
|
45
|
-
- !ruby/object:Gem::Version
|
46
|
-
version: '4.0'
|
43
|
+
version: 4.0.0
|
47
44
|
type: :runtime
|
48
45
|
prerelease: false
|
49
46
|
version_requirements: !ruby/object:Gem::Requirement
|
50
47
|
requirements:
|
51
48
|
- - ">="
|
52
49
|
- !ruby/object:Gem::Version
|
53
|
-
version:
|
54
|
-
- - "<"
|
55
|
-
- !ruby/object:Gem::Version
|
56
|
-
version: '4.0'
|
50
|
+
version: 4.0.0
|
57
51
|
- !ruby/object:Gem::Dependency
|
58
52
|
name: buff-config
|
59
53
|
requirement: !ruby/object:Gem::Requirement
|