rbfind 1.4 → 1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 280a77034256c49e824e1f17d34f4203ba674928
+  data.tar.gz: 88f8c7ba6ccdef27cc598b0d8a0886791ea8f6ec
+SHA512:
+  metadata.gz: 829dfbb87533f8042ad9ed3b663d032858bd13e9987855b253a9745859c441dca8944d8df67d9f113589bdc06fe285f59c304817479ec78df3ca65cc1d60c2d1
+  data.tar.gz: 6f920a815b6710ef37c9d2e169cebbc7b9208cf6cb68b870aead72b1983ed905237d2b99ecdc408270100d8f430a9e73535bf6363ba93d1bbe9698819fd9d24e

data/bin/rbfind

@@ -209,7 +209,7 @@ def set_encoding extern, intern = nil
 end
 
 
-class RbFindX < RbFind
+class RbFindApp < RbFind
 
   # Alias the question marks away from all method names because
   # they're a nuisance on the command line.
@@ -375,9 +375,9 @@ error_handle do
   opath = co ? "cpath" : "path"
   case @lines
     when :plain then
-      @puts and @block = "( #@block ) and colsep #{opath}, $., $_"
+      @puts and @block = "( #@block ) and colsep #{opath}, num, line"
       @real and @block = "break if ~/\0/o ; #@block"
-      @block = "lines { |line,num| $_, $. = line, num ; #@block }"
+      @block = "lines { |line,num| #@block }"
 
     when :grep then
       RE = Regexp.new @block, @icase && Regexp::IGNORECASE
@@ -474,7 +474,7 @@ end
   EOT
 
   eval @blkbegin if @blkbegin
-  RbFindX.open args, @params do |f| f.instance_eval @block end
+  RbFindApp.open args, @params do |f| f.instance_eval @block end
   eval @blkend   if @blkend
 end
 

data/lib/rbfind.rb

@@ -249,7 +249,7 @@ Sort without case sensitivity and preceding dot:
 
 class RbFind
 
-  VERSION = "1.4".freeze
+  VERSION = "1.5".freeze
 
   class <<self
     private :new
@@ -259,12 +259,13 @@ class RbFind
       end
       args.flatten!
       if args.any? then
-        args.inject 0 do |count,path|
-          f = new path, params, &block
-          count + f.count
+        count = 0
+        args.each do |path|
+          f = new path, count, params, &block
+          count = f.count
         end
       else
-        f = new nil, params, &block
+        f = new nil, 0, params, &block
         f.count
       end
     end
@@ -275,17 +276,15 @@ class RbFind
 
   attr_reader :count, :wd, :start
 
-  def initialize path, params = nil, &block
+  def initialize path, count, params = nil, &block
     @levels = []
     @block = block
 
     if params then
       params = params.dup
       dl = :do_level_depth if params.delete :depth
-      md = params.delete :max_depth
-      @max_depth = md.to_i if md
-      st = params.delete :sort
-      @sort = sort_parser st
+      md = params.delete :max_depth ; @max_depth = md.to_i if md
+      st = params.delete :sort ; @sort = sort_parser st
       @follow = params.delete :follow
       @error = params.delete :error
       params.empty?  or
@@ -293,7 +292,7 @@ class RbFind
     end
     @do_level = method dl||:do_level
 
-    @start, @count = Time.now, 0
+    @start, @count = Time.now, count
     @wd = Dir.getwd
     if path then
       File.lstat path
@@ -616,10 +615,11 @@ class RbFind
     block_given? or return lines do end
     open { |file|
       n = 0
-      file.each_line { |line|
+      file.each_line { |l|
+        l.chomp!
         n += 1
-        line.chomp!
-        yield line, n
+        set_predefs l, n
+        yield l, n
       }
       n
     }
@@ -781,7 +781,7 @@ class RbFind
 
   def do_level
     begin
-      @block.call self
+      call_block
     rescue Prune
       return
     end
@@ -796,12 +796,23 @@ class RbFind
       @path, @fullpath = path, fullpath
     end
     begin
-      @block.call self
+      call_block
     rescue Prune
       raise RuntimeError, "#{self.class}: prune doesn't work with :depth."
     end
   end
 
+  def call_block
+    set_predefs name, count
+    @block.call self
+  end
+
+  def set_predefs l, n
+    b = @block.binding
+    b.local_variable_set "_", [ l, n]
+    b.eval "$_, $. = *_"
+  end
+
   def read_dir
     handle_error Errno::EACCES do
       Dir.new @path

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '1.4'
-  prerelease: 
+  version: '1.5'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.
@@ -23,14 +22,15 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
-- README
-- lib/rbfind.rb
-- lib/humansiz.rb
 - LICENSE
+- README
 - bin/rbfind
+- lib/humansiz.rb
+- lib/rbfind.rb
 homepage: http://www.bertram-scharpf.de/software/rbfind
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options:
 - "--charset"
@@ -40,13 +40,11 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
@@ -54,8 +52,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - just Ruby
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby replacement for the standard Unix find tool
 test_files: []