mojodna-switchboard 0.0.9 → 0.0.10

data/Rakefile

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.1")
+  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.2")
 end
   EOF
 

data/lib/switchboard/core.rb

@@ -43,12 +43,11 @@ module Switchboard
           exit
         end
 
-        @deferreds.each do |name, deferred|
-          puts "Killing #{name}" if debug?
-          deferred.kill
-        end
+        die
+      end
 
-        shutdown!
+      at_exit do
+        die
       end
 
       @settings = settings
@@ -60,8 +59,12 @@ module Switchboard
 
     # Start running.
     def run!
+      @main_thread = Thread.current
+
       startup
 
+      @ready = true
+
       if @main
         instance_eval(&@main)
       elsif loop?
@@ -119,6 +122,10 @@ module Switchboard
       end
     end
 
+    def ready?
+      @ready
+    end
+
     hook(:exception, :iq, :message, :presence, :startup, :stream_connected, :shutdown)
 
   protected
@@ -135,6 +142,22 @@ module Switchboard
       settings["debug"]
     end
 
+    def die
+      @deferreds.each do |name, deferred|
+        puts "Killing #{name}" if debug?
+        deferred.kill
+      end
+
+      shutdown!
+
+      timeout(15) do
+        sleep 0.1 until shutdown_complete?
+      end
+
+    rescue Timeout::Error
+      puts "Shutdown timed out."
+    end
+
     def disconnect!
       stream.close
     end
@@ -244,7 +267,7 @@ module Switchboard
     end
 
     def shutdown(run_hooks = true)
-      if Thread.current != Thread.main
+      if Thread.current != @main_thread
         $stderr.puts "Wrong thread! You should be using #shutdown! instead."
         shutdown!
         return
@@ -260,10 +283,16 @@ module Switchboard
 
       puts "Shutting down..." if debug?
       disconnect! if connected?
+
+      @shutdown_complete = true
     end
 
     def shutdown?
       @shutdown
     end
+
+    def shutdown_complete?
+      @shutdown_complete
+    end
   end
 end

data/lib/switchboard/version.rb

@@ -1,3 +1,3 @@
 module Switchboard
-  VERSION = [0, 0, 9]
+  VERSION = [0, 0, 10]
 end

data/switchboard.gemspec

@@ -1,7 +1,7 @@
 # this file is automatically generated
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
   s.summary = "XMPP toolkit."
   s.description = "A toolkit for assembling XMPP clients and interacting with XMPP servers."
   s.authors = ["Seth Fitzsimmons"]
@@ -11,5 +11,5 @@ Gem::Specification.new do |s|
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.1")
+  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.2")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -22,7 +22,7 @@ dependencies:
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.0.1
+        version: 0.4.0.2
     version: 
 description: A toolkit for assembling XMPP clients and interacting with XMPP servers.
 email: