filewatch 0.2.5 → 0.3.0

data/lib/filewatch/namespace.rb

@@ -1,3 +0,0 @@
-module FileWatch
-  module Inotify ; end
-end

data/lib/filewatch/rubyfixes.rb

@@ -1,8 +0,0 @@
-
-# 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/stringpipeio.rb

@@ -1,33 +0,0 @@
-require "rubygems"
-require "filewatch/namespace"
-
-class FileWatch::StringPipeIO
-  def initialize
-    @buffer = ""
-  end # def initialize
-
-  def write(string)
-    @buffer += string
-  end # def write
-
-  def read(bytes=nil, nil_if_not_enough_data=false)
-    return nil if @buffer == nil || @buffer.empty?
-
-    if nil_if_not_enough_data && bytes > @buffer.size
-      return nil
-    end
-
-    bytes = @buffer.size if bytes == nil
-    data = @buffer[0 .. bytes]
-    if bytes <= @buffer.length
-      @buffer = @buffer[bytes .. -1]
-    else
-      @buffer = ""
-    end
-    return data
-  end # def read
-
-  def size
-    return @buffer.size
-  end
-end # class Inotify::StringPipeIO

data/lib/filewatch/tailglob.rb

@@ -1,244 +0,0 @@
-require "filewatch/namespace"
-require "filewatch/exception"
-require "filewatch/watchglob"
-require "logger"
-
-class FileWatch::TailGlob
-  attr_accessor :logger
-
-  public
-  def initialize
-    @watch = FileWatch::WatchGlob.new
-
-    # hash of string path => File
-    @files = {}
-    @globoptions = {}
-    @options = {}
-
-    self.logger = Logger.new(STDERR)
-    # hash of string path => action to take on EOF
-  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(glob, options={}, &block)
-    what_to_watch = [ :create, :modify, :delete_self, :move_self ]
-
-    # 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
-    @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(glob, *what_to_watch) do |path|
-      # Save per-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
-
-  private
-  def follow_file(path, seek=:end)
-    # Don't follow things that aren't files.
-    if !File.file?(path) 
-      @logger.info "Skipping follow on #{path}, File.file? == false"
-      return
-    end
-
-    options = @options[path] || {}
-    if options.include?(:exclude)
-      options[:exclude].each do |exclusion|
-        if File.fnmatch?(exclusion, path)
-          @logger.info "Skipping #{path.inspect}, matches exclusion #{exclusion.inspect}"
-          return
-        end
-      end
-    end
-
-    if options.include?(:new_follow_callback)
-      options[:new_follow_callback].each do |callback|
-        #puts "Callback: #{callback.inspect}"
-        callback.call(path)
-      end
-    end
-
-    close(path) if following?(path)
-    @files[path] = File.new(path, "r")
-    
-    # TODO(sissel): Support 'since'-like support.
-    case seek
-      when :end; @files[path].sysseek(0, IO::SEEK_END)
-      when :beginning; # nothing
-      else
-        if seek.is_a?(Numeric)
-          # 'seek' could be a number that is an offset from
-          # the start of the file. We should seek to that point.
-          @files[path].sysseek(seek, IO::SEEK_SET)
-        end # seek.is_a?(Numeric)
-    end # case seek
-  end # def follow_file
-
-  public
-  def subscribe(handler=nil, &block)
-    # TODO(sissel): Add handler support.
-    @watch.subscribe do |event|
-      path = event.name
-
-      p path => event.actions if $DEBUG
-      event.actions.each do |action|
-        method = "file_action_#{action}".to_sym
-        if respond_to?(method)
-          send(method, path, event, &block)
-        else
-          $stderr.puts "Unsupported method #{self.class.name}##{method}"
-        end
-      end
-    end # @watch.subscribe
-  end # def subscribe
-
-  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
-      begin
-        data = file.sysread(4096)
-        yield event.name, data
-      rescue EOFError
-        check_for_truncation_or_deletion(path, event, &block)
-        break
-      end
-    end # loop
-  end # def file_action_modify
-
-  protected
-  def check_for_truncation_or_deletion(path, event, &block)
-    file = @files[path]
-    pos = file.sysseek(0, IO::SEEK_CUR)
-    #puts "EOF(#{path}), pos: #{pos}"
-
-    # Truncation is determined by comparing the current read position in the
-    # file against the size of the file. If the file shrank, than we should
-    # assume truncation and seek to the beginning.
-    begin
-      stat = file.stat
-      #p stat.size => pos
-      if stat.size < pos
-        # Truncated. Seek to beginning and read.
-        file.sysseek(0, IO::SEEK_SET)
-        file_action_modify(path, event, &block)
-      end
-    rescue Errno::ENOENT
-      # File was deleted or renamed. Stop following it.
-      close(path)
-    end
-  end # def follow_file
-
-  protected
-  def reopen(path)
-    close(path)
-    follow_file(path, :beginning)
-  end # def reopen
-
-  protected
-  def close(path)
-    if following?(path)
-      p :CLOSE => path if $DEBUG
-      @files[path].close rescue nil
-      @files.delete(path)
-    end
-    return nil
-  end # def close
-
-  protected
-  def file_action_create(path, event, &block)
-    if following?(path)
-      # TODO(sissel): If we are watching this file already, schedule it to be
-      # opened the next time we hit EOF on the current file descriptor for the
-      # same file. Maybe? Or is reopening now fine?
-      #
-      reopen(path)
-
-      # Schedule a reopen at EOF
-      #@eof_actions[path] = :reopen
-    else
-      # If we are not yet watching this file, watch it.
-      # Make sure this file matches a known glob
-      if @globoptions.find { |glob, opts| File.fnmatch?(glob, path) }
-        follow_file(path, :beginning)
-        # Then read all of the data so far since this is a new file.
-        file_action_modify(path, event, &block)
-      end
-    end
-  end # def file_action_create
-
-  # This method is invoked when a file we are tailing is deleted.
-  protected
-  def file_action_delete_self(path, event, &block)
-    close(path)
-  end # def file_action_delete_self
-
-  # This method is invoked when a file we are tailing is moved.
-  def file_action_move_self(path, event, &block)
-    # File renames are assumed to be rotations, so we close.
-    # if this file is not open, this close has no effect.
-    close(event.old_name)
-  end
-
-  # Directory event; file in this dir was renamed.
-  protected
-  def file_action_moved_to(path, event, &block)
-    # TODO(sissel): ignore, maybe call close for good measure?
-  end
-
-  protected
-  def file_action_moved_from(path, event, &block)
-    # ignore
-  end # def file_action_moved_from
-
-  protected
-  def file_action_move(path, event, &block)
-    # ignore
-  end # def file_action_move
-
-  protected
-  def file_action_move(path, event, &block)
-    # ignore
-  end # def file_action_move
-
-  protected
-  def file_action_delete(path, event, &block)
-    # ignore
-  end # def file_action_delete
-
-  # Returns true if we are currently following the file at the given path.
-  public
-  def following?(path)
-    return @files.include?(path)
-  end # def following
-end # class FileWatch::Tail

data/lib/filewatch/watchglob.rb

@@ -1,83 +0,0 @@
-require "filewatch/namespace"
-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.
-  #
-  # For now, it only supports inotify.
-  def initialize
-    @watch = FileWatch::Watch.new
-    @globdirs = []
-    @globs = []
-    @logger = Logger.new(STDERR)
-  end
-
-  public
-  def watch(glob, *what_to_watch, &block)
-    @globs << [glob, what_to_watch]
-
-    watching = [] 
-    errors = []
-    paths = Dir.glob(glob)
-    paths.each do |path|
-      begin
-        next if watching.include?(path)
-        @logger.info("Watching #{path}")
-        @watch.watch(path, :create, :delete, :modify, *what_to_watch)
-        watching << path
-
-        # Yield each file found by glob to the block.
-        # This allows initialization on new files found at start.
-        yield path if block_given?
-      rescue FileWatch::Exception => e
-        @logger.info("Failed starting watch on #{path} - #{e}")
-        errors << e
-      end
-    end
-
-    # Go through the glob and look for paths leading into a '*'
-    splitpath = glob.split(File::SEPARATOR)
-    splitpath.each_with_index do |part, i|
-      current = File.join(splitpath[0 .. i])
-      current = "/" if current.empty?
-      next if watching.include?(current)
-      # TODO(sissel): Do better glob detection
-      if part.include?("*")
-        globprefix = File.join(splitpath[0 ... i])
-        Dir.glob(globprefix).each do |path|
-          next if watching.include?(path)
-          @logger.info("Watching dir: #{path.inspect}")
-          @watch.watch(path, :create, :moved_to, :moved_from)
-          @globdirs << path
-        end # Dir.glob
-      end # if part.include?("*")
-    end # splitpath.each_with_index
-  end # def watch
-
-  # TODO(sissel): implement 'unwatch' or cancel?
-
-  def subscribe(handler=nil, &block)
-    @watch.subscribe do |event|
-      # If this event is a directory event and the file matches a watched glob,
-      # then it should be a new-file creation event. Watch the file.
-      if event.type == :directory and event.actions.include?(:create) \
-        and @globdirs.include?(File.dirname(event.name))
-        glob, what = @globs.find { |glob, what| File.fnmatch?(glob, event.name) }
-        if glob
-          @watch.watch(event.name, *what)
-        end
-      end
-
-      # Push the event to our callback.
-      block.call event
-    end
-  end
-
-  def each(&block)
-    @inotify.each(&block)
-  end # def each
-end # class FileWatch::Watch

data/test/log4j/LogTest.java

@@ -1,21 +0,0 @@
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-
-public class LogTest {
-  private static Logger logger = Logger.getLogger(LogTest.class);
-
-  public static void main(String[] args) {
-    //BasicConfigurator.configure();
-    PropertyConfigurator.configure("log4j.properties");
-
-    int i = 0;
-    while (true) {
-      logger.info("Testing: " + i);
-      i++;
-      try {
-        Thread.sleep(100);
-      }  catch (Exception e) {
-      }
-    }
-  } /* public static void main(String[]) */
-} /* public class LogTest */

data/test/log4j/log4j.properties

@@ -1,20 +0,0 @@
-log4j.rootLogger=INFO,stdout,rolling
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
-
-log4j.appender.rolling=org.apache.log4j.RollingFileAppender
-log4j.appender.rolling.maxFileSize=1000
-log4j.appender.rolling.maxBackupIndex=10
-log4j.appender.rolling.layout=org.apache.log4j.PatternLayout
-log4j.appender.rolling.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
-log4j.appender.rolling.File=logs/logtest.log
-log4j.appender.rolling.DatePattern=.yyyy-MM-dd.HH-mm-ss
-
-#log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.D.layout=org.apache.log4j.PatternLayout
-#log4j.appender.D.layout=org.apache.log4j.JSONLayout
-#log4j.appender.D.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
-#log4j.appender.D.File=logs/logtest.log
-#log4j.appender.D.DatePattern=.yyyy-MM-dd.HH-mm-ss
-

data/test/logrotate/logrotate.conf

@@ -1,5 +0,0 @@
-/home/jls/projects/ruby-filewatch/test/logrotate/*.log {
-  rotate 5
-  #compress
-  size 100
-}