vetinari 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe414b4c35924d0c5fa15e67e84494b74b23f31f
-  data.tar.gz: 5e82b546876eb70fe159d0c9480fdeffbecbfacf
+  metadata.gz: f608f5d572103adef5c02583257c53b4a31bd62c
+  data.tar.gz: 06dd6242f7bab98b151ec5b309677b498007efeb
 SHA512:
-  metadata.gz: d0c60adeae677929cb9d903674432787c854c9185fd924e89443a65ffc5b1c1f1668e4c26e3fd2ea307405c453324f4a7faa509b6e12de97890ce80065742227
-  data.tar.gz: 9760ed1524abde7e444ada03ec74c4728467ceffb65ec21879ff0b7bcdab9c989af0fc1e9a88e77751e648ea9c12eeca763e5ded23e794d5f60df0e3baad82a0
+  metadata.gz: d92ea68da4913e79a56dd9d640359283bbe7a4bccfe2c000b6db3b45919dc8e4e456834e3eb60e3c8506c17ea1e5310a8a5d9604dd101a923b406cf53174e02d
+  data.tar.gz: 356eb42a77705a7d68780f427a76ea728a6d6764d84ca148229a534e997d24bf01a0216b115bd42dc3ff42d4e6a0940aae8461a26089689c398962069cd3bf62

data/lib/vetinari/bot.rb

@@ -5,6 +5,7 @@ module Vetinari
     attr_reader :config, :users, :user, :channels, :server_manager, :callbacks
 
     finalizer :finalize
+    trap_exit :dont_die
 
     def initialize(&block)
       @actor     = Actor.current
@@ -92,6 +93,10 @@ module Vetinari
       end
     end
 
+    def dont_die(actor)
+      # nothing!
+    end
+
     private
 
     def disconnected

data/lib/vetinari/callback_container.rb

@@ -89,7 +89,8 @@ module Vetinari
     def terminate_callbacks
       @callbacks.each do |event, hash|
         hash.each do |uuid, _hash|
-          _hash[:callback].terminate
+          actor = _hash[:callback]
+          actor.terminate if actor.alive?
         end
       end
     end

data/lib/vetinari/channel.rb

@@ -107,7 +107,7 @@ module Vetinari
       callbacks << @bot.on(:join) do |env|
         if env[:channel].name == @name
           condition.signal :joined
-          callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
+          callbacks.each { |cb| cb.async.remove_and_terminate if cb.alive? }
         end
       end
 
@@ -124,14 +124,14 @@ module Vetinari
 
           if channel_name == @name
             condition.signal msg
-            callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
+            callbacks.each { |cb| cb.async.remove_and_terminate if cb.alive? }
           end
         end
       end
 
       after(5) do
         condition.signal :timeout
-        callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
+        callbacks.each { |cb| cb.async.remove_and_terminate if cb.alive? }
       end
 
       if key

data/lib/vetinari/version.rb

@@ -1,3 +1,3 @@
 module Vetinari
-  VERSION = Gem::Version.new('0.2.2')
+  VERSION = Gem::Version.new('0.2.3')
 end

data/spec/bot_spec.rb

@@ -27,4 +27,17 @@ describe Vetinari::Bot.new do
       subject.terminate
     end.to_not change { Celluloid::Actor.all.size }
   end
+
+  it 'should not die if a linked channel dies' do
+    channel = Vetinari::Channel.new('#mended_drum', subject)
+
+    def (channel.bare_object).crash
+      raise 'boom'
+    end
+
+    expect(subject.links).to include(channel)
+    channel.crash rescue nil
+    expect(channel).to_not be_alive
+    expect(subject).to be_alive
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vetinari
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tobias Bühlmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io