eventmachine-tail 0.5.20110118081348 → 0.6.1

data/lib/em/filetail.rb

@@ -38,6 +38,8 @@ class EventMachine::FileTail
   CHUNKSIZE = 65536 
 
   #MAXSLEEP = 2
+  
+  FORCE_ENCODING = !! (defined? Encoding)
 
   # The path of the file being tailed
   attr_reader :path
@@ -151,7 +153,7 @@ class EventMachine::FileTail
   # EOF handler is to do nothing.
   public
   def eof
-    puts "EOF"
+    @logger.debug { 'EOF' }
     # do nothing, subclassers should implement this.
   end # def eof
 
@@ -159,7 +161,7 @@ class EventMachine::FileTail
   # modified or otherwise needs to be acted on.
   private
   def notify(status)
-    @logger.warn("notify: #{status} on #{path}")
+    @logger.debug { "notify: #{status} on #{path}" }
     if status == :modified
       schedule_next_read
     elsif status == :moved
@@ -179,6 +181,7 @@ class EventMachine::FileTail
   def open
     return if @closed
     @file.close if @file
+    return unless File.exists?(@path)
     begin
       @logger.debug "Opening file #{@path}"
       @file = File.open(@path, "r")
@@ -188,7 +191,7 @@ class EventMachine::FileTail
     end
 
     @naptime = 0
-    puts "EOF"
+    @logger.debug { 'EOF' }
     @position = 0
     schedule_next_read
   end # def open
@@ -207,6 +210,7 @@ class EventMachine::FileTail
   def watch
     @watch.stop_watching if @watch
     @symlink_timer.cancel if @symlink_timer
+    return unless File.exists?(@path)
 
     @logger.debug "Starting watch on #{@path}"
     callback = proc { |what| notify(what) }
@@ -254,6 +258,7 @@ class EventMachine::FileTail
     @logger.debug "#{self}: Reading..."
     begin
       data = @file.sysread(CHUNKSIZE)
+      data.force_encoding(@file.external_encoding) if FORCE_ENCODING
 
       # Won't get here if sysread throws EOF
       @position += data.length

data/test/alltests.rb

@@ -1,2 +1,5 @@
+$: << File.expand_path('..', __FILE__)
+
+
 require 'test_filetail'
 require 'test_glob'

data/test/test_filetail.rb

@@ -208,5 +208,25 @@ class TestFileTail < Test::Unit::TestCase
       File.delete(f.path)
     end
   end # def test_filetail_tracks_renames
+  
+  def test_encoding
+    return if RUBY_VERSION < '1.9.0'
+    tmp = Tempfile.new("testfiletail")
+    data = DATA.clone
+    EM.run do
+      abort_after_timeout(1)
+
+      EM::file_tail(tmp.path) do |filetail, line|
+        assert_equal(Encoding.default_external, line.encoding, 
+                     "Expected the read data to have the encoding specified in Encoding.default_external (#{Encoding.default_external}, but was #{line.encoding})")
+        finish
+      end
+
+      EM.next_tick do
+        tmp.puts(data.shift)
+        tmp.flush
+      end
+    end # EM.run
+  end # def test_encoding
 end # class TestFileTail
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine-tail
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 20110118081348
-  version: 0.5.20110118081348
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,6 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -77,13 +80,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: eventmachine tail - a file tail implementation with glob support