filewatch 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afac9c2d3c0a37891437ba7bb6a0f4bb8a4b68b0
-  data.tar.gz: d86fab5ae9f22ee5ba4c9552dec1feb8ea13b325
+  metadata.gz: bd471cc099285df704d3f28e4241871e1aa666e2
+  data.tar.gz: dfea4f9a717b2dc2b5d1ef1336091e7af10bf3b6
 SHA512:
-  metadata.gz: 772e3c37641040f481778777e31bb19cf7a420fd04c27129a27363c5b32c97bce86077dc628a2e25f861432630d83275d36c106009b68c24cd8e3c6304e454bc
-  data.tar.gz: 4bddb7bcdf81c9dbfe015ee53bb387b0ba15625f0a2870fbf91bb0ee08cd9904e92c10cf620785daec7f008d464f59b99f335fd2db56f2ba6254a2e438330df1
+  metadata.gz: adbda674e3639e946a0db108e56175a29ac10483cefe1e6ea429d4f1c8e8ca9f4434ea76f6f8db758a79d112b15152936ffddf5dea5446a939ed8be7ef7f0c09
+  data.tar.gz: 87608be8ee355a10e2e3962712c96254fdc971d0bab352c1a3155226d7bef63b3e9d1105c9abcff75db85a815d2f9f2789d9f19b6dfe89948c7a1015421f1145

data/lib/filewatch/tail.rb

@@ -42,7 +42,8 @@ module FileWatch
         :stat_interval => 1,
         :discover_interval => 5,
         :exclude => [],
-        :start_new_files_at => :end
+        :start_new_files_at => :end,
+        :delimiter => "\n"
       }.merge(opts)
       if !@opts.include?(:sincedb_path)
         @opts[:sincedb_path] = File.join(ENV["HOME"], ".sincedb") if ENV.include?("HOME")
@@ -75,7 +76,7 @@ module FileWatch
         case event
         when :create, :create_initial
           if @files.member?(path)
-            @logger.debug("#{event} for #{path}: already exists in @files")
+            @logger.debug? && @logger.debug("#{event} for #{path}: already exists in @files")
             next
           end
           if _open_file(path, event)
@@ -83,7 +84,7 @@ module FileWatch
           end
         when :modify
           if !@files.member?(path)
-            @logger.debug(":modify for #{path}, does not exist in @files")
+            @logger.debug? && @logger.debug(":modify for #{path}, does not exist in @files")
             if _open_file(path, event)
               _read_file(path, &block)
             end
@@ -91,9 +92,11 @@ module FileWatch
             _read_file(path, &block)
           end
         when :delete
-          @logger.debug(":delete for #{path}, deleted from @files")
-          _read_file(path, &block)
-          @files[path].close
+          @logger.debug? && @logger.debug(":delete for #{path}, deleted from @files")
+          if @files[path]
+            _read_file(path, &block)
+            @files[path].close
+          end
           @files.delete(path)
           @statcache.delete(path)
         else
@@ -104,7 +107,7 @@ module FileWatch
 
     private
     def _open_file(path, event)
-      @logger.debug("_open_file: #{path}: opening")
+      @logger.debug? && @logger.debug("_open_file: #{path}: opening")
       begin
         if @iswindows && defined? JRUBY_VERSION
             @files[path] = Java::RubyFileExt::getRubyFile(path)
@@ -120,7 +123,7 @@ module FileWatch
           @logger.warn("failed to open #{path}: #{$!}")
           @lastwarn[path] = now
         else
-          @logger.debug("(warn supressed) failed to open #{path}: #{$!}")
+          @logger.debug? && @logger.debug("(warn supressed) failed to open #{path}: #{$!}")
         end
         @files.delete(path)
         return false
@@ -139,28 +142,28 @@ module FileWatch
 
       if @sincedb.member?(inode)
         last_size = @sincedb[inode]
-        @logger.debug("#{path}: sincedb last value #{@sincedb[inode]}, cur size #{stat.size}")
+        @logger.debug? && @logger.debug("#{path}: sincedb last value #{@sincedb[inode]}, cur size #{stat.size}")
         if last_size <= stat.size
-          @logger.debug("#{path}: sincedb: seeking to #{last_size}")
+          @logger.debug? && @logger.debug("#{path}: sincedb: seeking to #{last_size}")
           @files[path].sysseek(last_size, IO::SEEK_SET)
         else
-          @logger.debug("#{path}: last value size is greater than current value, starting over")
+          @logger.debug? && @logger.debug("#{path}: last value size is greater than current value, starting over")
           @sincedb[inode] = 0
         end
       elsif event == :create_initial && @files[path]
         # TODO(sissel): Allow starting at beginning of the file.
         if @opts[:start_new_files_at] == :beginning
-          @logger.debug("#{path}: initial create, no sincedb, seeking to beginning of file")
+          @logger.debug? && @logger.debug("#{path}: initial create, no sincedb, seeking to beginning of file")
           @files[path].sysseek(0, IO::SEEK_SET)
           @sincedb[inode] = 0
         else 
           # seek to end
-          @logger.debug("#{path}: initial create, no sincedb, seeking to end #{stat.size}")
+          @logger.debug? && @logger.debug("#{path}: initial create, no sincedb, seeking to end #{stat.size}")
           @files[path].sysseek(stat.size, IO::SEEK_SET)
           @sincedb[inode] = stat.size
         end
       else
-        @logger.debug("#{path}: staying at position 0, no sincedb")
+        @logger.debug? && @logger.debug("#{path}: staying at position 0, no sincedb")
       end
 
       return true
@@ -168,7 +171,7 @@ module FileWatch
 
     private
     def _read_file(path, &block)
-      @buffers[path] ||= FileWatch::BufferedTokenizer.new
+      @buffers[path] ||= FileWatch::BufferedTokenizer.new(@opts[:delimiter])
 
       changed = false
       loop do
@@ -189,7 +192,7 @@ module FileWatch
         now = Time.now.to_i
         delta = now - @sincedb_last_write
         if delta >= @opts[:sincedb_write_interval]
-          @logger.debug("writing sincedb (delta since last write = #{delta})")
+          @logger.debug? && @logger.debug("writing sincedb (delta since last write = #{delta})")
           _sincedb_write
           @sincedb_last_write = now
         end
@@ -198,7 +201,7 @@ module FileWatch
 
     public
     def sincedb_write(reason=nil)
-      @logger.debug("caller requested sincedb write (#{reason})")
+      @logger.debug? && @logger.debug("caller requested sincedb write (#{reason})")
       _sincedb_write
     end
 
@@ -208,17 +211,19 @@ module FileWatch
       begin
         db = File.open(path)
       rescue
-        @logger.debug("_sincedb_open: #{path}: #{$!}")
+        #No existing sincedb to load
+        @logger.debug? && @logger.debug("_sincedb_open: #{path}: #{$!}")
         return
       end
 
-      @logger.debug("_sincedb_open: reading from #{path}")
+      @logger.debug? && @logger.debug("_sincedb_open: reading from #{path}")
       db.each do |line|
         ino, dev_major, dev_minor, pos = line.split(" ", 4)
         inode = [ino, dev_major.to_i, dev_minor.to_i]
-        @logger.debug("_sincedb_open: setting #{inode.inspect} to #{pos.to_i}")
+        @logger.debug? && @logger.debug("_sincedb_open: setting #{inode.inspect} to #{pos.to_i}")
         @sincedb[inode] = pos.to_i
       end
+      db.close
     end # def _sincedb_open
 
     private

data/lib/filewatch/watch.rb

@@ -67,7 +67,7 @@ module FileWatch
         rescue Errno::ENOENT
           # file has gone away or we can't read it anymore.
           @files.delete(path)
-          @logger.debug("#{path}: stat failed (#{$!}), deleting from @files")
+          @logger.debug? && @logger.debug("#{path}: stat failed (#{$!}), deleting from @files")
           yield(:delete, path)
           next
         end
@@ -80,15 +80,15 @@ module FileWatch
         end
 		
         if inode != @files[path][:inode]
-          @logger.debug("#{path}: old inode was #{@files[path][:inode].inspect}, new is #{inode.inspect}")
+          @logger.debug? && @logger.debug("#{path}: old inode was #{@files[path][:inode].inspect}, new is #{inode.inspect}")
           yield(:delete, path)
           yield(:create, path)
         elsif stat.size < @files[path][:size]
-          @logger.debug("#{path}: file rolled, new size is #{stat.size}, old size #{@files[path][:size]}")
+          @logger.debug? && @logger.debug("#{path}: file rolled, new size is #{stat.size}, old size #{@files[path][:size]}")
           yield(:delete, path)
           yield(:create, path)
         elsif stat.size > @files[path][:size]
-          @logger.debug("#{path}: file grew, old size #{@files[path][:size]}, new size #{stat.size}")
+          @logger.debug? && @logger.debug("#{path}: file grew, old size #{@files[path][:size]}, new size #{stat.size}")
           yield(:modify, path)
         end
 
@@ -124,21 +124,21 @@ module FileWatch
     private
     def _discover_file(path, initial=false)
       globbed_dirs = Dir.glob(path)
-      @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs}")
+      @logger.debug? && @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs}")
       if globbed_dirs.empty? && File.file?(path)
         globbed_dirs = [path]
-        @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs} because glob did not work")
+        @logger.debug? && @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs} because glob did not work")
       end
       globbed_dirs.each do |file|
         next if @files.member?(file)
         next unless File.file?(file)
 
-        @logger.debug("_discover_file: #{path}: new: #{file} (exclude is #{@exclude.inspect})")
+        @logger.debug? && @logger.debug("_discover_file: #{path}: new: #{file} (exclude is #{@exclude.inspect})")
 
         skip = false
         @exclude.each do |pattern|
           if File.fnmatch?(pattern, File.basename(file))
-            @logger.debug("_discover_file: #{file}: skipping because it " +
+            @logger.debug? && @logger.debug("_discover_file: #{file}: skipping because it " +
                           "matches exclude #{pattern}")
             skip = true
             break
@@ -154,7 +154,7 @@ module FileWatch
         }
 		
 		if @iswindows
-          fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
+          fileId = Winhelper.GetWindowsUniqueFileIdentifier(file)
           @files[file][:inode] = [fileId, stat.dev_major, stat.dev_minor]
         else
           @files[file][:inode] = [stat.ino.to_s, stat.dev_major, stat.dev_minor]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filewatch
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jordan Sissel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies: []
 description: Watch files and directories in ruby. Also supports tailing and glob file
   patterns.
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/globtail
+- lib/JRubyFileExtension.jar
 - lib/filewatch/buftok.rb
 - lib/filewatch/tail.rb
 - lib/filewatch/watch.rb
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: filewatch - file watching for ruby