vetinari 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0000606629bd97c6e36412292b86220a9279472b
-  data.tar.gz: 5cb4790367bb5037fa4aecd97c6058a88ba56f39
+  metadata.gz: 8caa318b353a259ce354a4f33ac6512929a70ddc
+  data.tar.gz: 6b0c114d8756323c6c93c7945e44b5c1392ee852
 SHA512:
-  metadata.gz: a40248f184e7ee83ce0f6b8e12e806d5c71cf9b6f258f53c3dc774070bdf77ce02ced8ea274d241bf8adbab732cb3779b7b480dbdcc2a1080e7c98e219e21d85
-  data.tar.gz: 8989e04679431ca77300fb6195901a4c355e1a7047ec314b62cb14f8629afc011fecccb3d185eb0345dac6aaa9dda891129cc9b2bff39aaeb535e666b4ad696d
+  metadata.gz: edd9ea43bb5a3636a2a4dec5246c205c40d18c310d24782e4d43cfce515fa89558c83ae2f261b823053d45456265f38aca52e0d9d7a2ade0969894ba1f3a601d
+  data.tar.gz: ce1804db1898b39dfc6869dac32f98b3c2b1a9846e02a8ef8881c504e7b48bcaa71101b3ddad80a3d72009be0f106bcf14e1de00336cce6f9e223f5852d3d7d8

data/README.md

@@ -1,4 +1,4 @@
-# Vetinari
+# Vetinari [![Gem Version](https://badge.fury.io/rb/vetinari.png)](http://badge.fury.io/rb/vetinari)
 Vetinari is a Domain Specific Language for writing IRC Bots using the [Celluloid::IO](https://github.com/celluloid/celluloid-io "Celluloid::IO") library.
 
 ## Requirements
@@ -29,7 +29,7 @@ bot.on(:connect) do
   bot.join '#vetinari'
 end
 
-bot.on(:channel, /foo/) do |env|
+bot.on(:channel, :pattern => /foo/) do |env|
   env[:channel].message('bar')
 end
 

data/examples/echo_bot.rb

@@ -10,14 +10,14 @@ echo_bot = Vetinari::Bot.new do |config|
 end
 
 echo_bot.on :connect do
-  echo_bot.join '#vetinari'
+  echo_bot.join('#vetinari')
 end
 
-echo_bot.on :channel, /\Aquit!\z/ do |env|
+echo_bot.on(:channel, :pattern => /\Aquit!\z/) do |env|
   echo_bot.quit
 end
 
-echo_bot.on :channel, //, 1 do |env|
+echo_bot.on(:channel, :pattern => //) do |env|
   env[:channel].message(env[:message])
 end
 

data/lib/vetinari/bot.rb

@@ -19,8 +19,8 @@ module Vetinari
       setup_dcc
     end
 
-    def on(event, pattern = //, worker = 0, &block)
-      @callbacks.add(event, pattern, worker, block)
+    def on(event, options = {}, &block)
+      @callbacks.add(event, options, block)
     end
 
     exclusive :on
@@ -111,16 +111,16 @@ module Vetinari
       end
 
       # User ping request.
-      on :query, /^\001PING \d+\001$/ do |env|
+      on :query, :pattern => /^\001PING \d+\001$/ do |env|
         time = env[:message].scan(/\d+/)[0]
         env[:user].notice("\001PING #{time}\001")
       end
 
-      on :query, /^\001VERSION\001$/ do |env|
+      on :query, :pattern => /^\001VERSION\001$/ do |env|
         env[:user].notice("\001VERSION Vetinari #{Vetinari::VERSION} (https://github.com/tbuehlmann/vetinari)")
       end
 
-      on :query, /^\001TIME\001$/ do |env|
+      on :query, :pattern => /^\001TIME\001$/ do |env|
         env[:user].notice("\001TIME #{Time.now.strftime('%a %b %d %H:%M:%S %Y')}\001")
       end
     end
@@ -306,7 +306,7 @@ module Vetinari
         env[:user] = @users[nick] || User.new(nick, @actor)
       end
 
-      on :query, /\A\001DCC SEND \"?\S+\"? \d+ \d+ \d+\001\z/ do |env|
+      on :query, :pattern => /\A\001DCC SEND \"?\S+\"? \d+ \d+ \d+\001\z/ do |env|
         results = env[:message].scan(/\A\001DCC SEND \"?(\S+)\"? (\d+) (\d+) (\d+)\001\z/)
         filename, ip, port, filesize = results.first
         filename = filename.delete("/\\")
@@ -337,6 +337,15 @@ module Vetinari
         end
       end
 
+      on :nick_change do |env|
+        # TODO: Update existing users with user/host information.
+        env.delete(:user)
+        env.delete(:host)
+        env[:old_nick] = env.delete(:nick)
+        env[:user] = @users[env[:old_nick]]
+        env[:user].renamed_to(env.delete(:new_nick))
+      end
+
       # Response to MODE command, giving back the channel modes.
       on 324 do |env|
         split = env[:params].split(/ /)

data/lib/vetinari/callback.rb

@@ -5,9 +5,9 @@ module Vetinari
     attr_reader :event
     attr_writer :container
 
-    def initialize(event, pattern, proc, container, uuid)
+    def initialize(event, options, proc, container, uuid)
       @event = event
-      @pattern = pattern
+      @options = options
       @proc = proc
       @container = container
       @uuid = uuid
@@ -29,9 +29,9 @@ module Vetinari
 
     def inspect
       event   = @event.inspect
-      pattern = @pattern.inspect
+      options = @options.inspect
       uuid    = @uuid.inspect
-      "#<Callback event=#{event} pattern=#{pattern} uuid=#{uuid}>"
+      "#<Callback event=#{event} options=#{options} uuid=#{uuid}>"
     end
 
     private
@@ -39,7 +39,11 @@ module Vetinari
     def matching?(env)
       case @event
       when :channel, :query
-        env[:message] =~ @pattern
+        if @options[:pattern]
+          env[:message] =~ @options[:pattern] ? true : false
+        else
+          true
+        end
       else
         true
       end

data/lib/vetinari/callback_container.rb

@@ -8,10 +8,10 @@ module Vetinari
       @mutex = Mutex.new
     end
     
-    def add(event, pattern, worker, proc)
+    def add(event, options, proc)
+      worker = Integer(options.delete(:worker) || 0)
       uuid = Celluloid.uuid
-      args = [event, pattern, proc, self, uuid]
-      worker = Integer(worker)
+      args = [event, options, proc, self, uuid]
 
       case
       when worker == 1

data/lib/vetinari/channel.rb

@@ -221,6 +221,10 @@ module Vetinari
       "#<Channel name=#{@name.inspect}>"
     end
 
+    def to_s
+      @name
+    end
+
     private
 
     def set_channel_mode(mode, param)

data/lib/vetinari/message_parser.rb

@@ -21,7 +21,7 @@ module Vetinari
       when /^:(\S+)!(\S+)@(\S+) MODE ((?:#{chantypes})\S+) ([+-]\S+)/
         {:type => :channel_mode, :nick => $1, :user => $2, :host => $3, :channel => $4, :modes => $5, :params => $'.lstrip}
       when /^:(\S+)!(\S+)@(\S+) NICK :/
-        {:type => :nickchange, :nick => $1, :user => $2, :host => $3, :new_nick => $'}
+        {:type => :nick_change, :nick => $1, :user => $2, :host => $3, :new_nick => $'}
       when /^:(\S+)!(\S+)@(\S+) KICK (\S+) (\S+) :/
         {:type => :kick, :nick => $1, :user => $2, :host => $3, :channel => $4, :kickee => $5, :message => $'}
       when /^:(\S+)!(\S+)@(\S+) TOPIC (\S+) :/

data/lib/vetinari/user.rb

@@ -4,8 +4,8 @@ module Vetinari
     attr_reader :nick, :user, :host, :online, :observed
     
     def initialize(nick, bot)
+      # TODO
       @bot = bot
-
       @nick = nick
       @user = nil
       @host = nil
@@ -97,8 +97,16 @@ module Vetinari
       @bot.raw "NOTICE #{@nick} :#{message}"
     end
 
+    def renamed_to(nick)
+      @nick = nick
+    end
+
     def inspect
       "#<User nick=#{@nick}>"
     end
+
+    def to_s
+      @nick
+    end
   end
 end

data/lib/vetinari/version.rb

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

data/spec/channel_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Vetinari::Channel do
+  bot = Vetinari::Bot.new
+  subject { Vetinari::Channel.new('#mended_drum', bot) }
+
+  it 'responds to #to_s' do
+    expect(subject.to_s).to eq('#mended_drum')
+  end
+end

data/spec/default_callbacks_spec.rb

@@ -50,4 +50,27 @@ describe Vetinari::Bot do
       subject.parse(':TheLibrarian!foo@bar KICK #mended_drum Vetinari :foo')
     end
   end
+
+  describe 'on :nick_change' do
+    before(:each) do
+      subject.parse(':Vetinari!foo@bar JOIN #mended_drum')
+      subject.parse(':Ridcully!foo@bar JOIN #mended_drum')
+    end
+
+    it 'works' do
+      user = subject.users['Ridcully']
+      subject.parse(':Ridcully!foo@bar NICK :Twoflower')
+      expect(user.nick).to eq('Twoflower')
+    end
+
+    it 'sets the old nick properly' do
+      subject.on :nick_change do |env|
+        expect(env[:old_nick]).to eq('Ridcully')
+        @called = true
+      end
+
+      subject.parse(':Ridcully!foo@bar NICK :Twoflower')
+      expect(@called).to be_true
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rspec'
 require 'vetinari'
-# require 'pry'
+require 'pry'
 
 RSpec.configure do |config|
   config.color_enabled = true

data/spec/user_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Vetinari::User do
+  bot = Vetinari::Bot.new
+  subject { Vetinari::User.new('Ridcully', bot) }
+
+  it 'responds to #to_s' do
+    expect(subject.to_s).to eq('Ridcully')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vetinari
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Tobias Bühlmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -116,10 +116,12 @@ files:
 - lib/vetinari/version.rb
 - spec/callback_spec.rb
 - spec/channel_management_spec.rb
+- spec/channel_spec.rb
 - spec/default_callbacks_spec.rb
 - spec/isupport_spec.rb
 - spec/spec_helper.rb
 - spec/user_management_spec.rb
+- spec/user_spec.rb
 - vetinari.gemspec
 homepage: https://github.com/tbuehlmann/vetinari
 licenses:
@@ -148,7 +150,9 @@ summary: Multithreaded IRC Bot Framework.
 test_files:
 - spec/callback_spec.rb
 - spec/channel_management_spec.rb
+- spec/channel_spec.rb
 - spec/default_callbacks_spec.rb
 - spec/isupport_spec.rb
 - spec/spec_helper.rb
 - spec/user_management_spec.rb
+- spec/user_spec.rb