rbfind 2.5 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bee921838a5b4d93f5483295e8c7e6b263e144e8d52e5ca53a464a222a5d055
-  data.tar.gz: 03f0b19f70747dbb152011ecc8f414d99764ad9052c82f9b0b1715939fb7a3dd
+  metadata.gz: 673e3195f462c1f8b06eeb61423bc73811a84e28f191f963af2c546d43717f4a
+  data.tar.gz: 20218e28ea03d78c4e0dba0bbf2aa2a2d8ae484839075eee8bfbec013efd2916
 SHA512:
-  metadata.gz: 3de28232b6d9b842ced7ff2880e4d80938c194c13c93fd6a69e5265d3f6999276129bc1469eae62a121776222d27836c95cc208ae2d656080875345d342d471e
-  data.tar.gz: d979151e81e3eaf660304c2072550f857957e9c08c4da74af67afc5d23e498021b546c33920ba20099fcb2248a2a621eccf51b9732b34212a1273188ec4d6c73
+  metadata.gz: 44276ce8399adf25ad8bcfad934522d5667ba8120d8d44bcda05fd705d272512a3a5302a0419b1a6d87049a948418df2d5c7c45a49603aba531a3096da103a86
+  data.tar.gz: 24d752cffc2e7669e60b225d6ce1108c9b0d51006215602e564daeeea1ccc2e6ad06ee306674109c371ffa28adb6da71b3f34e487959782abdba12dd71888f69

data/bin/rbfind

@@ -31,15 +31,21 @@ 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(--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    -S), nil,  "unsorted"],
+      [ %w(--nosort    -U), nil,  "unsorted"],
       [ %w(--sort-by   -s), :str, "sort expression"],
       [ %w(--reverse   -R), nil,  "reverse the sort"],
+      [ %w(--time      -t), nil,  "sort by time, newest first"],
+      [ %w(--size      -S), nil,  "sort by size, largest first"],
+      [ %w(--dirs      -F), nil,  "sort directories before files"],
       [ %w(--require   -r), :rb,  "require library"],
       [ %w(--puts-path -p), nil,  "do 'puts path/cpath' on true block"],
       [ %w(--ls-l      -P), nil,  "do 'ls -l' style output on true block"],
-      [ %w(--wider     -+), nil,  "widen fields in long output format (--ls-l)"],
+      [ %w(--long      -Q), nil,  "alternate long format on true block"],
+      [ %w(--ino       -J), nil,  "show inodes and number of hard links"],
+      [ %w(--wider     -+), nil,  "widen fields in long output format"],
       [ %w(--slash     -/), nil,  "append a slash to directory names"],
       [ %w(--lines     -l), :blk, "surround block by 'lines { |$_,$.| ... }'"],
       [ %w(--reallines -L), :blk, "same as -l but stop at any null character"],
@@ -52,6 +58,7 @@ module RbFind
       [ %w(--demand    -D), :rgx, "skip all filenames but these"],
       [ %w(--ext       -e), :lst, "skip all filename extensions but these"],
       [ %w(--visible   -I), nil,  "skip all hidden (starting with .dot)"],
+      [ %w(--all       -a), nil,  "all, including hidden (starting with .dot)"],
       [ %w(--nodirs    -N), nil,  "skip directories"],
       [ %w(--begin     -B), :blk, "eval block before begin"],
       [ %w(--end       -E), :blk, "eval block after end"],
@@ -78,15 +85,21 @@ 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 '--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 { |n| #{arg} }"
+          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 '--require'   then require arg
           when '--puts-path' then @puts = true
-          when '--ls-l'      then @puts = true ; @wd = 6
-          when '--wider'     then @wd = @wd ? @wd.succ : 4
+          when '--ls-l'      then @puts = :ls  ; @wds = 6 ; @wd = 6
+          when '--long'      then @puts = :alt ; @wds = 7 ; @wd = 4
+          when '--ino'       then @puts = :ino ; @wds = 8 ; @wd = 2
+          when '--wider'     then @wd and @wd += 2.succ ; @wds and @wds += @puts != :ls ? 4 : 3
           when '--slash'     then @slash = true
           when '--lines'     then @lines = :plain ;                 @block = arg
           when '--reallines' then @lines = :plain ; @real = true ;  @block = arg
@@ -99,6 +112,7 @@ module RbFind
           when '--demand'    then @demand = arg
           when '--ext'       then @ext = arg
           when '--visible'   then @visible = true
+          when '--all'       then @visible = false
           when '--nodirs'    then @nodirs = true
           when '--begin'     then @blkbegin = arg
           when '--end'       then @blkend   = arg
@@ -150,11 +164,17 @@ module RbFind
           end
           if @puts then
             @block = "( #@block ) and "
-            @block << if @wd then
-              "spcsep stype+modes, user.w#@wd, group.w#@wd, size.w#@wd, " +
-                "mtime.lsish, #{opath} + #{co ? 'carrow' : 'arrow'}.to_s"
-            else
-              "puts #{opath}"
+            @block << case @puts
+              when :ls then
+                "spcsep stype+modes, user.w#@wd,  group.w#@wd,  size.w#@wds, " +
+                  "mtime.lsish, #{opath} + #{co ? 'carrow' : 'arrow'}.to_s"
+              when :alt then
+                "spcsep stype+modes, user!.w#@wd, group!.w#@wd, size.w_#@wds, " +
+                  "mtime.long,  #{opath} + #{co ? 'carrow' : 'arrow'}.to_s"
+              when :ino then
+                "spcsep ino.w#@wds, nlink.w#@wd, #{opath}"
+              else
+                "puts #{opath}"
             end
           end
 
@@ -220,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
 
@@ -246,7 +266,7 @@ module RbFind
         $ rbfind -d -m3 -- /mnt/data
         $ rbfind 'filesize > 10.MiB and colsep size.to_hib, path'
 
-        $ rbfind -S "name =~ /^\.*/ ; $'.downcase"
+        $ rbfind -U "name =~ /^\.*/ ; $'.downcase"
         $ rbfind -B '$s=0' -E 'puts $s.to_h' 'filesize {|s|$s+=s}'
         $ rbfind 'puts path if ext == ".rb"'
         $ rbfind -p 'ext == ".rb"'
@@ -345,7 +365,7 @@ module RbFind
 
     def show
       puts "arguments:"
-      @args.each { |a| puts_val a }.any?              or puts_val "(none)"
+      @args.each { |a| puts_val a }.any?             or puts_val "(none)"
       puts "parameters:"
       @params.each { |k,v| puts_val k, "=", v }.any? or puts_val "(none)"
       puts "block:"
@@ -447,8 +467,9 @@ class Integer
   # convenient formatting, right justification
   def method_missing sym, *args
     case sym.to_s   # .to_s for Ruby 1.8
-      when /\Aw_?(\d+)/ then "%#{$1}d" % self
-      else                   super
+      when /\Aw(\d+)/  then "%#{$1}d" % self
+      when /\Aw_(\d+)/ then to_g.rjust $1.to_i
+      else                  super
     end
   end
 end

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.5".freeze
+  VERSION = "2.8.2".freeze
 
 =begin rdoc
 
@@ -270,14 +270,16 @@ Sort without case sensitivity and preceding dot:
 
     private
 
-    Params = Struct.new :max_depth, :depth_first, :follow,
-                            :sort, :reverse, :error, :block
+    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,
-                            sort: true, reverse: false, error: nil, &block
-      @params = Params.new max_depth, depth_first, follow,
-                  (sort_parser sort), reverse, error, block
-      @start, @count, @depth = Time.now, 0, 0
+    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, 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 }
+      @count, @depth = 0, 0
     end
 
     def sort_parser st
@@ -297,13 +299,12 @@ Sort without case sensitivity and preceding dot:
       if args.empty? then
         visit_dir Dir::CUR_DIR
       else
-        args.each { |base|
-          handle_error do
-            File.lstat base rescue raise "`#{base}` doesn't exist."
-            e = Entry.new base, self
-            enter e
-          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
 
@@ -313,34 +314,62 @@ Sort without case sensitivity and preceding dot:
 
     private
 
+    def step_depth
+      @depth += 1
+      yield
+    ensure
+      @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
-      visit_depth
+      if @params.depth_first then
+        enter_dir
+        begin
+          call_block
+        rescue Prune
+          handle_error do
+            raise "#{self.class}: prune with :depth_first is pointless."
+          end
+        end
+      else
+        begin
+          call_block
+          enter_dir if @current.path
+        rescue Prune
+        end
+      end
     ensure
       @current = c_
     end
 
     def visit_dir dir
-      return if @params.max_depth and @params.max_depth == @depth
-      list = (Dir.new dir).children
-      list = list.map { |f| Entry.new f, self }
-      @params.sort.call list
-      list.reverse! if @params.reverse
-      begin
-        @depth += 1
+      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 }
-      ensure
-        @depth -= 1
       end
     end
 
-    def visit_depth
-      if @params.depth_first then
-        enter_dir
-        call_block
-      else
-        call_block and enter_dir
+    def sort_entries list
+      @params.sort.call list
+      list.reverse! if @params.reverse
+      if @params.dirs then
+        list.replace list.partition { |e| e.rstat.directory? rescue nil }
+        list.reverse! if @params.depth_first
+        list.flatten!
       end
     end
 
@@ -361,9 +390,7 @@ Sort without case sensitivity and preceding dot:
           @current.instance_eval &@params.block
         rescue Done
         end
-        @current.path
       end
-    rescue Prune
     end
 
     def handle_error

data/lib/rbfind/humansiz.rb

@@ -5,7 +5,7 @@
 
 =begin rdoc
 
-Human readable sizes, times, and modes.
+Human readable sizes and times.
 
 Examples:
 
@@ -136,12 +136,23 @@ class Time
   #   file.stat.mtime.lsish    #=> " 1. Apr 2008    "
   #
   def lsish
-    strftime "#{PERC_DAY}. %b " +
-              (year == Time.now.year ? "%H:%M:%S" : "%Y    ")
+    strftime "%e. %b " + (year == Time.start.year ? "%H:%M:%S" : "%Y    ")
   end
 
-  # Windows has no "%e".
-  PERC_DAY = Time.now.strftime("%e") =~ /\d/ ? "%e" : "%d"   # :nodoc:
+  def long
+    s = Time.start
+    if year == s.year && month == s.month && day == s.day then
+      strftime "==%H:%M:%S"
+    else
+      strftime "%Y-%m-%d"
+    end
+  end
+
+  class <<self
+    def start
+      @start ||= Time.now
+    end
+  end
 
 end
 

metadata

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