smparkes-watchr 0.5.7.3 → 0.5.7.4

data/README.rdoc

@@ -90,4 +90,6 @@ first started, similar to what autotest does.
 
 1. Handle user interrupt processing more systematically
 
-1. Perhaps add the event type to the watch callback, since multiple events can fire now. But haven't neede this.
+1. Perhaps add the event type to the watch callback, since multiple events can fire now. But haven't neede this.
+
+1. Don't swallow config file error messages (particularly on reload)

data/lib/watchr/event_handlers/em.rb

@@ -42,14 +42,20 @@ module Watchr
         end
 
         def file_moved
+          SingleFileWatcher.handler.forget self, path
           stop_watching
           SingleFileWatcher.handler.notify(path, type)
         end
 
         def file_deleted
+          SingleFileWatcher.handler.forget self, path
           SingleFileWatcher.handler.notify(path, type)
         end
 
+        def stop
+          stop_watching
+        end
+
         private
 
         def update_reference_times
@@ -89,9 +95,15 @@ module Watchr
       # Will block control flow until application is explicitly stopped/killed.
       #
       def listen(monitored_paths)
-        @monitored_paths = monitored_paths
-        ::EM.run do
-          attach
+        # FIX ... make more generic (handle at a higher level ...)
+        while true
+          @monitored_paths = monitored_paths
+          @old_paths = []
+          @first_time = true
+          @watchers = {}
+          ::EM.run do
+            attach
+          end
         end
       end
 
@@ -104,6 +116,14 @@ module Watchr
         attach
       end
 
+      def forget connection, path
+        if @watchers[path] != connection
+          $stderr.puts \
+            "warning: no/wrong watcher to forget for #{path}: #{@watchers[path]} vs #{connection}"
+        end
+        @watchers.delete path
+      end
+
       private
 
       # Binds all <tt>monitored_paths</tt> to the listening loop.
@@ -116,9 +136,12 @@ module Watchr
         # p "new", new_paths
         raise "hell" if @monitored_paths.length == 1
         new_paths.each do |path|
+          if @watchers[path]
+            $stderr.puts "warning: replacing (ignoring) watcher for #{path}"
+            # @watchers[path].stop
+          end
           ::EM.watch_file path.to_s, SingleFileWatcher do |watcher|
             watcher.init @first_time
-            raise "hell" if @watchers[path]
             @watchers[path] = watcher
           end
         end

data/lib/watchr/script.rb

@@ -133,7 +133,13 @@ module Watchr
       # Should probably use a watchdog timer that gets reset on every change and then only fire actions
       # after the watchdog timer fires without get reset ..
 
-      sleep(0.1)
+      v = nil
+      (1..10).each do
+        old_v = v
+        v = @path.read
+        break if v && v == old_v
+        sleep(0.2)
+      end
 
       instance_eval(@path.read)
 

data/watchr.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name              = 'smparkes-watchr'
-  s.version           = '0.5.7.3'
+  s.version           = '0.5.7.4'
   s.summary           = "Modern continious testing (flexible alternative to autotest)"
   s.description       = "Modern continious testing (flexible alternative to autotest)."
   s.author            = "mynyml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smparkes-watchr
 version: !ruby/object:Gem::Version 
-  version: 0.5.7.3
+  version: 0.5.7.4
 platform: ruby
 authors: 
 - mynyml