ffilewatch 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a481af51457dff387bdf3cb7d33fe0dbe056bd
-  data.tar.gz: 60d50fa77dba07d4faf31526e2aa56be0a4ff663
+  metadata.gz: 829dcc5451842718057f3e2916b96d65616220ff
+  data.tar.gz: ddee5a1d1e691e0b308b210ff6e04f4dbeafb35d
 SHA512:
-  metadata.gz: 31810de1925838adb880afe3de1cd5ff465e87430f738f29d0ef9ea06b91d914e95b56a541ea97472a2b87f34bd92495b4670fc7baa4cc2d82208714b0b4c225
-  data.tar.gz: 59fcaef74a58f8e03d3b4035c093e5fc314ba3043be58aa7918422c965e6bcc21ae9e13456332809589181be44699649aab28c77b71d2979ff4bd6150ae9bbad
+  metadata.gz: 361b21094d3e94ca3f052ef0605141cd0e66e422d2c56e2d320db9d298f736136f74a3a88bcdecf1fa9f32aba61f5ffb4ac8d82c3ddacb34d1a71036993592ab
+  data.tar.gz: fb95934e8663c2f8eb4cd12d9a67c877a461d1fecee4eae0a0437d4c218327a9916294415c4cce8cc0fb64769a5854a93f1354375165d6cb06c8c59e92e77a99

data/lib/filewatch/tail.rb

@@ -76,7 +76,7 @@ module FileWatch
                        @opts[:discover_interval]) do |event, path|
         case event
         when :create, :create_initial
-          if @files[path].nil?
+          if !@files[path].nil?
             @logger.debug("#{event} for #{path}: already exists in @files")
             next
           end
@@ -94,12 +94,16 @@ module FileWatch
           end
         when :delete
           @logger.debug(":delete for #{path}, deleted from @files")
-          _read_file(path, &block)
-          @files[path].close
-          @files.delete(path)
+          # if File::exist?(path) # Rotated
+          #   if @files[path].nil?
+          #     _open_file(path, event)
+          #   end
+          #   _read_file(path, &block)
+          # end
+          @files.delete(path).close rescue nil
           @statcache.delete(path)
         when :noupdate
-          @logger.debug(":noupdate for #{path}, from @files")
+          # @logger.debug(":noupdate for #{path}, from @files")
           _sincedb_write_if_pending   # will check to see if sincedb_write requests are pending 
         else
           @logger.warn("unknown event type #{event} for #{path}")
@@ -189,6 +193,9 @@ module FileWatch
           end
 
           @sincedb[@statcache[path]] = @files[path].pos
+        rescue NoMethodError
+          @logger.warn("_read_file: file deleted while reading %s" % path)
+          break
         rescue Errno::EWOULDBLOCK, Errno::EINTR, EOFError
           break
         end
@@ -315,7 +322,7 @@ module FileWatch
             next if @locked[path]
             next if @files[path].nil?
             @logger.debug(":evict for #{path}, deleted from @files")
-            @files.delete(path).close
+            @files.delete(path).close rescue nil
             @statcache.delete(path)
             @changed.delete(path)
             @locked.delete(path)

data/lib/filewatch/watch.rb

@@ -1,4 +1,5 @@
 require "logger"
+require "pathname"
 if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
   require "filewatch/winhelper"
 end
@@ -53,9 +54,9 @@ module FileWatch
       @files.keys.each do |path|
         if ! @files[path][:create_sent]
           if @files[path][:initial]
-            yield(:create_initial, path)
+            yield(:create_initial, real(path))
           else
-            yield(:create, path)
+            yield(:create, real(path))
           end
           @files[path][:create_sent] = true
         end
@@ -68,7 +69,7 @@ module FileWatch
           # file has gone away or we can't read it anymore.
           @files.delete(path)
           @logger.debug("#{path}: stat failed (#{$!}), deleting from @files")
-          yield(:delete, path)
+          yield(:delete, real(path))
           next
         end
 
@@ -81,23 +82,23 @@ module FileWatch
 
         if inode != @files[path][:inode]
           @logger.debug("#{path}: old inode was #{@files[path][:inode].inspect}, new is #{inode.inspect}")
-          yield(:delete, path)
-          yield(:create, path)
+          yield(:delete, real(path))
+          yield(:create, real(path))
         elsif stat.size < @files[path][:size]
           @logger.debug("#{path}: file rolled, new size is #{stat.size}, old size #{@files[path][:size]}")
-          yield(:delete, path)
-          yield(:create, path)
+          yield(:delete, real(path))
+          yield(:create, real(path))
         elsif stat.size > @files[path][:size]
           @logger.debug("#{path}: file grew, old size #{@files[path][:size]}, new size #{stat.size}")
-          yield(:modify, path)
+          yield(:modify, real(path))
         else 
           # since there is no update, we should pass control back in case the caller needs to do any work
           # otherwise, they can ONLY do other work when a file is created or modified
-          @logger.debug("#{path}: nothing to update")
-          yield(:noupdate, path)
+          # @logger.debug("#{path}: nothing to update")
+          yield(:noupdate, real(path))
         end
 
-        @files[path][:size] = stat.size
+        @files[path][:size]  = stat.size
         @files[path][:inode] = inode
       end # @files.keys.each
     end # def each
@@ -126,6 +127,11 @@ module FileWatch
       end
     end # def subscribe
 
+    private
+    def real path
+      Pathname.new(path).realpath.to_s rescue path
+    end
+
     private
     def _discover_file(path, initial=false)
       globbed_dirs = Dir.glob(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffilewatch
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jordan Sissel
@@ -34,7 +34,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/globtail
 - lib/JRubyFileExtension.jar
 - lib/filewatch/tail.rb
 - lib/filewatch/watch.rb

data/bin/globtail

@@ -1,55 +0,0 @@
-#!/usr/bin/env ruby
-
-require "filewatch/tail"
-require "optparse"
-
-progname = File.basename($0)
-
-config = {
-  :verbose => false,
-}
-
-opts = OptionParser.new do |opts|
-  opts.banner = "#{progname} [-v] [-s path] [-i interval] [-x glob] path/glob ..."
-
-  opts.on("-v", "--verbose", "Enable verbose/debug output") do
-    config[:verbose] = true
-  end
-
-  opts.on("-x", "--exclude PATH", String, "path to exclude from watching") do |path|
-    config[:exclude] ||= []
-    config[:exclude] << path
-  end
-
-  opts.on("-s", "--sincedb PATH", String, "Sincedb path") do |path|
-    config[:sincedb_path] = path
-  end
-
-  opts.on("-i", "--interval SECONDS", Integer,
-          "Sincedb write interval") do |path|
-    config[:sincedb_write_interval] = path
-  end
-end
-
-begin
-  opts.order!
-rescue OptionParser::InvalidOption
-  $stderr.puts "#{progname}: #{$!}"
-  $stderr.puts opts.usage
-end
-
-logger = Logger.new(STDERR)
-logger.progname = progname
-logger.level = config[:verbose] ? Logger::DEBUG : Logger::INFO
-config[:logger] = logger
-
-tail = FileWatch::Tail.new(config)
-
-ARGV.each { |path| tail.tail(path) }
-
-Signal.trap("EXIT") { tail.sincedb_write("globtail exiting") }
-
-$stdout.sync = true
-tail.subscribe do |path, line|
-  puts "#{path}: #{line}"
-end