fileutil 0.0.2 → 0.0.85

data/lib/fileutil.rb

@@ -1,36 +1,59 @@
 class File
-  # find next (in the same direction with
-  # last search)
-  def find!
-    if @find_registry[:method] == :ffind
+  # repeat last ff/rew command
+  def repeat
+    if @find_registry[:method] == :ff
       seek(1,1)
-      ffind(@find_registry[:re])
+      if ff(@find_registry[:re]).nil?
+        seek(-1,1) 
+        return nil
+      else
+        return self
+      end
     else
-      rfind(@find_registry[:re])
+      rew(@find_registry[:re])
     end
   end
-  # find all matches in the file 
-  # regardless of the current position
+  # find all occurences of args (with or) 
+  # in the file egardless of the current
+  # position
   def findall *args
     p = pos
     seek(0)
-    results = [ ffind(*args) ]
-    while !find!.nil?
+    results = [ ff(*args).pos ]
+    while !repeat.nil?
       results.push pos
     end
     seek(p)
     return results
   end
-  # find the last matching text backwards
-  # starting from the current position. 
-  # accepts multiple search strings and/or 
-  # regexes, returns the position of the first
-  # one it encounters, also move to its position
-  def rfind *args
+  # do not rewind, just give
+  # the position that rew would 
+  # rewind to.
+  def rew? *args
+    p = pos 
+    p1 = rew(*args)
+    p1.nil? ? p1 = nil : p1 = pos
+    seek p
+    return p1
+  end
+  # do not fast forward, just give
+  # the position that ff would fast
+  # forward to.
+  def ff? *args
+    p = pos 
+    p1 = ff(*args)
+    p1.nil? ? p1 = nil : p1 = pos
+    seek p
+    return p1
+  end
+  # rewind until it finds one of args
+  # supplied as string or regex 
+  # returns nil if nothing found 
+  def rew *args
     p = pos
     psearch = p
     re = Regexp.union(args)
-    @find_registry = { :method => :rfind, :re => re }
+    @find_registry = { :method => :rew, :re => re }
     begin
       break if psearch == 0
       512 > pos ? buffer = pos : buffer = 512 # buffer = [512, p].min
@@ -50,33 +73,30 @@ class File
         return nil
       else 
         seek(psearch + check)
-        return pos
+        return self
       end
     rescue
       seek p
       return nil
     end
   end
-  # find the last matching text forwards
-  # starting from the current position. 
-  # accepts multiple search strings and/or 
-  # regexes, returns the position of the first
-  # one it encounters, also move to its position
-  def ffind *args
+  # fast forward until it finds one of args
+  # supplied as string or regex 
+  # returns nil if nothing found 
+  def ff *args
     p = pos
     re = Regexp.union(args)
-    @find_registry = { :method => :ffind, :re => re }
+    @find_registry = { :method => :ff, :re => re }
     buffer = 512
     begin
       psearch = pos
-      chunk = read(buffer)
-      break if eof?
-      seek(-80,1)
+      chunk = read(buffer) || ''
+      seek(-80,1) unless eof?
       check = chunk.index(re)
-    end while check.nil?
+    end while check.nil? and !eof?
     begin
       seek(psearch + check)
-      return pos
+      return self
     rescue
       seek p
       return nil
@@ -87,6 +107,8 @@ class File
   # start from current line (default is start)
   # from beggining; reset for do not change
   # current position (default).
+  # head leaves cursor at the beginning of the
+  # first line it doesn't return if reset false
   def head(n, cur=false, reset=true)
     #eof guard
     p = pos
@@ -98,18 +120,21 @@ class File
       lines.push(readline.chomp)
     end
     seek(p) if reset
-    return lines
+    return lines unless lines.length == 0
+    return nil
   end
   # unix tail like utility, returns lines
   # as an array. optional arguments cur for
   # start from current line (default is start)
   # from end; reset for do not change
   # current position (default).
+  # tail leaves 'cursor' at the end of
+  # last line it doesn't return if reset false
   def tail(n, cur=false, reset=true)
     p = pos
-    chunks = ''
+    chunks = '$'
     lines = 0
-    cur ? line_end : seek(size)
+    cur ? line_end.seek(1,1) : seek(size)
     begin
       p1 = pos
       p1 < 512 ? buffer = p1 : buffer = 512
@@ -118,20 +143,28 @@ class File
       lines += chunk.count("\n")
       chunks = chunk + chunks
       seek(-chunk.size,1)
-    end while lines < ( n + 1 ) && p1 != 0
+    end while lines < ( n + 1 ) && p1 > buffer
     ary = chunks.split(/\n/)
-    reset ? seek(p) : seek(p1-1-(ary.last(n).join("\n").length))
-    return ary.last(n)
+    ary.pop
+    if reset 
+      seek(p) 
+    else
+      seek(p1-2-(ary.last(n).join("\n").length)) rescue seek 0
+    end
+    return ary.last(n).reverse
   end
   # move to the first char of current line
   def line_start
-    unless readchar == "\n"
-      return rfind(/^/)
+    if pos > 0
+      seek(-1,1) 
+      return self if readchar == "\n" 
+    elsif pos == 0
+      return self
     end
-    return pos
+    return rew(/^/) 
   end
   # move to the last char of current line
   def line_end
-    return ffind(/$/)
+    return ff(/$/)
   end
 end

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: fileutil
 version: !ruby/object:Gem::Version
-  version: 0.0.2
   prerelease: 
+  version: 0.0.85
 platform: ruby
 authors:
 - Sencer Selcuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies: []
-description: use ffind, rfind, findall, find! to find text in a file etc.
-email: sencer@selc.uk
+description: use ff, rew, line_start, line_end to move in a file  head and tail -to
+  get lines, and to move line-by-line
+email: sencerselcuk@twitter
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -25,17 +26,17 @@ 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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23