berkshelf 8.0.9 → 8.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -0
- data/berkshelf.gemspec +25 -9
- data/lib/berkshelf/packager.rb +4 -4
- data/lib/berkshelf/version.rb +1 -1
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/attributes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/files/default/file.h +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/metadata.rb +2 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/recipes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/templates/default/template.erb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/attributes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/files/default/file.h +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/metadata.rb +2 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/recipes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/templates/default/template.erb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/attributes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/files/default/file.h +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb +2 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/recipes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/templates/default/template.erb +0 -0
- metadata +63 -16
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 547ce4d95888e7fd0fcfb2b50c449cc78c67ffb4885b44d953e69383d5d5ed26
|
4
|
+
data.tar.gz: 472be5adafecb5a2741701dc0c083017126c2cd9fb91bc5692a4d3f80beb2db6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b28e165ac351b1902ba1bc65f7715d5a1a709881f46c039f4186b7dd6e924a9412789332cae9c37db8e75caff2a503d4fa91637d872fc7f12b51fa6cc04dcea0
|
7
|
+
data.tar.gz: 78c7e37a5ebee0dbb8faa346cd5807f888fd16b8591688ee3248d04be4372035561ba65765700d6c39ab56d2d09f22acdc4d1aad24f416537babc5f042ae3caa
|
data/Gemfile
CHANGED
@@ -8,6 +8,7 @@ end
|
|
8
8
|
|
9
9
|
group :development do
|
10
10
|
gem "aruba", "~> 0.10" # Stay below 1 until aruba/in_process monkeypatching stops
|
11
|
+
gem "debug"
|
11
12
|
gem "cucumber", "< 4.0" # until we identify what is generating the ~@no_run tag in CI
|
12
13
|
gem "cucumber-expressions", "= 5.0.13"
|
13
14
|
gem "chef-zero", ">= 4.0"
|
data/berkshelf.gemspec
CHANGED
@@ -33,20 +33,36 @@ Gem::Specification.new do |s|
|
|
33
33
|
"changelog_uri" => "https://github.com/chef/berkshelf/blob/main/CHANGELOG.md",
|
34
34
|
}
|
35
35
|
|
36
|
+
ruby_version = Gem::Version.new(RUBY_VERSION)
|
37
|
+
|
36
38
|
s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
|
37
|
-
|
38
|
-
s.add_dependency "
|
39
|
+
|
40
|
+
s.add_dependency "chef-cleanroom", "~> 1.0"
|
41
|
+
|
42
|
+
if ruby_version >= Gem::Version.new("3.1.0")
|
43
|
+
s.add_dependency "minitar", "~> 1.0"
|
44
|
+
s.add_dependency "chef", ">= 18.0.0"
|
45
|
+
else
|
46
|
+
s.add_dependency "minitar", "~> 0.12"
|
47
|
+
|
48
|
+
if ruby_version >= Gem::Version.new("3.0.0")
|
49
|
+
s.add_dependency "chef", "~> 17.0" # needed for --skip-syntax-check
|
50
|
+
else
|
51
|
+
s.add_dependency "chef", ">= 15.7.32"
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
39
55
|
s.add_dependency "retryable", ">= 2.0", "< 4.0"
|
40
56
|
s.add_dependency "solve", "~> 4.0"
|
41
|
-
|
42
|
-
s.add_dependency "
|
57
|
+
|
58
|
+
s.add_dependency "thor", ">= 0.20", "< 1.3.0"
|
59
|
+
s.add_dependency "octokit", ">= 4.0", "< 6.0"
|
60
|
+
|
43
61
|
s.add_dependency "mixlib-archive", ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal
|
44
62
|
s.add_dependency "concurrent-ruby", "~> 1.0"
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
s.add_dependency "chef", ">= 15.7.32"
|
49
|
-
end
|
63
|
+
|
64
|
+
s.add_dependency "ffi", "~> 1.9", "< 1.16.0" #
|
65
|
+
|
50
66
|
s.add_dependency "chef-config"
|
51
67
|
# this is required for Mixlib::Config#from_json
|
52
68
|
s.add_dependency "mixlib-config", ">= 2.2.5"
|
data/lib/berkshelf/packager.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
require "
|
1
|
+
require "minitar"
|
2
2
|
require "find" unless defined?(Find)
|
3
3
|
require "zlib" unless defined?(Zlib)
|
4
4
|
|
@@ -47,7 +47,7 @@ module Berkshelf
|
|
47
47
|
Find.find(source) do |entry|
|
48
48
|
next if source == entry
|
49
49
|
|
50
|
-
|
50
|
+
Minitar.pack_file(entry, tar)
|
51
51
|
end
|
52
52
|
ensure
|
53
53
|
tar.close
|
@@ -79,12 +79,12 @@ module Berkshelf
|
|
79
79
|
# @return [String]
|
80
80
|
attr_reader :filename
|
81
81
|
|
82
|
-
# A private decorator for
|
82
|
+
# A private decorator for Minitar::Writer that
|
83
83
|
# turns absolute paths into relative ones.
|
84
84
|
class RelativeTarWriter < SimpleDelegator # :nodoc:
|
85
85
|
def initialize(io, base_path)
|
86
86
|
@base_path = Pathname.new(base_path)
|
87
|
-
super(
|
87
|
+
super(Minitar::Writer.new(io))
|
88
88
|
end
|
89
89
|
|
90
90
|
%w{add_file add_file_simple mkdir}.each do |method|
|
data/lib/berkshelf/version.rb
CHANGED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
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: 8.0.
|
4
|
+
version: 8.0.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jamie Winsor
|
@@ -9,10 +9,10 @@ authors:
|
|
9
9
|
- Michael Ivey
|
10
10
|
- Justin Campbell
|
11
11
|
- Seth Vargo
|
12
|
-
autorequire:
|
12
|
+
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date:
|
15
|
+
date: 2024-08-15 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: mixlib-shellout
|
@@ -35,7 +35,7 @@ dependencies:
|
|
35
35
|
- !ruby/object:Gem::Version
|
36
36
|
version: '4.0'
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
|
-
name: cleanroom
|
38
|
+
name: chef-cleanroom
|
39
39
|
requirement: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
41
|
- - "~>"
|
@@ -50,18 +50,32 @@ dependencies:
|
|
50
50
|
version: '1.0'
|
51
51
|
- !ruby/object:Gem::Dependency
|
52
52
|
name: minitar
|
53
|
+
requirement: !ruby/object:Gem::Requirement
|
54
|
+
requirements:
|
55
|
+
- - "~>"
|
56
|
+
- !ruby/object:Gem::Version
|
57
|
+
version: '1.0'
|
58
|
+
type: :runtime
|
59
|
+
prerelease: false
|
60
|
+
version_requirements: !ruby/object:Gem::Requirement
|
61
|
+
requirements:
|
62
|
+
- - "~>"
|
63
|
+
- !ruby/object:Gem::Version
|
64
|
+
version: '1.0'
|
65
|
+
- !ruby/object:Gem::Dependency
|
66
|
+
name: chef
|
53
67
|
requirement: !ruby/object:Gem::Requirement
|
54
68
|
requirements:
|
55
69
|
- - ">="
|
56
70
|
- !ruby/object:Gem::Version
|
57
|
-
version:
|
71
|
+
version: 18.0.0
|
58
72
|
type: :runtime
|
59
73
|
prerelease: false
|
60
74
|
version_requirements: !ruby/object:Gem::Requirement
|
61
75
|
requirements:
|
62
76
|
- - ">="
|
63
77
|
- !ruby/object:Gem::Version
|
64
|
-
version:
|
78
|
+
version: 18.0.0
|
65
79
|
- !ruby/object:Gem::Dependency
|
66
80
|
name: retryable
|
67
81
|
requirement: !ruby/object:Gem::Requirement
|
@@ -103,6 +117,9 @@ dependencies:
|
|
103
117
|
- - ">="
|
104
118
|
- !ruby/object:Gem::Version
|
105
119
|
version: '0.20'
|
120
|
+
- - "<"
|
121
|
+
- !ruby/object:Gem::Version
|
122
|
+
version: 1.3.0
|
106
123
|
type: :runtime
|
107
124
|
prerelease: false
|
108
125
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -110,20 +127,29 @@ dependencies:
|
|
110
127
|
- - ">="
|
111
128
|
- !ruby/object:Gem::Version
|
112
129
|
version: '0.20'
|
130
|
+
- - "<"
|
131
|
+
- !ruby/object:Gem::Version
|
132
|
+
version: 1.3.0
|
113
133
|
- !ruby/object:Gem::Dependency
|
114
134
|
name: octokit
|
115
135
|
requirement: !ruby/object:Gem::Requirement
|
116
136
|
requirements:
|
117
|
-
- - "
|
137
|
+
- - ">="
|
118
138
|
- !ruby/object:Gem::Version
|
119
139
|
version: '4.0'
|
140
|
+
- - "<"
|
141
|
+
- !ruby/object:Gem::Version
|
142
|
+
version: '6.0'
|
120
143
|
type: :runtime
|
121
144
|
prerelease: false
|
122
145
|
version_requirements: !ruby/object:Gem::Requirement
|
123
146
|
requirements:
|
124
|
-
- - "
|
147
|
+
- - ">="
|
125
148
|
- !ruby/object:Gem::Version
|
126
149
|
version: '4.0'
|
150
|
+
- - "<"
|
151
|
+
- !ruby/object:Gem::Version
|
152
|
+
version: '6.0'
|
127
153
|
- !ruby/object:Gem::Dependency
|
128
154
|
name: mixlib-archive
|
129
155
|
requirement: !ruby/object:Gem::Requirement
|
@@ -159,19 +185,25 @@ dependencies:
|
|
159
185
|
- !ruby/object:Gem::Version
|
160
186
|
version: '1.0'
|
161
187
|
- !ruby/object:Gem::Dependency
|
162
|
-
name:
|
188
|
+
name: ffi
|
163
189
|
requirement: !ruby/object:Gem::Requirement
|
164
190
|
requirements:
|
165
|
-
- - "
|
191
|
+
- - "~>"
|
192
|
+
- !ruby/object:Gem::Version
|
193
|
+
version: '1.9'
|
194
|
+
- - "<"
|
166
195
|
- !ruby/object:Gem::Version
|
167
|
-
version:
|
196
|
+
version: 1.16.0
|
168
197
|
type: :runtime
|
169
198
|
prerelease: false
|
170
199
|
version_requirements: !ruby/object:Gem::Requirement
|
171
200
|
requirements:
|
172
|
-
- - "
|
201
|
+
- - "~>"
|
202
|
+
- !ruby/object:Gem::Version
|
203
|
+
version: '1.9'
|
204
|
+
- - "<"
|
173
205
|
- !ruby/object:Gem::Version
|
174
|
-
version:
|
206
|
+
version: 1.16.0
|
175
207
|
- !ruby/object:Gem::Dependency
|
176
208
|
name: chef-config
|
177
209
|
requirement: !ruby/object:Gem::Requirement
|
@@ -314,6 +346,21 @@ files:
|
|
314
346
|
- spec/support/matchers/filepath_matchers.rb
|
315
347
|
- spec/support/path_helpers.rb
|
316
348
|
- spec/support/shared_examples/formatter.rb
|
349
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.1.0/attributes/default.rb
|
350
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.1.0/files/default/file.h
|
351
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.1.0/metadata.rb
|
352
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.1.0/recipes/default.rb
|
353
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.1.0/templates/default/template.erb
|
354
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.2.0/attributes/default.rb
|
355
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.2.0/files/default/file.h
|
356
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.2.0/metadata.rb
|
357
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.2.0/recipes/default.rb
|
358
|
+
- spec/tmp/berkshelf/cookbooks/fake-0.2.0/templates/default/template.erb
|
359
|
+
- spec/tmp/berkshelf/cookbooks/fake-1.0.0/attributes/default.rb
|
360
|
+
- spec/tmp/berkshelf/cookbooks/fake-1.0.0/files/default/file.h
|
361
|
+
- spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb
|
362
|
+
- spec/tmp/berkshelf/cookbooks/fake-1.0.0/recipes/default.rb
|
363
|
+
- spec/tmp/berkshelf/cookbooks/fake-1.0.0/templates/default/template.erb
|
317
364
|
- spec/unit/berkshelf/berksfile_spec.rb
|
318
365
|
- spec/unit/berkshelf/berkshelf/api_client/chef_server_connection_spec.rb
|
319
366
|
- spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb
|
@@ -363,7 +410,7 @@ metadata:
|
|
363
410
|
bug_tracker_uri: https://github.com/chef/berkshelf/issues
|
364
411
|
source_code_uri: https://github.com/chef/berkshelf
|
365
412
|
changelog_uri: https://github.com/chef/berkshelf/blob/main/CHANGELOG.md
|
366
|
-
post_install_message:
|
413
|
+
post_install_message:
|
367
414
|
rdoc_options: []
|
368
415
|
require_paths:
|
369
416
|
- lib
|
@@ -378,8 +425,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
378
425
|
- !ruby/object:Gem::Version
|
379
426
|
version: 2.0.0
|
380
427
|
requirements: []
|
381
|
-
rubygems_version: 3.
|
382
|
-
signing_key:
|
428
|
+
rubygems_version: 3.3.26
|
429
|
+
signing_key:
|
383
430
|
specification_version: 4
|
384
431
|
summary: Manages a Chef cookbook's dependencies
|
385
432
|
test_files: []
|