A platform for community discussion. Free, open, simple.
Revert "DEV: Update rubyzip to 3.x (#38932)" (#39078)
Jarek Radosz6b4e04854537
diff --git a/Gemfile b/Gemfileindex b7f47a31c01..7ce1d647c7c 100644--- a/Gemfile+++ b/Gemfile@@ -224,7 +224,8 @@ gem "rotp", require: falsegem "rqrcode"-gem "rubyzip", require: false+# can't upgrade to 3.x due to d-token-gate+gem "rubyzip", "~> 2.0", require: falsegem "sshkey", require: falsediff --git a/Gemfile.lock b/Gemfile.lockindex 52f52b3091f..96aa6c80be7 100644--- a/Gemfile.lock+++ b/Gemfile.lock@@ -624,7 +624,7 @@ GEMguess_html_encoding (>= 0.0.4)nokogiri (>= 1.6.0)ruby2_keywords (0.0.5)- rubyzip (3.2.2)+ rubyzip (2.4.1)sanitize (7.0.0)crass (~> 1.0.2)nokogiri (>= 1.16.8)@@ -902,7 +902,7 @@ DEPENDENCIESruby-progressbarruby-rc4ruby-readability- rubyzip+ rubyzip (~> 2.0)sanitizesassc-embeddedsawyer@@ -1207,7 +1207,7 @@ CHECKSUMSruby-rc4 (0.1.5) sha256=00cc40a39d20b53f5459e7ea006a92cf584e9bc275e2a6f7aa1515510e896c03ruby-readability (0.7.3) sha256=bd213fab037118cc15d999e167a8ea2cc6b689dc78c033e78fb36a2a37efc241ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef- rubyzip (3.2.2) sha256=c0ed99385f0625415c8f05bcae33fe649ed2952894a95ff8b08f26ca57ea5b3c+ rubyzip (2.4.1) sha256=8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615sanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984sass-embedded (1.91.0-aarch64-linux-gnu) sha256=932bf7223ffbbdeefc91cd364de6bf9dbfdc7d80201911eb4dae8d9a7f5bee50sass-embedded (1.91.0-aarch64-linux-musl) sha256=08449fac861094055a1afe7da376f887f8192b3dba6658db1de7be17d32355c4diff --git a/lib/compression/gzip.rb b/lib/compression/gzip.rbindex 7df4b9d240c..f32836f957e 100644--- a/lib/compression/gzip.rb+++ b/lib/compression/gzip.rb@@ -50,7 +50,7 @@ module Compressionremaining_size = available_sizeif ::File.exist?(entry_path)- raise DestinationFileExistsError, "Destination '#{entry_path}' already exists"+ raise ::Zip::DestinationFileExistsError, "Destination '#{entry_path}' already exists"end # Change this later.::File.open(entry_path, "wb") do |os|diff --git a/lib/compression/zip.rb b/lib/compression/zip.rbindex ccfe4096d34..dbf132bf880 100644--- a/lib/compression/zip.rb+++ b/lib/compression/zip.rb@@ -12,7 +12,7 @@ module Compressionabsolute_path = sanitize_path("#{path}/#{target_name}")zip_filename = "#{absolute_path}.zip"- ::Zip::File.open(zip_filename, create: true) do |zipfile|+ ::Zip::File.open(zip_filename, ::Zip::File::CREATE) do |zipfile|if File.directory?(absolute_path)entries = Dir.entries(absolute_path) - %w[. ..]write_entries(entries, absolute_path, "", zipfile)@@ -27,7 +27,7 @@ module Compressionprivatedef extract_folder(entry, entry_path)- FileUtils.mkdir_p(entry_path)+ entry.extract(entry_path)enddef get_compressed_file_stream(compressed_file_path)@@ -47,7 +47,7 @@ module Compressionremaining_size = available_sizeif ::File.exist?(entry_path)- raise DestinationFileExistsError, "Destination '#{entry_path}' already exists"+ raise ::Zip::DestinationFileExistsError, "Destination '#{entry_path}' already exists"end::File.open(entry_path, "wb") do |os|diff --git a/spec/system/page_objects/pages/csv_export_pm.rb b/spec/system/page_objects/pages/csv_export_pm.rbindex 2c73dc380dd..7260ee6e918 100644--- a/spec/system/page_objects/pages/csv_export_pm.rb+++ b/spec/system/page_objects/pages/csv_export_pm.rb@@ -36,8 +36,9 @@ module PageObjectspaths = []Zip::File.open(file) do |zip_file|zip_file.each do |f|- f.extract(f.name, destination_directory: Downloads::FOLDER)- paths << File.join(Downloads::FOLDER, f.name)+ path = File.join(Downloads::FOLDER, f.name)+ zip_file.extract(f, path)+ paths << pathendend