rbfind 2.8 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530e1d61cf675c858a06f62e62cbfe5cfa7b1492ec1ef9c77e293f7f0bb0b83d
-  data.tar.gz: '004834c6e324c296e0b4185910c8a1a70179ef90fbaeee0b262a8816d8e762af'
+  metadata.gz: c48f9b56403a1985bc80039a8f3cecf636cd4613cb641e9a3708e65bc5790500
+  data.tar.gz: 77dd4d10810a8c1492460a118d67d5d82951306146ef9db516ef0eb929fdf4cf
 SHA512:
-  metadata.gz: e6b7d8ce6bd4d81824705b4dd311383888ff6fa02dc0a6fc94c7b307432fd7cc1b17643b75a53e7917796def4c91fd6f7243424778c64ab9d1932b5575852e04
-  data.tar.gz: eb837f165e31d40ed2323bbcdf2344adf32a113d1520d6dbb83c844d17f4487b44adfe997189e17734b413c368a93a71e6053a0ae697212652bd2ab578e1a620
+  metadata.gz: 8333d71ff3fc7158418d54a3ce117b08b9459abe189ebdc2c5fa2ed66fe7b34baed1ec6ef0e7b624cbf3404c5637bbc6aa7f1a2e6c8583772e2883dfb738c8ef
+  data.tar.gz: 7b3eda841f6ca23bc21b3f5a5c48fb2ce7c4c0065fac58e9c8cd630cd94bb8da6ee029af17a4456d67339fa41b90bcd4b32b6107e2dd192c8e4fd0a8990b7b74

data/bin/rbfind

@@ -31,8 +31,8 @@ module RbFind
       [ %w(--bw        -w), nil,  "black and white on -p or default output"],
       [ %w(--colored   -c), nil,  "force color on -p or default output"],
       [ %w(--depth     -d), nil,  "yield directory after its contents"],
-      [ %w(--maxdepth  -m), :num, "maxium step depth"],
-      [ %w(--anydepth  -M), nil,  "no maxium step depth"],
+      [ %w(--maxdepth  -m), :num, "maxium step depth (0 = any)"],
+      [ %w(--argsdepth -A), nil,  "args have depth 1 (not 0)"],
       [ %w(--follow    -y), nil,  "follow symbolic links"],
       [ %w(--nosort    -U), nil,  "unsorted"],
       [ %w(--sort-by   -s), :str, "sort expression"],
@@ -85,15 +85,15 @@ module RbFind
           when '--bw'        then @color = false
           when '--colored'   then @color = true
           when '--depth'     then @params[ :depth_first] = true
-          when '--maxdepth'  then @params[ :max_depth] = arg.to_i
-          when '--anydepth'  then @params[ :max_depth] = nil
+          when '--maxdepth'  then @params[ :max_depth] = arg.to_i.nonzero?
+          when '--argsdepth' then @params[ :args_depth] = true
           when '--follow'    then @params[ :follow] = true
           when '--nosort'    then @params[ :sort] = false
           when '--sort-by'   then @params[ :sort] = instance_eval "proc { #{arg} }"
           when '--time'      then @params[ :sort] = proc { mtime } ; @params[ :reverse] = true
           when '--size'      then @params[ :sort] = proc { size  } ; @params[ :reverse] = true
           when '--dirs'      then @params[ :dirs] = true
-          when '--reverse'   then @params[ :reverse] = true
+          when '--reverse'   then @params[ :reverse] = !@params[ :reverse]
           when '--require'   then require arg
           when '--puts-path' then @puts = true
           when '--ls-l'      then @puts = :ls  ; @wds = 6 ; @wd = 6
@@ -240,10 +240,10 @@ module RbFind
         "--" stops option processing.
 
         The last argument is a block that will be executed on every found
-        file object. It may be omitted; then "puts path" is assumed or "cpath"
-        in case the output is a terminal.
+        file object. It may be omitted; then "puts path" is assumed, or
+        "puts cpath" in case the output is a terminal.
 
-        Default sort order is alphabetical.
+        Default sort order is by name.
       EOT
     end
 
@@ -358,9 +358,6 @@ module RbFind
       error_handle do
         eval @blkbegin if @blkbegin
         b = @block
-        if not @args.empty? and @params[ :max_depth] then
-          @params[ :max_depth] -= 1
-        end
         Walk.run *@args, **@params do instance_eval b end
         eval @blkend   if @blkend
       end

data/lib/rbfind/table.rb

@@ -95,7 +95,13 @@ module RbFind
     def calc_widths
       w = @heads.map { 0 }
       @rows.each { |r|
-        w = (w.zip r).map { |i,c| j = c.length ; j > i ? j : i }
+        w = (w.zip r).map { |i,c|
+          if c then
+            j = c.length
+            i = j if j > i
+          end
+          i
+        }
       }
       w
     end

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.8".freeze
+  VERSION = "2.8.4".freeze
 
 =begin rdoc
 
@@ -270,12 +270,12 @@ Sort without case sensitivity and preceding dot:
 
     private
 
-    Params = Struct.new :max_depth, :depth_first, :follow,
+    Params = Struct.new :max_depth, :args_depth, :depth_first, :follow,
                             :sort, :dirs, :reverse, :error, :block
 
-    def initialize max_depth: nil, depth_first: nil, follow: nil,
+    def initialize max_depth: nil, args_depth: false, depth_first: nil, follow: nil,
                             sort: true, dirs: false, reverse: false, error: nil, &block
-      @params = Params.new max_depth, depth_first, follow,
+      @params = Params.new max_depth, args_depth, depth_first, follow,
                   (sort_parser sort), dirs, reverse, error, block
       @start = Time.instance_eval { @start = Time.now }
       Time.instance_eval { @start = Time.now }
@@ -299,10 +299,12 @@ Sort without case sensitivity and preceding dot:
       if args.empty? then
         visit_dir Dir::CUR_DIR
       else
-        args.each { |base|
-          e = Entry.new base, self
-          enter e if handle_error do e.stat end
-        }
+        list = args.map { |base| Entry.new base, self }
+        list.select! { |e| handle_error do e.stat end }
+        sort_entries list
+        step_depth_args do
+          list.each { |e| enter e }
+        end
       end
     end
 
@@ -319,6 +321,16 @@ Sort without case sensitivity and preceding dot:
       @depth -= 1
     end
 
+    def step_depth_args
+      if @params[ :args_depth] then
+        step_depth do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
     def enter elem
       c_, @current = @current, elem
       @count += 1
@@ -343,18 +355,22 @@ Sort without case sensitivity and preceding dot:
     end
 
     def visit_dir dir
-      return if @params.max_depth and @params.max_depth == @depth
+      return if @params.max_depth and @params.max_depth <= @depth
       list = (Dir.new dir).children.map { |f| Entry.new f, self }
+      sort_entries list
+      step_depth do
+        list.each { |e| enter e }
+      end
+    end
+
+    def sort_entries list
       @params.sort.call list
       list.reverse! if @params.reverse
       if @params.dirs then
-        list = list.partition { |e| e.rstat.directory? rescue nil }
+        list.replace list.partition { |e| e.rstat.directory? rescue nil }
         list.reverse! if @params.depth_first
         list.flatten!
       end
-      step_depth do
-        list.each { |e| enter e }
-      end
     end
 
     def enter_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '2.8'
+  version: 2.8.4
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.