path_expander 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed735c31f663a48f088d47a6de1ded3de2944a209cdd43de28299498da7f4f2d
-  data.tar.gz: c0752e73ec8e3a12157aecf9b42bce92edbfb174f3e1a13804b4d99f5b80c53a
+  metadata.gz: fea80c4cff03e65125325d75b60a64e1e8fdfb2ae959483ea63fb1081decdc96
+  data.tar.gz: afbbf32a9ba9bffff56d42ecde177ac22411575276b45b70094a6ea026e6e9dc
 SHA512:
-  metadata.gz: 3f02173165eeb07e29a03c235583ae327a9b3e329a3a7f66ca66bc3aa33eaa7298b03f04f3f06c9af76199fac1a2bd460e759bf2dfcd092ae121873c237ef547
-  data.tar.gz: caee8354046efd7e537d9753e6623713e04a0a493ecdf2e98e7cfa30d7c87b9286304be06de30e2bcf849a9e4124de882e7a330468f0135b7df47b2ad830e81c
+  metadata.gz: 24a9797858c8a8b50a041d3a7855e30653ff0ce6c3c21086c9224e33bceb9feeb7dd14a4b38ab5789683b19cb17763e96bcdaf9b497d2e1a22ade78d3c7227e7
+  data.tar.gz: ce87766ab92c89098229bda19275ad41e54636e9d8a5b13605bbc46129c0e66d72793c6cf77421d0cf681806148e1af5cfeceb07d67f5be2044ea87154594a71

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 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:

data/lib/path_expander.rb

@@ -13,7 +13,7 @@
 # PathExpander.
 
 class PathExpander
-  VERSION = "1.0.5" # :nodoc:
+  VERSION = "1.1.0" # :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
 
   ##
@@ -71,18 +78,25 @@ class PathExpander
   # 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
         if File.exist? $1 then
+          clean = false
           neg_files += expand_dirs_to_files($1)
         else
           flags << arg
@@ -90,6 +104,7 @@ class PathExpander
       else
         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
@@ -97,7 +112,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
 
   ##

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
@@ -157,6 +157,14 @@ class TestPathExpander < Minitest::Test
                         "/./")
   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_flags
     exp = %w[a b c]
     act = expander.process_flags %w[a b c]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: path_expander
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc