eventmachine-tail 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c548a8a257df50b5a05dd3d0f8c4de8d2e5f49dc
-  data.tar.gz: cac4d6fd51b4a3a0dcb743383f54fb43b7ed4cc5
+SHA256:
+  metadata.gz: 96b3872cfc6a1c388aa9ee4d8f67ae2b69cc7a9ae5fdbb39449a9a293702fb37
+  data.tar.gz: c268790026a0f65cff3d521dcd366db1ab848f685f4ccd9aa69c024bb09bf406
 SHA512:
-  metadata.gz: 585fd44303c0e66a3842a5adaf47cab658cd6c5921460f5f1dfcd3647c5621d173ca8e49c585d870053c6729ff54aa03182a8cd644996c6c6d7df9267dbea2c9
-  data.tar.gz: 39b8a7cedaad282ab7616cd791b58dd1baea8eb3eb378868aa05b7cf73cb624a9ceb3309281c82d1c3b2812b96568612d38589d332afeb433039e6b59eaf0909
+  metadata.gz: 15956a61dd9222dd09147623d7b8357850d2995ed5a270039b326e623d33916ca1fd2321920a1334ce5a4398a0db49e4134f32dacb1148153cb133cc202281da
+  data.tar.gz: 507f39f080224e3784e23bcaf1ba8c680f54d47e277fd134c8becb30089aa33b415eb4e9e0cbe035ec30c8d3a8598ca1505d715a63ec40295fc376c329e5abdc

data/lib/em/filetail.rb

@@ -173,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
@@ -188,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")
@@ -228,7 +227,7 @@ class EventMachine::FileTail
   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) }

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_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,40 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-tail
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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/em/globwatcher.rb
+- bin/emtail
+- bin/rtail
 - lib/em/filetail.rb
+- lib/em/globwatcher.rb
 - lib/eventmachine-tail.rb
 - samples/glob-tail.rb
 - samples/globwatch.rb
@@ -44,30 +59,26 @@ files:
 - test/test_filetail.rb
 - test/test_glob.rb
 - test/testcase_helpers.rb
-- bin/emtail
-- bin/rtail
 homepage: http://code.google.com/p/semicomplete/wiki/EventMachineTail
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: eventmachine tail - a file tail implementation with glob support
 test_files: []