rbfind 2.13 → 2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98488c856ff5755a635ef73c4c25fa7dfba6f84dbe4ee41546ffb22e4ec82fb1
-  data.tar.gz: f48565d71eedeef67f1cc93008c185df4637f26ba2ca1d409dc0887b44ff48e0
+  metadata.gz: d2f219a0e17b31db93bb38ec0425b37cc0a5921cdbd89638bab4de5d4303e161
+  data.tar.gz: 0d470ef4ceac6aa088aea20c4ae7804341fbb5a84d23108bf5342acb6ad5e0e7
 SHA512:
-  metadata.gz: ee7b581d587bb0730b2aad2a502bc7ef3ce54a1bfe5742ca4bc92995aaba06db6400e30c9d23a2f8ae04c62d0b608cccf2a11cdd64f13bc23ab39f6c6af1e6b9
-  data.tar.gz: bfdb28913be3435781c52c630fbff63d29965908cafee6494a6c6a267a8da1ce568a71424687d8298f655aa66a5998e74d391934689c2d31fa33f9df364c8dc0
+  metadata.gz: d67aae93c618f927f4b3c8ffad8916c0e526be0a59c9567538b90ac5de8d70f317799119347aa370088aae5a77ca95b30eec90f18fd269006d0ec886247f1ecf
+  data.tar.gz: 56c9ba35469ac5b677b2aa3c6e7b9ee5977e0abcf65c563704aa768b29fc6afdf92ff92931c317c8a273af69b3ed2344cf25ee6e8d10d9782fb30043b438c956

data/LICENSE

@@ -1,24 +1,24 @@
-   ____  _     _____ _           _
-  |  _ \| |__ |  ___(_)_ __   __| |
-  | |_) | '_ \| |_  | | '_ \ / _` |
-  |  _ <| |_) |  _| | | | | | (_| |
-  |_| \_\_.__/|_|   |_|_| |_|\__,_|
+# BSD-2-clause license, extended by language use conditions
 
-
-Copyright (c) 2008-2019, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (C) 2008-2025, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
+  * Redistributions must not contain any clauses about anticipated
+    harassment or discrimination, nor must they be held in a so-called
+    "inclusive language". As far as German language is used, the
+    conditions mentioned below additionally apply.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -32,3 +32,21 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+## Use of the German Language
+
+Beim Gebrauch deutscher Sprache sind Weiterentwicklungen und
+-verbreitungen nur gestattet unter Einhaltung sowie abermaligen
+Einforderns folgender zusätzlicher Bedingungen:
+
+  * Keine Verwendung von sogenannter „geschlechtergerechter Sprache“,
+    also Anfügen von weiblichen Endungen mit Binnen-I, Sternchen,
+    Doppelpunkt, Unterstrich oder ähnlichem, oder Konstruktionen, die
+    den Sachverhalt falsch wiedergeben („Radfahrende“, „Studierende“).
+
+  * Keine Verwendung der „reformierten Rechtschreibung“ von 1996,
+    insbesondere Doppel-S am Silbenende, „plazieren“ mit T, sowie
+    Großschreibung von Wendungen wie „des weiteren“.
+
+
+<!-- vim:set ft=markdown : -->

data/README.md

@@ -0,0 +1,61 @@
+# RbFind
+
+A substitute for the Unix find tool using Ruby expressions
+
+
+## Description
+
+RbFind does the same as the standard Unix find tool but has a
+different calling syntax. Specify your search reqest as a
+Ruby expression.
+
+
+## Features
+
+  * ls long format style output
+  * Built-in grep
+  * Colored ls and grep output
+  * Automatically exclude version control system or Vim swap files
+  * No dependecies
+
+
+## Example
+
+Find files that were modified in the last five minutes.
+
+```sh
+rbfind -p 'file and age < 5.m'
+```
+
+Grep whole directory but skip `.git/` or `.svn/`, and
+`.filename.swp`.
+
+```sh
+rbfind -CWg require
+```
+
+Save time and do not grep large files.
+
+```sh
+rbfind 'filesize < 100.kB and grep /require/'
+```
+
+Output ls long format.
+
+```sh
+rbfind -P
+```
+
+Print MD5 digest and size for each file.
+
+```sh
+rbfind 'spacesep digest_md5, size.w8, path'
+```
+
+
+## Copyright
+
+  * (C) 2008-2025, Bertram Scharpf <software@bertram-scharpf.de>
+  * License: [BSD-2-Clause+](./LICENSE)
+  * Repository: [ruby-nvim](https://github.com/BertramScharpf/rbfind.git)
+

data/bin/rbfind

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 #
 #  rbfind  --  Ruby Find with many features
@@ -6,13 +6,12 @@
 
 require "rbfind"
 require "rbfind/humansiz"
-require "English"
-require 'getoptlong'
+require 'rbfind/appl'
 
 
 module RbFind
 
-  class Application
+  class RbFindAppl < Application
 
     PROGRAM = <<~EOT
       rbfind #{RbFind::VERSION}  --  A find tool using Ruby
@@ -21,129 +20,65 @@ module RbFind
         License: BSD
     EOT
 
-    OPTIONS = [
-      #    options          arg   description
-      [ %w(--help      -h), nil,  "print this help"],
-      [ %w(--examples  -X), nil,  "print this help and examples"],
-      [ %w(--version   -V), nil,  "print version information"],
-      [ %w(--verbose   -v), nil,  "standard Ruby error reports"],
-      [ %w(--show      -o), nil,  "just show Ruby block built from options"],
-      [ %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 (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"],
-      [ %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(--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"],
-      [ %w(--lines     -l), :blk, "surround block by 'lines { |$_,$.| ... }'"],
-      [ %w(--reallines -L), :blk, "same as -l but stop at any null character"],
-      [ %w(--grep      -g), :blk, "grep files (implies -pL)"],
-      [ %w(--igrep     -G), :blk, "case insensitive grep"],
-      [ %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), :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(--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"],
-      [ %w(--file      -f), :nam, "read block expression from file"],
-      [ %w(--encoding  -K), :str, "encoding extern[:intern] (same as ruby -E)"],
-      [ %w(--width-user  ), :num, "width of user field"],
-      [ %w(--width-size  ), :num, "width of size field"],
-    ]
-
-    def initialize
+    option %w(h help      ), "print this help"                            do usage          ; raise Exit ; end
+    option %w(X examples  ), "print this help and examples"               do usage_examples ; raise Exit ; end
+    option %w(V version   ), "print version information"                  do puts PROGRAM   ; raise Exit ; end
+    option %w(v verbose   ), "standard Ruby error reports"                do @verbose = true ; end
+    option %w(o show      ), "just show Ruby block built from options"    do @show = true ; end
+    option %w(w bw        ), "black and white on -p or default output"    do @color = false ; end
+    option %w(c colored   ), "force color on -p or default output"        do @color = true ; end
+    option %w(d depth     ), "yield directory after its contents"         do @params[ :depth_first] = true ; end
+    option %w(m maxdepth  ), "maxium step depth (0 = any)"                do |num| @params[ :max_depth] = num.to_i.nonzero? ; end
+    option %w(A argsdepth ), "args have depth 1 (not 0)"                  do @params[ :args_depth] = true ; end
+    option %w(y follow    ), "follow symbolic links"                      do @params[ :follow] = true ; end
+    option %w(U nosort    ), "unsorted"                                   do @params[ :sort] = false ; end
+    option %w(s sort-by   ), "sort expression"                            do |str| @params[ :sort] = instance_eval "proc { #{str} }" ; end
+    option %w(R reverse   ), "reverse the sort"                           do @params[ :reverse] = !@params[ :reverse] ; end
+    option %w(t time      ), "sort by time, newest first"                 do @params[ :sort] = proc { mtime } ; @params[ :reverse] = true ; end
+    option %w(S size      ), "sort by size, largest first"                do @params[ :sort] = proc { size  } ; @params[ :reverse] = true ; end
+    option %w(F dirs      ), "sort directories before files"              do @params[ :dirs] = true ; end
+    option %w(r require   ), "require library"                            do |rb| require rb ; end
+    option %w(x execute   ), "execute block"                              do |b| @block = b ; end
+    option %w(p puts-path ), "do 'puts path/cpath' on true block"         do @puts = :plain ; end
+    option %w(P ls-l      ), "do 'ls -l' style output on true block"      do @puts = :ls    ; @wds ||= 6 ; @wdu ||= 6 ; end
+    option %w(Q long      ), "alternate long format on true block"        do @puts = :alt   ; @wds ||= 7 ; @wdu ||= 4 ; end
+    option %w(H humanage  ), "long format with human readable ages"       do @puts = :hum   ; @wds ||= 7 ; @wdu ||= 4 ; end
+    option %w(J ino       ), "show inodes and number of hard links"       do @puts = :ino   ; @wds ||= 8 ; @wdu ||= 2 ; end
+    option %w(+ wider     ), "widen fields in long output format"         do @wdu and @wdu += 2 ; @wds and @wds += @puts != :ls ? 4 : 3 ; end
+    option %w(/ slash     ), "append a slash to directory names"          do @slash = true ; end
+    option %w(l lines     ), "surround block by 'lines { |$_,$.| ... }'"  do |blk| @lines = :plain ;                 @block = blk ; end
+    option %w(L reallines ), "same as -l but stop at any null character"  do |blk| @lines = :plain ; @real = true ;  @block = blk ; end
+    option %w(g grep      ), "grep files (implies -pL)"                   do |blk| @lines = :grep  ;                 @block = blk ; end
+    option %w(G igrep     ), "case insensitive grep"                      do |blk| @lines = :grep  ; @icase = true ; @block = blk ; end
+    option %w(b binary    ), "grep even binary files"                     do @binary = true ; end
+    option %w(C no-vcs    ), "prune version control dirs (CVS/.svn/.git)" do @vcs = true ; end
+    option %w(W no-swap   ), "ignore Vim swapfiles"                       do @vim = true ; end
+    option %w(k skip      ), "filenames to skip"                          do |rgx| @skip = rgx ; end
+    option %w(D demand    ), "skip all filenames but these"               do |rgx| @demand = rgx ; end
+    option %w(e ext       ), "skip all filename extensions but these"     do |lst| @ext = lst ; end
+    option %w(I visible   ), "skip all hidden (starting with .dot)"       do @visible = true ; end
+    option %w(a all       ), "all, including hidden (starting with .dot)" do @visible = false ; end
+    option %w(i icase     ), "ignore case in file and path matches"       do @icase = true ; end
+    option %w(N nodirs    ), "skip directories"                           do @nodirs = true ; end
+    option %w(B begin     ), "eval block before begin"                    do |blk| @blkbegin = blk ; end
+    option %w(E end       ), "eval block after end"                       do |blk| @blkend   = blk ; end
+    option %w(f file      ), "read block expression from file"            do |nam| @block = File.open nam do |f| f.each { |l| l.chomp! } end ; end
+    option %w(K encoding  ), "encoding extern[:intern] (same as ruby -E)" do |str| e, i = str.split ":", 2 ; set_encoding e, i ; end
+    option %w(  width-user), "width of user field"                        do |num| @wdu = num.to_i.nonzero? ; end
+    option %w(  width-size), "width of size field"                        do |num| @wds = num.to_i.nonzero? ; end
+
+    def initialize args
       @params = {}
       envopts = ENV[ "RBFIND_OPTIONS"]
-      $*.unshift *envopts.split if envopts
-      opts = GetoptLong.new *OPTIONS.map { |names,arg,|
-        [*names,(arg ? GetoptLong::REQUIRED_ARGUMENT : GetoptLong::NO_ARGUMENT)]
-      }
-      opts.ordering = GetoptLong::PERMUTE
-      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 ; @wdu ||= 6
-        when '--long'       then @puts = :alt ; @wds ||= 7 ; @wdu ||= 4
-        when '--humanage'   then @puts = :hum ; @wds ||= 7 ; @wdu ||= 4
-        when '--ino'        then @puts = :ino ; @wds ||= 8 ; @wdu ||= 2
-        when '--wider'      then @wdu and @wdu += 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
-        when '--width-user' then @wdu = arg.to_i.nonzero?
-        when '--width-size' then @wds = arg.to_i.nonzero?
+      if envopts then
+        e = []
+        envopts.scan /"((?:[^"\\]|\\.)*)"|'([^']*)'|(\S+)/ do
+          e.push $1 ? (eval $1) : ($2 || $3)
         end
+        args.unshift *e
       end
-      @args = $*.dup
-      if @args.empty? and not $stdin.tty? then
-        $stdin.each_line { |l|
-          l.chomp!
-          @args.push l
-        }
-      end
+      super args
       build_block
-    rescue GetoptLong::InvalidOption
-      $stderr.puts $!
-      $stderr.puts
-      usage
-      exit 9
-    rescue
-      $stderr.puts $!
-      exit 8
     end
 
     def run
@@ -182,15 +117,12 @@ module RbFind
       (Regexp.new str, flags).inspect
     end
 
-    def last_arg_not_a_file
+    def treat_last_arg_as_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
+      not l or
+        File.exist? l or
+        l.start_with? "." or
+        (not l =~ /[;<>{}\[\]()*?'"!&|~ ]/ and l =~ %r(/))
     end
 
     def join_code a, ind = 0
@@ -198,14 +130,10 @@ module RbFind
       when Array then
         a.map { |e| join_code e, ind + 1 }.join "\n"
       else
-        INDENT * ind + a
+        INDENT * ind + a.to_s
       end
     end
 
-    def pre_block str
-      @block = [ str, *@block]
-    end
-
     def build_block
       co = color_on $stdout
       opath = co ? "cpath" : "path"
@@ -214,7 +142,7 @@ module RbFind
       when :plain then
         @block = [ @block]
         @puts and @block = [ "if (", @block, ") then", [ "colsep #{opath}, num, line"], "end" ]
-        @real and pre_block "break if ~/\\0/o"
+        @real and @block.unshift "break if ~/\\0/o"
         @block = [ "lines { |line,num|", [ "$_, $. = line, num"], @block, "}"]
 
       when :grep then
@@ -226,35 +154,33 @@ module RbFind
 
       else
         unless @block then
-          if last_arg_not_a_file then
-            @block = @args.pop
+          if treat_last_arg_as_file then
+            @block = "true"
+            @puts ||= :plain
           else
-            @puts ||= true
+            @block = @args.pop
           end
         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.w8, nlink.w2, #{opath}"]
-            else           [ "puts #{opath}"]
-            end
-          @block = [ "if (", [ cond], ") then", @block, "end"] if cond
-        end
+        output = 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.w8, nlink.w2, #{opath}"]
+          when :plain then [ "puts #{opath}"]
+          end
+        output and @block = [ "if (", [ @block], ") then", output, "end"]
 
       end
 
       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}"
+      @skip   and @block.unshift "done if     name =~ #{build_re @skip,   osic}"
+      @demand and @block.unshift "done unless name =~ #{build_re @demand, osic}"
+      @ext    and @block.unshift "done unless ext  =~ #{build_re_ext osic}"
 
-      @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?"
+      @visible and @block.unshift "done unless visible?"
+      @nodirs  and @block.unshift "done if dir?"
+      @vcs     and @block.unshift "no_vcs"
+      @vim     and @block.unshift "done if vimswap?"
 
       @params[ :error] = proc do
         case $!
@@ -275,13 +201,9 @@ module RbFind
           rbfind [options] path... 'block'
 
       EOT
-      OPTIONS.each { |(long,short),arg,desc|
-        puts "    %-12s %2s  %-5s  %s" % [long,short,arg.to_s.upcase,desc]
-      }
+      self.class.usage
       puts <<~'EOT'
 
-        "--" 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
         "puts cpath" in case the output is a terminal.
@@ -489,9 +411,8 @@ class Time
 
   # autoload several formating methods
   def method_missing sym, *args, &block
+    require "time" and return send sym, *args, &block
     super
-  rescue NoMethodError, NameError
-    send sym, *args, &block if require "time"
   end
 
   # several common schemes
@@ -566,5 +487,5 @@ class Proc
 end
 
 
-RbFind::Application.new.run
+RbFind::RbFindAppl.run
 

data/lib/rbfind/appl.rb

@@ -0,0 +1,158 @@
+#
+#  rbfind/appl.rb  --  Option parsing etc.
+#
+
+
+module RbFind
+
+  class Application
+
+    class Exit < Exception ; end
+
+    class OptError < StandardError
+      def initialize opt
+        super "Unknown option: #{opt}"
+      end
+    end
+
+
+    class <<self
+
+      def inherited cls
+        cls.init_opts
+      end
+
+      attr_reader :options
+      attr_accessor :debug
+
+      def init_opts
+        @options, @optdocs = {}, []
+      end
+
+      def option names, doc, &block
+        names.each { |n| @options[ n] = block }
+        @optdocs.push [ names, doc]
+      end
+
+      def run
+        exit (new $*).run.to_i
+      rescue Exit
+        exit 0
+      rescue OptError
+        $stderr.puts $!
+        usage
+        exit 15
+      rescue
+        raise if @debug
+        $stderr.puts $!
+        exit 1
+      end
+
+      def usage
+        omax, amax, l = 0, 0, []
+        @optdocs.each { |names,desc|
+          m = names.map { |n| (n.length > 1 ? "--" : "-") + n }.join " "
+          omax = m.length if m.length > omax
+          _, arg = @options[ names.first].parameters.first
+          if arg then
+            a = arg.upcase
+            amax = a.length if a.length > amax
+          end
+          l.push [ m, a, desc]
+        }
+        l.push [ "--", nil, "stop option processing"]
+        fmt = "    %%-%ds  %%-%ds  %%s" % [ omax, amax]
+        l.each { |mad| puts fmt % mad }
+      end
+
+      def process_options args
+        rest = []
+        loop do
+          arg, *args = *args
+          arg or break
+          if arg =~ /^-/ then
+            arg = $'
+            if arg =~ /^-/ then
+              arg = $'
+              if arg.empty? then
+                rest.concat args
+                break
+              end
+              arg, val = arg.split "=", 2
+              opt = @options[ arg] or raise OptError, "--#{arg}"
+              if val then
+                opt.parameters.empty? and raise OptError, "--#{args}=value"
+                yield opt, val
+              else
+                unless opt.parameters.empty? then
+                  if opt.arity.nonzero? or args.first !~ /^-/ then
+                    arg, *args = *args
+                  else
+                    arg = nil
+                  end
+                end
+                yield opt, arg
+              end
+            else
+              loop do
+                a = arg.slice! 0, 1
+                a.empty? and break
+                opt = @options[ a] or raise OptError, "-#{a}"
+                if opt.parameters.empty? then
+                  yield opt
+                else
+                  if arg.empty? then
+                    if opt.arity.nonzero? or args.first !~ /^-/ then
+                      arg, *args = *args
+                    end
+                  end
+                  yield opt, arg
+                  break
+                end
+              end
+            end
+          else
+            rest.push arg
+          end
+        end
+        rest
+      end
+
+    end
+
+    def initialize args
+      @args = self.class.process_options args do |opt,arg|
+        if arg then
+          instance_exec arg, &opt
+        else
+          instance_exec &opt
+        end
+      end
+    end
+
+  end
+
+
+  if __FILE__ == $0 then
+
+    class DummyAppl < Application
+
+      option %w(q qqq),   "Do Qs"      do @q = @q.to_i.pred end
+      option %w(x xxx),   "Do Xs"      do @x = @x.to_i.succ end
+      option %w(y yyy),   "Do Ys"      do |arg| @y = arg end
+      option %w(z zzz),   "Do Zs"      do |arg=3| @z = arg end
+      option %w(h help),  "This help"  do self.class.usage ; raise Exit ; end
+      option %w(g debug), "Debug info" do self.class.debug = true end
+
+      def run
+        puts inspect
+      end
+
+    end
+
+    DummyAppl.run
+
+  end
+
+end
+

data/lib/rbfind/core.rb

@@ -79,4 +79,3 @@ class File
 
 end
 
-

data/lib/rbfind/csv.rb

@@ -31,6 +31,7 @@ module RbFind
     def csv sep, *args
       e = args.join sep
       Csv.putl e
+      nil
     end
 
 

data/lib/rbfind/table.rb

@@ -129,3 +129,4 @@ module RbFind
   end
 
 end
+

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.13".freeze
+  VERSION = "2.14".freeze
 
 =begin rdoc
 
@@ -367,9 +367,10 @@ Sort without case sensitivity and preceding dot:
       @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!
+        df = list.partition { |e| e.rstat.directory? rescue nil }
+        df.reverse! if @params.depth_first
+        list.clear
+        list.concat *df
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '2.13'
+  version: '2.14'
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.
@@ -20,11 +20,13 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE
+- README.md
 files:
 - LICENSE
-- README
+- README.md
 - bin/rbfind
 - lib/rbfind.rb
+- lib/rbfind/appl.rb
 - lib/rbfind/core.rb
 - lib/rbfind/csv.rb
 - lib/rbfind/humansiz.rb
@@ -33,11 +35,7 @@ homepage: http://www.bertram-scharpf.de/software/rbfind
 licenses:
 - BSD-2-Clause
 metadata: {}
-rdoc_options:
-- "--charset"
-- utf-8
-- "--main"
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -52,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Just Ruby
-rubygems_version: 3.6.6
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Ruby replacement for the standard Unix find tool
 test_files: []

data/README

@@ -1,45 +0,0 @@
-= RbFind
-
-A substitute for the Unix find tool using Ruby expressions
-
-== Description
-
-RbFind does the same as the standard Unix find tool but has a
-different calling syntax. You may specify your search reqest as a
-Ruby expression.
-
-== Features
-
-* ls long format style output
-* Built-in grep
-* Colored ls and grep output
-* Automatically exclude version control system or Vim swap files
-* No dependecies
-
-== Example
-
-Find files that were modified in the last five minutes.
-
-  $ rbfind -p 'file and age < 5.m'
-
-Grep whole directory but skip ".git/" or ".svn/", and
-".filename.swp".
-
-  $ rbfind -CWg require
-
-Save time and do not grep large files.
-
-  $ rbfind 'filesize < 100.kB and grep /require/'
-
-Output ls long format.
-
-  $ rbfind -P
-
-Print MD5 digest and size for each file.
-
-  $ rbfind 'spacesep digest_md5, size.w8, path'
-
-== Copyright
-
-(C) 2008-2014, Bertram Scharpf <software@bertram-scharpf.de>
-