ffilewatch 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549c952357ea62a8fdeb2d93170b9c2bec986b05
-  data.tar.gz: 2e3e96f0817e95a115457e167513948ca73eedde
+  metadata.gz: 481083c53436c7285931f96e4635bb24a5c746a5
+  data.tar.gz: b181239c5ba187b531374dde0db12de41b0a95a0
 SHA512:
-  metadata.gz: 4a9fb7e1a426ea49db28d397c26209c0b0c2dcfcea9d4397441b0f70de80c4bf691909f3fc23f3f359941f5f9142287b3e2fcc7a9dcdd64299559ec31e6976d3
-  data.tar.gz: 1881f07e0bd99d146967e454ac4b7ea41dcb69f02eb409cb918fb64144f3eb0203928fb7255664355829f85a2ddf9a118c74ed39d26a59c44fa669444f2be104
+  metadata.gz: 62f41469d190c2553fdc6db47e0789a3913d8e08ef3a44deffcf8d6c9ca0bda77e8c67132602c2553db7bd3430a295a0387346115a4065e3861c886011ee3a71
+  data.tar.gz: 96dfba9b0d253e52cdd4bd628d9fcde353778665bb1a114b1ab7032077cbc30e581c1abbc74656268619c458771127b4e57f59acca6584de8511baf272c52e8c

data/lib/filewatch/tail.rb

@@ -22,7 +22,7 @@ module FileWatch
         @logger = opts[:logger]
       else
         @logger = Logger.new(STDERR)
-        @logger.level = Logger::INFO
+        @logger.level = Logger::DEBUG
       end
       @evict = nil
       @files = {}
@@ -52,8 +52,9 @@ module FileWatch
       if !@opts.include?(:sincedb_path)
         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 = FileWatch::Watch.new ignore_before: @opts[:ignore_before]
-      @watch.logger = @logger
+      @watch = FileWatch::Watch.new \
+        logger: @opts[:logger],
+        ignore_before: @opts[:ignore_before]
       @watch.exclude(@opts[:exclude])
       _start_eviction
       _sincedb_open
@@ -151,9 +152,9 @@ module FileWatch
 
       if @sincedb.member?(inode)
         last_size = @sincedb[inode]
-        @logger.debug("#{path}: sincedb last value #{@sincedb[inode]}, cur size #{stat.size}")
+        # @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("#{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")
@@ -162,17 +163,17 @@ module FileWatch
       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("#{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("#{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("#{path}: staying at position 0, no sincedb")
       end
       @changed[path] = Time.now.to_i
       @locked[path] = false
@@ -229,7 +230,7 @@ module FileWatch
       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("_sincedb_open: setting #{inode.inspect} to #{pos.to_i}")
         @sincedb[inode] = pos.to_i
       end
       db.close
@@ -274,7 +275,7 @@ module FileWatch
          end
       end
 
-      @logger.debug("writing sincedb (delta since last write = #{delta})")
+      # @logger.debug("writing sincedb (delta since last write = #{delta})")
 
       path = @opts[:sincedb_path]
       tmp = "#{path}.new"

data/lib/filewatch/watch.rb

@@ -18,7 +18,7 @@ module FileWatch
         @logger = opts[:logger]
       else
         @logger = Logger.new(STDERR)
-        @logger.level = Logger::INFO
+        @logger.level = Logger::DEBUG
       end
       @watching = []
       @exclude = []
@@ -92,7 +92,7 @@ module FileWatch
           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}")
+          # @logger.debug("#{path}: file grew, old size #{@files[path][:size]}, new size #{stat.size}")
           yield(:modify, real(path))
         else 
           # since there is no update, we should pass control back in case the caller needs to do any work
@@ -145,22 +145,27 @@ module FileWatch
         next if @files.member?(file)
         next unless File.file?(file)
 
-        @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 " +
-                          "matches exclude #{pattern}")
+            # @logger.debug("_discover_file: #{file}: skipping because it " +
+            #               "matches exclude #{pattern}")
             skip = true
             break
           end
         end
         next if skip
 
-        next if File::mtime(file).to_i < @opts[:ignore_before]
-
         stat = File::Stat.new(file)
+
+        if stat.mtime.to_i < @opts[:ignore_before]
+          # @logger.debug("_discover_file: #{file}: skipping because it " +
+          #               "was last modified before ignore_before")
+          next
+        end
+
+        @logger.debug("_discover_file: #{path}: new: #{file} (exclude is #{@exclude.inspect})")
+
         @files[file] = {
           :size => 0,
           :inode => [stat.ino, stat.dev_major, stat.dev_minor],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffilewatch
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Jordan Sissel