Skip to content

Commit 2c5a961

Browse files
build(deps): bump rubyzip from 2.4.1 to 3.0.0 (#4479)
* build(deps): bump rubyzip from 2.4.1 to 3.0.0 Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 2.4.1 to 3.0.0. - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](rubyzip/rubyzip@v2.4.1...v3.0.0) --- updated-dependencies: - dependency-name: rubyzip dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update Zip::File.open to rubyzip 3.0.0 * Update zip.select call to rubyzip 3.0.0 * Replace reduce method with sum function for rubyzip 3.0.0 * Update Zip::File.open to rubyzip 3.0.0 * Fix zip entry iteration for rubyzip 3.0.0 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jochen Ehret <[email protected]>
1 parent 73d7b29 commit 2c5a961

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ GEM
521521
ruby2_keywords (0.0.5)
522522
ruby_parser (3.8.3)
523523
sexp_processor (~> 4.1)
524-
rubyzip (2.4.1)
524+
rubyzip (3.0.0)
525525
securerandom (0.4.1)
526526
sequel (5.94.0)
527527
bigdecimal

lib/cloud_controller/app_packager.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def fix_subdir_permissions(root_path, app_contents_path)
4949

5050
def size
5151
Zip::File.open(@path) do |in_zip|
52-
in_zip.reduce(0) { |memo, entry| memo + entry.size }
52+
in_zip.entries.sum(&:size)
5353
end
5454
rescue Zip::Error
5555
invalid_zip!
@@ -59,7 +59,7 @@ def size
5959

6060
def get_dirs_from_zip(zip_path)
6161
Zip::File.open(zip_path) do |in_zip|
62-
in_zip.select(&:directory?)
62+
in_zip.entries.select(&:directory?).map(&:name)
6363
end
6464
end
6565

lib/cloud_controller/benchmark/blobstore.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def generate_resources
107107

108108
def zip_resources(resource_dir, output_dir)
109109
zip_file = File.join(output_dir, 'zipped_package')
110-
Zip::File.open(zip_file, Zip::File::CREATE) do |zipfile|
110+
Zip::File.open(zip_file, create: true) do |zipfile|
111111
Find.find(resource_dir).
112112
select { |f| File.file?(f) }.
113113
each do |file|

spec/support/test_zip.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module TestZip
44
def self.create(zip_name, file_count, file_size=1024, &blk)
5-
Zip::File.open(zip_name, Zip::File::CREATE) do |zipfile|
5+
Zip::File.open(zip_name, create: true) do |zipfile|
66
file_count.times do |i|
77
zipfile.get_output_stream("ziptest_#{i}") do |f|
88
f.write('A' * file_size)

spec/unit/lib/app_packager_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
app_packager.fix_subdir_permissions(@tmpdir, "#{@tmpdir}/application_contents")
217217

218218
has_dirs = Zip::File.open(input_zip) do |in_zip|
219-
in_zip.any?(&:directory?)
219+
in_zip.entries.any?(&:directory?)
220220
end
221221

222222
expect(has_dirs).to be_falsey

0 commit comments

Comments
 (0)