wires 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee0ef4612e829c49c23b2b56726ebfa7b78e0a7
-  data.tar.gz: 855a4eee6ae3b7c9906876202c23a1503bc1484e
+  metadata.gz: 660935c436c6c57687e2c3c8a506d9810e478789
+  data.tar.gz: e2cd88acddaade081ca3da917f885e40845d2282
 SHA512:
-  metadata.gz: 980b22d9a6bd54663e18c89f3b57c2fcae6d9973f337b2d08035ae17cb3029a2688ef868864955520fd7db8868340dd8368ecac24c3924417a8946edbc91ea1f
-  data.tar.gz: 4ab9d5b9cc254ebc0b9f33d2988b9c08f1f10a960793132b9ed72fca4a3e3a921293a5792eabbe077b274f717a4a65169aa6c2b712342d045942f6bbd80adcbb
+  metadata.gz: addb4f0b4d550fa8e2d45d3124900a9a4a605c65ac05ebf10206bef54bffa23b6666ad4381ba675232e081fa75936e6e63639247f37f17b9c432852fa815477c
+  data.tar.gz: 670c122be77ebde3f81e87efb1d1317a526624cddb139c2e9ea9b988f5c1405b1c682b1f6c497c4e79a1b61fc9599b6fe0819a1c4eeaa8394fcaf2fdffb7fb6d

data/lib/wires/channels.rb

@@ -8,7 +8,11 @@ nil end
 
 
 def fire(event, channel='*') 
-    Channel(channel).fire(event)
+    Channel(channel).fire(event, blocking=false)
+nil end
+
+def fire_and_wait(event, channel='*') 
+    Channel(channel).fire(event, blocking=true)
 nil end
 
 
@@ -56,7 +60,7 @@ class Channel
     nil end
     
     # Fire an event on this channel
-    def fire(_event)
+    def fire(_event, blocking=false)
         
         # Pull out args from optional array notation
         _event = [_event] unless _event.is_a? Array
@@ -76,7 +80,7 @@ class Channel
         for chan in relevant_channels()
             for target in chan.target_list
                 for string in target[0] & event.class.codestrings
-                    Hub << [string, event, *target[1..-1]]
+                    Hub << [string, event, blocking, *target[1..-1]]
         end end end
         
     nil end

data/lib/wires/hub.rb

@@ -40,11 +40,12 @@ private
     
     def self.process_item(x)
         x, waiting_thread = x
-        string, event, proc = x
+        string, event, blocking, proc = x
         Thread.new do
             begin
-                waiting_thread.wakeup
+                waiting_thread.wakeup unless blocking
                 proc.call($event = event)
+                waiting_thread.wakeup if blocking
                 
             rescue Interrupt, SystemExit => e
                 @keepgoing = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joe McIlvain