eventmachine-tail 0.6.4 → 0.6.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 96b3872cfc6a1c388aa9ee4d8f67ae2b69cc7a9ae5fdbb39449a9a293702fb37
+  data.tar.gz: c268790026a0f65cff3d521dcd366db1ab848f685f4ccd9aa69c024bb09bf406
+SHA512:
+  metadata.gz: 15956a61dd9222dd09147623d7b8357850d2995ed5a270039b326e623d33916ca1fd2321920a1334ce5a4398a0db49e4134f32dacb1148153cb133cc202281da
+  data.tar.gz: 507f39f080224e3784e23bcaf1ba8c680f54d47e277fd134c8becb30089aa33b415eb4e9e0cbe035ec30c8d3a8598ca1505d715a63ec40295fc376c329e5abdc

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
@@ -171,7 +173,6 @@ class EventMachine::FileTail
       schedule_next_read
     elsif status == :moved
       # read to EOF, then reopen.
-      @reopen_on_eof = true
       schedule_next_read
     elsif status == :unbind
       # :unbind is called after the :deleted handler
@@ -186,7 +187,7 @@ class EventMachine::FileTail
   def open
     return if @closed
     @file.close if @file && !@file.closed?
-    return unless File.exists?(@path)
+    return unless File.exist?(@path)
     begin
       @logger.debug "Opening file #{@path}"
       @file = File.open(@path, "r")
@@ -214,19 +215,19 @@ 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
     @watch.stop_watching if @watch
     @symlink_timer.cancel if @symlink_timer
-    return unless File.exists?(@path)
+    return unless File.exist?(@path)
 
     @logger.debug "Starting watch on #{@path}"
     callback = proc { |what| notify(what) }
@@ -354,19 +355,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 +394,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/lib/em/globwatcher.rb

@@ -81,6 +81,15 @@ class EventMachine::FileGlobWatch
       "module?")
   end # def file_found
 
+  # This method is called when a file is modified.
+  #
+  # * path - The string path of the file modified
+  #
+  # You AREN'T required to implement this in your sublcass or module
+  public
+  def file_modified(path)
+  end
+
   # This method is called when a file is deleted.
   #
   # * path - the string path of the file deleted
@@ -104,7 +113,10 @@ class EventMachine::FileGlobWatch
       fileinfo = FileInfo.new(path) rescue next
       # Skip files that have the same inode (renamed or hardlinked)
       known_files.delete(fileinfo.stat.ino)
-      next if @files.include?(fileinfo.stat.ino)
+      if @files.include?(fileinfo.stat.ino)
+        next unless modified(fileinfo)
+        file_modified(path)
+      end
 
       track(fileinfo)
       file_found(path)
@@ -144,6 +156,11 @@ class EventMachine::FileGlobWatch
     #end
   end # def watch
 
+  # Tells if a file has been modified since last time
+  def modified(fileinfo)
+    not @files[fileinfo.stat.ino].stat.mtime == fileinfo.stat.mtime
+  end
+
   private
   class FileWatcher < EventMachine::FileWatch
     def initialize(globwatch, &block)

data/samples/globwatch.rb

@@ -16,6 +16,10 @@ class Watcher < EventMachine::FileGlobWatch
   def file_found(path)
     puts "Found: #{path}"
   end
+
+  def file_modified(path)
+    puts "Modified: #{path}"
+  end
 end # class Watcher
 
 EM.run do

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

data/test/test_glob.rb

@@ -32,6 +32,26 @@ class Watcher < EventMachine::FileGlobWatch
   end
 end # class Reader
 
+class ModificationWatcher < EventMachine::FileGlobWatch
+  def initialize(path, interval, data, testobj)
+    super(path, interval)
+    @data = data
+    @testobj = testobj
+  end # def initialize
+
+  def file_found(path)
+  end
+
+  def file_deleted(patH)
+  end
+
+  def file_modified(path)
+    @testobj.assert(@data.include?(path), "Expected #{path} in \n#{@data.join("\n")}")
+    @data.delete(path)
+    @testobj.finish if @data.length == 0
+  end
+end # class ModificationWatcher
+
 class TestGlobWatcher < Test::Unit::TestCase
   include EventMachineTailTestHelpers
   SLEEPMAX = 1
@@ -142,5 +162,29 @@ class TestGlobWatcher < Test::Unit::TestCase
       end
     end
   end # def test_glob_ignores_file_renames
+
+  def test_glob_finds_modified_files_at_runtime
+    EM.run do
+      abort_after_timeout(SLEEPMAX * @data.length + 10)
+
+      datacopy = @data.clone
+
+      # To test if file edit is detected, file must exist first
+      datacopy.each do |filename|
+        File.new(filename, "w").close
+      end
+
+      EM::watch_glob("#{@dir}/*", ModificationWatcher, @watchinterval, @data.clone, self)
+
+      sleep(2) # Modification time resolution is 1 second, so we need to allow mtimes to change
+      timer = EM::PeriodicTimer.new(0.2) do
+        File.open(datacopy.shift, "w") do |f|
+          f.puts("LOLCAT!")
+        end
+        sleep(rand * SLEEPMAX)
+        timer.cancel if datacopy.length == 0
+      end
+    end # EM.run
+  end # def test_glob_finds_modified_files_at_runtime
 end # class TestGlobWatcher
 

metadata

@@ -1,77 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-tail
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.6.6
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 1980-01-02 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'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Add file 'tail' implemented with EventMachine. Also includes a 'glob
   watch' class for watching a directory pattern for new matches, like /var/log/*.log
 email: jls@semicomplete.com
 executables:
-- rtail
 - emtail
+- rtail
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/eventmachine-tail.rb
-- lib/em/globwatcher.rb
+- bin/emtail
+- bin/rtail
 - lib/em/filetail.rb
-- samples/tail.rb
+- lib/em/globwatcher.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: []
-post_install_message: 
+licenses:
+- BSD-3-Clause
+metadata: {}
 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
-signing_key: 
-specification_version: 3
+rubygems_version: 3.6.7
+specification_version: 4
 summary: eventmachine tail - a file tail implementation with glob support
 test_files: []