eventmachine-tail 0.6.4 → 0.6.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c548a8a257df50b5a05dd3d0f8c4de8d2e5f49dc
+  data.tar.gz: cac4d6fd51b4a3a0dcb743383f54fb43b7ed4cc5
+SHA512:
+  metadata.gz: 585fd44303c0e66a3842a5adaf47cab658cd6c5921460f5f1dfcd3647c5621d173ca8e49c585d870053c6729ff54aa03182a8cd644996c6c6d7df9267dbea2c9
+  data.tar.gz: 39b8a7cedaad282ab7616cd791b58dd1baea8eb3eb378868aa05b7cf73cb624a9ceb3309281c82d1c3b2812b96568612d38589d332afeb433039e6b59eaf0909

data/lib/em/filetail.rb

@@ -35,10 +35,10 @@ EventMachine.kqueue = true if EventMachine.kqueue?
 # See also: EventMachine::FileTail#receive_data
 class EventMachine::FileTail
   # Maximum size to read at a time from a single file.
-  CHUNKSIZE = 65536 
+  CHUNKSIZE = 65536
 
   #MAXSLEEP = 2
-  
+
   FORCE_ENCODING = !! (defined? Encoding)
 
   # The path of the file being tailed
@@ -46,7 +46,7 @@ class EventMachine::FileTail
 
   # The current file read position
   attr_reader :position
-  
+
   # If this tail is closed
   attr_reader :closed
 
@@ -57,11 +57,11 @@ class EventMachine::FileTail
   # Check interval for looking for a file if we are tailing it and it has
   # gone missing.
   attr_accessor :missing_file_check_interval
-  
+
   # Tail a file
   #
   # * path is a string file path to tail
-  # * startpos is an offset to start tailing the file at. If -1, start at end of 
+  # * startpos is an offset to start tailing the file at. If -1, start at end of
   # file.
   #
   # If you want debug messages, run ruby with '-d' or set $DEBUG
@@ -102,6 +102,8 @@ class EventMachine::FileTail
 
     EventMachine::next_tick do
       open
+      next unless @file
+
       if (startpos == -1)
         @position = @file.sysseek(0, IO::SEEK_END)
         # TODO(sissel): if we don't have inotify or kqueue, should we
@@ -116,7 +118,7 @@ class EventMachine::FileTail
     end # EventMachine::next_tick
   end # def initialize
 
-  # This method is called when a tailed file has data read. 
+  # This method is called when a tailed file has data read.
   #
   # * data - string data read from the file.
   #
@@ -132,7 +134,7 @@ class EventMachine::FileTail
   #       @buffer.extract(data).each do |line|
   #         # do something with 'line'
   #       end
-  #     end  
+  #     end
   public
   def receive_data(data)
     if @handler # FileTail.new called with a block
@@ -214,13 +216,13 @@ class EventMachine::FileTail
       @file.close if @file
     end
   end # def close
-  
+
   # More rubyesque way of checking if this tail is closed
   public
   def closed?
     @closed
   end
-  
+
   # Watch our file.
   private
   def watch
@@ -354,19 +356,19 @@ class EventMachine::FileTail
   def read_file_metadata(&block)
     begin
       filestat = File.stat(@path)
+      symlink_stat = nil
+      symlink_target = nil
+
+      if filestat.symlink?
+        symlink_stat = File.lstat(@path) rescue nil
+        symlink_target = File.readlink(@path) rescue nil
+      end
     rescue Errno::ENOENT
       raise
     rescue => e
       @logger.debug("File stat on '#{@path}' failed")
       on_exception e
     end
-    symlink_stat = nil
-    symlink_target = nil
-
-    if File.symlink?(@path)
-      symlink_stat = File.lstat(@path) rescue nil
-      symlink_target = File.readlink(@path) rescue nil
-    end
 
     if block_given?
       yield filestat, symlink_stat, symlink_target
@@ -393,7 +395,7 @@ class EventMachine::FileTail
         @logger.debug "Symlink target changed. Reopening..."
         @reopen_on_eof = true
         schedule_next_read
-      end 
+      end
     elsif (filestat.ino != @filestat.ino or filestat.rdev != @filestat.rdev)
       @logger.debug "Inode or device changed. Reopening..."
       @logger.debug filestat

data/test/test_filetail.rb

@@ -26,11 +26,11 @@ class Reader < EventMachine::FileTail
     @buffer.extract(data).each do |line|
       @lineno += 1
       expected = @data.shift
-      @testobj.assert_equal(expected, line, 
+      @testobj.assert_equal(expected, line,
           "Expected '#{expected}' on line #{@lineno}, but got '#{line}'")
     end # @buffer.extract
   end # def receive_data
-  
+
   # This effectively tests EOF handling by requiring it to work in order
   # for the tests to pass.
   def eof
@@ -63,6 +63,23 @@ class TestFileTail < Test::Unit::TestCase
     end # EM.run
   end # def test_filetail
 
+  def test_filetail_close
+    tmp = Tempfile.new("testfiletail")
+    data = DATA.clone
+    data.each { |i| tmp.puts i }
+    tmp.flush
+
+    EM.run do
+      abort_after_timeout(2)
+
+      ft = EM::file_tail(tmp.path, Reader, -1, self)
+      ft.close
+      timer = EM::PeriodicTimer.new(0.2) do
+        timer.cancel and finish if ft.closed?
+      end
+    end # EM.run
+  end # def test_filetail_close
+
   def test_filetail_with_seek
     tmp = Tempfile.new("testfiletail")
     data = DATA.clone
@@ -86,7 +103,7 @@ class TestFileTail < Test::Unit::TestCase
       EM::file_tail(tmp.path) do |filetail, line|
         lineno += 1
         expected = data.shift
-        assert_equal(expected, line, 
+        assert_equal(expected, line,
                      "Expected '#{expected}' on line #{@lineno}, but got '#{line}'")
         finish if data.length == 0
       end
@@ -120,7 +137,7 @@ class TestFileTail < Test::Unit::TestCase
         lineno += 1
         expected = data.shift
         #puts "Got #{lineno}: #{line}"
-        assert_equal(expected, line, 
+        assert_equal(expected, line,
                      "Expected '#{expected}' on line #{lineno}, but got '#{line}'")
         finish if data.length == 0
 
@@ -176,7 +193,7 @@ class TestFileTail < Test::Unit::TestCase
         lineno += 1
         expected = data.shift
         puts "Got #{lineno}: #{line}" if $debug
-        assert_equal(expected, line, 
+        assert_equal(expected, line,
                      "Expected '#{expected}' on line #{lineno}, but got '#{line}'")
         finish if data.length == 0
 
@@ -208,7 +225,7 @@ 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")
@@ -217,7 +234,7 @@ class TestFileTail < Test::Unit::TestCase
       abort_after_timeout(1)
 
       EM::file_tail(tmp.path) do |filetail, line|
-        assert_equal(Encoding.default_external, line.encoding, 
+        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

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-tail
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.6.5
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Add file 'tail' implemented with EventMachine. Also includes a 'glob
@@ -36,42 +33,41 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/eventmachine-tail.rb
 - lib/em/globwatcher.rb
 - lib/em/filetail.rb
-- samples/tail.rb
+- lib/eventmachine-tail.rb
+- samples/glob-tail.rb
 - samples/globwatch.rb
 - samples/tail-with-block.rb
-- samples/glob-tail.rb
+- samples/tail.rb
+- test/alltests.rb
 - test/test_filetail.rb
 - test/test_glob.rb
 - test/testcase_helpers.rb
-- test/alltests.rb
 - bin/emtail
 - bin/rtail
 homepage: http://code.google.com/p/semicomplete/wiki/EventMachineTail
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - 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
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: eventmachine tail - a file tail implementation with glob support
 test_files: []