Merge pull request #400 from d-m-u/fixing_zip_requires_that_i_just_broke

Add back missing requires for rubyzip
ManageIQ · Dec 12, 2019 · 309f9be · 309f9be
2 parents a4c31f6 + 09524e4
commit 309f9be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/app/models/miq_ae_yaml_export_zipfs.rb b/app/models/miq_ae_yaml_export_zipfs.rb
@@ -18,6 +18,7 @@ def write_data(base_path, export_hash)
   end
 
   def export
+    require 'zip/filesystem'
     Zip::File.open(@temp_file_name, Zip::File::CREATE) do |zf|
       @zip_file = zf
       write_model

diff --git a/app/models/miq_ae_yaml_import_zipfs.rb b/app/models/miq_ae_yaml_import_zipfs.rb
@@ -6,6 +6,7 @@ def initialize(domain, options)
   end
 
   def load_zip
+    require 'zip/filesystem'
     raise MiqAeException::FileNotFound, "import file: #{@options['zip_file']} not found" \
       unless File.exist?(@options['zip_file'])
     @zip = Zip::File.open(@options['zip_file'])

diff --git a/spec/models/miq_ae_yaml_import_export_spec.rb b/spec/models/miq_ae_yaml_import_export_spec.rb
@@ -975,6 +975,7 @@ def check_class_component_counts(counts)
   end
 
   def create_bogus_zip_file
+    require 'zip/filesystem'
     Zip::File.open(@zip_file, Zip::File::CREATE) do |zh|
       zh.file.open("first.txt", "w") { |f| f.puts "Hello world" }
       zh.dir.mkdir("mydir")