filewatch 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bf179bb78fa086471f144cc90404a616076d09
-  data.tar.gz: e0579d790be4bc6a400f4db10097cf610fbc219a
+  metadata.gz: 942a2b016e43afadaa980bf4964646a425ed763a
+  data.tar.gz: eed10c3d4d6368803121747a1d9777bc01df7f5f
 SHA512:
-  metadata.gz: 49599f9831b7f87285e819f926f5748f318dcd636313968f00013dc62bf969f43fa74e119374de73bc36a9ef7f39f5ec198f15397892a48e605287fdd216b828
-  data.tar.gz: 80afb0abad3f869aeb7461f7de3d9e9e49b9bbaf010d9c37f4a9803f5cd3d006224aa65d56ac789869a92f0efe974558f16d6f5185566bc686447e09264b8e96
+  metadata.gz: bc6dc3c1a2ad58f9e5e34d2d60a73d44c1f6727e698ee13ef6d5dbc72c9d215488577a121dd084c3e6316b435d3f5c98effe631de90d31dd9b3ae4405eebb71a
+  data.tar.gz: 8212663fd9cfd801ecf88f214c2d30356c20cc3f29a7af18b0ec1794eca87adbd72e330e7fac744ad36cd86dd6826b90c7cbe83ccfa3af4c263fe2560ee17400

data/lib/filewatch/tail_base.rb

@@ -45,7 +45,6 @@ module FileWatch
         :discover_interval => 5,
         :exclude => [],
         :start_new_files_at => :end,
-        # :ignore_after => 24 * 60 * 60,
         :delimiter => "\n"
       }.merge(opts)
       if !@opts.include?(:sincedb_path)
@@ -56,7 +55,8 @@ module FileWatch
         raise NoSinceDBPathGiven.new("No HOME or SINCEDB_PATH set in environment. I need one of these set so I can keep track of the files I am following.")
       end
       @watch.exclude(@opts[:exclude])
-      @watch.ignore_after = @opts[:ignore_after]
+      @watch.close_older = @opts[:close_older]
+      @watch.ignore_older = @opts[:ignore_older]
 
       _sincedb_open
     end # def initialize
@@ -82,11 +82,11 @@ module FileWatch
     private
 
     def file_expired?(stat)
-      return false if @opts[:ignore_after].nil?
+      return false if @opts[:ignore_older].nil?
       # (Time.now - stat.mtime) <- in jruby, this does int and float
       # conversions before the subtraction and returns a float.
       # so use all ints instead
-      (Time.now.to_i - stat.mtime.to_i) > @opts[:ignore_after]
+      (Time.now.to_i - stat.mtime.to_i) > @opts[:ignore_older]
     end
 
     def _open_file(path, event)

data/lib/filewatch/watch.rb

@@ -45,7 +45,7 @@ module FileWatch
       def to_s() inspect; end
     end
 
-    attr_accessor :logger, :ignore_after
+    attr_accessor :logger, :close_older, :ignore_older
 
     public
     def initialize(opts={})
@@ -148,7 +148,7 @@ module FileWatch
             next
           end
 
-          if expired?(stat, watched_file)
+          if file_closable?(stat, watched_file)
             if !watched_file.timeout_sent?
               @logger.debug? && @logger.debug("#{path}: file expired")
               yield(:timeout, path)
@@ -207,20 +207,24 @@ module FileWatch
     end # def subscribe
 
     private
-    def expired?(stat, watched_file)
-      file_expired?(stat) && watched_file.size == stat.size
+    def file_closable?(stat, watched_file)
+      file_can_close?(stat) && watched_file.size == stat.size
     end
 
-    def discover_expired?(stat)
-      file_expired?(stat)
+    def file_ignorable?(stat)
+      return false unless expiry_ignore_enabled?
+      # (Time.now - stat.mtime) <- in jruby, this does int and float
+      # conversions before the subtraction and returns a float.
+      # so use all ints instead
+      (Time.now.to_i - stat.mtime.to_i) > @ignore_older
     end
 
-    def file_expired?(stat)
-      return false unless expiry_enabled?
+    def file_can_close?(stat)
+      return false unless expiry_close_enabled?
       # (Time.now - stat.mtime) <- in jruby, this does int and float
       # conversions before the subtraction and returns a float.
       # so use all ints instead
-      (Time.now.to_i - stat.mtime.to_i) > @ignore_after
+      (Time.now.to_i - stat.mtime.to_i) > @close_older
     end
 
     private
@@ -247,9 +251,13 @@ module FileWatch
         # let the caller build the object in its context
         watched_file = yield(file, stat)
 
-        if discover_expired?(stat)
-          msg = "_discover_file: #{file}: skipping because it was last modified more than #{@ignore_after} seconds ago"
+        if file_ignorable?(stat)
+          msg = "_discover_file: #{file}: skipping because it was last modified more than #{@ignore_older} seconds ago"
           @logger.debug? && @logger.debug(msg)
+          # we update the size on discovery here
+          # so the existing contents are not read.
+          # because, normally, a newly discovered file will
+          # have a watched_file size of zero
           watched_file.update(stat)
         end
 
@@ -258,8 +266,13 @@ module FileWatch
     end # def _discover_file
 
     private
-    def expiry_enabled?
-      !@ignore_after.nil?
+    def expiry_close_enabled?
+      !@close_older.nil?
+    end
+
+    private
+    def expiry_ignore_enabled?
+      !@ignore_older.nil?
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filewatch
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Jordan Sissel
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement