filewatch 0.2.2 → 0.2.4

data/bin/gtail

@@ -32,10 +32,7 @@ def main(args)
 
   tail = FileWatch::TailGlob.new
   ARGV.each do |path|
-    tail.tail(path, :exclude => exclude_patterns) do |fullpath|
-      p :new => fullpath
-    end
-     
+    tail.tail(path, :exclude => exclude_patterns)
   end
 
   buffer = BufferedTokenizer.new

data/lib/filewatch/inotify/event.rb

@@ -1,6 +1,7 @@
-require "filewatch/namespace"
-require "filewatch/inotify/fd"
 require "ffi"
+require "filewatch/inotify/fd"
+require "filewatch/namespace"
+require "filewatch/rubyfixes"
 
 class FileWatch::Inotify::Event < FFI::Struct
   layout :wd, :int,

data/lib/filewatch/inotify/fd.rb

@@ -1,10 +1,11 @@
 require "rubygems"
 require "ffi"
 require "fcntl"
+require "filewatch/exception"
 require "filewatch/inotify/event"
 require "filewatch/namespace"
+require "filewatch/rubyfixes"
 require "filewatch/stringpipeio"
-require "filewatch/exception"
 
 class FileWatch::Inotify::FD
   include Enumerable

data/lib/filewatch/rubyfixes.rb

@@ -0,0 +1,8 @@
+
+# Ruby <= 1.8.6 doesn't have String#bytesize
+# FFI 1.0.7 wants it. Monkeypatch time.
+if !String.instance_methods.include?("bytesize")
+  class String
+    alias :bytesize :size
+  end
+end

data/lib/filewatch/tailglob.rb

@@ -1,8 +1,10 @@
 require "filewatch/namespace"
 require "filewatch/exception"
 require "filewatch/watchglob"
+require "logger"
 
 class FileWatch::TailGlob
+  attr_accessor :logger
 
   public
   def initialize
@@ -10,31 +12,46 @@ class FileWatch::TailGlob
 
     # hash of string path => File
     @files = {}
+    @globoptions = {}
     @options = {}
 
+    self.logger = Logger.new(STDERR)
     # hash of string path => action to take on EOF
-    #@eof_actions = {}
   end # def initialize
 
+  def logger=(logger)
+    @logger = logger
+    @watch.logger = logger
+  end
+
   # Watch a path glob.
   #
   # Options is a hash of:
   #   :exclude => array of globs to ignore.
   public
-  def tail(path, options={}, &block)
+  def tail(glob, options={}, &block)
     what_to_watch = [ :create, :modify, :delete ]
 
+    # Setup a callback specific to tihs tail call for handling
+    # new files found; so we can attach options to each new file.
+    callback_set_options = lambda do |path| 
+      @options[path] = options
+    end
+
     # Save glob options
-    @options[path] = options
-    @options[path][:new_follow_callback] = block
+    @globoptions[glob] = options
+
+    # callbacks can be an array of functions to call.
+    callbacks = [ callback_set_options ]
+    callbacks << block if block_given?
+    @globoptions[glob][:new_follow_callback] = callbacks
 
-    @watch.watch(path, *what_to_watch) do |path|
+    @watch.watch(glob, *what_to_watch) do |path|
       # Save per-path options
-      @options[path] = options
+       callback_set_options.call(path)
      
       # for each file found by the glob, open it.
       follow_file(path, :end)
-
     end # @watch.watch
   end # def watch
 
@@ -42,7 +59,7 @@ class FileWatch::TailGlob
   def follow_file(path, seek=:end)
     # Don't follow things that aren't files.
     if !File.file?(path) 
-      puts "Skipping follow on #{path}, File.file? == false"
+      @logger.info "Skipping follow on #{path}, File.file? == false"
       return
     end
 
@@ -50,14 +67,17 @@ class FileWatch::TailGlob
     if options.include?(:exclude)
       options[:exclude].each do |exclusion|
         if File.fnmatch?(exclusion, path)
-          puts "Skipping #{path.inspect}, matches exclusion #{exclusion.inspect}"
+          @logger.info "Skipping #{path.inspect}, matches exclusion #{exclusion.inspect}"
           return
         end
       end
     end
 
     if options.include?(:new_follow_callback)
-      options[:new_follow_callback].call(path)
+      options[:new_follow_callback].each do |callback|
+        #puts "Callback: #{callback.inspect}"
+        callback.call(path)
+      end
     end
 
     close(path) if @files.include?(path)
@@ -95,23 +115,25 @@ class FileWatch::TailGlob
 
   protected
   def file_action_modify(path, event, &block)
+    file = @files[path]
+    # Check if this path is in the exclude list.
+    # TODO(sissel): Is this check sufficient?
+    if file.nil?
+      @logger.info "Ignoring modify on '#{path}' - it's probably ignored'"
+      return
+    end
+
+    # Read until EOF, emitting each chunk read.
     loop do
-      file = @files[path]
       begin
         data = file.sysread(4096)
         yield event.name, data
       rescue EOFError
         check_for_truncation_or_deletion(path, event, &block)
-        #case @eof_actions[path]
-          #when :reopen
-            #puts "Reopening #{path} due to eof and new file"
-            #reopen(path)
-        #end
-
         break
       end
-    end
-  end
+    end # loop
+  end # def file_action_modify
 
   protected
   def check_for_truncation_or_deletion(path, event, &block)

data/lib/filewatch/watchglob.rb

@@ -3,6 +3,8 @@ require "filewatch/exception"
 require "filewatch/watch"
 
 class FileWatch::WatchGlob
+  attr_accessor :logger
+
   # This class exists to wrap inotify, kqueue, periodic polling, etc,
   # to provide you with a way to watch files and directories.
   #
@@ -11,6 +13,7 @@ class FileWatch::WatchGlob
     @watch = FileWatch::Watch.new
     @globdirs = []
     @globs = []
+    @logger = Logger.new(STDERR)
   end
 
   public
@@ -23,7 +26,7 @@ class FileWatch::WatchGlob
     paths.each do |path|
       begin
         next if watching.include?(path)
-        puts "Watching #{path}"
+        @logger.info("Watching #{path}")
         @watch.watch(path, :create, :delete, :modify)
         watching << path
 
@@ -31,7 +34,7 @@ class FileWatch::WatchGlob
         # This allows initialization on new files found at start.
         yield path if block_given?
       rescue FileWatch::Exception => e
-        $stderr.puts "Failed starting watch on #{path} - #{e}"
+        @logger.info("Failed starting watch on #{path} - #{e}")
         errors << e
       end
     end
@@ -47,12 +50,12 @@ class FileWatch::WatchGlob
         globprefix = File.join(splitpath[0 ... i])
         Dir.glob(globprefix).each do |path|
           next if watching.include?(path)
-          p "Watching dir #{path}"
+          @logger.info("Watching dir: #{path.inspect}")
           @watch.watch(path, :create)
           @globdirs << path
-        end
-      end
-    end
+        end # Dir.glob
+      end # if part.include?("*")
+    end # splitpath.each_with_index
   end # def watch
 
   # TODO(sissel): implement 'unwatch' or cancel?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: filewatch
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -07:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,17 +41,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/filewatch/buftok.rb
-- lib/filewatch/exception.rb
+- lib/filewatch/watchglob.rb
+- lib/filewatch/watch.rb
+- lib/filewatch/tailglob.rb
+- lib/filewatch/namespace.rb
 - lib/filewatch/tail.rb
+- lib/filewatch/rubyfixes.rb
+- lib/filewatch/exception.rb
 - lib/filewatch/stringpipeio.rb
 - lib/filewatch/inotify/emhandler.rb
 - lib/filewatch/inotify/fd.rb
 - lib/filewatch/inotify/event.rb
-- lib/filewatch/watchglob.rb
-- lib/filewatch/watch.rb
-- lib/filewatch/namespace.rb
-- lib/filewatch/tailglob.rb
+- lib/filewatch/buftok.rb
 - test/log4j/log4j.properties
 - test/log4j/LogTest.java
 - bin/gtail
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: filewatch - file watching for ruby