vetinari 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78880d961649c425e2c89754d7236fada5a8768e
-  data.tar.gz: 4aeabaeb70c5e9be616ff847c8d624b8462590c5
+  metadata.gz: fe414b4c35924d0c5fa15e67e84494b74b23f31f
+  data.tar.gz: 5e82b546876eb70fe159d0c9480fdeffbecbfacf
 SHA512:
-  metadata.gz: b7fcf851e371ebae8069adaf5eb7c7f820b9bfd2dd77b244454229cf46466d5ebf4d23ad8fccaedaeffc09a7e4ee4003ea47b0f9ad986a61b72d24b16d8c5e2c
-  data.tar.gz: b0c4bb57dcb1f311d22ade88c91e5372b0ebf555529cf4d9f94c073b1ac088f1ef4fef08de5f34a044f9152340b385810448acb960ce6c0a773c0ea7c080f3cf
+  metadata.gz: d0c60adeae677929cb9d903674432787c854c9185fd924e89443a65ffc5b1c1f1668e4c26e3fd2ea307405c453324f4a7faa509b6e12de97890ce80065742227
+  data.tar.gz: 9760ed1524abde7e444ada03ec74c4728467ceffb65ec21879ff0b7bcdab9c989af0fc1e9a88e77751e648ea9c12eeca763e5ded23e794d5f60df0e3baad82a0

data/lib/vetinari/bot.rb

@@ -4,6 +4,8 @@ module Vetinari
 
     attr_reader :config, :users, :user, :channels, :server_manager, :callbacks
 
+    finalizer :finalize
+
     def initialize(&block)
       @actor     = Actor.current
       @config    = Configuration.new(&block)
@@ -75,6 +77,21 @@ module Vetinari
       end
     end
 
+    def finalize
+      if connected?
+        quit
+        @socket.close rescue nil
+      end
+
+      @callbacks.terminate_callbacks
+      @users.terminate
+      @channels.terminate
+
+      links.each do |actor|
+        actor.terminate if actor.alive?
+      end
+    end
+
     private
 
     def disconnected

data/lib/vetinari/callback_container.rb

@@ -85,5 +85,13 @@ module Vetinari
     def inspect
       "#<CallbackContainer bot=#{@bot.inspect}>"
     end
+
+    def terminate_callbacks
+      @callbacks.each do |event, hash|
+        hash.each do |uuid, _hash|
+          _hash[:callback].terminate
+        end
+      end
+    end
   end
 end

data/lib/vetinari/channel.rb

@@ -17,6 +17,8 @@ module Vetinari
       @modes = {}
       @lists = Hash.new { |hash, key| hash[key] = [] }
       @mutex = Mutex.new
+
+      link(@bot)
     end
 
     # Experimental, no tests so far.
@@ -105,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 }
+          callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
         end
       end
 
@@ -122,14 +124,14 @@ module Vetinari
 
           if channel_name == @name
             condition.signal msg
-            callbacks.each { |cb| cb.remove_and_terminate }
+            callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
           end
         end
       end
 
       after(5) do
         condition.signal :timeout
-        callbacks.each { |cb| cb.remove_and_terminate }
+        callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
       end
 
       if key

data/lib/vetinari/channel_container.rb

@@ -4,6 +4,8 @@ module Vetinari
 
     attr_reader :channels
 
+    finalizer :finalize
+
     exclusive
 
     def initialize
@@ -70,5 +72,9 @@ module Vetinari
 
       users
     end
+
+    def finalize
+      @channels.each(&:terminate)
+    end
   end
 end

data/lib/vetinari/irc.rb

@@ -19,7 +19,7 @@ module Vetinari
       callbacks << on(:nick_change) do |env|
         if env[:user].bot?
           condition.signal env[:user].nick
-          callbacks.each { |cb| cb.remove_and_terminate }
+          callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
         end
       end
 
@@ -31,13 +31,13 @@ module Vetinari
       raw_messages.each do |raw, msg|
         callbacks << on(raw) do |env|
           condition.signal(msg)
-          callbacks.each { |cb| cb.remove_and_terminate }
+          callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
         end
       end
 
       after(5) do
         condition.signal(:timeout)
-        callbacks.each { |cb| cb.remove_and_terminate }
+        callbacks.each { |cb| cb.remove_and_terminate if cb.alive? }
       end
 
       raw "NICK :#{nick}"

data/lib/vetinari/version.rb

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

data/spec/bot_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Vetinari::Bot.new do
+  subject { Vetinari::Bot.new { |c| c.verbose = false } }
+  before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
+  end
+
+  it 'terminates all linked actors on termination' do
+    expect do
+      subject.parse(':server 001 Vetinari :Welcome message')
+      subject.parse(':server 376 Vetinari :End of /MOTD command.')
+      subject.parse(':Vetinari!foo@bar JOIN #mended_drum')
+      subject.parse(':TheLibrarian!foo@bar JOIN #mended_drum')
+      subject.terminate
+    end.to_not change { Celluloid::Actor.all.size }
+  end
+
+  it 'terminates all linked actors on termination with wild channels' do
+    expect do
+      subject.parse(':server 001 Vetinari :Welcome message')
+      subject.parse(':server 376 Vetinari :End of /MOTD command.')
+      subject.parse(':Vetinari!foo@bar JOIN #mended_drum')
+      subject.parse(':TheLibrarian!foo@bar JOIN #mended_drum')
+      Vetinari::Channel.new('#unseen_university', subject)
+      subject.terminate
+    end.to_not change { Celluloid::Actor.all.size }
+  end
+end

data/spec/callback_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe 'Callback' do
   subject { Vetinari::Bot.new { |c| c.verbose = false } }
   let(:callbacks) { subject.callbacks.instance_variable_get('@callbacks') }
+  before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
+  end
 
   it 'is added correctly' do
     expect(callbacks[:channel]).to have(1).callback

data/spec/channel_management_spec.rb

@@ -4,6 +4,8 @@ describe 'Channel Management' do
   subject { Vetinari::Bot.new { |c| c.verbose = false } }
 
   before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
     subject.parse(':server 001 Vetinari :Welcome message')
     subject.parse(':server 376 Vetinari :End of /MOTD command.')
   end

data/spec/channel_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe Vetinari::Channel do
   bot = Vetinari::Bot.new
   subject { Vetinari::Channel.new('#mended_drum', bot) }
+  before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
+  end
 
   it 'responds to #to_s' do
     expect(subject.to_s).to eq('#mended_drum')

data/spec/default_callbacks_spec.rb

@@ -5,6 +5,8 @@ describe Vetinari::Bot do
   let(:bare) { subject.bare_object }
 
   before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
     subject.parse(':server 001 Vetinari :Welcome message')
     subject.parse(':server 376 Vetinari :End of /MOTD command.')
   end

data/spec/join_spec.rb

@@ -4,6 +4,8 @@ describe 'Bot#join' do
   subject { Vetinari::Bot.new { |c| c.verbose = false } }
 
   before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
     subject.parse(':server 001 Vetinari :Welcome message')
     subject.parse(':server 376 Vetinari :End of /MOTD command.')
   end

data/spec/rename_spec.rb

@@ -4,6 +4,8 @@ describe 'Bot#rename' do
   subject { Vetinari::Bot.new { |c| c.verbose = false } }
 
   before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
     subject.parse(':server 001 Vetinari :Welcome message')
     subject.parse(':server 376 Vetinari :End of /MOTD command.')
     subject.parse(':server 005 Vetinari NICKLEN=10')

data/spec/user_management_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe 'User Management' do
   subject { Vetinari::Bot.new { |c| c.verbose = false } }
+  before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
+  end
 
   context 'Connecting to the server' do
     it 'adds itself to the user_list when connected to the server' do

data/spec/user_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe Vetinari::User do
   bot = Vetinari::Bot.new
   subject { Vetinari::User.new('Ridcully', bot) }
+  before(:each) do
+    Celluloid.shutdown
+    Celluloid.boot
+  end
 
   it 'responds to #to_s' do
     expect(subject.to_s).to eq('Ridcully')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vetinari
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tobias Bühlmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -114,6 +114,7 @@ files:
 - lib/vetinari/user.rb
 - lib/vetinari/user_container.rb
 - lib/vetinari/version.rb
+- spec/bot_spec.rb
 - spec/callback_spec.rb
 - spec/channel_management_spec.rb
 - spec/channel_spec.rb
@@ -150,6 +151,7 @@ signing_key:
 specification_version: 4
 summary: Multithreaded IRC Bot Framework.
 test_files:
+- spec/bot_spec.rb
 - spec/callback_spec.rb
 - spec/channel_management_spec.rb
 - spec/channel_spec.rb