rbfind 2.6 → 2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a448408396d2339b4aa0656dfeb579c6533373623ca9e6cb0e4b48812e2b03
-  data.tar.gz: d71f32510fdc92315c7f5aaa16d08560d6bc6b1d9515af85913f3c4a4f42e6ba
+  metadata.gz: b57d2e44d4df6453083635d22ab01c92ea5b54fed8c121a313ac351048f16b51
+  data.tar.gz: 20518a97f6e446de75b6397a0e725a9f1c93d5c61f93743072a2b60e322c75a5
 SHA512:
-  metadata.gz: bab39e437deaa7cf9d4e283f83c5ee354c3f28b4ed7159b90adfdcc7210c2dfce80593cfadcceb3c0702c4641c93b66b4fd2e4351deccd62adb9267754aaf588
-  data.tar.gz: 44adde8bccbb1f840187bb9973a7e835d098f05c715fa22cf493a06fa8c00bc5bdbdb7e0d5da77db925034f3315f16148fd7431ed8b745febaeaadda0d5fd560
+  metadata.gz: 6ad6d7f05ad3de24d717dc7d274ea5dc75fd5ee81640c1de03bef875727a5f33ed80846ad7445a990ac925734a1dbed66312bac0686bcbb7d16bd1d33ae2d710
+  data.tar.gz: 9b97002d3fd98ffd891d5d10b6fc60087a18f2a2b828a0a0099554fa2f50fe0e562a3cd4a062602e9210508d389b733974ddeb9442e0636083cc4e98a8740777

data/bin/rbfind

@@ -43,6 +43,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(--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 { |$_,$.| ... }'"],
@@ -95,7 +96,8 @@ module RbFind
           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 '--wider'     then @wd and @wd += 2.succ ; @wds and @wds += @puts == :alt ? 4 : 3
+          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
@@ -161,12 +163,14 @@ module RbFind
           if @puts then
             @block = "( #@block ) and "
             @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"
+              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
@@ -359,7 +363,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:"

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.6".freeze
+  VERSION = "2.7".freeze
 
 =begin rdoc
 
@@ -275,7 +275,7 @@ Sort without case sensitivity and preceding dot:
 
     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,
+      @params = Params.new max_depth&.nonzero?, depth_first, follow,
                   (sort_parser sort), dirs, reverse, error, block
       @start = Time.instance_eval { @start = Time.now }
       Time.instance_eval { @start = Time.now }
@@ -299,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."
+        step_depth do
+          args.each { |base|
             e = Entry.new base, self
-            enter e
-          end
-        }
+            enter e if handle_error do e.stat end
+          }
+        end
       end
     end
 
@@ -315,10 +314,32 @@ Sort without case sensitivity and preceding dot:
 
     private
 
+    def step_depth
+      @depth += 1
+      yield
+    ensure
+      @depth -= 1
+    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
@@ -327,22 +348,14 @@ Sort without case sensitivity and preceding dot:
       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
+      list.reverse! if @params.reverse
+      if @params.dirs then
+        list = list.partition { |e| e.rstat.directory? rescue nil }
+        list.reverse! if @params.depth_first
+        list.flatten!
       end
-    end
-
-    def visit_depth
-      if @params.depth_first then
-        enter_dir
-        call_block
-      else
-        call_block and enter_dir
+      step_depth do
+        list.each { |e| enter e }
       end
     end
 
@@ -363,9 +376,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

metadata

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