eventmachine-tail 0.2.20100517011408 → 0.2.20100524185851

data/lib/em/filetail.rb

@@ -4,6 +4,7 @@ require "eventmachine"
 require "logger"
 
 EventMachine.epoll if EventMachine.epoll?
+EventMachine.kqueue = true if EventMachine.kqueue?
 
 # Tail a file.
 #
@@ -44,7 +45,7 @@ class EventMachine::FileTail
   # See also: EventMachine::file_tail
   #
   public
-  def initialize(path, startpos=-1)
+  def initialize(path, startpos=-1, &block)
     @path = path
     @logger = Logger.new(STDOUT)
     @logger.level = ($DEBUG and Logger::DEBUG or Logger::WARN)
@@ -53,6 +54,11 @@ class EventMachine::FileTail
     @file = nil
     @fstat = File.stat(@path)
 
+    if block_given?
+      @handler = block
+      @buffer = BufferedTokenizer.new
+    end
+
     if @fstat.directory?
       raise Errno::EISDIR.new(@path)
     end
@@ -86,9 +92,15 @@ class EventMachine::FileTail
   #     end  
   public
   def receive_data(data)
-    raise NotImplementedError.new("#{self.class.name}#receive_data is not "\
-      "implemented. Did you forget to implement this in your subclass or "\
-      "module?")
+    if @handler # FileTail.new called with a block
+      @buffer.extract(data).each do |line|
+        @handler.call(self, line)
+      end
+    else
+      raise NotImplementedError.new("#{self.class.name}#receive_data is not "\
+        "implemented. Did you forget to implement this in your subclass or "\
+        "module?")
+    end
   end # def receive_data
 
   # notify is invoked when the file you are tailing has been modified or
@@ -217,13 +229,23 @@ module EventMachine
   # path is the path to the file to tail.
   # handler should be a module implementing 'receive_data' or
   # must be a subclasses of EventMachine::FileTail
-  def self.file_tail(path, handler=nil, *args)
+  #
+  # For example:
+  #   EM::file_tail("/var/log/messages", MyHandler)
+  #
+  # If a block is given, and the handler is not specified or does
+  # not implement EventMachine::FileTail#receive_data, then it
+  # will be called as such:
+  #   EM::file_tail(...) do |filetail, line|
+  #     # filetail is the FileTail instance watching the file
+  #     # line is the line read from the file
+  #   end
+  def self.file_tail(path, handler=nil, *args, &block)
     # This code mostly styled on what EventMachine does in many of it's other
     # methods.
     args = [path, *args]
     klass = klass_from_handler(EventMachine::FileTail, handler, *args);
-    c = klass.new(*args)
-    yield c if block_given?
+    c = klass.new(*args, &block)
     return c
   end # def self.file_tail
 end # module EventMachine

data/lib/em/globwatcher.rb

@@ -6,6 +6,7 @@ require "logger"
 require "set"
 
 EventMachine.epoll if EventMachine.epoll?
+EventMachine.kqueue = true if EventMachine.kqueue?
 
 # A file glob pattern watcher for EventMachine.
 #

data/samples/tail-with-block.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+#
+# Simple 'tail -f' example.
+# Usage example:
+#   tail.rb /var/log/messages
+
+require "rubygems"
+require "eventmachine"
+require "eventmachine-tail"
+
+def main(args)
+  if args.length == 0
+    puts "Usage: #{$0} <path> [path2] [...]"
+    return 1
+  end
+
+  EventMachine.run do
+    args.each do |path|
+      EventMachine::file_tail(path) do |filetail, line|
+        puts line
+      end
+    end
+  end
+end # def main
+
+exit(main(ARGV))

data/test/test_filetail.rb

@@ -11,7 +11,7 @@ require 'testcase_helpers.rb'
 
 # Generate some data
 DATA = (1..10).collect { |i| rand.to_s }
-SLEEPMAX = 2
+SLEEPMAX = 1
 
 class Reader < EventMachine::FileTail
   def initialize(path, startpos=-1, testobj=nil)
@@ -67,5 +67,30 @@ class TestFileTail < Test::Unit::TestCase
       EM::file_tail(tmp.path, Reader, 0, self)
     end # EM.run
   end # def test_filetail
+
+  def test_filetail_with_block
+    tmp = Tempfile.new("testfiletail")
+    data = DATA.clone
+    EM.run do
+      abort_after_timeout(DATA.length * SLEEPMAX + 10)
+
+      lineno = 0
+      EM::file_tail(tmp.path) do |filetail, line|
+        lineno += 1
+        expected = data.shift
+        assert_equal(expected, line, 
+                     "Expected '#{expected}' on line #{@lineno}, but got '#{line}'")
+        finish if data.length == 0
+      end
+
+      data_copy = data.clone
+      timer = EM::PeriodicTimer.new(0.2) do
+        tmp.puts data_copy.shift
+        tmp.flush
+        sleep(rand * SLEEPMAX)
+        timer.cancel if data_copy.length == 0
+      end
+    end # EM.run
+  end # def test_filetail_with_block
 end # class TestFileTail
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 20100517011408
-  version: 0.2.20100517011408
+  - 20100524185851
+  version: 0.2.20100524185851
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - samples/tail.rb
 - samples/glob-tail.rb
 - samples/globwatch.rb
+- samples/tail-with-block.rb
 - test/test_filetail.rb
 - test/test_glob.rb
 - test/alltests.rb