rbfind 2.8.6 → 2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45064c66f0f1b078369e892f4619edb0a6ee35fb039bffd5dfee1c430516bf2c
-  data.tar.gz: 9b2a8aa0630d6edb1ab3e5e4ea8b8c5ba163b9596d8181aa6acd1af0d0372f05
+  metadata.gz: aa9bf2ca868c2a2d061907c5fd2aff5e7fc0b16efca5a2cfce29ab760839444b
+  data.tar.gz: a739af2888f22b85c1780166dbf029273b7e76581d11fe0969bcdec8229ee66e
 SHA512:
-  metadata.gz: bab1b1a56377b5d7327986b5af068ccb1468b8f669c51e8153d66cbf9ec79be5bb68941fb54b0cbf855c43c7dec1084b4e9cd75b5c523a9be733e66f146bca67
-  data.tar.gz: 91ba9211832a27516bb2809f9173c579cba85131266eb5b23b5eb7b9c25290feb3d82aaee57506c7db592c48289658c807e0bd4e02c9ff9d530685718a375806
+  metadata.gz: 4687e55164883d414875e4bc2a9ee6dcc7e9ee06d17b9db0ef26411f68e4492fc21e29675ee28636d95e5bd088feacfe729fe4fa3eeb618a2d63f06349c46d55
+  data.tar.gz: 0d4a00f2d0ab6cae193cfa05d473127613e97560b65824bc80f449b5f955d6ddce4609b159dad1dba5c0504a1c91a603e98407c725c1ae1ac71d557c5684e119

data/bin/rbfind

@@ -44,6 +44,7 @@ module RbFind
       [ %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(--long      -Q), nil,  "alternate long format on true block"],
+      [ %w(--humanage  -H), nil,  "long format with human readable ages"],
       [ %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"],
@@ -59,6 +60,7 @@ module RbFind
       [ %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(--icase     -i), nil,  "ignore case in file and path matches"],
       [ %w(--nodirs    -N), nil,  "skip directories"],
       [ %w(--begin     -B), :blk, "eval block before begin"],
       [ %w(--end       -E), :blk, "eval block after end"],
@@ -77,47 +79,49 @@ module RbFind
       opts.quiet = true
       opts.each do |opt,arg|
         case opt
-          when '--help'      then usage          ; exit
-          when '--version'   then puts PROGRAM   ; exit
-          when '--examples'  then usage_examples ; exit
-          when '--verbose'   then @verbose = true
-          when '--show'      then @show = true
-          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.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] = !@params[ :reverse]
-          when '--require'   then require arg
-          when '--puts-path' then @puts = true
-          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
-          when '--grep'      then @lines = :grep  ;                 @block = arg
-          when '--igrep'     then @lines = :grep  ; @icase = true ; @block = arg
-          when '--binary'    then @binary = true
-          when '--no-vcs'    then @vcs = true
-          when '--no-swap'   then @vim = true
-          when '--skip'      then @skip = arg
-          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
-          when '--file'      then @block = File.read arg
-          when '--encoding'  then e, i = arg.split ":" ; set_encoding e, i
+        when '--help'      then usage          ; exit
+        when '--version'   then puts PROGRAM   ; exit
+        when '--examples'  then usage_examples ; exit
+        when '--verbose'   then @verbose = true
+        when '--show'      then @show = true
+        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.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] = !@params[ :reverse]
+        when '--require'   then require arg
+        when '--puts-path' then @puts = true
+        when '--ls-l'      then @puts = :ls  ; @wds = 6 ; @wd = 6
+        when '--long'      then @puts = :alt ; @wds = 7 ; @wd = 4
+        when '--humanage'  then @puts = :hum ; @wds = 7 ; @wd = 4
+        when '--ino'       then @puts = :ino ; @wds = 8 ; @wd = 2
+        when '--wider'     then @wd and @wd += 2 ; @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
+        when '--grep'      then @lines = :grep  ;                 @block = arg
+        when '--igrep'     then @lines = :grep  ; @icase = true ; @block = arg
+        when '--binary'    then @binary = true
+        when '--no-vcs'    then @vcs = true
+        when '--no-swap'   then @vim = true
+        when '--skip'      then @skip = arg
+        when '--demand'    then @demand = arg
+        when '--ext'       then @ext = arg
+        when '--visible'   then @visible = true
+        when '--all'       then @visible = false
+        when '--icase'     then @icase = true
+        when '--nodirs'    then @nodirs = true
+        when '--begin'     then @blkbegin = arg
+        when '--end'       then @blkend   = arg
+        when '--file'      then @block = File.open arg do |f| f.each { |l| l.chomp! } end
+        when '--encoding'  then e, i = arg.split ":" ; set_encoding e, i
         end
       end
       @args = $*.dup
@@ -138,91 +142,126 @@ module RbFind
       exit 8
     end
 
+    def run
+      if @show then
+        show
+      else
+        execute
+      end
+    end
+
+    private
+
+    INDENT = " "*2
+
+    def long_fmt ug_bang, grp, time, opath, co
+      b = "!" if ug_bang
+      g = "_" if grp
+      [
+        "spcsep stype+modes,",
+        [
+          "user#{b}.w#@wd, group#{b}.w#@wd,",
+          "size.w#{g}#@wds, #{time},",
+          "#{opath} + #{co ? 'carrow' : 'arrow'}.to_s",
+        ]
+      ]
+    end
+
+    def build_re str, flags
+      (Regexp.new str, flags).inspect
+    end
+
+    def build_re_ext flags
+      exts = @ext.split(/ +|,/).map { |e| e.delete_prefix! "." ; e }
+      ej = exts.join '|'
+      str = '\A\.(' + ej + ')\z'
+      (Regexp.new str, flags).inspect
+    end
+
+    def last_arg_not_a_file
+      l = @args.last
+      return unless l
+      return if (File.lstat l rescue false)
+      unless l =~ /[;<>{}\[\]()*?'"!&|]/ then
+        return if l =~ %r(\A[^ /]+/)
+        return if l =~ %r(\A\S*/\w*[^imoxuesn]\w*\b(?!:/))
+      end
+      true
+    end
+
+    def join_code a, ind = 0
+      case a
+      when Array then
+        a.map { |e| join_code e, ind + 1 }.join "\n"
+      else
+        INDENT * ind + a
+      end
+    end
+
+    def pre_block str
+      @block = [ str, *@block]
+    end
+
     def build_block
       co = color_on $stdout
       opath = co ? "cpath" : "path"
       @slash and opath << "!"
       case @lines
-        when :plain then
-          @puts and @block = "( #@block ) and colsep #{opath}, num, line"
-          @real and @block = "break if ~/\0/o ; #@block"
-          @block = "lines { |line,num| #@block }"
-
-        when :grep then
-          re = Regexp.new @block, @icase && Regexp::IGNORECASE
-          @block = "grep %r#{re.inspect}"
-          @block << ", true" if co
-          @block << " ; $stdout.flush" unless $stdout.tty?
-          @binary or @block = "not binary? and (#@block)"
-
-        else
-          @block ||= if @args.last and not (File.lstat @args.last rescue false) then
-            @args.pop.dup
+      when :plain then
+        @block = [ @block]
+        @puts and @block = [ "if (", @block, ") then", [ "colsep #{opath}, num, line"], "end" ]
+        @real and pre_block "break if ~/\\0/o"
+        @block = [ "lines { |line,num|", [ "$_, $. = line, num"], @block, "}"]
+
+      when :grep then
+        ic = Regexp::IGNORECASE if @icase
+        color = ", true" if co
+        @block = [ "grep %r#{build_re @block, ic}#{color}"]
+        @block.push "$stdout.flush" unless $stdout.tty?
+        @binary or @block = [ "unless binary? then", @block, "end"]
+
+      else
+        unless @block then
+          if last_arg_not_a_file then
+            @block = @args.pop
           else
             @puts ||= true
-            "true"
           end
-          if @puts then
-            @block = "( #@block ) and "
-            @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
+        if @puts then
+          cond = @block
+          @block = case @puts
+            when :ls  then long_fmt false, false, "mtime.lsish", opath, co
+            when :alt then long_fmt true,  true,  "mtime.long",  opath, co
+            when :hum then long_fmt true,  true,  "mage.t.r4",   opath, co
+            when :ino then [ "spcsep ino.w#@wds, nlink.w#@wd, #{opath}"]
+            else           [ "puts #{opath}"]
             end
-          end
-
-      end
-
-      osic = File::ALT_SEPARATOR&&Regexp::IGNORECASE
-      if @skip then
-        re = Regexp.new @skip, osic
-        @block.insert 0, "done if name =~ #{re.inspect} ; "
-      end
-
-      if @demand then
-        re = Regexp.new @demand, osic
-        @block.insert 0, "done unless name =~ #{re.inspect} ; "
-      end
+          @block = [ "if (", [ cond], ") then", @block, "end"] if cond
+        end
 
-      if @ext then
-        re = Regexp.new '\A\.(' +
-          @ext.split(/ +|,/).map { |e| e[ /\A\.?(.*)\z/, 1] }.join('|') +
-          ')\z', osic
-        @block.insert 0, "ext =~ #{re.inspect} or done ; "
       end
 
-      @visible and @block.insert 0, "visible? or done ; "
-
-      @nodirs and @block.insert 0, "done if dir? ; "
+      osic = Regexp::IGNORECASE if File::ALT_SEPARATOR || @icase
+      @skip   and pre_block "done if     name =~ #{build_re @skip,   osic}"
+      @demand and pre_block "done unless name =~ #{build_re @demand, osic}"
+      @ext    and pre_block "done unless ext =~ #{build_re_ext osic}"
 
-      @vcs and @block.insert 0, "no_vcs ; "
-      @vim and @block.insert 0, "vimswap? and done ; "
+      @visible and pre_block "done unless visible?"
+      @nodirs  and pre_block "done if dir?"
+      @vcs     and pre_block "no_vcs"
+      @vim     and pre_block "done if vimswap?"
 
       @params[ :error] = proc do
         case $!
-          when Errno::EPIPE         then raise
-          when NameError, TypeError then raise
-          when ArgumentError        then raise
-          else                           show_error $!
+        when Errno::EPIPE         then raise
+        when NameError, TypeError then raise
+        when ArgumentError        then raise
+        else                           show_error $!
         end
       end
     end
 
-    def run
-      if @show then
-        show
-      else
-        execute
-      end
-    end
-
     private
 
     def usage
@@ -250,56 +289,56 @@ module RbFind
     def usage_examples
       usage
       puts <<~'EOT'
-      Examples:
-        $ rbfind -p 'file and age < 5.m'
-        $ rbfind -p 'file and age > 1.d'
-        $ rbfind -p '(90.d .. 183.d) === age'
-
-        $ rbfind -Cg require
-        $ rbfind -Cp
-        $ rbfind 'filesize < 100.kB and grep /require/'
-        $ rbfind -g 'define\s*ALLOC_N'
-        $ rbfind myproject -e rb -l '~/require/ and puts $_'
-
-        $ rbfind -pe '.rb c h'
-        $ rbfind /usr/include -e .h -g EACCES
-        $ rbfind -d -m3 -- /mnt/data
-        $ rbfind 'filesize > 10.MiB and colsep size.to_hib, path'
-
-        $ 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"'
-        $ rbfind /usr/include -p -D '\.h$' -l '~/EACCES/'
-        $ rbfind /usr/include -pD 'pg|pq|postgres' dir
-        $ rbfind 'no_svn ; puts path'
-        $ rbfind 'prune if name == ".svn" ; puts path'
-        $ rbfind -p 'prune if name == ".svn"'
-        $ rbfind myproject 'name[/\.rb$/] and lines { |l,i| l=~/require/ and puts l }'
-        # rbfind /etc 'lines { |l,| l["192.168."] and (puts path ; break) }'
-        $ rbfind /etc 'readable? or raise "Access denied: #{path}" ;
-        >              lines { |l,| l["192.168."] and (puts path ; break) }'
-
-        $ rbfind 'col_sep stype+modes, size.w10, path'
-        $ rbfind 'tab_sep stype+modes, size.w10, path'
-        $ rbfind 'spc_sep stype+modes, size.to_h, user, group, mtime.lsish, path'
-        $ rbfind 'p stype+modes, size.to_h, user, group, mtime.lsish, path'
-        $ rbfind 'p stype+modes, size.to_h, user, group, mtime!, path'
-        $ rbfind 'p stype+modes, size.to_h, user, group, mtime.i, path'
-        $ rbfind 'p mtime.u, path'
-        $ rbfind 'p modes, user.w8, group.w8, size.w8, cpath + carrow.to_s'
-
-        $ rbfind 'p digest_md5, size.w8, path'
-        $ rbfind 'p digest_sha256, size.w8, path'
-
-        $ rbfind 'rename name.downcase'
-        $ rbfind 'ext == ".tgz" and rename without_ext+".tar.gz"'
-
-        See the RbFind documentation or the "rbfind.rb" source file for more
-        sophisticated examples and for a full list of file examination methods.
-
-        Valid units are 1.s, 1.m, 1.h, 1.d, 1.w for time values and
-        1.kB == 1000, 1.kiB == 1024, 1.MB, 1.MiB for file sizes.
+        Examples:
+          $ rbfind -p 'file and age < 5.m'
+          $ rbfind -p 'file and age > 1.d'
+          $ rbfind -p '(90.d .. 183.d) === age'
+
+          $ rbfind -Cg require
+          $ rbfind -Cp
+          $ rbfind 'filesize < 100.kB and grep /require/'
+          $ rbfind -g 'define\s*ALLOC_N'
+          $ rbfind myproject -e rb -l '~/require/ and puts $_'
+
+          $ rbfind -pe '.rb c h'
+          $ rbfind /usr/include -e .h -g EACCES
+          $ rbfind -d -m3 -- /mnt/data
+          $ rbfind 'filesize > 10.MiB and colsep size.to_hib, path'
+
+          $ 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"'
+          $ rbfind /usr/include -p -D '\.h$' -l '~/EACCES/'
+          $ rbfind /usr/include -pD 'pg|pq|postgres' dir
+          $ rbfind 'no_svn ; puts path'
+          $ rbfind 'prune if name == ".svn" ; puts path'
+          $ rbfind -p 'prune if name == ".svn"'
+          $ rbfind myproject 'name[/\.rb$/] and lines { |l,i| l=~/require/ and puts l }'
+          # rbfind /etc 'lines { |l,| l["192.168."] and (puts path ; break) }'
+          $ rbfind /etc 'readable? or raise "Access denied: #{path}" ;
+          >              lines { |l,| l["192.168."] and (puts path ; break) }'
+
+          $ rbfind 'col_sep stype+modes, size.w10, path'
+          $ rbfind 'tab_sep stype+modes, size.w10, path'
+          $ rbfind 'spc_sep stype+modes, size.to_h, user, group, mtime.lsish, path'
+          $ rbfind 'p stype+modes, size.to_h, user, group, mtime.lsish, path'
+          $ rbfind 'p stype+modes, size.to_h, user, group, mtime!, path'
+          $ rbfind 'p stype+modes, size.to_h, user, group, mtime.i, path'
+          $ rbfind 'p mtime.u, path'
+          $ rbfind 'p modes, user.w8, group.w8, size.w8, cpath + carrow.to_s'
+
+          $ rbfind 'p digest_md5, size.w8, path'
+          $ rbfind 'p digest_sha256, size.w8, path'
+
+          $ rbfind 'rename name.downcase'
+          $ rbfind 'ext == ".tgz" and rename without_ext+".tar.gz"'
+
+          See the RbFind documentation or the "rbfind.rb" source file for more
+          sophisticated examples and for a full list of file examination methods.
+
+          Valid units are 1.s, 1.m, 1.h, 1.d, 1.w for time values and
+          1.kB == 1000, 1.kiB == 1024, 1.MB, 1.MiB for file sizes.
       EOT
     end
 
@@ -357,7 +396,7 @@ module RbFind
     def execute
       error_handle do
         eval @blkbegin if @blkbegin
-        b = @block
+        b = join_code @block
         Walk.run *@args, **@params do instance_eval b end
         eval @blkend   if @blkend
       end
@@ -369,11 +408,10 @@ module RbFind
       puts "parameters:"
       @params.each { |k,v| puts_val k, "=", v }.any? or puts_val "(none)"
       puts "block:"
-      @block.each_line { |l| puts_val l }
+      c = join_code @block, 1
+      puts c
     end
 
-    INDENT = " "*2
-
     def puts_val *args
       l = [ INDENT, *args].join ""
       puts l
@@ -419,22 +457,22 @@ module RbFind
     alias method_missing_orig method_missing
     def method_missing sym, *args, &block
       case sym.to_s
-        when /\Adigest_(.*)/, /\A([a-z]+[0-9]+)\z/ then
-          m = $1
-          d = begin
-            Digest.const_get m.upcase
-          rescue NameError
-            if m =~ /sha\d\d\d/ then m = "sha2" end
-            require "digest/#{m}" and retry
-            raise
-          end
-          e = d.new
-          read 0x1000_0000 do |b| e.update b end
-          e.hexdigest
-        when /\A([amc]time)!\z/ then
-          (send $1).strftime "%Y-%m-%d %H:%M:%S %z"
-        else
-          method_missing_orig sym, *args, &block
+      when /\Adigest_(.*)/, /\A([a-z]+[0-9]+)\z/ then
+        m = $1
+        d = begin
+          Digest.const_get m.upcase
+        rescue NameError
+          if m =~ /sha\d\d\d/ then m = "sha2" end
+          require "digest/#{m}" and retry
+          raise
+        end
+        e = d.new
+        read 0x1000_0000 do |b| e.update b end
+        e.hexdigest
+      when /\A([amc]time)!\z/ then
+        (send $1).strftime "%Y-%m-%d %H:%M:%S %z"
+      else
+        method_missing_orig sym, *args, &block
       end
     end
 
@@ -447,11 +485,9 @@ class Time
 
   # autoload several formating methods
   def method_missing sym, *args, &block
-    if require "time" then
-      send sym, *args, &block
-    else
-      super
-    end
+    super
+  rescue NoMethodError
+    send sym, *args, &block if require "time"
   end
 
   # several common schemes
@@ -466,20 +502,21 @@ end
 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
-      when /\Aw_(\d+)/ then to_g.rjust $1.to_i
-      else                  super
+    case sym
+    when /\Aw(\d+)/  then "%#{$1}d" % self
+    when /\Aw_(\d+)/ then to_g.rjust $1.to_i
+    else                  super
     end
   end
 end
 
 class String
-  # convenient formatting, left justification
+  # convenient formatting, left and right justification
   def method_missing sym, *args
-    case sym.to_s   # .to_s for Ruby 1.8
-      when /\Aw_?(\d+)/ then ljust $1.to_i
-      else                   super
+    case sym
+    when /\Aw_?(\d+)/ then ljust $1.to_i
+    when /\Ar_?(\d+)/ then rjust $1.to_i
+    else                   super
     end
   end
   # conventient date/time construction
@@ -497,9 +534,9 @@ class NilClass
   def between? min, max ; false ; end
 
   def method_missing sym, *args
-    case sym.to_s   # .to_s for Ruby 1.8
-      when /\Aw_?(\d+)/ then " "*$1.to_i
-      else                   super
+    case sym
+    when /\A[wr]_?(\d+)/ then " "*$1.to_i
+    else                      super
     end
   end
 end

data/lib/rbfind/core.rb

@@ -34,29 +34,29 @@ class File
 
     def stype
       case mode >> 12
-        when 001 then "p"
-        when 002 then "c"
-        when 004 then "d"
-        when 006 then "b"
-        when 010 then "-"
-        when 012 then "l"
-        when 014 then "s"
-        when 016 then "w"
-        else          "?"
+      when 001 then "p"
+      when 002 then "c"
+      when 004 then "d"
+      when 006 then "b"
+      when 010 then "-"
+      when 012 then "l"
+      when 014 then "s"
+      when 016 then "w"
+      else          "?"
       end
     end
 
     def suffix
       case mode >> 12
-        when 001 then "|"
-        when 002 then " "
-        when 004 then "/"
-        when 006 then " "
-        when 010 then executable? ? "*" : " "
-        when 012 then "@"
-        when 014 then "="
-        when 016 then "%"
-        else          "?"
+      when 001 then "|"
+      when 002 then " "
+      when 004 then "/"
+      when 006 then " "
+      when 010 then executable? ? "*" : " "
+      when 012 then "@"
+      when 014 then "="
+      when 016 then "%"
+      else          "?"
       end
     end
 

data/lib/rbfind/humansiz.rb

@@ -103,19 +103,20 @@ end
 
 class Time
 
-  TIME_UNITS = [ "seconds", 60, "minutes", 60, "hours", 24, "days", 7, "weeks", ]
+  TIME_UNITS = { seconds: 60, minutes: 60, hours: 24, days: 7, weeks: nil }
   class <<self
     def to_unit n
-      u = TIME_UNITS.each_slice 2 do |nam,val|
+      u = TIME_UNITS.each_pair do |nam,val|
         break nam if not val or n < val
         n /= val
       end
       "#{n}#{u[0]}"
     end
     def to_sec num, unit
-      TIME_UNITS.each_slice 2 do |nam,val|
+      TIME_UNITS.each_pair do |nam,val|
         return num if nam.start_with? unit
-        num *= val
+        num *= val.to_i
+        num.nonzero? or break
       end
       raise "No time unit: #{unit}."
     end

data/lib/rbfind/table.rb

@@ -14,7 +14,7 @@ module RbFind
           when />\z/  then +1
           when /\^\z/ then  0
           when /<?\z/ then -1
-        end
+          end
         [ $`, a]
       }
       @rows = []
@@ -58,9 +58,9 @@ module RbFind
         j = (w.zip @heads, r).map { |v,(_,a),c|
           c ||= ""
           case a
-            when -1 then c.ljust  v
-            when  0 then c.center v
-            when +1 then c.rjust  v
+          when -1 then c.ljust  v
+          when  0 then c.center v
+          when +1 then c.rjust  v
           end
         }
         l = j.join " "
@@ -120,9 +120,9 @@ module RbFind
 
     def html_align a
       case a
-        when -1 then "left"
-        when  0 then "center"
-        when +1 then "right"
+      when -1 then "left"
+      when  0 then "center"
+      when +1 then "right"
       end
     end
 

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.8.6".freeze
+  VERSION = "2.9".freeze
 
 =begin rdoc
 
@@ -284,10 +284,10 @@ Sort without case sensitivity and preceding dot:
 
     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 } }
+      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
     end
 
@@ -386,7 +386,6 @@ Sort without case sensitivity and preceding dot:
     def call_block
       handle_error do
         begin
-          $_, $. = @current.name, @count
           @current.instance_eval &@params.block
         rescue Done
         end
@@ -397,9 +396,9 @@ Sort without case sensitivity and preceding dot:
       yield
     rescue
       case @params.error
-        when Proc   then @params.error.call
-        when String then instance_eval @params.error
-        else             raise
+      when Proc   then @params.error.call
+      when String then instance_eval @params.error
+      else             raise
       end
       nil
     end
@@ -651,7 +650,6 @@ Sort without case sensitivity and preceding dot:
         file.each_line { |l|
           l.chomp!
           n += 1
-          $_, $. = l, n
           r ||= true if yield l, n
         }
         r
@@ -660,9 +658,9 @@ Sort without case sensitivity and preceding dot:
 
     def grep re, color = nil
       case color
-        when /\A\d+(?:;\d+)*\z/, nil, false then
-        when true then color = "31;1"  # red
-        else           raise "Illegal color spec: #{color}"
+      when /\A\d+(?:;\d+)*\z/, nil, false then
+      when true then color = "31;1"  # red
+      else           raise "Illegal color spec: #{color}"
       end
       lines { |l,i|
         l.scrub!
@@ -795,7 +793,7 @@ Sort without case sensitivity and preceding dot:
         when 016 then                       13
         when nil then                        1
         else                                14
-      end
+        end
       self.class.colored arg, code
     end
 
@@ -803,8 +801,8 @@ Sort without case sensitivity and preceding dot:
       # Overwrite this to define custom colors
       # Example:
       #   case ext
-      #     when ".png", /\.jpe?g$/, /\.tiff?$/ then 15
-      #     when /\.tar\.(gz|bz2)$/             then 16
+      #   when ".png", /\.jpe?g$/, /\.tiff?$/ then 15
+      #   when /\.tar\.(gz|bz2)$/             then 16
       #   end
     end
 
@@ -832,11 +830,11 @@ Sort without case sensitivity and preceding dot:
             fg, bg = $~.captures.map { |x| x.downcase.ord - ?a.ord }
             a = []
             case fg
-              when 0..7 then a.push 30 + fg
+            when 0..7 then a.push 30 + fg
             end
             a.push 1 if $1 == $1.upcase
             case bg
-              when 0..7 then a.push 40 + bg
+            when 0..7 then a.push 40 + bg
             end
             e = a.join ";"
             cols.push e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: '2.9'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - just Ruby
-rubygems_version: 3.0.8
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby replacement for the standard Unix find tool