rbfind 2.14 → 2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f219a0e17b31db93bb38ec0425b37cc0a5921cdbd89638bab4de5d4303e161
-  data.tar.gz: 0d470ef4ceac6aa088aea20c4ae7804341fbb5a84d23108bf5342acb6ad5e0e7
+  metadata.gz: f3e09c84e19be797486dcc7542e6c7f4ad5c0f40902c49a3863ea935ce13bc90
+  data.tar.gz: 1f8a5b49effa192a4a0adbcad84a9c34646ddbc34926ca14af608cb0e526c3a4
 SHA512:
-  metadata.gz: d67aae93c618f927f4b3c8ffad8916c0e526be0a59c9567538b90ac5de8d70f317799119347aa370088aae5a77ca95b30eec90f18fd269006d0ec886247f1ecf
-  data.tar.gz: 56c9ba35469ac5b677b2aa3c6e7b9ee5977e0abcf65c563704aa768b29fc6afdf92ff92931c317c8a273af69b3ed2344cf25ee6e8d10d9782fb30043b438c956
+  metadata.gz: 8d4ca8a987bdc92a7518504f558f2a6eedb0da3885ea6934937c9bbe70687d2b6aa02a19e2f358ff6a68b1b78e42b3c15c8d053ef659b88f1d8cc73834c622f9
+  data.tar.gz: ebcde948bfb8827b6d54f7a09b85b4d935e6748b5cc30b3b24fb8ef58403bb0b6b8d8b4076967f8d4ed746d65e73989cbc6456942f19a11042dfa94a42f837ee

data/bin/rbfind

@@ -62,7 +62,7 @@ module RbFind
     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(f file      ), "read block expression from file"            do |nam| @block = File.read nam ; 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
@@ -126,12 +126,18 @@ module RbFind
     end
 
     def join_code a, ind = 0
-      case a
-      when Array then
-        a.map { |e| join_code e, ind + 1 }.join "\n"
-      else
-        INDENT * ind + a.to_s
-      end
+      r = a.map { |e|
+        q = case e
+        when Array then
+          join_code e, ind + 1
+        else
+          INDENT * ind + e.to_s
+        end
+        q.rstrip!
+        q unless q.empty?
+      }
+      r.compact!
+      r.join "\n"
     end
 
     def build_block
@@ -148,7 +154,7 @@ module RbFind
       when :grep then
         ic = Regexp::IGNORECASE if @icase
         color = ", true" if co
-        @block = [ "grep %r#{build_re @block, ic}#{color}"]
+        @block = [ "grep %r#{build_re @block.to_s, ic}#{color}"]
         @block.push "$stdout.flush" unless $stdout.tty?
         @binary or @block = [ "unless binary? then", @block, "end"]
 
@@ -161,6 +167,7 @@ module RbFind
             @block = @args.pop
           end
         end
+        @block = [ "$_, $. = name, count", @block]
         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
@@ -168,7 +175,7 @@ module RbFind
           when :ino   then [ "spcsep ino.w8, nlink.w2, #{opath}"]
           when :plain then [ "puts #{opath}"]
           end
-        output and @block = [ "if (", [ @block], ") then", output, "end"]
+        output and @block = [ "if (", @block, ") then", output, "end"]
 
       end
 

data/lib/rbfind/humansiz.rb

@@ -48,7 +48,7 @@ class Numeric                   # sizes in bytes
   def GiB ; self * Gb ; end
   def TiB ; self * Tb ; end
 
-  PREFIXES = " kMGTPEZY".scan /./   # :nodoc:
+  PREFIXES = " kMGTPEZY"
 
   # :call-seq:
   #    num.to_h()  -> str

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.14".freeze
+  VERSION = "2.15".freeze
 
 =begin rdoc
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '2.14'
+  version: '2.15'
 platform: ruby
 authors:
 - Bertram Scharpf
@@ -33,7 +33,7 @@ files:
 - lib/rbfind/table.rb
 homepage: http://www.bertram-scharpf.de/software/rbfind
 licenses:
-- BSD-2-Clause
+- BSD-2-Clause+
 metadata: {}
 rdoc_options: []
 require_paths: