wires 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc852c0d3cd3cc7571a39f56b081a006d8e704f2
-  data.tar.gz: 937220faab14ab5bd4da7a0c3cb3877f99e56a76
+  metadata.gz: d9c6a74afd25b600883e65a5bb6e54ac1e966eca
+  data.tar.gz: 920c223d33dc8128fd0fc7f1b9af13992f5da51e
 SHA512:
-  metadata.gz: 4f6f27c768dae1cc9bbf6b93495df61b5165c050f420a86317fc732aa8b670443a3b9d62ad5a7c1ae07e45c23267e6ad9b2b6e015beb2f708819896d1593ab66
-  data.tar.gz: d8b45765b30d6e690f5a4c6d49d3832a1e41f0b8d4f9bd2c8cb4cde7179a6db3ff62537a42266ede277cc689b9243d70c491f0930a7a364df020d1aa4921a7a1
+  metadata.gz: 18d14b246f4f015b56e8fe9d0122201ecd27f6627764c62b814b1683aedfb705c5d1fb5b101432ec1f42a7dbdf0047916287d112a7555c94b81e851a478fe0e7
+  data.tar.gz: ea363328dceda12c2c2b933be15018ddf16dd84125232718c7189c9a81562d01664dcf884b9ef31bdd0ba2eb3f333608a82c565f9f03eb9f9743dc4229ee26c5

data/lib/wires/hub.rb

@@ -184,7 +184,7 @@ class Hub
         @child_threads << Thread.new do
           begin
             waiting_thread.wakeup unless blocking or not waiting_thread
-            proc.call($event = event)
+            proc.call(event)
             waiting_thread.wakeup if blocking and waiting_thread
             
           rescue Interrupt, SystemExit => e

data/lib/wires/time.rb

@@ -6,9 +6,10 @@ class TimeSchedulerAnonEvent  < TimeSchedulerEvent; end
 
 # A singleton class to schedule future firing of events
 class TimeScheduler
-  @schedule      = Array.new
-  @schedule_lock = Mutex.new
-  @thread        = Thread.new {nil}
+  @schedule       = Array.new
+  @schedule_lock  = Mutex.new
+  @thread         = Thread.new {nil}
+  @keepgoing_lock = Mutex.new
   
   # Operate on the metaclass as a type of singleton pattern
   class << self
@@ -66,8 +67,8 @@ class TimeScheduler
         # Calculate the time to sleep based on next event's time
         if on_deck
           sleep [(on_deck[:time]-Time.now), 0].max
-        else
-          sleep # sleep until wakeup if no event is on deck
+        else # sleep until wakeup if no event is on deck
+          sleep if @keepgoing
         end
         
       end
@@ -84,8 +85,10 @@ class TimeScheduler
   
   # Stop the main loop upon death of Hub
   Hub.before_kill(retain:true) do 
-    @keepgoing=false
-    @thread.wakeup
+    @keepgoing_lock.synchronize do
+      @keepgoing=false
+      @thread.wakeup
+    end
     sleep 0
   end
   # Refire the start event after Hub dies in case it restarts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport