rbfind 2.4 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc576c9c24d5acd2c31b95e55bfd40b306c1510060c06c2a5d00140c1fca77dd
-  data.tar.gz: e2a95604bf31b4290d71b0c93da8bff1cde417407cf6c22c79872cf4132c6de3
+  metadata.gz: 7bee921838a5b4d93f5483295e8c7e6b263e144e8d52e5ca53a464a222a5d055
+  data.tar.gz: 03f0b19f70747dbb152011ecc8f414d99764ad9052c82f9b0b1715939fb7a3dd
 SHA512:
-  metadata.gz: 671c10d123f2a025f4ee3b0f0b08cbe2a74ef830a0b8f56cd7485470c68051902db9ace56b00a5f479d36ceefb802d133ddd43aa5cc025286a49405ce4860e79
-  data.tar.gz: 39a4b9cd0565455b010228a68fefd7d021e81953cdd23c150555a83fef577a342282f42b6476c6f1e97287d9e99b659349284eae55244fbfff01edf40a2d724c
+  metadata.gz: 3de28232b6d9b842ced7ff2880e4d80938c194c13c93fd6a69e5265d3f6999276129bc1469eae62a121776222d27836c95cc208ae2d656080875345d342d471e
+  data.tar.gz: d979151e81e3eaf660304c2072550f857957e9c08c4da74af67afc5d23e498021b546c33920ba20099fcb2248a2a621eccf51b9732b34212a1273188ec4d6c73

data/bin/rbfind

@@ -34,8 +34,8 @@ module RbFind
       [ %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(--sort-by   -s), :str, "sort expression"],
+      [ %w(--reverse   -R), nil,  "reverse the sort"],
       [ %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"],
@@ -48,14 +48,14 @@ 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(--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)"],
     ]
 
@@ -483,6 +483,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.4".freeze
+  VERSION = "2.5".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,28 @@ Sort without case sensitivity and preceding dot:
 
     private
 
+    Params = Struct.new :max_depth, :depth_first, :follow,
+                            :sort, :reverse, :error, :block
+
     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
+      @params = Params.new max_depth, depth_first, follow,
+                  (sort_parser sort), reverse, error, block
+      @start, @count, @depth = Time.now, 0, 0
     end
 
-    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 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
@@ -308,93 +300,68 @@ Sort without case sensitivity and preceding dot:
         args.each { |base|
           handle_error do
             File.lstat base rescue raise "`#{base}` doesn't exist."
-            visit_depth base
+            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
+      list = list.map { |f| Entry.new f, self }
+      @params.sort.call list
+      list.reverse! if @params.reverse
+      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 +369,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 +384,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 +442,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 +513,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 +526,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
 
 
@@ -584,7 +581,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
@@ -694,10 +692,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

metadata

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