smparkes-watchr 0.5.7.7 → 0.5.7.8

data/lib/watchr/controller.rb

@@ -24,6 +24,7 @@ module Watchr
                      handler = Watchr.handler.new
                      handler.add_observer self
                      Watchr.debug "using %s handler" % handler.class.name
+                     Script.handler = handler
                      handler
                    end
       @handler
@@ -95,7 +96,16 @@ module Watchr
         end
         watch
       end
+      paths.each do |path|
+        # $stderr.print "lookup #{path}\n"
+        @script.depends_on(path).each do |dependence|
+          # $stderr.print "add #{dependence} for #{path}\n"
+          paths << dependence
+        end
+      end
       paths.push(@script.path).compact!
+      paths.uniq!
+      # $stderr.print "watch #{paths.map {|path| Pathname(path).expand_path }.join(' ')}\n"
       paths.map {|path| Pathname(path).expand_path }
     end
   end

data/lib/watchr/event_handlers/em.rb

@@ -25,11 +25,14 @@ module Watchr
           attr_accessor :handler
         end
 
-        def init first_time
+        def init first_time, event
           # p "w", path, first_time,(first_time ? :load : :created)
           # $stderr.puts "#{signature}: #{pathname}"
           update_reference_times
-          SingleFileWatcher.handler.notify(pathname, (first_time ? :load : :created) )
+          # FIX: doesn't pass events
+          if !event
+            SingleFileWatcher.handler.notify(pathname, (first_time ? :load : :created) )
+          end
         end
 
         # File's path as a Pathname
@@ -82,9 +85,11 @@ module Watchr
         private
 
         def update_reference_times
-          @reference_atime = pathname.atime
-          @reference_mtime = pathname.mtime
-          @reference_ctime = pathname.ctime
+          begin
+            @reference_atime = pathname.atime
+            @reference_mtime = pathname.mtime
+            @reference_ctime = pathname.ctime
+          rescue Exception; end
         end
 
         # Type of latest event.
@@ -155,21 +160,31 @@ module Watchr
         @old_paths.delete Pathname(path)
       end
 
-      def watch path
+      def watch path, event = nil
         begin
+          # p "watch", path, @first_time
           ::EM.watch_file path.to_s, SingleFileWatcher do |watcher|
-            watcher.init @first_time
+            watcher.init @first_time, event
             @watchers[path] = watcher
           end
           @old_paths << path
-        rescue Errno::ENOENT; end
+        rescue Errno::ENOENT => e
+          $stderr.puts e
+        rescue Exception => e
+          $stderr.puts e
+        end
       end  
 
+      def add path
+        @monitored_paths << path
+        # $stderr.print "add #{path.inspect}\n"
+        attach :dependence
+      end
+
       private
 
       # Binds all <tt>monitored_paths</tt> to the listening loop.
-      def attach
-        # p "scan"
+      def attach event = nil
         @monitored_paths = @monitored_paths.uniq 
         new_paths = @monitored_paths - @old_paths
         remove_paths = @old_paths - @monitored_paths
@@ -182,14 +197,14 @@ module Watchr
             $stderr.puts "warning: replacing (ignoring) watcher for #{path}"
             @watchers[path].stop
           end
-          watch path
+          watch path, event
         end
         remove_paths.each do |path|
           watcher = @watchers[path]
           raise "hell" if !watcher
           watcher.stop
         end
-        @old_paths = @monitored_paths
+        @old_paths = @monitored_paths.dup
         @first_time = false
       end
 

data/lib/watchr/script.rb

@@ -4,7 +4,6 @@ module Watchr
     def batches
       @batches ||= {}
     end
-
   end
 
   # A script object wraps a script file, and is used by a controller.
@@ -15,8 +14,11 @@ module Watchr
   #   script = Watchr::Script.new(path)
   #
   class Script
+
     DEFAULT_EVENT_TYPE = :modified
 
+    
+
     class Batch
       def initialize rule
         @timer = nil
@@ -24,7 +26,7 @@ module Watchr
         @events = []
       end
 
-      def call data, event
+      def call data, event, path
         if @timer
           @timer.cancel
         end
@@ -33,7 +35,7 @@ module Watchr
           Watchr.batches.delete self
         end
         Watchr.batches[self] = self
-        @events << [ data, event ]
+        @events << [ data, event, path ]
       end
 
       def deliver
@@ -41,6 +43,9 @@ module Watchr
         @timer = nil
         @events = []
         @rule.action.call [events]
+        events.each do |event|
+          Script.learn event[2]
+        end
       end
     end
 
@@ -56,16 +61,20 @@ module Watchr
 
     class Rule
 
-      def call data, event
+      def call data, event, path
+        # $stderr.print "call #{data} #{event} #{path}\n"
         if options[:batch]
           self.batch ||= Batch.new self
-          batch.call data, event
+          batch.call data, event, path
         else
           if action.arity == 1 
             action.call data
-          else
+          elsif action.arity == 2
             action.call data, event
+          else
+            action.call data, event, path
           end
+          Script.learn path
         end
       end
 
@@ -81,6 +90,7 @@ module Watchr
       end
 
       def match path
+        # $stderr.print("match #{path}\n")
         pattern = self.pattern
         ( pattern.class == String ) and ( pattern = Regexp.new pattern )
         # p path, pattern, pattern.match(path)
@@ -102,6 +112,7 @@ module Watchr
     # path<Pathname>:: the path to the script
     #
     def initialize(path)
+      self.class.script = self
       @path  = path
       @rules = []
       @default_action = lambda {}
@@ -211,6 +222,23 @@ module Watchr
       instance_eval(@path.read)
     end
 
+    class << self
+      attr_accessor :script, :handler
+      def learn path
+        script.depends_on(path).each do |p|
+          handler.add Pathname(p)
+        end
+      end
+    end
+
+    def depends_on path
+      []
+    end
+
+    def depended_on_by path
+      []
+    end
+
     # Find an action corresponding to a path and event type. The returned
     # action is actually a wrapper around the rule's action, with the
     # match_data prepopulated.
@@ -225,16 +253,17 @@ module Watchr
     #   script.action_for('test/test_watchr.rb').call #=> "ruby test/test_watchr.rb"
     #
     def call_action_for(path, event_type = DEFAULT_EVENT_TYPE)
+      # $stderr.print "caf #{path}\n";
+      pathname = path
       path = rel_path(path).to_s
-      # p path
+      depended_on_by(path).each { |dependence| call_action_for(dependence, event_type) }
       rules_for(path).each do |rule|
-        # p rule
         types = rule.event_types
         !types.empty? or types = [ nil ]
         types.each do |rule_event_type|
           if ( rule_event_type.nil? && ( event_type != :load ) ) || ( rule_event_type == event_type )
             data = path.match(rule.pattern)
-            return rule.call(data, event_type)
+            return rule.call(data, event_type, pathname)
           end
         end
       end
@@ -276,12 +305,7 @@ module Watchr
     # rules<Array(Rule)>:: rules corresponding to <tt>path</tt>
     #
     def rules_for(path)
-      @rules.reverse.select do |rule|
-        # p "K", path, rule.pattern, path.match(rule.pattern)
-        path.match(rule.pattern)
-      end
-      # p "KK", path, @rules.reverse.select {|rule| path.match(rule.pattern) }
-      @rules.reverse.select {|rule| path.match(rule.pattern) }
+      @rules.reverse.select do |rule| path.match(rule.pattern) end
     end
 
     # Make a path relative to current working directory.

data/watchr.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name              = 'smparkes-watchr'
-  s.version           = '0.5.7.7'
+  s.version           = '0.5.7.8'
   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.7
+  version: 0.5.7.8
 platform: ruby
 authors: 
 - mynyml
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-11-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency