rbfind 2.2 → 2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ec1222c8e64f36c9927aa96c1c4f2a737d624d142fea22bfce274637074a7b
-  data.tar.gz: 6c34e268c249977c6c74dc3bf42d841ea63c2649274742be29918a1c19d592a0
+  metadata.gz: f0a448408396d2339b4aa0656dfeb579c6533373623ca9e6cb0e4b48812e2b03
+  data.tar.gz: d71f32510fdc92315c7f5aaa16d08560d6bc6b1d9515af85913f3c4a4f42e6ba
 SHA512:
-  metadata.gz: c71fdaa76238ddae6fcc6b887bf30280f7f48c97e92d324ad5a400f81de8038f4fbe1b10ff931e4cc8f80604d69e71e496a80f99544ff5ba5a37ad0beb1dc2ea
-  data.tar.gz: b12aad69797682840b1a75b07b77f5474d5aab8e66b4b536dfe41e538e7f5fee493aaf5ad493db8419454532729600acc037e0936001b193d7911a44ac886f73
+  metadata.gz: bab39e437deaa7cf9d4e283f83c5ee354c3f28b4ed7159b90adfdcc7210c2dfce80593cfadcceb3c0702c4641c93b66b4fd2e4351deccd62adb9267754aaf588
+  data.tar.gz: 44adde8bccbb1f840187bb9973a7e835d098f05c715fa22cf493a06fa8c00bc5bdbdb7e0d5da77db925034f3315f16148fd7431ed8b745febaeaadda0d5fd560

data/bin/rbfind

@@ -33,13 +33,17 @@ module RbFind
       [ %w(--depth     -d), nil,  "yield directory after its contents"],
       [ %w(--maxdepth  -m), :num, "maxium step depth"],
       [ %w(--follow    -y), nil,  "follow symbolic links"],
-      [ %w(--nosort    -S), nil,  "unsorted"],
-      [ %w(--sort-by   -s), :str, "sort expression ('n' is name)"],
-      [ %w(--reverse   -R), :str, "reverse sort"],
+      [ %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(--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"],
@@ -48,14 +52,15 @@ module RbFind
       [ %w(--binary    -b), nil,  "grep even binary files"],
       [ %w(--no-vcs    -C), nil,  "prune version control dirs (CVS/.svn/.git)"],
       [ %w(--no-swap   -W), nil,  "ignore Vim swapfiles"],
-      [ %w(--skip      -k), :lst, "filenames to skip"],
-      [ %w(--demand    -D), :lst, "skip all filenames but these"],
+      [ %w(--skip      -k), :rgx, "filenames to skip"],
+      [ %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"],
-      [ %w(--file      -f), :blk, "read block expression from file"],
+      [ %w(--file      -f), :nam, "read block expression from file"],
       [ %w(--encoding  -K), :str, "encoding extern[:intern] (same as ruby -E)"],
     ]
 
@@ -81,12 +86,16 @@ module RbFind
           when '--maxdepth'  then @params[ :max_depth] = arg.to_i
           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 '--wider'     then @wd and @wd += 2.succ ; @wds and @wds += @puts == :alt ? 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 +108,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
@@ -142,7 +152,7 @@ module RbFind
           @binary or @block = "not binary? and (#@block)"
 
         else
-          @block ||= if @args.last and not (File.exists? @args.last) then
+          @block ||= if @args.last and not (File.lstat @args.last rescue false) then
             @args.pop.dup
           else
             @puts ||= true
@@ -150,11 +160,15 @@ 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 :alt then
+                "spcsep stype+modes, user!.w#@wd, group!.w#@wd, size.w_#@wds, " +
+                  "mtime.long,  #{opath} + #{co ? 'carrow' : 'arrow'}.to_s"
+              when :ls then
+                "spcsep stype+modes, user.w#@wd,  group.w#@wd,  size.w#@wds, " +
+                  "mtime.lsish, #{opath} + #{co ? 'carrow' : 'arrow'}.to_s"
+              else
+                "puts #{opath}"
             end
           end
 
@@ -246,7 +260,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"'
@@ -447,8 +461,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
@@ -483,6 +498,20 @@ class NilClass
   end
 end
 
+class TrueClass
+  def <=> oth
+    oth == true ? 0 : oth == false ? 1 : nil
+  end
+  include Enumerable
+end
+
+class FalseClass
+  def <=> oth
+    oth == false ? 0 : oth == true ? -1 : nil
+  end
+  include Enumerable
+end
+
 class Proc
   def to_s
     "#<%s:0x%08x>" % [ self.class, object_id]

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.2".freeze
+  VERSION = "2.6".freeze
 
 =begin rdoc
 
@@ -241,7 +241,7 @@ Reverse sort:
 
 Sort without case sensitivity and preceding dot:
 
-    s = proc { |x| x =~ /^\.?/ ; $'.downcase }
+    s = proc { name =~ /^\.?/ ; $'.downcase }
     RbFind.run sort: s do
       puts path
     end
@@ -270,36 +270,30 @@ Sort without case sensitivity and preceding dot:
 
     private
 
-    def initialize max_depth: nil, depth_first: nil, follow: nil,
-                            sort: true, reverse: false, error: nil, &block
-      @max_depth = max_depth
-      @depth_first = depth_first
-      @follow = follow
-      @sort = sort_parser sort, reverse
-      @error = error
-      @block = block
-
-      ostat = $stdout.stat
-      @ostat = ostat if ostat.file?
-
-      @wd, @start, @count = Dir.getwd, Time.now, 0
-    end
+    Params = Struct.new :max_depth, :depth_first, :follow,
+                            :sort, :dirs, :reverse, :error, :block
 
-    def sort_parser st, rev
-      r = case st
-        when Proc                then proc { |l| l.sort_by! &st }
-        when nil, false, nil, "" then proc { }
-        else                          proc { |l| l.sort! }
+    def initialize max_depth: nil, depth_first: nil, follow: nil,
+                            sort: true, dirs: false, reverse: false, error: nil, &block
+      @params = Params.new max_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
+      case st
+        when Proc       then proc { |l| l.sort_by! { |e| e.instance_eval &st } }
+        when String     then proc { |l| l.sort_by! { |e| e.instance_eval st  } }
+        when nil, false then proc { }
+        else                 proc { |l| l.sort_by! { |e| e.name } }
       end
-      rev ? proc { |l| r.call l ; l.reverse! } : r
     end
 
     public
 
-    attr_reader :wd, :start, :count, :depth
-
     def run *args
-      @levels, @depth = [], 0
       args.flatten!
       args.compact!
       if args.empty? then
@@ -307,94 +301,69 @@ Sort without case sensitivity and preceding dot:
       else
         args.each { |base|
           handle_error do
-            File.exists? base or raise "`#{base}` doesn't exist."
-            visit_depth base
+            File.lstat base rescue raise "`#{base}` doesn't exist."
+            e = Entry.new base, self
+            enter e
           end
         }
       end
-    ensure
-      @levels = @depth = nil
     end
 
+    attr_reader :start, :count
+    attr_reader :depth
+    attr_reader :current
+
     private
 
-    def join_path
-      (File.join @levels).freeze
+    def enter elem
+      c_, @current = @current, elem
+      @count += 1
+      visit_depth
+    ensure
+      @current = c_
     end
 
-    def visit filename
-      @depth += 1
-      visit_depth filename
-    ensure
-      @depth -= 1
+    def visit_dir dir
+      return if @params.max_depth and @params.max_depth == @depth
+      list = (Dir.new dir).children.map { |f| Entry.new f, self }
+      @params.sort.call list
+      @params.reverse and list.reverse!
+      @params.dirs and list = list.partition { |e| e.rstat.directory? }.flatten
+      begin
+        @depth += 1
+        list.each { |e| enter e }
+      ensure
+        @depth -= 1
+      end
     end
 
-    def visit_depth filename
-      @levels.push filename.dup.freeze
-      p_, @path = @path, join_path
-      if @depth_first then
+    def visit_depth
+      if @params.depth_first then
         enter_dir
-        call_block or raise "#{self.class}: prune doesn't work with :depth_first."
+        call_block
       else
         call_block and enter_dir
       end
-      @count += 1
-    ensure
-      @path = p_
-      @levels.pop
     end
 
     def enter_dir
-      return unless File.directory? @path
-      if File.symlink? @path then
-        return unless @follow and handle_error do
-          d = @path.dup
-          while d != Dir::CUR_DIR do
-            d, = File.split d
-            raise "cyclic recursion in #@path" if File.identical? d, @path
-          end
-          true
-        end
-      end
+      return unless @current.stat.directory? || (@params.follow &&
+                    @current.symlink? && @current.rstat.directory?)
       handle_error do
-        visit_dir @path
+        @current.cyclic? and
+          raise "Cyclic recursion in #{@current.path}"
+        visit_dir @current.path
       end
     end
 
-    def visit_dir dir
-      return if @max_depth and @max_depth == @depth
-      list = (Dir.new dir).children
-      @sort.call list
-      list.each { |f| visit f }
-    ensure
-    end
-
     def call_block
-      e = Entry.new @levels.last, @path, self
       handle_error do
-        $_, $. = e.name, count
         begin
-          e.instance_eval &@block
+          $_, $. = @current.name, @count
+          @current.instance_eval &@params.block
         rescue Done
         end
-        if !(e.name.equal? @levels.last) && e.name != @levels.last then
-          if e.name then
-            e.name == (File.basename e.name) or
-              raise "#{self.class}: rename to `#{e.name}' may not be a path."
-            e.name.freeze
-            @levels.pop
-            @levels.push e.name
-            p, @path = @path, join_path
-            File.rename p, @path
-          else
-            if e.dir? then
-              Dir.rmdir @path
-            else
-              File.unlink @path
-            end
-          end
-        end
-        true
+        @current.path
       end
     rescue Prune
     end
@@ -402,9 +371,9 @@ Sort without case sensitivity and preceding dot:
     def handle_error
       yield
     rescue
-      case @error
-        when Proc   then @error.call
-        when String then instance_eval @error
+      case @params.error
+        when Proc   then @params.error.call
+        when String then instance_eval @params.error
         else             raise
       end
       nil
@@ -417,21 +386,35 @@ Sort without case sensitivity and preceding dot:
 
     attr_reader :path, :name
 
-    def initialize name, path, walk
-      @name, @path, @walk = name, path, walk
+    def initialize filename, walk
+      @walk = walk
+      @prev, @name = walk.current, filename.dup.freeze
+      @path = join_path @name
+    end
+
+    protected
+    attr_reader :prev
+    private
+    def join_path name
+      @prev ? (File.join @prev.path, name).freeze : name
+    end
+    def reset
+      @fullpath = @stat = @rstat = @ostat = @colors = nil
     end
+    public
 
+    def count ; @walk.count ; end
     def depth ; @walk.depth ; end
     def now   ; @walk.start ; end
 
-    def fullpath ; @fullpath ||= File.absolute_path @path, @walk.wd ; end
+    def fullpath ; @fullpath ||= File.absolute_path @path ; end
 
     def stat  ; @stat  ||= File.lstat @path ; end
     def rstat ; @rstat ||= File.stat  @path ; end
 
 
     private
-    def append_slash s ; (File.directory? s) ? (File.join s, "") : s ; end
+    def append_slash s ; directory? ? (File.join s, "") : s ; end
     public
 
     def path!     ; append_slash path     ; end
@@ -461,7 +444,23 @@ Sort without case sensitivity and preceding dot:
     end
     public
 
-    def dir? ; stat.directory? ; end
+    def directory? ; stat.directory? ; end
+    alias dir? directory?
+
+    def symlink? ; stat.symlink? ; end
+
+    def cyclic?
+      e = self
+      loop do
+        e = e.prev
+        e or break
+        if File.identical? e.path, @path then
+          return true
+        end
+      end
+      false
+    end
+
 
     def aage ; @walk.start - stat.atime ; end
     def mage ; @walk.start - stat.mtime ; end
@@ -516,10 +515,10 @@ Sort without case sensitivity and preceding dot:
     end
 
 
-    def readlink ; File.readlink @path if stat.symlink? ; end
+    def readlink ; File.readlink @path if symlink? ; end
 
     def broken_link?
-      return unless stat.symlink?
+      return unless symlink?
       rstat
       false
     rescue
@@ -529,7 +528,7 @@ Sort without case sensitivity and preceding dot:
 
     ARROW = " -> "
     def arrow
-      ARROW + (File.readlink @path) if stat.symlink?
+      ARROW + (File.readlink @path) if symlink?
     end
 
 
@@ -552,7 +551,11 @@ Sort without case sensitivity and preceding dot:
     # Check whether a directory contains an entry.
     #
     def contains? name
-      File.exists? File.join @path, name
+      p = File.join @path, name
+      File.lstat p
+      true
+    rescue
+      false
     end
 
     # :call-seq:
@@ -580,7 +583,8 @@ Sort without case sensitivity and preceding dot:
     # nothing will be done.
     #
     def open &block
-      @ostat and @ostat.identical? @path and
+      @ostat ||= $stdout.stat
+      @ostat.identical? @path and
         raise "Refusing to open output file."
       File.open @path, &block if file?
     end
@@ -690,10 +694,27 @@ Sort without case sensitivity and preceding dot:
     include Csv
 
 
-    def rename newname ; @name = newname ; end
+    def rename newname
+      @name = newname
+      newname == (File.basename newname) or
+        raise "Rename to `#{newname}' may not be a path."
+      p = join_path newname
+      (File.exist? p) and raise "Rename to `#{p}` would overwrite."
+      File.rename @path, p
+      @name, @path = newname.dup.freeze, p
+      reset
+    end
     alias mv rename
 
-    def rm ; @name = nil ; end
+    def rm
+      if directory? then
+        Dir.rmdir @path
+      else
+        File.unlink @path
+      end
+      @name = @path = nil
+      reset
+    end
 
 
     def cname      ; color name      ; end

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
 

data/lib/rbfind/table.rb

@@ -9,18 +9,28 @@ module RbFind
 
     def initialize *heads
       heads.flatten!
-      @heads = heads
+      @heads = heads.map { |h|
+        a = case h
+          when />\z/  then +1
+          when /\^\z/ then  0
+          when /<?\z/ then -1
+        end
+        [ $`, a]
+      }
       @rows = []
     end
 
-    def spawn
-      self.class.new *@heads
+    attr_reader :heads
+    protected :heads
+    def initialize_copy oth
+      @heads = oth.heads
+      @rows = []
     end
 
     def add *row
       row.flatten!
       n = @heads.size
-      row[ 0, n] = row[ 0, n].map { |r| r.to_s }
+      row.map! { |r| break if n.zero? ; n -= 1 ; r.to_s }
       @rows.push row
     end
 
@@ -32,20 +42,24 @@ module RbFind
       @rows.empty?
     end
 
-    def output head: false
+    def output head: false, ifempty: nil
+      if empty? and ifempty then
+        puts ifempty
+        return
+      end
       make_lines head: head do |l| puts l end
     end
 
     def make_lines head: false
       rs = @rows
-      rs.unshift heads_plain if head
+      rs.unshift @heads.map { |(h,a)| h } if head
       w = calc_widths
       rs.each { |r|
-        j = (w.zip @heads, r).map { |v,h,c|
-          case h
-            when />\z/  then c.rjust  v
-            when /\^\z/ then c.center v
-            when /<?\z/ then c.ljust  v
+        j = (w.zip @heads, r).map { |v,(_,a),c|
+          case a
+            when -1 then c.ljust  v
+            when  0 then c.center v
+            when +1 then c.rjust  v
           end
         }
         l = j.join " "
@@ -59,14 +73,14 @@ module RbFind
       @html = ""
       tag :table, table, nl: 2 do
         tag :tr, row, nl: 1 do
-          (@heads.zip heads_plain).each { |h,c|
-            tag :td, c.downcase, align: (html_align h) do @html << c end
+          @heads.each { |(h,a)|
+            tag :td, h.downcase, align: a do @html << h end
           }
         end
         @rows.each { |r|
           tag :tr, table, nl: 1 do
-            (@heads.zip heads_plain, r).each { |h,g,c|
-              tag :td, g.downcase, align: (html_align h) do @html << c end
+            (@heads.zip r).each { |(g,a),c|
+              tag :td, g.downcase, align: a do @html << c end
             }
           end
         }
@@ -86,13 +100,9 @@ module RbFind
       w
     end
 
-    def heads_plain
-      @heads.map { |h| h.sub /\W\z/, "" }
-    end
-
     def tag name, cls, nl: 0, align: nil
       @html << "<#{name}"
-      @html << " style=\"text-align: " << align << ";\"" if align
+      @html << " style=\"text-align: " << (html_align align) << ";\"" if align
       @html << " class=\"" << cls << "\"" if cls
       @html << ">"
       @html << $/ if nl > 1
@@ -101,11 +111,11 @@ module RbFind
       @html << $/ if nl > 0
     end
 
-    def html_align h
-      case h
-        when />/  then "right"
-        when /\^/ then "center"
-        when /<?/ then "left"
+    def html_align a
+      case a
+        when -1 then "left"
+        when  0 then "center"
+        when +1 then "right"
       end
     end
 

metadata

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