tkellem 0.8.5 → 0.8.6

data/lib/tkellem/bouncer.rb

@@ -87,6 +87,9 @@ class Bouncer
       @away[client] = msg.args.last
       check_away_status
       false
+    when 'NICK'
+      @nick = msg.args.last
+      true
     else
       true
     end
@@ -122,6 +125,15 @@ class Bouncer
       # swallow it, we handle ping-pong from clients separately, in
       # BouncerConnection
       false
+    when '433'
+      # nick already in use, try another
+      change_nick("#{@nick}_")
+      false
+    when 'NICK'
+      if msg.prefix == nick
+        @nick = msg.args.last
+      end
+      true
     else
       true
     end
@@ -183,7 +195,7 @@ class Bouncer
   end
 
   def send_welcome(bouncer_conn)
-    @welcomes.each { |msg| bouncer_conn.send_msg(msg) }
+    @welcomes.each { |msg| msg.args[0] = nick; bouncer_conn.send_msg(msg) }
   end
 
   def connect!

data/lib/tkellem/irc_message.rb

@@ -20,7 +20,7 @@ class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)
 
     msg = self.new(prefix, command, args)
 
-    if args.last.match(%r{#{"\x01"}([^ ]+)([^\1]*)#{"\x01"}})
+    if args.last.try(:match, %r{#{"\x01"}([^ ]+)([^\1]*)#{"\x01"}})
       msg.ctcp = $1.upcase
       msg.args[-1] = $2.strip
     end

data/lib/tkellem/tkellem_server.rb

@@ -37,6 +37,10 @@ class TkellemServer
     Observer.forward_to << self
   end
 
+  def stop
+    Observer.forward_to.delete(self)
+  end
+
   # callbacks for AR observer events
   def after_create(obj)
     case obj

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/spec/irc_message_spec.rb

@@ -21,6 +21,13 @@ describe IrcMessage, ".parse" do
     line.args.should == ["#myroom", "http://google.com/"]
     line.replay.should == orig
   end
+
+  it "should parse with no arguments" do
+    line = IrcMessage.parse("AWAY")
+    line.command.should == "AWAY"
+    line.args.should == []
+    line.replay.should == "AWAY"
+  end
 end
 
 describe IrcMessage, "#with_timestamp" do

data/spec/irc_server_spec.rb

@@ -48,7 +48,12 @@ describe Bouncer, "connection" do
   end
 
   def tk_server
-    @tk_server ||= TkellemServer.new
+    $tk_server ||= TkellemServer.new
+  end
+
+  after(:each) do
+    $tk_server.stop if $tk_server
+    $tk_server = nil
   end
 
   def network_user(opts = {})
@@ -60,7 +65,7 @@ describe Bouncer, "connection" do
   def bouncer(opts = {})
     tk_server
     network_user
-    @bouncer = @tk_server.bouncers.values.last
+    @bouncer = $tk_server.bouncers.values.last
     if opts[:connect]
       @server_conn = em(IrcServerConnection).new(@bouncer, false)
       @server_conn.stub!(:send_data)
@@ -88,4 +93,45 @@ describe Bouncer, "connection" do
     @client.receive_line("NICK some_other_nick")
     @client.receive_line("USER #{@user.username}@#{@network.name} a b :c")
   end
+
+  it "should attempt another nick if the default is taken" do
+    network_user(:nick => 'mynick')
+    bouncer
+    @server_conn = em(IrcServerConnection).new(@bouncer, false)
+    @server_conn.stub!(:send_data)
+    @bouncer.connection_established(@server_conn)
+    @server_conn.should_receive(:send_data).with("NICK mynick_\r\n")
+    @bouncer.server_msg(m ":server 433 * mynick :Nickname already in use")
+    @bouncer.nick.should == 'mynick_'
+    @bouncer.send :ready!
+  end
+
+  it "should change nicks if a client sends nick after connecting" do
+    network_user(:nick => 'mynick')
+    bouncer(:connect => true)
+    @bouncer.server_msg(m ":mynick JOIN #t1")
+    client_connection
+    @client.should_receive(:send_msg).with(":mynick JOIN #t1")
+    @client.receive_line("PASS test123")
+    @client.receive_line("NICK mynick")
+    @client.receive_line("USER #{@user.username}@#{@network.name} a b :c")
+    @bouncer.nick.should == 'mynick'
+    @bouncer.client_msg(@client, m("NICK some_other"))
+    @bouncer.nick.should == 'some_other'
+  end
+
+  it "should change nicks if a server forces nick change" do
+    network_user(:nick => 'mynick')
+    bouncer(:connect => true)
+    @bouncer.server_msg(m ":mynick JOIN #t1")
+    client_connection
+    @client.should_receive(:send_msg).with(":mynick JOIN #t1")
+    @client.receive_line("PASS test123")
+    @client.receive_line("NICK mynick")
+    @client.receive_line("USER #{@user.username}@#{@network.name} a b :c")
+    @bouncer.nick.should == 'mynick'
+    @client.should_receive(:send_msg).with(m ":mynick NICK some_other")
+    @bouncer.server_msg(m ":mynick NICK some_other")
+    @bouncer.nick.should == 'some_other'
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: tkellem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Brian Palmer