eventmachine-tail 0.4.20100903005209 → 0.5.20101005181243

data/lib/em/filetail.rb

@@ -89,13 +89,13 @@ class EventMachine::FileTail
     EventMachine::next_tick do
       open
       if (startpos == -1)
-        @file.sysseek(0, IO::SEEK_END)
+        @position = @file.sysseek(0, IO::SEEK_END)
         # TODO(sissel): if we don't have inotify or kqueue, should we
         # schedule a next read, here?
         # Is there a race condition between setting the file position and
         # watching given the two together are not atomic?
       else
-        @file.sysseek(startpos, IO::SEEK_SET)
+        @position = @file.sysseek(startpos, IO::SEEK_SET)
         schedule_next_read
       end
       watch
@@ -331,13 +331,13 @@ class EventMachine::FileTail
     elsif (filestat.size < @filestat.size)
       # If the file size shrank, assume truncation and seek to the beginning.
       @logger.info("File likely truncated... #{path}")
-      @file.sysseek(0, IO::SEEK_SET)
+      @position = @file.sysseek(0, IO::SEEK_SET)
       schedule_next_read
     end
   end # def handle_fstat
 
   def to_s
-    return "#{self.class.name}(#{@path}) @ pos:#{@file.sysseek(0, IO::SEEK_CUR)}"
+    return "#{self.class.name}(#{@path}) @ pos:#{@position}"
   end # def to_s
 end # class EventMachine::FileTail
 

data/lib/em/globwatcher.rb

@@ -171,20 +171,25 @@ end # class EventMachine::FileGlobWatch
 class EventMachine::FileGlobWatchTail < EventMachine::FileGlobWatch
   # Initialize a new file glob tail.
   #
-  # path should be a glob or file path.
-  # handler should be a module or subclass of EventMachine::FileTail
+  # * path - glob or file path (string)
+  # * handler - a module or subclass of EventMachine::FileTail
   #   See also EventMachine::file_tail
-  # interval is how often (seconds) the glob path should be scanned
-  # exclude is an array of Regexp (or anything with .match) for 
+  # * interval - how often (seconds) the glob path should be scanned
+  # * exclude - an array of Regexp (or anything with .match) for 
   #   excluding from things to tail
+  #
   # The remainder of arguments are passed to EventMachine::file_tail as
-  #   EventMachine::file_tail(path_found, handler, *args)
+  #   EventMachine::file_tail(path_found, handler, *args, &block)
   public
-  def initialize(path, handler=nil, interval=60, exclude=[], *args)
+  def initialize(path, handler=nil, interval=60, exclude=[], *args, &block)
     super(path, interval)
     @handler = handler
     @args = args
     @exclude = exclude
+
+    if block_given?
+      @handler = block
+    end
   end # def initialize
 
   public
@@ -200,7 +205,11 @@ class EventMachine::FileGlobWatchTail < EventMachine::FileGlobWatch
       end
       @logger.info "#{self.class}: Watching #{path}"
 
-      EventMachine::file_tail(path, @handler, *@args)
+      if @handler.is_a? Proc
+        EventMachine::file_tail(path, nil, *@args, &@handler)
+      else
+        EventMachine::file_tail(path, @handler, *@args)
+      end
     rescue Errno::EACCES => e
       file_error(path, e)
     rescue Errno::EISDIR => e
@@ -228,15 +237,21 @@ end # class EventMachine::FileGlobWatchHandler
 module EventMachine
   # Watch a glob and tail any files found.
   #
-  # 'glob' should be a string path or glob, such as /var/log/*.log
-  # handler must be a module or subclass of EventMachine::FileGlobWatchTail
+  # * glob - a string path or glob, such as /var/log/*.log
+  # * handler - a module or subclass of EventMachine::FileGlobWatchTail.
+  #   handler can be omitted if you give a block.
+  #
+  # If you give a block and omit the handler parameter, then the behavior
+  # is that your block is called for every line read from any file the same
+  # way EventMachine::file_tail does when called with a block.
+  #           
   #   See EventMachine::FileGlobWatchTail for the callback methods.
-  def self.glob_tail(glob, handler=nil, *args)
-    handler = EventMachine::FileGlobWatch if handler == nil
+  #   See EventMachine::file_tail for more information about block behavior.
+  def self.glob_tail(glob, handler=nil, *args, &block)
+    handler = EventMachine::FileGlobWatchTail if handler == nil
     args.unshift(glob)
     klass = klass_from_handler(EventMachine::FileGlobWatchTail, handler, *args)
-    c = klass.new(*args)
-    yield c if block_given?
+    c = klass.new(*args, &block)
     return c
   end 
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 20100903005209
-  version: 0.4.20100903005209
+  - 5
+  - 20101005181243
+  version: 0.5.20101005181243
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -07:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency