zipr 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d81272a9a6533e52cc6e92c391aa1a36ec48443b8899bc17cb1f0570115c177
-  data.tar.gz: b3a559a665e86be77ebe99ae33b9bb8b1932be918bbd40bb9b486b1071b90358
+  metadata.gz: 29d17a3bd1b8b10a97dca34e9bb8c7b7dd27ac3a9ccdb63a79a4b3e6bc71138f
+  data.tar.gz: 408ed3fd53d0537b559ca1ead8b2aa2e87e47abfefc9848ab2bb0df59f5f9492
 SHA512:
-  metadata.gz: bf058b81ca99e1c7a1ea413fab134a4cff198ca92a0b5e99fd1c8903d452ca616bc2d3a530bf57a160b7c3a49a236f6101392297a49c58dd548a3eb71b228323
-  data.tar.gz: 39219668c4a9a9606d82cbcb614d3ef110488132f7e19e5494518efcb56d5fd3ac58edaec06fb512072a2d8cf56204bd9e3b513fdf73dad961b647920f36c4d8
+  metadata.gz: a8b6f6ab632bdf5dd884fd1cf4d5cf1a650c068ae86c0f3dfcc3649cba993f9ee01df70bcc2fb4e30dc3f57ae39c7404fe15266271267676bfe30c03e6ecf3dd
+  data.tar.gz: 9833cb57b68c4af55aefd5c25c9c2be2e7eb5f4b90ed9629388b3533b6b6683f9570007afa56318fd44bc1264281fe223832596c69c512e40fa202f2499a4a68

data/lib/zipr/archive.rb

@@ -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]

data/lib/zipr/helper.rb

@@ -21,13 +21,21 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alex Munoz