smparkes-watchr 0.5.7.1 → 0.5.7.2

data/lib/watchr/controller.rb

@@ -83,8 +83,10 @@ module Watchr
     #
     def monitored_paths
       paths = Dir['**/*'].select do |path|
+p path
         @script.rules.any? {|r| r.match(path) }
       end
+p paths
       paths.push(@script.path).compact!
       paths.map {|path| Pathname(path).expand_path }
     end

data/lib/watchr/event_handlers/em.rb

@@ -47,7 +47,6 @@ module Watchr
         end
 
         def file_deleted
-          stop_watching
           SingleFileWatcher.handler.notify(path, type)
         end
 

data/lib/watchr/script.rb

@@ -22,7 +22,9 @@ module Watchr
 
     class Rule
       def match path
-        ( md = self.pattern.match(path) ) &&
+        pattern = self.pattern
+        ( pattern.class == String ) and ( pattern = Regexp.new pattern )
+        ( md = pattern.match(path) ) &&
           ( self.predicate == nil || self.predicate.call(md) )
       end
     end
@@ -160,8 +162,9 @@ module Watchr
       # p path
       rules_for(path).each do |rule|
         # p rule
-        rule.event_types.each do |rule_event_type|
-          # p rule_event_type
+        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.action.call(data)

data/test/test_script.rb

@@ -25,13 +25,13 @@ class TestScript < Test::Unit::TestCase
   test "rule object" do
     rule = @script.watch('pattern', :modified) { nil }
     rule.pattern.should be('pattern')
-    rule.event_type.should be(:modified)
+    rule.event_types[0].should be(:modified)
     rule.action.call.should be(nil)
   end
 
   test "default event type" do
     rule = @script.watch('pattern') { nil }
-    rule.event_type.should be(:modified)
+    rule.event_types[0].should be(:modified)
   end
 
   test "finds action for path" do

data/watchr.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name              = 'smparkes-watchr'
-  s.version           = '0.5.7.1'
+  s.version           = '0.5.7.2'
   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.1
+  version: 0.5.7.2
 platform: ruby
 authors: 
 - mynyml