fsevent 0.1 → 0.2

data/test/test_watch.rb

@@ -25,9 +25,9 @@ class TestFSEventWatch < Test::Unit::TestCase
     values = [9,2,3,5,1]
     src_sched = values.map.with_index {|v, i| t + (i+1)*10 }
     srcdevice = FSEvent::SimpleDevice.new("src", {"s"=>0}, [], 1, src_sched) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(5)
-      fsevent.status_changed "s", values.shift
+      fsevent.modify_status "s", values.shift
     }
     fsevent.register_device(srcdevice)
     fsevent.start
@@ -39,17 +39,17 @@ class TestFSEventWatch < Test::Unit::TestCase
       t = Time.utc(2000)
       fsevent = FSEvent.new(t)
       values = [9,2,3,5,1]
-      src_sched = values.map.with_index {|v, i| t + (i+1)*10 }
+      src_sched = values.map.with_index {|v, j| t + (j+1)*10 }
       srcdevice = FSEvent::SimpleDevice.new("src", {"s"=>0}, [], 1, src_sched) {
-        |watched_status_change|
+        |watched_status, changed_status|
         fsevent.set_elapsed_time(5)
-        fsevent.status_changed "s", values.shift
+        fsevent.modify_status "s", values.shift
       }
       test_result = []
       dstdevice = FSEvent::SimpleDevice.new("dst", {}, [["src","s"]], 1) {
-        |watched_status_change|
+        |watched_status, changed_status|
         fsevent.set_elapsed_time(1)
-        test_result << [fsevent.current_time, watched_status_change]
+        test_result << [fsevent.current_time, watched_status]
       }
       if i == 0
         fsevent.register_device(srcdevice)
@@ -74,15 +74,15 @@ class TestFSEventWatch < Test::Unit::TestCase
     t = Time.utc(2000)
     fsevent = FSEvent.new(t)
     srcdevice = FSEvent::SimpleDevice.new("src", {"s"=>0}, [], 1, [t+10]) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(5)
-      fsevent.status_changed "s", 100
+      fsevent.modify_status "s", 100
     }
     test_result = []
     dstdevice = FSEvent::SimpleDevice.new("dst", {}, [["src","s", :immediate]], 1, [t+20]) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(1)
-      test_result << [fsevent.current_time, watched_status_change]
+      test_result << [fsevent.current_time, watched_status]
     }
     fsevent.register_device(srcdevice)
     fsevent.register_device(dstdevice)
@@ -93,42 +93,19 @@ class TestFSEventWatch < Test::Unit::TestCase
       test_result)
   end
 
-  def test_wakeup_immediate_only_at_beginning
-    t = Time.utc(2000)
-    fsevent = FSEvent.new(t)
-    srcdevice = FSEvent::SimpleDevice.new("src", {"s"=>0}, [], 1, [t+10]) {
-      |watched_status_change|
-      fsevent.set_elapsed_time(5)
-      fsevent.status_changed "s", 100
-    }
-    test_result = []
-    dstdevice = FSEvent::SimpleDevice.new("dst", {}, [["src","s", :immediate_only_at_beginning]], 1, [t+20]) {
-      |watched_status_change|
-      fsevent.set_elapsed_time(1)
-      test_result << [fsevent.current_time, watched_status_change]
-    }
-    fsevent.register_device(srcdevice)
-    fsevent.register_device(dstdevice)
-    fsevent.start
-    assert_equal(
-      [[t + 1, {"src"=>{"s"=>0}}],
-       [t + 20, {"src"=>{"s"=>100}}]],
-      test_result)
-  end
-
   def test_wakeup_schedule
     t = Time.utc(2000)
     fsevent = FSEvent.new(t)
     srcdevice = FSEvent::SimpleDevice.new("src", {"s"=>0}, [], 1, [t+10]) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(5)
-      fsevent.status_changed "s", 100
+      fsevent.modify_status "s", 100
     }
     test_result = []
     dstdevice = FSEvent::SimpleDevice.new("dst", {}, [["src","s", :schedule]], 1, [t+20]) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(1)
-      test_result << [fsevent.current_time, watched_status_change]
+      test_result << [fsevent.current_time, watched_status]
     }
     fsevent.register_device(srcdevice)
     fsevent.register_device(dstdevice)
@@ -143,27 +120,59 @@ class TestFSEventWatch < Test::Unit::TestCase
     fsevent = FSEvent.new(t)
     s = 0
     srcdevice = FSEvent::SimpleDevice.new("src", {"s"=>0}, [], 1, [t+10, t+20]) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(5)
       s += 100
-      fsevent.status_changed "s", s
+      fsevent.modify_status "s", s
     }
     test_result = []
     dstdevice = FSEvent::SimpleDevice.new("dst", {}, [["src","s", :schedule]], 1, [t+17, t+27]) {
-      |watched_status_change|
+      |watched_status, changed_status|
       fsevent.set_elapsed_time(1)
       if fsevent.current_time == t+17
         fsevent.del_watch("src", "s")
       end
-      test_result << [fsevent.current_time, watched_status_change]
+      test_result << [fsevent.current_time, watched_status]
     }
     fsevent.register_device(srcdevice)
     fsevent.register_device(dstdevice)
     fsevent.start
     assert_equal(
       [[t+17, {"src"=>{"s"=>100}}],
-       [t+27, nil]],
+       [t+27, {}]],
       test_result)
   end
 
+  def test_lookup_watchers_exact1
+    ws = FSEvent::WatchSet.new
+    ws.add("src", "status", "d", :immediate)
+    assert_equal([["d", :immediate]], ws.lookup_watchers("src", "status"))
+  end
+
+  def test_lookup_watchers_exact2
+    ws = FSEvent::WatchSet.new
+    ws.add("src", "s", "d1", :immediate)
+    ws.add("src", "s", "d2", :schedule)
+    assert_equal([["d1", :immediate], ["d2", :schedule]],
+                 ws.lookup_watchers("src", "s"))
+  end
+
+  def test_lookup_watchers_prefix_exact
+    ws = FSEvent::WatchSet.new
+    ws.add("sr*", "status", "d", :immediate)
+    assert_equal([["d", :immediate]], ws.lookup_watchers("src", "status"))
+  end
+
+  def test_lookup_watchers_exact_prefix
+    ws = FSEvent::WatchSet.new
+    ws.add("src", "st*", "d", :immediate)
+    assert_equal([["d", :immediate]], ws.lookup_watchers("src", "status"))
+  end
+
+  def test_lookup_watchers_prefix_prefix
+    ws = FSEvent::WatchSet.new
+    ws.add("sr*", "st*", "d", :immediate)
+    assert_equal([["d", :immediate]], ws.lookup_watchers("src", "status"))
+  end
+
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fsevent
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Tanaka Akira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
-dependencies: []
+date: 2013-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: depq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: |
   fail safe event driven framework
 email: tanaka-akira@aist.go.jp
@@ -23,6 +51,7 @@ files:
 - fsevent.gemspec
 - lib/fsevent.rb
 - lib/fsevent/abstractdevice.rb
+- lib/fsevent/debugdumper.rb
 - lib/fsevent/failsafedevice.rb
 - lib/fsevent/framework.rb
 - lib/fsevent/periodicschedule.rb
@@ -31,6 +60,7 @@ files:
 - lib/fsevent/schedulemerger.rb
 - lib/fsevent/simpledevice.rb
 - lib/fsevent/util.rb
+- lib/fsevent/watchset.rb
 - sample/repeat.rb
 - sample/repeat2.rb
 - test/test_failsafedevice.rb