filewatch 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd471cc099285df704d3f28e4241871e1aa666e2
-  data.tar.gz: dfea4f9a717b2dc2b5d1ef1336091e7af10bf3b6
+  metadata.gz: 0e65e9502f748961f239834468650fec44803b49
+  data.tar.gz: d0a583f9ca8d394ab0adccda0a843e30ebcf4d40
 SHA512:
-  metadata.gz: adbda674e3639e946a0db108e56175a29ac10483cefe1e6ea429d4f1c8e8ca9f4434ea76f6f8db758a79d112b15152936ffddf5dea5446a939ed8be7ef7f0c09
-  data.tar.gz: 87608be8ee355a10e2e3962712c96254fdc971d0bab352c1a3155226d7bef63b3e9d1105c9abcff75db85a815d2f9f2789d9f19b6dfe89948c7a1015421f1145
+  metadata.gz: 2a96dd9971c7bcde08e601a4e6d22c1d4fad2851b9489d79e378302fa819cc2919bb3f2bf83c5a28877d97e022f45ed6b3a53425034d4dd6eac4f04e7325f10b
+  data.tar.gz: 5c4eb3f52ed225b541fba0a2adfb5a869072f5473923a3de750d8e5520b4579e05b3af3822b841ed7f262f920e033ef00c2e59f3796ce42048905234fad1c161

data/lib/filewatch/helper.rb

@@ -0,0 +1,69 @@
+# code downloaded from Ruby on Rails 4.2.1
+# https://raw.githubusercontent.com/rails/rails/v4.2.1/activesupport/lib/active_support/core_ext/file/atomic.rb
+require 'fileutils'
+
+class File
+  # Write to a file atomically. Useful for situations where you don't
+  # want other processes or threads to see half-written files.
+  #
+  #   File.atomic_write('important.file') do |file|
+  #     file.write('hello')
+  #   end
+  #
+  # If your temp directory is not on the same filesystem as the file you're
+  # trying to write, you can provide a different temporary directory.
+  #
+  #   File.atomic_write('/data/something.important', '/data/tmp') do |file|
+  #     file.write('hello')
+  #   end
+  def self.atomic_write(file_name)
+
+    if File.exist?(file_name)
+      # Get original file permissions
+      old_stat = stat(file_name)
+    else
+      # If not possible, probe which are the default permissions in the
+      # destination directory.
+      old_stat = probe_stat_in(dirname(file_name))
+    end
+
+    mode = old_stat ? old_stat.mode : nil
+
+    # Create temporary file with identical permissions
+    temp_file = File.new(rand_filename(file_name), "w", mode)
+    temp_file.binmode
+    return_val = yield temp_file
+    temp_file.close
+
+    # Overwrite original file with temp file
+    File.rename(temp_file.path, file_name)
+
+    # Unable to get permissions of the original file => return
+    return return_val if old_stat.nil?
+
+    # Set correct uid/gid on new file
+    chown(old_stat.uid, old_stat.gid, file_name) if old_stat
+
+    return_val
+  end
+
+  # Private utility method.
+  def self.probe_stat_in(dir) #:nodoc:
+    basename = rand_filename(".permissions_check")
+    file_name = join(dir, basename)
+    FileUtils.touch(file_name)
+    stat(file_name)
+  rescue
+    # ...
+  ensure
+    FileUtils.rm_f(file_name) if File.exist?(file_name)
+  end
+
+  def self.rand_filename(prefix)
+    [ prefix, Thread.current.object_id, Process.pid, rand(1000000) ].join('.')
+  end
+
+  def self.device?(file_name)
+    chardev?(file_name) || blockdev?(file_name)
+  end
+end

data/lib/filewatch/tail.rb

@@ -1,3 +1,4 @@
+require "filewatch/helper"
 require "filewatch/buftok"
 require "filewatch/watch"
 if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -103,7 +104,14 @@ module FileWatch
           @logger.warn("unknown event type #{event} for #{path}")
         end
       end # @watch.subscribe
-    end # def each
+    end # def subscribe
+
+    public
+    def sincedb_record_uid(path, stat)
+      inode = @watch.inode(path,stat)
+      @statcache[path] = inode
+      return inode
+    end # def sincedb_record_uid
 
     private
     def _open_file(path, event)
@@ -130,37 +138,28 @@ module FileWatch
       end
 
       stat = File::Stat.new(path)
-      
-      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
+      sincedb_record_uid = sincedb_record_uid(path, stat)
 
-      if @sincedb.member?(inode)
-        last_size = @sincedb[inode]
-        @logger.debug? && @logger.debug("#{path}: sincedb last value #{@sincedb[inode]}, cur size #{stat.size}")
+      if @sincedb.member?(sincedb_record_uid)
+        last_size = @sincedb[sincedb_record_uid]
+        @logger.debug? && @logger.debug("#{path}: sincedb last value #{@sincedb[sincedb_record_uid]}, cur size #{stat.size}")
         if last_size <= stat.size
           @logger.debug? && @logger.debug("#{path}: sincedb: seeking to #{last_size}")
           @files[path].sysseek(last_size, IO::SEEK_SET)
         else
           @logger.debug? && @logger.debug("#{path}: last value size is greater than current value, starting over")
-          @sincedb[inode] = 0
+          @sincedb[sincedb_record_uid] = 0
         end
       elsif event == :create_initial && @files[path]
-        # TODO(sissel): Allow starting at beginning of the file.
         if @opts[:start_new_files_at] == :beginning
           @logger.debug? && @logger.debug("#{path}: initial create, no sincedb, seeking to beginning of file")
           @files[path].sysseek(0, IO::SEEK_SET)
-          @sincedb[inode] = 0
+          @sincedb[sincedb_record_uid] = 0
         else 
           # seek to end
           @logger.debug? && @logger.debug("#{path}: initial create, no sincedb, seeking to end #{stat.size}")
           @files[path].sysseek(stat.size, IO::SEEK_SET)
-          @sincedb[inode] = stat.size
+          @sincedb[sincedb_record_uid] = stat.size
         end
       else
         @logger.debug? && @logger.debug("#{path}: staying at position 0, no sincedb")
@@ -172,7 +171,6 @@ module FileWatch
     private
     def _read_file(path, &block)
       @buffers[path] ||= FileWatch::BufferedTokenizer.new(@opts[:delimiter])
-
       changed = false
       loop do
         begin
@@ -219,9 +217,9 @@ module FileWatch
       @logger.debug? && @logger.debug("_sincedb_open: reading from #{path}")
       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? && @logger.debug("_sincedb_open: setting #{inode.inspect} to #{pos.to_i}")
-        @sincedb[inode] = pos.to_i
+        sincedb_record_uid = [ino, dev_major.to_i, dev_minor.to_i]
+        @logger.debug? && @logger.debug("_sincedb_open: setting #{sincedb_record_uid.inspect} to #{pos.to_i}")
+        @sincedb[sincedb_record_uid] = pos.to_i
       end
       db.close
     end # def _sincedb_open
@@ -229,29 +227,24 @@ module FileWatch
     private
     def _sincedb_write
       path = @opts[:sincedb_path]
-      tmp = "#{path}.new"
-      begin
-        db = File.open(tmp, "w")
-      rescue => e
-        @logger.warn("_sincedb_write failed: #{tmp}: #{e}")
-        return
-      end
-
-      @sincedb.each do |inode, pos|
-        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}")
+      if File.device?(path)
+        IO.write(path, serialize_sincedb, 0)
+      else
+        File.atomic_write(path) {|file| file.write(serialize_sincedb) }
       end
     end # def _sincedb_write
 
     public
     def quit
+      _sincedb_write
       @watch.quit
     end # def quit
+
+    private
+    def serialize_sincedb
+      @sincedb.map do |inode, pos|
+        [inode, pos].flatten.join(" ")
+      end.join("\n") + "\n"
+    end
   end # class Tail
 end # module FileWatch

data/lib/filewatch/watch.rb

@@ -39,7 +39,18 @@ module FileWatch
       end
 
       return true
-    end # def tail
+    end # def watch
+
+    public
+    def inode(path,stat)
+      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
+      return inode
+    end
 
     # Calls &block with params [event_type, path]
     # event_type can be one of:
@@ -72,13 +83,7 @@ module FileWatch
           next
         end
 
-        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
-		
+        inode = inode(path,stat)
         if inode != @files[path][:inode]
           @logger.debug? && @logger.debug("#{path}: old inode was #{@files[path][:inode].inspect}, new is #{inode.inspect}")
           yield(:delete, path)
@@ -149,20 +154,10 @@ module FileWatch
         stat = File::Stat.new(file)
         @files[file] = {
           :size => 0,
-          :inode => [stat.ino, stat.dev_major, stat.dev_minor],
+          :inode => inode(file,stat),
           :create_sent => false,
+          :initial => initial
         }
-		
-		if @iswindows
-          fileId = Winhelper.GetWindowsUniqueFileIdentifier(file)
-          @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
       end
     end # def _discover_file
 

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: filewatch
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jordan Sissel
 - Pete Fritchman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-04-14 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
@@ -24,6 +23,7 @@ files:
 - bin/globtail
 - lib/JRubyFileExtension.jar
 - lib/filewatch/buftok.rb
+- lib/filewatch/helper.rb
 - lib/filewatch/tail.rb
 - lib/filewatch/watch.rb
 - lib/filewatch/winhelper.rb
@@ -53,25 +53,25 @@ files:
 homepage: https://github.com/jordansissel/ruby-filewatch
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.2.2
+signing_key:
 specification_version: 4
 summary: filewatch - file watching for ruby
 test_files: []