path_expander 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '078794a2686ec79aee95140d174dd05ea1ccbd8c'
-  data.tar.gz: 2fb711acd045afc03765cfccb572ea5ca8154a9b
+SHA256:
+  metadata.gz: 95157151cd3523ba3bcd9ca1668dbfa436e87b9dfabb3431ca218ea66571c436
+  data.tar.gz: b0714ed15b27ae4b4dc16f1f87ec20dd2732299ffbadff80b9e51ba004855ef6
 SHA512:
-  metadata.gz: a22db0c268baed2eef264cc30650ba7c3d750db464c3652037161831df613dce7266c307b47ee5cc11d3b6885d753f57e0100c41d9ac4b6d347d657a8e9a0bbd
-  data.tar.gz: 274a8cb6da20b77e9c2180ab3759d1bc5f942bef0503883153793f7823e2aafc7519b65c6b9830f43a05fef47bf6fa0ca71160f3e97bdc23062d12afb8326c71
+  metadata.gz: c53f545816dc9c6341c1bddfede9b4ef137e64100dd4883df1ee7bf81d4df2adf91f78fabfa2ce431d1f85c03d65941dadd6e1e8b50de6f27ab9a63724da1398
+  data.tar.gz: 017eb994f9a635e8b780d326a364cae4fc82fd3852cd792c8819ccb9550539b14f49fc01a68b076a7fb367a7e6020099b7dfb9d6f5134cc33cb464ea13fabf9d

data/History.rdoc

@@ -1,3 +1,33 @@
+=== 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:
@@ -15,4 +45,3 @@
 * 1 major enhancement
 
   * Birthday!
-

data/lib/path_expander.rb

@@ -13,7 +13,7 @@
 # PathExpander.
 
 class PathExpander
-  VERSION = "1.0.2" # :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
 
   ##
@@ -46,7 +53,7 @@ class PathExpander
       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
 

data/test/test_path_expander.rb

@@ -24,7 +24,7 @@ class TestPathExpander < Minitest::Test
   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
@@ -34,6 +34,14 @@ 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/"
@@ -142,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.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,46 +20,51 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  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: 2017-05-09 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.16'
+        version: '3.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.24'
 description: |-
   PathExpander helps pre-process command-line arguments expanding
   directories into their constituent files. It further helps by
@@ -94,8 +99,9 @@ files:
 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"
 - README.rdoc
@@ -112,9 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-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