path_expander 1.1.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eeec1c048574cc4f0d12d4827fd428aad427165599cc9ebfc291a2584410fb5
-  data.tar.gz: 427e3257b3683f4cceb531579a1451cba3ca64c9877dda8f1b311bebb131880f
+  metadata.gz: e36919ef787b530755a0706b85ac1e9718fbe8645ecd544d330b7aa391f7c5b9
+  data.tar.gz: adc4bcc85e12d66912486d2c6624f208a0e09d4d0351bf78c0840d960a32a150
 SHA512:
-  metadata.gz: 18ee4bd508494c318766fd46dde203281cb6db721d34af35ac123163ee21bf7bef3cabbd3522be440c076280282fdf74f0fd89ca5c4aae684620b9ea12daa164
-  data.tar.gz: abe9be4d62c6302f93d012d4ea2757c80b2828dd1faee86c9ab99dffe4aeaf7ab7d29ee2330633810cb11a638d33c69b66c12d03a07fd26c1f6c5e543fdb6a1f
+  metadata.gz: 44f28957ef37e141489b449064b2e945fc8ce9777b93bd1653cbb506eabdba7ee0fdc4b1c89f837ac0ad3fdd25ff44300b5a7b96411d2f56cfa073a6b8f62bca
+  data.tar.gz: 7b97304cc78414ae7d91625538943161d7721b6d3f21d479f88c65b437014432984c3f96bfa4d0e0eca62b195c42db259eedfd02f8a8be52ded96cbabe7fcc70

data/History.rdoc

@@ -1,3 +1,20 @@
+=== 2.0.1 / 2026-01-08
+
+* 4 bug fixes:
+
+  * Fix path_expander processing of regexp args on windows.
+  * Normalize paths when expanding dirs.
+  * Added CI setup from minitest 6.
+  * Normalize GHA workflow with minitest and others.
+
+=== 2.0.0 / 2025-12-11
+
+* 3 major enhancements:
+
+  * Added #pre_process and #post_process and call them from #process.
+  * Modified #process to return self if block given, otherwise Enumerator.
+  * Modified #process to take a block for processing files directly.
+
 === 1.1.3 / 2024-09-11
 
 * 1 bug fix:

data/README.rdoc

@@ -36,7 +36,7 @@ PathExpander.
       end
     end
 
-    MyPathExpander.new(ARGV, my_glob).process.each do |f|
+    MyPathExpander.new(ARGV, my_glob).process do |f|
       # do something with each file
     end
 
@@ -46,7 +46,7 @@ PathExpander.
 
 == INSTALL:
 
-* sudo gem install path_expander
+* gem install path_expander
 
 == LICENSE:
 

data/Rakefile

@@ -6,20 +6,7 @@ require "hoe"
 Hoe.plugin :isolate
 Hoe.plugin :seattlerb
 Hoe.plugin :rdoc
-
-# Hoe.plugin :compiler
-# Hoe.plugin :doofus
-# Hoe.plugin :email
-# Hoe.plugin :gem_prelude_sucks
-# Hoe.plugin :history
-# Hoe.plugin :inline
-# Hoe.plugin :isolate
-# Hoe.plugin :minitest
-# Hoe.plugin :perforce
-# Hoe.plugin :racc
-# Hoe.plugin :rcov
-# Hoe.plugin :rdoc
-# Hoe.plugin :seattlerb
+Hoe.plugin :cov
 
 Hoe.spec "path_expander" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"

data/lib/path_expander.rb

@@ -1,3 +1,5 @@
+require "pathname" unless defined? Pathname
+
 ##
 # PathExpander helps pre-process command-line arguments expanding
 # directories into their constituent files. It further helps by
@@ -13,7 +15,7 @@
 # PathExpander.
 
 class PathExpander
-  VERSION = "1.1.3" # :nodoc:
+  VERSION = "2.0.1" # :nodoc:
 
   ##
   # The args array to process.
@@ -55,9 +57,11 @@ class PathExpander
       else
         p
       end
-    }.flatten.sort.map { |s| s.to_s.delete_prefix "./" }
+    }.flatten.sort.map { |s| _normalize s }
   end
 
+  def _normalize(f) = Pathname.new(f).cleanpath.to_s # :nodoc:
+
   ##
   # Process a file into more arguments. Override this to add
   # additional capabilities.
@@ -92,6 +96,8 @@ class PathExpander
     flags     = []
     clean     = true
 
+    root_dir = File.expand_path "/" # needed for windows paths
+
     args.each do |arg|
       case arg
       when /^@(.*)/ then # push back on, so they can have dirs/-/@ as well
@@ -107,7 +113,7 @@ class PathExpander
           flags << arg
         end
       else
-        root_path = File.expand_path(arg) == "/" # eg: -n /./
+        root_path = File.expand_path(arg) == root_dir # eg: -n /./
         if File.exist? arg and not root_path then
           clean = false
           pos_files += expand_dirs_to_files(arg)
@@ -135,22 +141,43 @@ class PathExpander
   end
 
   ##
-  # Top-level method processes args. It replaces args' contents with a
-  # new array of flags to process and returns a list of files to
-  # process. Eg
+  # Top-level method processes args. If no block is given, immediately
+  # returns with an Enumerator for further chaining.
   #
-  #     PathExpander.new(ARGV).process.each do |f|
+  # Otherwise, it calls +pre_process+, +process_args+ and
+  # +process_flags+, enumerates over the files, and then calls
+  # +post_process+, returning self for any further chaining.
+  #
+  # Most of the time, you're going to provide a block to process files
+  # and do nothing more with the result. Eg:
+  #
+  #     PathExpander.new(ARGV).process do |f|
   #       puts "./#{f}"
   #     end
+  #
+  # or:
+  #
+  #     PathExpander.new(ARGV).process # => Enumerator
+
+  def process(&b)
+    return enum_for(:process) unless block_given?
+
+    pre_process
 
-  def process
     files, flags = process_args
 
     args.replace process_flags flags
 
-    files.uniq
+    files.uniq.each(&b)
+
+    post_process
+
+    self
   end
 
+  def pre_process = nil
+  def post_process = nil
+
   ##
   # A file filter mechanism similar to, but not as extensive as,
   # .gitignore files:

data/test/test_path_expander.rb

@@ -89,12 +89,33 @@ class TestPathExpander < Minitest::Test
     assert_filter_files_absolute_paths miss_absolute, "nope"
   end
 
+  def test_filter_files__ignore_file
+    files = expander.expand_dirs_to_files "test"
+
+    act = expander.filter_files files, "Manifest.txt"
+
+    assert_equal [], act
+  end
+
   def test_process
     self.args.concat %w[test --seed 42]
 
     act = expander.process
 
-    assert_equal %w[test/test_bad.rb test/test_path_expander.rb], act
+    assert_kind_of Enumerator, act
+    assert_equal %w[test/test_bad.rb test/test_path_expander.rb], act.to_a
+    assert_equal %w[--seed 42], expander.args
+    assert_equal %w[--seed 42], args # affected our original array (eg, ARGV)
+  end
+
+  def test_process__block
+    self.args.concat %w[test --seed 42]
+
+    act = []
+    result = expander.process { |x| act << x }
+
+    assert_same expander, result
+    assert_equal %w[test/test_bad.rb test/test_path_expander.rb], act.to_a
     assert_equal %w[--seed 42], expander.args
     assert_equal %w[--seed 42], args # affected our original array (eg, ARGV)
   end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: path_expander
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.1
 platform: ruby
 authors:
 - Ryan Davis
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
+  GRYDY29tMB4XDTI2MDEwNzAxMDkxNFoXDTI3MDEwNzAxMDkxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +21,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
-  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
-  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
-  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
-  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
-  deKfBjgVAq7EYHu1AczzlUly
+  AQA/X8/PKTTc/IkYQEUL6XWtfK8fAfbuLJzmLcz6f2ZWrtBvPsYvqRuwI1bWUtil
+  2ibJEfIuSIHX6BsUTX18+hlaIussf6EWq/YkE7e2BKmgQE42vSOZMce0kCEAPbx0
+  rQtqonfWTHQ8UbQ7GqCL3gDQ0QDD2B+HUlb4uaCZ2icxqa/eOtxMvHC2tj+h0xKY
+  xL84ipM5kr0bHGf9/MRZJWcw51urueNycBXu1Xh+pEN8qBmYsFRR4SIODLClybAO
+  6cbm2PyPQgKNiqE4H+IQrDVHd9bJs1XgLElk3qoaJBWXc/5fy0J1imYb25UqmiHG
+  snGe1hrppvBRdcyEzvhfIPjI
   -----END CERTIFICATE-----
-date: 2024-09-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -37,34 +36,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.5'
 description: |-
   PathExpander helps pre-process command-line arguments expanding
   directories into their constituent files. It further helps by
@@ -101,7 +114,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/seattlerb/path_expander
-post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -118,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: PathExpander helps pre-process command-line arguments expanding directories
   into their constituent files