rbfind 2.1 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccb45a241d65a9dadc83c1ba5a72515f2165d18bf84564e15fad687010221a8
-  data.tar.gz: aef115794fdd548ba799413611e39964eca2c9ce9dc10d7ee355e95c52af1ff9
+  metadata.gz: cc576c9c24d5acd2c31b95e55bfd40b306c1510060c06c2a5d00140c1fca77dd
+  data.tar.gz: e2a95604bf31b4290d71b0c93da8bff1cde417407cf6c22c79872cf4132c6de3
 SHA512:
-  metadata.gz: 95c622fbc6cadf9b86eafa357c1a3dadbdb9ca8df85a83569e2855254c38bc219c11fc4e6a2c59dbeb730ff0f7e6b3133e8e5827158821c8d7ad9d6e3b03be04
-  data.tar.gz: f7d5151eb5402104aa7cedc31e932ec9471b0d73df230a1b7943c664ba3d2be98c8bf340624c9c6779330776eefea64241b0cdf449dd61d5ecea70c8625dd4a2
+  metadata.gz: 671c10d123f2a025f4ee3b0f0b08cbe2a74ef830a0b8f56cd7485470c68051902db9ace56b00a5f479d36ceefb802d133ddd43aa5cc025286a49405ce4860e79
+  data.tar.gz: 39a4b9cd0565455b010228a68fefd7d021e81953cdd23c150555a83fef577a342282f42b6476c6f1e97287d9e99b659349284eae55244fbfff01edf40a2d724c

data/bin/rbfind

@@ -142,7 +142,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
@@ -369,6 +369,7 @@ module RbFind
     alias hidden       hidden?
     alias visible      visible?
     alias broken_link  broken_link?
+    alias broken       broken?
     alias dir          dir?
     alias binary       binary?
     alias bin          bin?

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.1".freeze
+  VERSION = "2.4".freeze
 
 =begin rdoc
 
@@ -307,7 +307,7 @@ Sort without case sensitivity and preceding dot:
       else
         args.each { |base|
           handle_error do
-            File.exists? base or raise "`#{base}` doesn't exist."
+            File.lstat base rescue raise "`#{base}` doesn't exist."
             visit_depth base
           end
         }
@@ -519,12 +519,13 @@ Sort without case sensitivity and preceding dot:
     def readlink ; File.readlink @path if stat.symlink? ; end
 
     def broken_link?
-      return if stat.symlink?
+      return unless stat.symlink?
       rstat
       false
     rescue
       true
     end
+    alias broken? broken_link?
 
     ARROW = " -> "
     def arrow
@@ -551,7 +552,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:

data/lib/rbfind/humansiz.rb

@@ -83,6 +83,16 @@ class Numeric                   # sizes in bytes
 end
 
 
+class Integer
+  def to_g
+    s = to_s
+    l = []
+    while (t = s.slice! /\d{1,3}\z/) do l.unshift t end
+    l.join "_"
+  end
+end
+
+
 class Numeric
   "smhdw".each_char { |c|
     define_method c do Time.to_sec self, c 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.1'
+  version: '2.4'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-11-07 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.6
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Ruby replacement for the standard Unix find tool