directory_watcher 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.3.1 / 2009-10-26
+
+* 1 bug fix
+  - explicitly killing the Rev loop when stopping
+
 == 1.3.0 / 2009-10-21
 
 * 2 major enhancements

data/lib/directory_watcher.rb

@@ -211,7 +211,7 @@ require 'yaml'
 #
 class DirectoryWatcher
 
-  VERSION = '1.3.0'    # :nodoc:
+  VERSION = '1.3.1'    # :nodoc:
 
   # An +Event+ structure contains the _type_ of the event and the file _path_
   # to which the event pertains. The type can be one of the following:
@@ -451,7 +451,7 @@ class DirectoryWatcher
   # already running, this method will return without taking any action.
   #
   def start
-    return if running?
+    return self if running?
 
     load!
     @scanner.start
@@ -462,7 +462,7 @@ class DirectoryWatcher
   # already stopped, this method will return without taking any action.
   #
   def stop
-    return unless running?
+    return self unless running?
 
     @scanner.stop
     self
@@ -487,6 +487,7 @@ class DirectoryWatcher
     File.delete(@persist) if @persist and test(?f, @persist)
     @scanner.reset pre_load
     start if was_running
+    self
   end
 
   # call-seq:

data/lib/directory_watcher/rev_scanner.rb

@@ -57,9 +57,6 @@ class DirectoryWatcher::RevScanner < ::DirectoryWatcher::Scanner
   def stop
     return unless running?
 
-    @thread._rev_loop.stop rescue nil
-    @thread = nil
-
     @timer.detach
     @timer = nil
 
@@ -67,6 +64,10 @@ class DirectoryWatcher::RevScanner < ::DirectoryWatcher::Scanner
     @watchers.clear
 
     notify
+
+    @thread._rev_loop.stop rescue nil
+    @thread.kill    # for some reason the rev loop is not returning after stopping
+    @thread = nil
   end
 
   # :stopdoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: directory_watcher
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 -06:00
+date: 2009-10-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency