zipr 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d17a3bd1b8b10a97dca34e9bb8c7b7dd27ac3a9ccdb63a79a4b3e6bc71138f
-  data.tar.gz: 408ed3fd53d0537b559ca1ead8b2aa2e87e47abfefc9848ab2bb0df59f5f9492
+  metadata.gz: a62bdef06b58c837858d72e7f3e6fa1a16a62888783f014b96cdce25acaa4255
+  data.tar.gz: d304d5bcf9876d6e3a1852b3137246530f8881ef19fbd33890e9a0c082307b7e
 SHA512:
-  metadata.gz: a8b6f6ab632bdf5dd884fd1cf4d5cf1a650c068ae86c0f3dfcc3649cba993f9ee01df70bcc2fb4e30dc3f57ae39c7404fe15266271267676bfe30c03e6ecf3dd
-  data.tar.gz: 9833cb57b68c4af55aefd5c25c9c2be2e7eb5f4b90ed9629388b3533b6b6683f9570007afa56318fd44bc1264281fe223832596c69c512e40fa202f2499a4a68
+  metadata.gz: 84b0029024a874635ffeb55bed38daeed54d178cecc74e523e4abd776e21df3a4b39c5cb7b19d156ea65c0077ae073b924eff8a3ecdf056005bd9516df6fbc16
+  data.tar.gz: 2591e17d3cd2e121901c4deef767d70a8b84740bbb47363fa4e524d4e8e81a4142772b5ecf44677cad95f1a86f54228a0e3d8255eaf4704e23b2200b11fddfca

data/lib/zipr/archive.rb

@@ -357,7 +357,7 @@ module Zipr
       ::Zip::File.open(@path, ::Zip::File::CREATE) do |zip_archive|
         EasyIO.logger.info "Adding to #{@path}..." unless @options[:silent]
         files_to_add.each do |source_file|
-          add_directory_lambda = ->(relative_path) { zip_archive.mkdir(relative_path) }
+          add_directory_lambda = ->(relative_path) { zip_archive.mkdir(relative_path) unless zip_archive.find_entry(relative_path) }
           add_file_lambda = ->(relative_path) { zip_archive.add(relative_path, source_file) { :overwrite } }
           _add_item(source_file, add_directory_lambda, add_file_lambda, source_folder)
         end
@@ -441,6 +441,7 @@ module Zipr
     def _extract_file?(archive_entry_name, is_a_directory, destination_folder, files_to_check)
       destination_path = "#{destination_folder}/#{archive_entry_name}"
       return false unless files_to_check == :all || files_to_check.include?(archive_entry_name) # Make sure the file is in the whitelist if it was provided
+      return false if archive_entry_name == 'archive_checksum'
       return false if ::File.directory?(destination_path) && is_a_directory # Archive item is a directory and the destination directory exists
       return false if @mode == :if_missing && ::File.exist?(destination_path) # File exists and we're not overwriting existing files due to the mode
       return false if _excluded_file?(archive_entry_name, destination_path: destination_path) # File is excluded in :options
@@ -469,7 +470,7 @@ module Zipr
       _assign_checksums(checksums)
       @options = options || @options || {}
       @mode = mode || @mode || :idempotent
-      @archive_changed = ::File.exist?(@path) && @checksums['archive_checksum'] != Digest::SHA256.file(@path).hexdigest
+      @archive_changed = (::File.exist?(@path) && @checksums['archive_checksum'] != Digest::SHA256.file(@path).hexdigest) || !::File.exist?(@checksum_path)
     end
 
     def _assign_checksums(checksums)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipr
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Munoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_io
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for easily extracting and creating 7zip and zip archives idempotently.