filewatch-ext 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc02b1e8e969759f62b9962cea5a75e90166d878
-  data.tar.gz: c574c0b6b2c0afa7184bf9d83de1cfbece399298
+  metadata.gz: 8c2f601c3875a6526e3d94d73a160d4a2c5345e0
+  data.tar.gz: 66a06cf9f623d99c0c3c93f5965ed5b8b51a5bbc
 SHA512:
-  metadata.gz: 6d53563ad238de688ebe97921dcb51ebab42301d27772929a37ca207582b9a5b4300b8e1fefddc30171d9572deeb44371a506f8cd68c3f7aaccb1a0b1273bfe0
-  data.tar.gz: cdb418c8ede09c47ad56370f460789232c85353e07bdf0ed3e2adc124b830567547a9e28fef915caea1f4f013410014417e30378fce6dc1f9599149f002e3723
+  metadata.gz: b4ff38b663a5b97fa4846aece1a924792229e655eb9201c73e201a61a66cfd37438553b67a5015bc45376fce4b040d67754b1bf7ad2b08644a5aaa3741769f32
+  data.tar.gz: 9d3bff0679f839020dc8babd8e3eb1915dad0823ceba2d3d2db4a6713d8d0e6a954186480b06fec40227b5e797cef81689ccde25e53e3a57c9fafe2a7d8da187

data/lib/filewatch/ext/progress_tail.rb

@@ -4,6 +4,13 @@ module FileWatch
   module Ext
     class ProgressTail < FileWatch::ObservingTail
 
+      public
+      def initialize(opts={})
+        super
+        @opts[:progress_write_interval] = 500 unless @opts.include?(:progress_write_interval)
+        @progress_last_write = 0
+      end
+
       private
       def observe_read_file(watched_file, listener)
         changed = false
@@ -11,15 +18,24 @@ module FileWatch
           begin
             data = watched_file.file_read(32768)
             changed = true
+
             watched_file.buffer_extract(data).each do |line|
-              listener.accept(line)
               @sincedb[watched_file.inode] += (line.bytesize + @delimiter_byte_size)
+              size = watched_file.filestat.size
+              pos = @sincedb[watched_file.inode]
+
+              now = Time.now.to_f
+              delta = now - @progress_last_write
+              if delta * 1000 >= @opts[:progress_write_interval] or size == pos
+                listener.accept(line, size, pos)
+                @progress_last_write = now
+              else
+                listener.accept(line, nil, nil)
+              end
             end
             # watched_file bytes_read tracks the sincedb entry
             # see TODO in watch.rb
             watched_file.update_bytes_read(@sincedb[watched_file.inode])
-
-            _progressdb_send(watched_file, listener)
           rescue EOFError
             listener.eof
             watched_file.unwatch if @opts[:eof_close]
@@ -45,17 +61,6 @@ module FileWatch
         end
       end # def _read_file
 
-
-      private
-      def _progressdb_send watched_file, listener
-        path = watched_file.path
-        sincedb_key = watched_file.inode
-        stat = watched_file.filestat
-
-        line = [sincedb_key, stat.size, @sincedb[sincedb_key]].flatten.join(" ")
-
-        listener.progress(line)
-      end
     end # module ProgressTail
   end # module Ext
 end # module FileWatch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatch-ext
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Signify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatch