zipr 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937bdb977ae3c5773f446384d75a99909dce1525b37a7178d962d0e0b0e7303d
-  data.tar.gz: 520bd57c12f5cd9418fe94eff77c9760d3a04e67d2b45ae773fae8722fe7636b
+  metadata.gz: 6976718d5e5290a0ae2569b40ddbcb99e96215356a1ec154f3b6bfe2a2486062
+  data.tar.gz: d59070f7523eb976b4e443440e7c8f5468b42fc7465ad95041f10081971bfdb4
 SHA512:
-  metadata.gz: 937864d6924a089ede4705c5cba15bd361c050bfc5548230362b4c29eb6c03abcae3209d3178a6e168838cf4078fbcda7792b43c2548d365c76f04a87a905acc
-  data.tar.gz: d529bd61f887f1a663245cfa4ce16e2a7469990a071d18b3b49fd9f359352bee4ac3a880cb803b45ed949f2eada808f91bb3cd803035507e6e2deb79418d186b
+  metadata.gz: 31dd85955d53b08413d931d7a65c755c697c2b54e1dd3d85d54fea007fcd346e079b5badac853815670644d15f06e16ea460c00c13a1257817b98ee0b05f6b39
+  data.tar.gz: fe3f113d4098f1ddfac92b70b470b3aced82a49806b78f0df4284330e75e433595da060699ad4121fc6afaf23d13ed251289e4c76b8cbc9005325952fff16e44

data/lib/zipr/archive.rb

@@ -210,7 +210,7 @@ module Zipr
       unless ::File.exist?(@path)
         # If the archive doesn't exist but checksums were provided, check for files to extract based off of checksums
         return @checksums.select { |entry_name, checksum| _extract_file?(entry_name, checksum == 'directory', destination_folder, files_to_check) }.keys unless @checksums.nil? || @checksums.empty?
-        # If the archive doesn't exist and no checksums were found, extract all files_to_check or :all files
+        # If the archive doesn't exist and no checksums were found, extract all files_to_check
         return files_to_check
       end
 
@@ -234,13 +234,22 @@ module Zipr
     #   An array of files to be added (or the :all symbol).
     # Parameters:
     #   source_folder: The filesystem directory where files are being added from.
-    #   files_to_check: Array of files intended to be added to an archive. Can be exact names/paths or names/paths with wildcards (glob style).
+    #   files_to_check: Array of files intended to be added to an archive. Can be exact names/paths or names/paths with wildcards (glob style) or a Regexp.
     #     default: All files and folders under the source_folder.
     def determine_files_to_add(source_folder, files_to_check: nil)
       files_to_check ||= Dir.glob("#{source_folder}/**/*".tr('\\', '/')) if files_to_check.nil?
       files_to_add = []
+      source_folder_glob = nil
       files_to_check.each do |target_search|
-        files = Dir.glob(Zipr.prepend_source_folder(source_folder, target_search))
+        files = if target_search.is_a?(Regexp)
+                  source_folder_glob ||= Dir.glob("#{source_folder.tr('\\', '/')}/**/*")
+                  source_folder_glob.select do |path|
+                    path =~ target_search
+                  end
+                  source_folder_glob.select { |path| path.to_s =~ target_search }
+                else
+                  Dir.glob(Zipr.prepend_source_folder(source_folder, target_search))
+                end
         files.each do |source_file|
           relative_path = Zipr.slice_source_folder(source_folder, source_file)
           exists_in_zip = !!@checksums[relative_path]
@@ -432,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
@@ -443,18 +453,24 @@ module Zipr
       @options[:exclude_files] ||= []
       @options[:exclude_unless_missing] ||= []
       @options[:exclude_unless_archive_changed] ||= []
-      return true if @options[:exclude_files].any? { |e| file_path.tr('\\', '/') =~ /^#{Zipr.wildcard_to_regex(e.tr('\\', '/'))}$/i }
-      return true if ::File.exist?(destination_path) && @options[:exclude_unless_missing].any? { |e| file_path.tr('\\', '/') =~ /^#{Zipr.wildcard_to_regex(e.tr('\\', '/'))}$/i }
-      return true if exists_in_zip && @options[:exclude_unless_missing].any? { |e| file_path.tr('\\', '/') =~ /^#{Zipr.wildcard_to_regex(e.tr('\\', '/'))}$/i }
-      return true if !@archive_changed && ::File.exist?(destination_path) && @options[:exclude_unless_archive_changed].any? { |e| file_path.tr('\\', '/') =~ /^#{Zipr.wildcard_to_regex(e.tr('\\', '/'))}$/i }
+      return true if @options[:exclude_files].any? { |e| file_path.tr('\\', '/') =~ _convert_backslashes_and_cast_to_regexp(e) }
+      return true if ::File.exist?(destination_path) && @options[:exclude_unless_missing].any? { |e| file_path.tr('\\', '/') =~ _convert_backslashes_and_cast_to_regexp(e) }
+      return true if exists_in_zip && @options[:exclude_unless_missing].any? { |e| file_path.tr('\\', '/') =~ _convert_backslashes_and_cast_to_regexp(e) }
+      return true if !@archive_changed && ::File.exist?(destination_path) && @options[:exclude_unless_archive_changed].any? { |e| file_path.tr('\\', '/') =~ _convert_backslashes_and_cast_to_regexp(e) }
       false
     end
 
+    def _convert_backslashes_and_cast_to_regexp(path)
+      return path if path.is_a?(Regexp) # If it's already a regexp, leave it alone
+      path = path.tr('\\', '/')
+      /^#{Zipr.wildcard_to_regexp(path)}$/i
+    end
+
     def _assign_common_accessors(options: nil, checksums: nil, mode: nil)
       _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)

data/lib/zipr/helper.rb

@@ -21,19 +21,27 @@ module Zipr
   def flattened_paths(source_folder, files)
     return files if source_folder.nil? || source_folder.empty?
     result = []
+    source_folder_glob = nil
     files.each do |entry|
+      if entry.is_a?(Regexp)
+        source_folder_glob ||= Dir.glob("#{source_folder.tr('\\', '/')}/**/*")
+        matched_files = source_folder_glob.select { |path| path =~ entry }
+        result += matched_files.map { |f| slice_source_folder(source_folder, f) }
+        next
+      end
+
       standardized_entry = "#{source_folder.tr('\\', '/')}/#{slice_source_folder(source_folder, entry)}"
       files_found = Dir.glob(standardized_entry)
       if files_found.empty?
         result.push(entry)
       else
-        result += files_found.map { |e| slice_source_folder(source_folder, e) }
+        result += files_found.map { |f| slice_source_folder(source_folder, f) }
       end
     end
     result
   end
 
-  def wildcard_to_regex(entry)
+  def wildcard_to_regexp(entry)
     return entry if entry.is_a?(Regexp)
     escaped_entry = Regexp.escape(entry).gsub(/\\\*/, '.*') # Convert asterisks to .*
     /#{escaped_entry}/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Alex Munoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_io