path_expander 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb707e47c24f77a4b4a2d23c8db936f9b6d0b9db
-  data.tar.gz: f69d58051c1c4a8d38e7c762bf164cc4b2b96055
+SHA256:
+  metadata.gz: 95157151cd3523ba3bcd9ca1668dbfa436e87b9dfabb3431ca218ea66571c436
+  data.tar.gz: b0714ed15b27ae4b4dc16f1f87ec20dd2732299ffbadff80b9e51ba004855ef6
 SHA512:
-  metadata.gz: c91cc5482ca821c474986e05cfc0d1b337f1cd9c2632fd323578e9f0a5e8789825204c9ebd748d26ca7b97bb184225555c96459724cfd1b6f88dbb43b3f1661f
-  data.tar.gz: 0b50d8770583b077005a75039a972ca2b7f1e1b4f766c8d0772f891b2a43972bc5157433a1ae51a1511de430d6538dfbe7a28197cb043b2e9bb7f67023e167cb
+  metadata.gz: c53f545816dc9c6341c1bddfede9b4ef137e64100dd4883df1ee7bf81d4df2adf91f78fabfa2ce431d1f85c03d65941dadd6e1e8b50de6f27ab9a63724da1398
+  data.tar.gz: 017eb994f9a635e8b780d326a364cae4fc82fd3852cd792c8819ccb9550539b14f49fc01a68b076a7fb367a7e6020099b7dfb9d6f5134cc33cb464ea13fabf9d

data/History.rdoc

@@ -1,6 +1,47 @@
+=== 1.1.1 / 2022-07-03
+
+* 1 bug fix:
+
+  * Process plain '-' as a file, not an option.
+
+=== 1.1.0 / 2019-09-22
+
+* 1 minor enhancement:
+
+  * Added a default path (default: ".") to scan if no files are initially found.
+
+=== 1.0.5 / 2019-09-14
+
+* 1 bug fix:
+
+  * Fixed a deprecation warning from File.exists?
+
+=== 1.0.4 / 2019-05-26
+
+* 1 bug fix:
+
+  * Sorted the output from expand_dirs_to_files. (deivid-rodriguez)
+
+=== 1.0.3 / 2018-03-16
+
+* 1 bug fix:
+
+  * Don't process files if path expands to root directory. Prevents -n /./ from hanging.
+
+=== 1.0.2 / 2017-05-09
+
+* 1 bug fix:
+
+  * Fixed expand_dirs_to_files returning non-files on glob expansion.
+
+=== 1.0.1 / 2016-11-30
+
+* 1 bug fix:
+
+  * Expanded paths in filter_files to fix globs w/ absolute paths. (mknapik)
+
 === 1.0.0 / 2016-05-11
 
 * 1 major enhancement
 
   * Birthday!
-

data/Manifest.txt

@@ -4,5 +4,6 @@ Manifest.txt
 README.rdoc
 Rakefile
 lib/path_expander.rb
+test/bad_named_dir.rb/.ignore
 test/test_bad.rb
 test/test_path_expander.rb

data/README.rdoc

@@ -32,7 +32,7 @@ PathExpander.
       MY_GLOB = "**/*.rb"
 
       def initialize args = ARGV
-        super args, TEST_GLOB
+        super args, MY_GLOB
       end
     end
 

data/lib/path_expander.rb

@@ -13,7 +13,7 @@
 # PathExpander.
 
 class PathExpander
-  VERSION = "1.0.0" # :nodoc:
+  VERSION = "1.1.1" # :nodoc:
 
   ##
   # The args array to process.
@@ -25,13 +25,20 @@ class PathExpander
 
   attr_accessor :glob
 
+  ##
+  # The path to scan if no paths are found in the initial scan.
+
+  attr_accessor :path
+
   ##
   # Create a new path expander that operates on args and expands via
-  # glob as necessary.
+  # glob as necessary. Takes an optional +path+ arg to fall back on if
+  # no paths are found on the initial scan (see #process_args).
 
-  def initialize args, glob
+  def initialize args, glob, path = "."
     self.args = args
     self.glob = glob
+    self.path = path
   end
 
   ##
@@ -42,11 +49,11 @@ class PathExpander
   def expand_dirs_to_files *dirs
     dirs.flatten.map { |p|
       if File.directory? p then
-        Dir[File.join(p, glob)]
+        Dir[File.join(p, glob)].find_all { |f| File.file? f }
       else
         p
       end
-    }.flatten
+    }.flatten.sort
   end
 
   ##
@@ -67,28 +74,40 @@ class PathExpander
   # -not_a_path   :: Add to flags to be processed.
   # dir_path      :: Expand and add to files to be processed.
   # file_path     :: Add to files to be processed.
+  # -             :: Add "-" (stdin) to files to be processed.
   #
   # See expand_dirs_to_files for details on how expansion occurs.
   #
   # Subtraction happens last, regardless of argument ordering.
+  #
+  # If no files are found (which is not the same as having an empty
+  # file list after subtraction), then fall back to expanding on the
+  # default #path given to initialize.
 
   def process_args
     pos_files = []
     neg_files = []
     flags     = []
+    clean     = true
 
     args.each do |arg|
       case arg
       when /^@(.*)/ then # push back on, so they can have dirs/-/@ as well
+        clean = false
         args.concat process_file $1
+      when "-" then
+        pos_files << arg
       when /^-(.*)/ then
         if File.exist? $1 then
+          clean = false
           neg_files += expand_dirs_to_files($1)
         else
           flags << arg
         end
       else
-        if File.exist? arg then
+        root_path = File.expand_path(arg) == "/" # eg: -n /./
+        if File.exist? arg and not root_path then
+          clean = false
           pos_files += expand_dirs_to_files(arg)
         else
           flags << arg
@@ -96,7 +115,10 @@ class PathExpander
       end
     end
 
-    [pos_files - neg_files, flags]
+    files = pos_files - neg_files
+    files += expand_dirs_to_files(self.path) if files.empty? && clean
+
+    [files, flags]
   end
 
   ##
@@ -143,7 +165,7 @@ class PathExpander
   def filter_files files, ignore
     ignore_paths = if ignore.respond_to? :read then
                      ignore.read
-                   elsif File.exists? ignore then
+                   elsif File.exist? ignore then
                      File.read ignore
                    end
 
@@ -152,8 +174,13 @@ class PathExpander
       dirs, ifiles    = nonglobs.partition { |p| p.end_with? "/" }
       dirs            = dirs.map { |s| s.chomp "/" }
 
+      dirs.map!   { |i| File.expand_path i }
+      globs.map!  { |i| File.expand_path i }
+      ifiles.map! { |i| File.expand_path i }
+
       only_paths = File::FNM_PATHNAME
       files = files.reject { |f|
+        f = File.expand_path(f)
         dirs.any?     { |i| File.fnmatch?(i, File.dirname(f), only_paths) } ||
           globs.any?  { |i| File.fnmatch?(i, f) } ||
           ifiles.any? { |i| File.fnmatch?(i, f, only_paths) }

data/test/test_path_expander.rb

@@ -17,10 +17,14 @@ class TestPathExpander < Minitest::Test
     assert_equal exp, act
   end
 
+  def assert_filter_files_absolute_paths exp, filter, files = [File.join(Dir.pwd, 'test/dog_and_cat.rb')]
+    assert_filter_files exp, filter, files
+  end
+
   def assert_process_args exp_files, exp_args, *args
     expander.args.concat args
 
-    assert_equal [exp_files, exp_args], expander.process_args
+    assert_equal [exp_files.sort, exp_args], expander.process_args
   end
 
   def test_expand_dirs_to_files
@@ -30,16 +34,30 @@ class TestPathExpander < Minitest::Test
     assert_equal %w[Rakefile], expander.expand_dirs_to_files("Rakefile")
   end
 
+  def test_expand_dirs_to_files_sorting
+    exp = %w[test/test_bad.rb test/test_path_expander.rb]
+    input = %w[test/test_path_expander.rb test/test_bad.rb]
+
+    assert_equal exp, expander.expand_dirs_to_files(*input)
+    assert_equal %w[Rakefile], expander.expand_dirs_to_files("Rakefile")
+  end
+
   def test_filter_files_dir
     assert_filter_files [], "test/"
+    assert_filter_files_absolute_paths [], "test/"
   end
 
   def test_filter_files_files
-    assert_filter_files [], "test/*.rb"
-
     example = %w[test/file.rb test/sub/file.rb top/test/perf.rb]
+    example_absolute_paths = example.map { |e| File.join(Dir.pwd, e) }
+
+    assert_filter_files [], "test/*.rb"
 
     assert_filter_files example[1..-1], "test/*.rb", example
+
+    assert_filter_files_absolute_paths [], "test/*.rb"
+
+    assert_filter_files_absolute_paths example_absolute_paths[1..-1], "test/*.rb", example_absolute_paths
   end
 
   def test_filter_files_glob
@@ -47,12 +65,22 @@ class TestPathExpander < Minitest::Test
     assert_filter_files [], "test*", ["test/lib/woot.rb"]
     assert_filter_files [], "*.rb"
     assert_filter_files [], "*dog*.rb"
+
+    assert_filter_files_absolute_paths [], "test*"
+    assert_filter_files_absolute_paths [], "test*", [File.join(Dir.pwd, "test/lib/woot.rb")]
+    assert_filter_files_absolute_paths [], "*.rb"
+    assert_filter_files_absolute_paths [], "*dog*.rb"
   end
 
   def test_filter_files_glob_miss
     miss = %w[test/dog_and_cat.rb]
+    miss_absolute = [File.join(Dir.pwd, 'test/dog_and_cat.rb')]
+
     assert_filter_files miss, "test"
     assert_filter_files miss, "nope"
+
+    assert_filter_files_absolute_paths miss_absolute, "test"
+    assert_filter_files_absolute_paths miss_absolute, "nope"
   end
 
   def test_process
@@ -122,6 +150,27 @@ class TestPathExpander < Minitest::Test
                         "42")
   end
 
+  def test_process_args_root
+    assert_process_args(%w[],
+                        %w[-n /./],
+                        "-n",
+                        "/./")
+  end
+
+  def test_process_args_no_files
+    self.expander = PathExpander.new args, "*.rb", "test" # extra test default
+
+    assert_process_args(%w[test/test_bad.rb test/test_path_expander.rb],
+                        %w[-v],
+                        "-v")
+  end
+
+  def test_process_args_dash
+    assert_process_args(%w[-],
+                        %w[-v],
+                        "-", "-v")
+  end
+
   def test_process_flags
     exp = %w[a b c]
     act = expander.process_flags %w[a b c]

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: path_expander
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,44 +21,50 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.24'
 description: |-
   PathExpander helps pre-process command-line arguments expanding
   directories into their constituent files. It further helps by
@@ -81,38 +87,39 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- .autotest
+- ".autotest"
 - History.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/path_expander.rb
+- test/bad_named_dir.rb/.ignore
 - test/test_bad.rb
 - test/test_path_expander.rb
 homepage: https://github.com/seattlerb/path_expander
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/seattlerb/path_expander
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.12
+signing_key:
 specification_version: 4
 summary: PathExpander helps pre-process command-line arguments expanding directories
   into their constituent files

metadata.gz.sig

@@ -1,3 +1,2 @@
-�V�[�F͜!yľ!l��N�5[�)�%htK4��!�����/�>���{�^P()�4&�
-���X�^�j*���
-n�.�^A����?N�;�d����"k��ρ��ʣ�($(�z�@�|���x��c�� �׊$ �6I+y�AR���Zj�;K�y�����؟�vf��.{�T��������{t92��h̐9S��P�v���#�̸|����Ⳕ��H����/Ч�����@%0%Bv3��^�+��
+,�n�]EΆ�j�S{nh�m�v�)���Ӷ�{�!�$iI�,L�o�'i�Aэԍ\���![g�� 2[݄�A�vȽ�s9kn"IQ�`T�QAa�l�%���}e�N,%��轴ʨ�g\��C�#I��dž1�?�H���-X'�\ѻm�E�g���#�m�Ţ�.�ח��u�4ڂd8�׊�j��30@`LP�%9���J��ȚE;�1�&�<8�T�,�
+��"�����5�jY�?EL���q��@����