rbfind 1.8 → 1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5ad1ea90993fab6b5755dde2f356913246a615d2
-  data.tar.gz: cefcd11a0a1d0bad1db056b83bf854fac75f8169
+SHA256:
+  metadata.gz: 4b687941a0ed418599c3f32451afdf5bcaba86f7df68286396409f48446ca740
+  data.tar.gz: e513a7092e68bae9f88fa83c8be96dcd58b52ef7baf425a7fa49814858e1888a
 SHA512:
-  metadata.gz: ca1803b87dd0ec6c1f3781555e3ad07920b380b561b627842c9c2e535e3e5c5b72b7c056c5af3d99957057959d3f53122b260a4f7e770fd47ec48f09832c38b6
-  data.tar.gz: 8694e27a954f2d629125e6f0afef8b5990ed04f68180c29616fe4ea4225a2f74e005d09fa4033eebf3e7c0f76853b6d8039f4ccd9b346733e3a86c4c4b778224
+  metadata.gz: 1eafac28ac55651614b926b83fa129087891ca43a14ec1c3217f522799d0e722a8b7381257a04355f1dd497cb62f63823f577fe3a01d878848cd0c834e751a03
+  data.tar.gz: 0a87bc6a2be21912f2015e5b7f540c6b941df33224ac30f9be33783f2d6108092b862137403b360c4f9816d11e2086b03ae757528871029d3a50221cb45f1e7c

data/LICENSE

@@ -5,7 +5,7 @@
   |_| \_\_.__/|_|   |_|_| |_|\__,_|
 
 
-Copyright (c) 2008-2014, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (c) 2008-2019, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/bin/rbfind

@@ -47,6 +47,7 @@ OPTIONS = [
   [ %w(--demand    -D), :lst, "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"],
@@ -264,6 +265,10 @@ class RbFindApp < RbFind
     end
   end
 
+  def hide_instance_eval
+    instance_eval yield
+  end
+
 end
 
 
@@ -309,6 +314,7 @@ begin
       when '--demand'    then @demand = arg
       when '--ext'       then @ext = arg
       when '--visible'   then @visible = true
+      when '--nodirs'    then @nodirs = true
       when '--begin'     then @blkbegin = arg
       when '--end'       then @blkend   = arg
       when '--file'      then @block = File.read arg
@@ -433,6 +439,8 @@ error_handle do
 
   @visible and @block.insert 0, "visible? or prune ; "
 
+  @nodirs and @block.insert 0, "next if dir? ; "
+
   @vcs and @block.insert 0, "no_vcs ; "
   @vim and @block.insert 0, "vimswap? and next ; "
 
@@ -484,7 +492,7 @@ end
   EOT
 
   eval @blkbegin if @blkbegin
-  RbFindApp.open args, @params do |f| f.instance_eval @block end
+  RbFindApp.open args, @params do |f| f.hide_instance_eval { @block } end
   eval @blkend   if @blkend
 end
 

data/lib/rbfind.rb

@@ -37,6 +37,13 @@ class Dir
 
 end
 
+class File
+  class Stat
+    def same? oth
+      dev == oth.dev and ino == oth.ino
+    end
+  end
+end
 
 
 =begin rdoc
@@ -210,7 +217,7 @@ LC_ALL="de_DE.UTF-8" and if you are searching directories containing
 single-byte encoded file names or files with single-byte or binary
 content.
 
-The #grep facility will will condone encoding mismatches by calling
+The #grep facility will condone encoding mismatches by calling
 the String#scrub! method. But neither the #lines and #read function
 will do any transformation nor will the file names and the path
 specifications be changed.
@@ -277,7 +284,7 @@ Sort without case sensitivity and preceding dot:
 
 class RbFind
 
-  VERSION = "1.8".freeze
+  VERSION = "1.11".freeze
 
   class <<self
     private :new
@@ -320,6 +327,9 @@ class RbFind
     end
     @do_level = method dl||:do_level
 
+    @ostat = $stdout.stat
+    @ostat = nil unless @ostat.file?
+
     @start, @count = Time.now, count
     @wd = Dir.getwd
     if path then
@@ -620,6 +630,9 @@ class RbFind
   # nothing will be done.
   #
   def open &block
+    if @ostat and (s = File.stat @path).same? @ostat then
+      raise "Refusing to open output file."
+    end
     handle_error Errno::EACCES do
       File.open @path, &block if file?
     end
@@ -636,8 +649,12 @@ class RbFind
   def read n = nil
     open { |o|
       if block_given? then
-        while (r = o.read n) do
-          yield r
+        if n then
+          while (r = o.read n) do
+            yield r
+          end
+        else
+          yield o.read
         end
       else
         o.read n
@@ -652,15 +669,16 @@ class RbFind
   #
   def lines
     block_given? or return lines do end
+    r = false
     open { |file|
       n = 0
       file.each_line { |l|
         l.chomp!
         n += 1
         set_predefs l, n
-        yield l, n
+        r ||= true if yield l, n
       }
-      n
+      r
     }
   end
 
@@ -677,6 +695,7 @@ class RbFind
         l = "#$`\e[#{color}m#$&\e[m#$'"
       end
       colsep @path, i, l
+      true
     }
   end
 
@@ -757,6 +776,7 @@ class RbFind
   alias spc_sep spcsep
   alias space_sep spc_sep
   alias spacesep spcsep
+  alias p spcsep
 
   def csv sep, *args
     e = args.join sep
@@ -921,7 +941,7 @@ class RbFind
       when 010 then
         col_type or \
         if (m & 0111).nonzero? then
-          if (m & 04000).nonzero? then     9
+          if    (m & 04000).nonzero? then  9
           elsif (m & 02000).nonzero? then 10
           else                             6
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '1.11'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.
@@ -29,7 +29,7 @@ files:
 - lib/rbfind.rb
 homepage: http://www.bertram-scharpf.de/software/rbfind
 licenses:
-- BSD
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -51,8 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - just Ruby
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby replacement for the standard Unix find tool