filewatch 0.5.1 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: afac9c2d3c0a37891437ba7bb6a0f4bb8a4b68b0
+  data.tar.gz: d86fab5ae9f22ee5ba4c9552dec1feb8ea13b325
+SHA512:
+  metadata.gz: 772e3c37641040f481778777e31bb19cf7a420fd04c27129a27363c5b32c97bce86077dc628a2e25f861432630d83275d36c106009b68c24cd8e3c6304e454bc
+  data.tar.gz: 4bddb7bcdf81c9dbfe015ee53bb387b0ba15625f0a2870fbf91bb0ee08cd9904e92c10cf620785daec7f008d464f59b99f335fd2db56f2ba6254a2e438330df1

data/lib/filewatch/tail.rb

@@ -1,6 +1,13 @@
 require "filewatch/buftok"
 require "filewatch/watch"
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  require "filewatch/winhelper"
+end
 require "logger"
+require "rbconfig"
+
+include Java if defined? JRUBY_VERSION
+require "JRubyFileExtension.jar" if defined? JRUBY_VERSION
 
 module FileWatch
   class Tail
@@ -14,6 +21,8 @@ module FileWatch
 
     public
     def initialize(opts={})
+      @iswindows = ((RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/) != nil)
+
       if opts[:logger]
         @logger = opts[:logger]
       else
@@ -97,7 +106,11 @@ module FileWatch
     def _open_file(path, event)
       @logger.debug("_open_file: #{path}: opening")
       begin
-        @files[path] = File.open(path)
+        if @iswindows && defined? JRUBY_VERSION
+            @files[path] = Java::RubyFileExt::getRubyFile(path)
+        else
+            @files[path] = File.open(path)
+        end
       rescue
         # don't emit this message too often. if a file that we can't
         # read is changing a lot, we'll try to open it more often,
@@ -114,7 +127,14 @@ module FileWatch
       end
 
       stat = File::Stat.new(path)
-      inode = [stat.ino, stat.dev_major, stat.dev_minor]
+      
+      if @iswindows
+        fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
+        inode = [fileId, stat.dev_major, stat.dev_minor]
+      else
+        inode = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
+        end
+  
       @statcache[path] = inode
 
       if @sincedb.member?(inode)
@@ -153,32 +173,28 @@ module FileWatch
       changed = false
       loop do
         begin
-          data = @files[path].sysread(16394)
+          data = @files[path].sysread(32768)
           changed = true
           @buffers[path].extract(data).each do |line|
             yield(path, line)
           end
 
           @sincedb[@statcache[path]] = @files[path].pos
-          write_sincedb_if_necessary
         rescue Errno::EWOULDBLOCK, Errno::EINTR, EOFError
           break
         end
       end
 
-      write_sincedb_if_necessary
-    end # def _read_file
-
-    private
-    def write_sincedb_if_necessary
-      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})")
-        _sincedb_write
-        @sincedb_last_write = now
+      if changed
+        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})")
+          _sincedb_write
+          @sincedb_last_write = now
+        end
       end
-    end # def write_sincedb_if_necessary
+    end # def _read_file
 
     public
     def sincedb_write(reason=nil)
@@ -199,7 +215,7 @@ module FileWatch
       @logger.debug("_sincedb_open: reading from #{path}")
       db.each do |line|
         ino, dev_major, dev_minor, pos = line.split(" ", 4)
-        inode = [ino.to_i, dev_major.to_i, dev_minor.to_i]
+        inode = [ino, dev_major.to_i, dev_minor.to_i]
         @logger.debug("_sincedb_open: setting #{inode.inspect} to #{pos.to_i}")
         @sincedb[inode] = pos.to_i
       end
@@ -208,10 +224,11 @@ module FileWatch
     private
     def _sincedb_write
       path = @opts[:sincedb_path]
+      tmp = "#{path}.new"
       begin
-        db = File.open(path, "w")
-      rescue
-        @logger.debug("_sincedb_write: #{path}: #{$!}")
+        db = File.open(tmp, "w")
+      rescue => e
+        @logger.warn("_sincedb_write failed: #{tmp}: #{e}")
         return
       end
 
@@ -219,6 +236,12 @@ module FileWatch
         db.puts([inode, pos].flatten.join(" "))
       end
       db.close
+
+      begin
+        File.rename(tmp, path)
+      rescue => e
+        @logger.warn("_sincedb_write rename/sync failed: #{tmp} -> #{path}: #{e}")
+      end
     end # def _sincedb_write
 
     public

data/lib/filewatch/watch.rb

@@ -1,4 +1,7 @@
 require "logger"
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  require "filewatch/winhelper"
+end
 
 module FileWatch
   class Watch
@@ -6,6 +9,7 @@ module FileWatch
 
     public
     def initialize(opts={})
+      @iswindows = ((RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/) != nil)
       if opts[:logger]
         @logger = opts[:logger]
       else
@@ -68,7 +72,13 @@ module FileWatch
           next
         end
 
-        inode = [stat.ino, stat.dev_major, stat.dev_minor]
+        if @iswindows
+          fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
+          inode = [fileId, stat.dev_major, stat.dev_minor]
+        else
+          inode = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
+        end
+		
         if inode != @files[path][:inode]
           @logger.debug("#{path}: old inode was #{@files[path][:inode].inspect}, new is #{inode.inspect}")
           yield(:delete, path)
@@ -142,6 +152,14 @@ module FileWatch
           :inode => [stat.ino, stat.dev_major, stat.dev_minor],
           :create_sent => false,
         }
+		
+		if @iswindows
+          fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
+          @files[file][:inode] = [fileId, stat.dev_major, stat.dev_minor]
+        else
+          @files[file][:inode] = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
+        end
+		
         if initial
           @files[file][:initial] = true
         end

data/lib/filewatch/winhelper.rb

@@ -0,0 +1,70 @@
+require "ffi"
+	
+module Winhelper
+	extend FFI::Library
+	
+	ffi_lib 'kernel32'
+	ffi_convention :stdcall
+	class FileTime < FFI::Struct
+		layout :lowDateTime, :uint,
+		:highDateTime, :uint
+	end
+	
+	#http://msdn.microsoft.com/en-us/library/windows/desktop/aa363788(v=vs.85).aspx
+	class FileInformation < FFI::Struct
+		def initialize()
+			createTime = FileTime.new
+			lastAccessTime = FileTime.new
+			lastWriteTime = FileTime.new
+		end
+		
+		layout :fileAttributes, :uint, #DWORD    dwFileAttributes;
+		:createTime, FileTime,  #FILETIME ftCreationTime;
+		:lastAccessTime, FileTime, #FILETIME ftLastAccessTime;
+		:lastWriteTime, FileTime, #FILETIME ftLastWriteTime;
+		:volumeSerialNumber, :uint, #DWORD    dwVolumeSerialNumber;
+		:fileSizeHigh, :uint, #DWORD    nFileSizeHigh;
+		:fileSizeLow, :uint, #DWORD    nFileSizeLow;
+		:numberOfLinks, :uint, #DWORD    nNumberOfLinks;
+		:fileIndexHigh, :uint, #DWORD    nFileIndexHigh;
+		:fileIndexLow, :uint #DWORD    nFileIndexLow;
+	end
+		
+	
+	#http://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
+	#HANDLE WINAPI CreateFile(_In_ LPCTSTR lpFileName,_In_  DWORD dwDesiredAccess,_In_ DWORD dwShareMode,
+	#						_In_opt_  LPSECURITY_ATTRIBUTES lpSecurityAttributes,_In_  DWORD dwCreationDisposition,
+	#						_In_      DWORD dwFlagsAndAttributes,_In_opt_  HANDLE hTemplateFile);
+	attach_function :GetOpenFileHandle, :CreateFileA, [:pointer, :uint, :uint, :pointer, :uint, :uint, :pointer], :pointer	
+	
+	#http://msdn.microsoft.com/en-us/library/windows/desktop/aa364952(v=vs.85).aspx
+	#BOOL WINAPI GetFileInformationByHandle(_In_   HANDLE hFile,_Out_  LPBY_HANDLE_FILE_INFORMATION lpFileInformation);
+	attach_function :GetFileInformationByHandle, [:pointer, :pointer], :int
+	
+	attach_function :CloseHandle, [:pointer], :int
+	
+	
+	def self.GetWindowsUniqueFileIdentifier(path)
+		handle = GetOpenFileHandle(path, 0, 7, nil, 3, 128, nil)
+		fileInfo = Winhelper::FileInformation.new
+		success = GetFileInformationByHandle(handle, fileInfo)
+		CloseHandle(handle)
+		if  success == 1
+			#args = [
+			#		fileInfo[:fileAttributes], fileInfo[:volumeSerialNumber], fileInfo[:fileSizeHigh], fileInfo[:fileSizeLow], 
+			#		fileInfo[:numberOfLinks], fileInfo[:fileIndexHigh], fileInfo[:fileIndexLow]
+			#	]
+			#p "Information: %u %u %u %u %u %u %u " % args
+			#this is only guaranteed on NTFS, for ReFS on windows 2012, GetFileInformationByHandleEx should be used with FILE_ID_INFO, which returns a 128 bit identifier
+			return "#{fileInfo[:volumeSerialNumber]}-#{fileInfo[:fileIndexLow]}-#{fileInfo[:fileIndexHigh]}"
+		else
+			#p "cannot retrieve file information, returning path"
+			return path;
+		end
+	end
+end
+
+#fileId = Winhelper.GetWindowsUniqueFileIdentifier('C:\inetpub\logs\LogFiles\W3SVC1\u_ex1fdsadfsadfasdf30612.log')
+#p "FileId: " + fileId
+#p "outside function, sleeping"
+#sleep(10)

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: filewatch
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease:
+  version: 0.6.0
 platform: ruby
 authors:
 - Jordan Sissel
 - Pete Fritchman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies: []
-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
@@ -21,9 +21,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/globtail
 - lib/filewatch/buftok.rb
-- lib/filewatch/watch.rb
 - lib/filewatch/tail.rb
+- lib/filewatch/watch.rb
+- lib/filewatch/winhelper.rb
 - test/filewatch/tail.rb
 - test/globtail/Makefile
 - test/globtail/framework.sh
@@ -47,10 +49,10 @@ files:
 - test/globtail/test8.sh
 - test/globtail/test9.data
 - test/globtail/test9.sh
-- bin/globtail
 homepage: https://github.com/jordansissel/ruby-filewatch
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -59,20 +61,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.4.3
+signing_key: 
+specification_version: 4
 summary: filewatch - file watching for ruby
 test_files: []