rbfind 2.0.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37699eab678876b60d10d42b360d2a3bdb4f1b47d950ee28077d2087d5f35d15
-  data.tar.gz: 575d2eaeb4208087545448ae9627a9dbf8c652e068e88c3caad3707897a3a4da
+  metadata.gz: 28dcc78acea4b26243eb554d31b6df6e97e4ab0b382df6f0cc50382c5c6721cf
+  data.tar.gz: 8711486e4e567c6581849ac029c2f7b887f4dc707759e17ca52d7e4f45ffafa0
 SHA512:
-  metadata.gz: 9027e94322984970d2aba116bd3e135395ab5fab025d36bc78796b7038057398e4fe10cc2917fd1872391be8250e609559d9c6d53c8af7cc2de6a664c4ad885c
-  data.tar.gz: 9cc76b09a38a3212a67ddbf5d590247b672f1ed80fbfa36e9d4dfd5874f07119c57f0e76ee3c780cfe882eec02aa9d54c2567c5e2742aae12c27d88d5e6bfbbe
+  metadata.gz: 928d4d2718225a08935c7590c40bd6e917cc0e520f44c657c8e9bf0d496a0b7712452408035f9355992dffb26011156cf81d5272a1e288b3f46d70bff8d8ddc2
+  data.tar.gz: f47260d1510f30fe4e23c42e93364366be0ffeee930a5972362a370252108ade399c81e5ec2179ab5f31fd1bba093771213f112771d567d8a1c0672b45c4b785

data/bin/rbfind

@@ -37,7 +37,6 @@ module RbFind
       [ %w(--sort-by   -s), :str, "sort expression ('n' is name)"],
       [ %w(--reverse   -R), :str, "reverse sort"],
       [ %w(--require   -r), :rb,  "require library"],
-      [ %w(--fileutils -U), nil,  "include FileUtils module"],
       [ %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(--wider     -+), nil,  "widen fields in long output format (--ls-l)"],
@@ -85,7 +84,6 @@ module RbFind
           when '--sort-by'   then @params[ :sort] = instance_eval "proc { |n| #{arg} }"
           when '--reverse'   then @params[ :reverse] = true
           when '--require'   then require arg
-          when '--fileutils' then require "fileutils" ; include FileUtils
           when '--puts-path' then @puts = true
           when '--ls-l'      then @puts = true ; @wd = 6
           when '--wider'     then @wd = @wd ? @wd.succ : 4
@@ -371,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.0.2".freeze
+  VERSION = "2.3.1".freeze
 
 =begin rdoc
 
@@ -119,6 +119,8 @@ Derivated from stat:
     csv sep, path, ... # separate by user-defined separator
 
     rename newname   # rename, but leave it in the same directory
+    mv newname       # dto.
+    rm               # remove
 
 
 == Color support
@@ -374,16 +376,22 @@ Sort without case sensitivity and preceding dot:
         begin
           e.instance_eval &@block
         rescue Done
-        ensure
-          if !(e.name.equal? @levels.last) && e.name != @levels.last then
-            p = @path
+        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
-            @path = join_path
+            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
@@ -511,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
@@ -682,7 +691,9 @@ Sort without case sensitivity and preceding dot:
 
 
     def rename newname ; @name = newname ; end
+    alias mv rename
 
+    def rm ; @name = nil ; end
 
 
     def cname      ; color name      ; end

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.0.2
+  version: 2.3.1
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-10-24 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