filewatch 0.2.5 → 0.3.0

data/test/globtail/Makefile

@@ -0,0 +1,7 @@
+test:
+	@i=1; while [ -x "test$${i}.sh" ]; do \
+		echo "test$${i}:" ; \
+		./test$${i}.sh || exit 1 ; \
+		echo "PASS" ; \
+		i=$$(($$i+1)) ; \
+	done

data/test/globtail/framework.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+test_init() {
+  export TEST_BASE=$(dirname $0)
+  export FW_BASE="$TEST_BASE/../.."
+  export RUBYLIB=$FW_BASE/lib:$RUBYLIB
+  export SINCEDB=$(mktemp)
+  export TAIL="$FW_BASE/bin/globtail -v -s $SINCEDB -i 5 -x skip*.log"
+  export TEST_DIR=$(mktemp -d)
+  export TEST_OUT=$(mktemp)
+  touch $TEST_OUT
+  mkdir -p $TEST_DIR
+}
+
+test_start() {
+  $TAIL "$TEST_DIR/*" >>$TEST_OUT 2>&1 &
+  export TEST_TAIL_PID=$!
+
+  # let globtail get started and do it's initial glob
+  sleep 3
+}
+
+test_stop() {
+  kill $TEST_TAIL_PID 2>/dev/null
+  count=0
+  while kill -0 $TEST_TAIL_PID 2>/dev/null; do
+    count=$((count+1))
+    sleep 1
+    if [ "$count" -eq 5 ]; then
+      kill -9 $TEST_TAIL_PID
+      count=0
+    fi
+  done
+  export TEST_TAIL_PID=""
+}
+
+test_done() {
+  [ -n "$TEST_TAIL_PID" ] && test_stop
+
+  output=$(mktemp)
+  output_clean=$(mktemp)
+  sed -e "s,^${TEST_DIR}/,," $TEST_OUT | sort > $output
+  sed -e '/^D, \[/d' < $output > $output_clean
+
+  data_file=$(echo $0 | sed -e 's/\.sh$/.data/')
+
+  diff $TEST_BASE/$data_file $output_clean >/dev/null
+  diff_rc=$?
+
+  if [ $diff_rc -ne 0 ]; then
+    diff -u $TEST_BASE/$data_file $output_clean
+    echo "$0 TEST FAILURE (output differs)"
+    sed -e 's,^,output: ,' $TEST_OUT
+  fi
+
+  rm -rf $TEST_DIR $TEST_OUT $output $output_clean $SINCEDB
+  exit $diff_rc
+}

data/test/globtail/test1.data

@@ -0,0 +1,5 @@
+a.log: a
+a.log: a
+b.log: b
+c.log: c
+c.log: c

data/test/globtail/test1.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+# Test: basic tail support
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo a > $TEST_DIR/a.log
+echo b > $TEST_DIR/b.log
+echo c > $TEST_DIR/c.log
+echo a >> $TEST_DIR/a.log
+echo c >> $TEST_DIR/c.log
+
+sleep 5
+
+test_done

data/test/globtail/test10.data

@@ -0,0 +1,4 @@
+a.log: 1
+a.log: 2
+a.log: 3
+a.log: 4

data/test/globtail/test10.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+# Test: file rename & old file name having new data
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo 1 > $TEST_DIR/a.log
+sleep 8
+
+echo 2 >> $TEST_DIR/a.log
+sleep 3
+
+echo 3 >> $TEST_DIR/a.log
+mv $TEST_DIR/a.log $TEST_DIR/b.log
+echo 4 > $TEST_DIR/a.log
+sleep 8
+
+test_done

data/test/globtail/test2.data

@@ -0,0 +1,2 @@
+a.log: a
+b.log: b

data/test/globtail/test2.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+# Test: tests glob discovery of a new file, and in-memory sincedb
+# preserving file position after a rename
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo a > $TEST_DIR/a.log
+sleep 5
+mv $TEST_DIR/a.log $TEST_DIR/b.log
+sleep 5
+echo b >> $TEST_DIR/b.log
+sleep 3
+
+test_done

data/test/globtail/test3.data

@@ -0,0 +1,3 @@
+a.log: a
+a.log: b
+b.log: c

data/test/globtail/test3.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# Test: tests glob discovery of a new file, and in-memory sincedb
+# preserving file position after a rename
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo a > $TEST_DIR/a.log
+echo b >> $TEST_DIR/a.log
+sleep 5
+mv $TEST_DIR/a.log $TEST_DIR/b.log
+sleep 5
+echo c >> $TEST_DIR/b.log
+sleep 3
+
+test_done

data/test/globtail/test4.data

@@ -0,0 +1,4 @@
+a.log: 1
+a.log: 2
+a.log: 3
+a.log: 4

data/test/globtail/test4.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# Test: tests file truncation
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo 1 > $TEST_DIR/a.log
+echo 2 >> $TEST_DIR/a.log
+echo 3 >> $TEST_DIR/a.log
+sleep 3
+echo 4 > $TEST_DIR/a.log
+sleep 3
+
+test_done

data/test/globtail/test5.data

@@ -0,0 +1,6 @@
+a.log: 1
+a.log: 2
+a.log: 3
+a.log: 4
+a.log: 5
+a.log: 6

data/test/globtail/test5.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+# Test: make sure we properly write a sincedb on SIGTERM, and pick up
+# new log lines that were written while globtail is being restarted.
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo 1 > $TEST_DIR/a.log
+echo 2 >> $TEST_DIR/a.log
+echo 3 >> $TEST_DIR/a.log
+sleep 6
+
+echo 4 >> $TEST_DIR/a.log
+test_stop
+
+echo 5 >> $TEST_DIR/a.log
+
+test_start
+
+echo 6 >> $TEST_DIR/a.log
+sleep 3
+
+test_done

data/test/globtail/test6.data

@@ -0,0 +1,6 @@
+a.log: 1
+a.log: 2
+a.log: 3
+a.log: 4
+a.log: 5
+a.log: 6

data/test/globtail/test6.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+# Test: ensure sincedb periodic database writing works (make sure we're not
+# relying on SIGTERM handling)
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo 1 > $TEST_DIR/a.log
+echo 2 >> $TEST_DIR/a.log
+echo 3 >> $TEST_DIR/a.log
+sleep 8
+
+echo 4 >> $TEST_DIR/a.log
+sleep 3
+
+# send a "kill -9" to test that the sincedb write interval stuff is working
+kill -9 $TEST_TAIL_PID
+test_stop
+
+echo 5 >> $TEST_DIR/a.log
+
+test_start
+
+echo 6 >> $TEST_DIR/a.log
+sleep 3
+
+test_done

data/test/globtail/test7.data

@@ -0,0 +1,5 @@
+a.log: 1
+a.log: 2
+a.log: 3
+b.log: 4
+b.log: 5

data/test/globtail/test7.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+# Test: make sure a renamed file resumes it's since state
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo 1 > $TEST_DIR/a.log
+echo 2 >> $TEST_DIR/a.log
+echo 3 >> $TEST_DIR/a.log
+sleep 6
+
+test_stop
+
+echo 4 >> $TEST_DIR/a.log
+mv $TEST_DIR/a.log $TEST_DIR/b.log
+
+test_start
+
+echo 5 >> $TEST_DIR/b.log
+sleep 3
+
+test_done

data/test/globtail/test8.data

@@ -0,0 +1,5 @@
+a.log: 1
+a.log: 2
+a.log: 3
+a.log: 4
+a.log: 5

data/test/globtail/test8.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+# Test: sincedb, and file truncation between globtail runs
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo 1 > $TEST_DIR/a.log
+echo 2 >> $TEST_DIR/a.log
+echo 3 >> $TEST_DIR/a.log
+sleep 8
+
+test_stop
+
+echo 4 > $TEST_DIR/a.log
+
+test_start
+
+echo 5 >> $TEST_DIR/a.log
+sleep 3
+
+test_done

data/test/globtail/test9.data

@@ -0,0 +1,3 @@
+a.log: a1
+b.log: b1
+b.log: b2

data/test/globtail/test9.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+# Test: exclude support
+
+. $(dirname $0)/framework.sh
+
+test_init
+test_start
+
+echo a1 > $TEST_DIR/a.log
+echo b1 > $TEST_DIR/b.log
+echo nope1 > $TEST_DIR/skip1.log
+
+sleep 8
+
+mv $TEST_DIR/b.log $TEST_DIR/skip2.log
+echo b2 > $TEST_DIR/b.log
+sleep 8
+
+echo nope2 >> $TEST_DIR/skip2.log
+sleep 3
+
+test_done

metadata

@@ -1,62 +1,62 @@
 --- !ruby/object:Gem::Specification 
 name: filewatch
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jordan Sissel
+- Pete Fritchman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -07:00
+date: 2011-09-04 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-description: Watch files and directories in ruby. Also supports tailing and glob file patterns. Works with plain ruby, EventMachine, and JRuby
-email: jls@semicomplete.com
+dependencies: []
+
+description: Watch files and directories in ruby. Also supports tailing and glob file patterns.
+email: 
+- jls@semicomplete.com
+- petef@databits.net
 executables: 
-- gtail
+- globtail
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- lib/filewatch/watchglob.rb
+- lib/filewatch/buftok.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/buftok.rb
-- test/log4j/log4j.properties
-- test/log4j/LogTest.java
-- test/logrotate/logrotate.conf
-- bin/gtail
+- test/globtail/test5.data
+- test/globtail/test7.sh
+- test/globtail/test3.sh
+- test/globtail/test2.data
+- test/globtail/test3.data
+- test/globtail/test6.sh
+- test/globtail/test1.data
+- test/globtail/Makefile
+- test/globtail/test10.sh
+- test/globtail/test4.data
+- test/globtail/framework.sh
+- test/globtail/test1.sh
+- test/globtail/test8.sh
+- test/globtail/test7.data
+- test/globtail/test8.data
+- test/globtail/test9.data
+- test/globtail/test9.sh
+- test/globtail/test5.sh
+- test/globtail/test10.data
+- test/globtail/test2.sh
+- test/globtail/test4.sh
+- test/globtail/test6.data
+- bin/globtail
 has_rdoc: true
 homepage: https://github.com/jordansissel/ruby-filewatch
 licenses: []
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: filewatch - file watching for ruby