filewatch 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ac6ba9efca68da9ea0b3342e87deab3635f53c
-  data.tar.gz: 5a71f0673de75e1444584b01c0dcfe56e039d2ce
+  metadata.gz: e80ef8ef31b018ae2e8bcca3794c6389efbe9668
+  data.tar.gz: bf76dc26caa7715951a657769ad64a9bda8b5ca6
 SHA512:
-  metadata.gz: 366003c080654805fa4da59a6ef354a25cb0a8495090d668ad0dd8ae628e7bf7438b5d0894938925bed8d8e2b08a6dae3671a0772480d94d210039273aaa7e01
-  data.tar.gz: d05f46ef57830653fbd19c3eef0d4e49fd4137f5604d0296df1991fc64ae0b6b74c926a7e2796bf528d4c55d1571f8a9b190115b88571110027bb16ebe6fe8fb
+  metadata.gz: 63156fc561b37940e580a9bcbee7d2649f9b1ba24f8c16cb58830a9850baf2734c7f9ef6dbd0ba2cd4d5efcabf8d26c6f0f69dffca36ce7b0b388b6c9ea5f4d8
+  data.tar.gz: a0b76e79c2393bb8d05ceb6a18378e750c7eec25a7c4df61da066bacd0cc1f6b2f2c0e1287d629768a846ba4bb32dd9c7c56727b098a9cf2a49de5c6dc7dbfac

data/lib/filewatch/observing_tail.rb

@@ -64,6 +64,8 @@ module FileWatch
           @logger.warn("unknown event type #{event} for #{path}")
         end
       end # @watch.subscribe
+      # when watch.subscribe ends - its because we got quit
+      _sincedb_write
     end # def subscribe
 
     private

data/lib/filewatch/tail.rb

@@ -11,13 +11,11 @@ module FileWatch
     attr_writer :target
 
     def self.new_observing(opts = {})
-      new.tap do |instance|
-        instance.target = ObservingTail.new(opts)
-      end
+      new({}, ObservingTail.new(opts))
     end
 
-    def initialize(opts = {})
-      @target = YieldingTail.new(opts)
+    def initialize(opts = {}, target = YieldingTail.new(opts))
+      @target = target
     end
   end
 end

data/lib/filewatch/tail_base.rb

@@ -209,8 +209,6 @@ module FileWatch
     # before the instance is disposed of.
     def quit
       @watch.quit # <-- should close all the files
-      # and that should allow the sincedb_write to succeed if it could not before
-      _sincedb_write
     end # def quit
 
     public

data/lib/filewatch/watch.rb

@@ -117,127 +117,147 @@ module FileWatch
     def each(&block)
       synchronized do
         return if @files.empty?
-
-        file_deleteable = []
-        # creates this array just once
-        watched_files = @files.values
-
-        # look at the closed to see if its changed
-        watched_files.select {|wf| wf.closed? }.each do |watched_file|
-          path = watched_file.path
-          begin
-            stat = watched_file.restat
-            if watched_file.size_changed? || watched_file.inode_changed?(inode(path,stat))
-              # if the closed file changed, move it to the watched state
-              # not to active state because we want to use MAX_OPEN_FILES throttling.
-              watched_file.watch
+        begin
+          file_deletable = []
+          # creates this array just once
+          watched_files = @files.values
+
+          # look at the closed to see if its changed
+          watched_files.select {|wf| wf.closed? }.each do |watched_file|
+            path = watched_file.path
+            break if quit?
+            begin
+              stat = watched_file.restat
+              if watched_file.size_changed? || watched_file.inode_changed?(inode(path,stat))
+                # if the closed file changed, move it to the watched state
+                # not to active state because we want to use MAX_OPEN_FILES throttling.
+                watched_file.watch
+              end
+            rescue Errno::ENOENT
+              # file has gone away or we can't read it anymore.
+              file_deletable << path
+              @logger.debug? && @logger.debug("each: closed?: stat failed: #{path}: (#{$!}), deleting from @files")
+            rescue => e
+              @logger.error("each: closed?: #{path}: (#{e.inspect})")
             end
-          rescue Errno::ENOENT
-            # file has gone away or we can't read it anymore.
-            file_deleteable << path
-            @logger.debug? && @logger.debug("each: closed: stat failed: #{path}: (#{$!}), deleting from @files")
-          rescue => e
-            @logger.debug? && @logger.debug("each: closed: stat failed: #{path}: (#{e.inspect})")
           end
-        end
-
-        # look at the ignored to see if its changed
-        watched_files.select {|wf| wf.ignored? }.each do |watched_file|
-          path = watched_file.path
-          begin
-            stat = watched_file.restat
-            if watched_file.size_changed? || watched_file.inode_changed?(inode(path,stat))
-              # if the ignored file changed, move it to the watched state
-              # not to active state because we want to use MAX_OPEN_FILES throttling.
-              # this file has not been yielded to the block yet
-              # but we must have the tail to start from the end, so when the file
-              # was first ignored we updated the bytes_read to the stat.size at that time.
-              # by adding this to the sincedb so that the subsequent modify
-              # event can detect the change
-              watched_file.watch
-              yield(:unignore, watched_file)
+          return if quit?
+
+          # look at the ignored to see if its changed
+          watched_files.select {|wf| wf.ignored? }.each do |watched_file|
+            path = watched_file.path
+            break if quit?
+            begin
+              stat = watched_file.restat
+              if watched_file.size_changed? || watched_file.inode_changed?(inode(path,stat))
+                # if the ignored file changed, move it to the watched state
+                # not to active state because we want to use MAX_OPEN_FILES throttling.
+                # this file has not been yielded to the block yet
+                # but we must have the tail to start from the end, so when the file
+                # was first ignored we updated the bytes_read to the stat.size at that time.
+                # by adding this to the sincedb so that the subsequent modify
+                # event can detect the change
+                watched_file.watch
+                yield(:unignore, watched_file)
+              end
+            rescue Errno::ENOENT
+              # file has gone away or we can't read it anymore.
+              file_deletable << path
+              @logger.debug? && @logger.debug("each: ignored: stat failed: #{path}: (#{$!}), deleting from @files")
+            rescue => e
+              @logger.error("each: ignored?: #{path}: (#{e.inspect})")
             end
-          rescue Errno::ENOENT
-            # file has gone away or we can't read it anymore.
-            file_deleteable << path
-            @logger.debug? && @logger.debug("each: ignored: stat failed: #{path}: (#{$!}), deleting from @files")
-          rescue => e
-            @logger.debug? && @logger.debug("each: ignored: stat failed: #{path}: (#{e.inspect})")
           end
-        end
 
-        # Send any creates.
-        if (to_take = @max_active - watched_files.count{|wf| wf.active?}) > 0
-          watched_files.select {|wf| wf.watched? }.take(to_take).each do |watched_file|
-            watched_file.activate
-            # don't do create again
-            next if watched_file.state_history_any?(:closed, :ignored)
-            # if the file can't be opened during the yield
-            # its state is set back to watched
-            if watched_file.initial?
-              yield(:create_initial, watched_file)
-            else
-              yield(:create, watched_file)
+          return if quit?
+
+          # Send any creates.
+          if (to_take = @max_active - watched_files.count{|wf| wf.active?}) > 0
+            watched_files.select {|wf| wf.watched? }.take(to_take).each do |watched_file|
+              break if quit?
+              path = watched_file.path
+              begin
+                stat = watched_file.restat
+                watched_file.activate
+                # don't do create again
+                next if watched_file.state_history_any?(:closed, :ignored)
+                # if the file can't be opened during the yield
+                # its state is set back to watched
+                sym = watched_file.initial? ? :create_initial : :create
+                yield(sym, watched_file)
+              rescue Errno::ENOENT
+                # file has gone away or we can't read it anymore.
+                file_deletable << path
+                watched_file.unwatch
+                yield(:delete, watched_file)
+                next
+                @logger.debug? && @logger.debug("each: closed: stat failed: #{path}: (#{$!}), deleting from @files")
+              rescue => e
+                @logger.error("each: watched?: #{path}: (#{e.inspect})")
+              end
             end
-          end
-        else
-          now = Time.now.to_i
-          if (now - @lastwarn_max_files) > MAX_FILES_WARN_INTERVAL
-            waiting = @files.size - @max_active
-            specific = if @close_older.nil?
-             ", try setting close_older. There are #{waiting} unopened files"
-            else
-              ", files yet to open: #{waiting}"
+          else
+            now = Time.now.to_i
+            if (now - @lastwarn_max_files) > MAX_FILES_WARN_INTERVAL
+              waiting = @files.size - @max_active
+              specific = if @close_older.nil?
+               ", try setting close_older. There are #{waiting} unopened files"
+              else
+                ", files yet to open: #{waiting}"
+              end
+              @logger.warn(@max_warn_msg + specific)
+              @lastwarn_max_files = now
             end
-            @logger.warn(@max_warn_msg + specific)
-            @lastwarn_max_files = now
           end
-        end
 
-        # wf.active means the actual files were opened
-        # and have been read once - unless they were empty at the time
-        watched_files.select {|wf| wf.active? }.each do |watched_file|
-          path = watched_file.path
-          begin
-            stat = watched_file.restat
-          rescue Errno::ENOENT
-            # file has gone away or we can't read it anymore.
-            file_deleteable << path
-            @logger.debug? && @logger.debug("each: active: stat failed: #{path}: (#{$!}), deleting from @files")
-            watched_file.unwatch
-            yield(:delete, watched_file)
-            next
-          rescue => e
-            @logger.debug? && @logger.debug("each: active: stat failed: #{path}: (#{e.inspect})")
-            next
-          end
+          return if quit?
+
+          # wf.active means the actual files were opened
+          # and have been read once - unless they were empty at the time
+          watched_files.select {|wf| wf.active? }.each do |watched_file|
+            path = watched_file.path
+            break if quit?
+            begin
+              stat = watched_file.restat
+            rescue Errno::ENOENT
+              # file has gone away or we can't read it anymore.
+              file_deletable << path
+              @logger.debug? && @logger.debug("each: active: stat failed: #{path}: (#{$!}), deleting from @files")
+              watched_file.unwatch
+              yield(:delete, watched_file)
+              next
+            rescue => e
+              @logger.error("each: active?: #{path}: (#{e.inspect})")
+              next
+            end
 
-          if watched_file.file_closable?
-            @logger.debug? && @logger.debug("each: active: file expired: #{path}")
-            yield(:timeout, watched_file)
-            watched_file.close
-            next
-          end
+            if watched_file.file_closable?
+              @logger.debug? && @logger.debug("each: active: file expired: #{path}")
+              yield(:timeout, watched_file)
+              watched_file.close
+              next
+            end
 
-          _inode = inode(path,stat)
-          read_thus_far = watched_file.bytes_read
-          # we don't update the size here, its updated when we actually read
-          if watched_file.inode_changed?(_inode)
-            @logger.debug? && @logger.debug("each: new inode: #{path}: old inode was #{watched_file.inode.inspect}, new is #{_inode.inspect}")
-            watched_file.update_inode(_inode)
-            yield(:delete, watched_file)
-            yield(:create, watched_file)
-          elsif stat.size < read_thus_far
-            @logger.debug? && @logger.debug("each: file rolled: #{path}: new size is #{stat.size}, old size #{read_thus_far}")
-            yield(:delete, watched_file)
-            yield(:create, watched_file)
-          elsif stat.size > read_thus_far
-            @logger.debug? && @logger.debug("each: file grew: #{path}: old size #{read_thus_far}, new size #{stat.size}")
-            yield(:modify, watched_file)
+            _inode = inode(path,stat)
+            read_thus_far = watched_file.bytes_read
+            # we don't update the size here, its updated when we actually read
+            if watched_file.inode_changed?(_inode)
+              @logger.debug? && @logger.debug("each: new inode: #{path}: old inode was #{watched_file.inode.inspect}, new is #{_inode.inspect}")
+              watched_file.update_inode(_inode)
+              yield(:delete, watched_file)
+              yield(:create, watched_file)
+            elsif stat.size < read_thus_far
+              @logger.debug? && @logger.debug("each: file rolled: #{path}: new size is #{stat.size}, old size #{read_thus_far}")
+              yield(:delete, watched_file)
+              yield(:create, watched_file)
+            elsif stat.size > read_thus_far
+              @logger.debug? && @logger.debug("each: file grew: #{path}: old size #{read_thus_far}, new size #{stat.size}")
+              yield(:modify, watched_file)
+            end
           end
+        ensure
+          file_deletable.each {|f| @files.delete(f)}
         end
-
-        file_deleteable.each {|f| @files.delete(f)}
       end
     end # def each
 
@@ -258,7 +278,7 @@ module FileWatch
       reset_quit
       while !quit?
         each(&block)
-
+        break if quit?
         glob += 1
         if glob == discover_interval
           discover

data/lib/filewatch/yielding_tail.rb

@@ -47,6 +47,8 @@ module FileWatch
           @logger.warn("unknown event type #{event} for #{path}")
         end
       end # @watch.subscribe
+      # when watch.subscribe ends - its because we got quit
+      _sincedb_write
     end # def subscribe
 
     private

metadata

@@ -1,31 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: filewatch
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jordan Sissel
 - Pete Fritchman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: stud
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Watch files and directories in ruby. Also supports tailing and glob file patterns.
+description: Watch files and directories in ruby. Also supports tailing and glob file
+  patterns.
 email:
 - jls@semicomplete.com
 - petef@databits.net
@@ -34,8 +35,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/globtail
-- lib/JRubyFileExtension.jar
 - lib/filewatch/buftok.rb
 - lib/filewatch/helper.rb
 - lib/filewatch/observing_tail.rb
@@ -45,9 +44,10 @@ files:
 - lib/filewatch/watched_file.rb
 - lib/filewatch/winhelper.rb
 - lib/filewatch/yielding_tail.rb
+- lib/JRubyFileExtension.jar
 - test/filewatch/tail.rb
-- test/globtail/Makefile
 - test/globtail/framework.sh
+- test/globtail/Makefile
 - test/globtail/test1.data
 - test/globtail/test1.sh
 - test/globtail/test10.data
@@ -68,10 +68,11 @@ files:
 - test/globtail/test8.sh
 - test/globtail/test9.data
 - test/globtail/test9.sh
+- bin/globtail
 homepage: https://github.com/jordansissel/ruby-filewatch
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -87,9 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.14
+signing_key: 
 specification_version: 4
 summary: filewatch - file watching for ruby
 test_files: []