wires 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf7c26252b01261e552ad00ca7ae8dcc20515e8
-  data.tar.gz: 667a3598ae40b52aab46a79a30126a036894429e
+  metadata.gz: ed84cacba5f8de403b014bf21dea7f17f715039d
+  data.tar.gz: 5db5c2bb5684593b81e0faf26dae9317d1c0bb55
 SHA512:
-  metadata.gz: 9df8d83551265f447ae50263a7f0595439f26137dc926ea1c4cf6f660e052bb9be011dcf59debd88bcad453a0b4d1d85b99aceb1911cb768439726c7a1dd38e3
-  data.tar.gz: 73a9116f9118c88194b47882df37309d8ee024fd7628a1bfe56c6d4a791bdcf0e65a62a092266905e6a922b15f87ee5cc58fae650cccc22086d339a84ee4ec97
+  metadata.gz: 18d0e590b738f66685730de3006f978a9faa22124a37e5511e798f909999ceb8b0bd41a72c96a9e18acf8c30a241865dcadbd2a0bca307a5bc7bf301bed57d72
+  data.tar.gz: e699ce9a9d99f7077f95c06c700e15c0b03ea2795d804da7b10f9f596d7b180cc278d0938660a2a887d9d9a252cc2949afdcbeb2ceab744c248020b85c43240b

data/lib/wires/hub.rb

@@ -3,62 +3,61 @@
 def puts(x) $stdout.puts(x) end
 
 
-# An event hub. Event/proc associations come in, and the procs 
+# An Event Hub. Event/proc associations come in, and the procs 
 # get called in new threads in the order received
 class Hub
     @@queue = Queue.new
     
-    def self._run
+    # Start the Hub event loop in a new thread
+    def self.run
+        @@thread = Thread.new() {Hub.run_loop}
+        at_exit { @@thread.join if not $! }
+    end
+    
+    # Start the Hub event loop in the current thread
+    def self.run_in_place() self.run_loop() end
+    
+    # Kill the Hub event loop (softly)
+    def self.kill() @@keepgoing=false end
+    
+    # Put x in the queue, and block until x is processed
+    def self.fire(x)
+        @@queue << [x, Thread.current]
+        sleep # yield to event loop thread until awoken by it later
+    end
+    def self.<<(x) fire(x) end
+    
+private
+    
+    def self.run_loop
         @@keepgoing = true
             
         while @@keepgoing
             if @@queue.empty? then sleep(0)
-            else _process_item(@@queue.shift) end
+            else process_item(@@queue.shift) end
         end
     end
     
-    def self.run!
-        @@thread = Thread.new() {Hub._run}
-        at_exit { @@thread.join if not $! }
-    end
-    
-    def self.run_in_place!() self._run() end
-    
-    def self.kill!() @@keepgoing=false end
-    
-    def self._process_item(x)
+    def self.process_item(x)
         x, waiting_thread = x
         string, event, proc = x
         Thread.new do
-            
             begin
                 waiting_thread.wakeup
                 proc.call($event = event)
                 
             rescue Interrupt, SystemExit => e
                 @keepgoing = false
-                _unhandled_exception(e)
+                unhandled_exception(e)
                 
             rescue Exception => e
-                _unhandled_exception(e)
+                unhandled_exception(e)
             end
         end
     end
     
-    def self._unhandled_exception(x)
+    def self.unhandled_exception(x)
         $stderr.puts $!
         $stderr.puts $@
     end
-    
-    def self.fire(x)
-        @@queue << [x, Thread.current]
-        sleep
-    end
-    
-    def self.enqueue(x) fire(x) end
-    def self.<<(x)      fire(x) end
-    
-    private_class_method :new
 end
-
-

metadata

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