filewatch 0.3.4 → 0.4.0

data/lib/filewatch/tail.rb

@@ -33,6 +33,7 @@ module FileWatch
         :stat_interval => 1,
         :discover_interval => 5,
         :exclude => [],
+        :start_new_files_at => :end
       }.merge(opts)
       if !@opts.include?(:sincedb_path)
         @opts[:sincedb_path] = File.join(ENV["HOME"], ".sincedb") if ENV.include?("HOME")
@@ -127,9 +128,17 @@ module FileWatch
           @sincedb[inode] = 0
         end
       elsif event == :create_initial && @files[path]
-        @logger.debug("#{path}: initial create, no sincedb, seeking to end #{stat.size}")
-        @files[path].sysseek(stat.size, IO::SEEK_SET)
-        @sincedb[inode] = stat.size
+        # TODO(sissel): Allow starting at beginning of the file.
+        if @opts[:start_new_files_at] == :beginning
+          @logger.debug("#{path}: initial create, no sincedb, seeking to beginning of file")
+          @files[path].sysseek(0, IO::SEEK_SET)
+          @sincedb[inode] = 0
+        else 
+          # seek to end
+          @logger.debug("#{path}: initial create, no sincedb, seeking to end #{stat.size}")
+          @files[path].sysseek(stat.size, IO::SEEK_SET)
+          @sincedb[inode] = stat.size
+        end
       else
         @logger.debug("#{path}: staying at position 0, no sincedb")
       end

data/lib/filewatch/watch.rb

@@ -112,7 +112,13 @@ module FileWatch
 
     private
     def _discover_file(path, initial=false)
-      Dir.glob(path).each do |file|
+      globbed_dirs = Dir.glob(path)
+      @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs}")
+      if globbed_dirs.empty? && File.file?(path)
+        globbed_dirs = [path]
+        @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs} because glob did not work")
+      end
+      globbed_dirs.each do |file|
         next if @files.member?(file)
         next unless File.file?(file)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filewatch
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies: []
 description: Watch files and directories in ruby. Also supports tailing and glob file
   patterns.
@@ -22,31 +22,31 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/filewatch/watch.rb
 - lib/filewatch/tail.rb
 - lib/filewatch/buftok.rb
-- lib/filewatch/watch.rb
-- test/globtail/test9.data
-- test/globtail/test10.sh
-- test/globtail/test3.sh
-- test/globtail/test8.sh
-- test/globtail/test6.sh
-- test/globtail/test4.data
-- test/globtail/framework.sh
-- test/globtail/Makefile
+- test/globtail/test4.sh
+- test/globtail/test10.data
 - test/globtail/test5.data
-- test/globtail/test6.data
+- test/globtail/Makefile
+- test/globtail/test9.sh
+- test/globtail/test7.sh
+- test/globtail/test4.data
+- test/globtail/test8.sh
+- test/globtail/test10.sh
 - test/globtail/test7.data
 - test/globtail/test2.data
-- test/globtail/test5.sh
-- test/globtail/test10.data
-- test/globtail/test8.data
+- test/globtail/test3.sh
+- test/globtail/test6.data
 - test/globtail/test1.sh
-- test/globtail/test4.sh
-- test/globtail/test3.data
 - test/globtail/test1.data
-- test/globtail/test7.sh
+- test/globtail/test8.data
+- test/globtail/framework.sh
 - test/globtail/test2.sh
-- test/globtail/test9.sh
+- test/globtail/test3.data
+- test/globtail/test9.data
+- test/globtail/test5.sh
+- test/globtail/test6.sh
 - bin/globtail
 homepage: https://github.com/jordansissel/ruby-filewatch
 licenses: []