carrier-pigeon 0.6.0 → 0.7.0

data/README.org

@@ -56,12 +56,4 @@ Identify with NickServ
 :   :nickserv_password => "secret"
 : )
 
-Register (ping reply) prior to joining or messaging a channel
-(required for some private servers)
 
-: CarrierPigeon.send(
-:   :uri => "irc://nick:password@irc.domain.com:6667/#channel",
-:   :message => "cooooo, coo coo",
-:   :register_first => true,
-:   :join => true
-: )

data/carrier-pigeon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "carrier-pigeon"
-  s.version     = "0.6.0"
+  s.version     = "0.7.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sean Porter"]
   s.email       = ["portertech@gmail.com"]

data/lib/carrier-pigeon.rb

@@ -22,16 +22,15 @@ class CarrierPigeon
     sendln "PASS #{options[:password]}" if options[:password]
     sendln "NICK #{options[:nick]}"
     sendln "USER #{options[:nick]} 0 * :#{options[:nick]}"
-    sendln options[:nickserv_command] if options[:nickserv_command]
-    if options[:register_first]
-      while line = @socket.gets
-        case line
-          when /^PING :(.+)$/i
-            sendln "PONG :#{$1}"
-            break
-        end
+    while line = @socket.gets
+      case line
+      when /00[1-4] #{Regexp.escape(options[:nick])}/
+        break
+      when /^PING :(.+)$/i
+        sendln "PONG :#{$1}"
       end
     end
+    sendln options[:nickserv_command] if options[:nickserv_command]
     if options[:join]
       join = "JOIN #{options[:channel]}"
       join += " #{options[:channel_password]}" if options[:channel_password]

data/test/send_tests.rb

@@ -26,18 +26,18 @@ PRIVMSG #test :test
 QUIT :quit
 EXPECTED
 
-JOIN_PASSWORD = <<"EXPECTED"
+PONG = <<"EXPECTED"
 NICK foo
 USER foo 0 * :foo
-JOIN #test bar
+PONG :dummy
 PRIVMSG #test :test
 QUIT :quit
 EXPECTED
 
-REGISTER = <<"EXPECTED"
+JOIN_PASSWORD = <<"EXPECTED"
 NICK foo
 USER foo 0 * :foo
-PONG :hello
+JOIN #test bar
 PRIVMSG #test :test
 QUIT :quit
 EXPECTED
@@ -51,13 +51,12 @@ QUIT :quit
 EXPECTED
 
 describe CarrierPigeon do
-
   before do
     @server_received = ""
     @tcp_server = TCPServer.new(16667)
     Thread.new do
       socket = @tcp_server.accept
-      socket.puts "PING :hello"
+      server_messages.each { |msg| socket.puts msg }
       while line = socket.gets
         @server_received << line
         socket.close if line =~ /:quit/
@@ -70,70 +69,91 @@ describe CarrierPigeon do
     sleep 1
   end
 
-  it "can send a private message to an irc channel" do
-    CarrierPigeon.send(
-      :uri => "irc://foo@localhost:16667/#test",
-      :message => "test"
-    )
-    @server_received.must_equal(PRIVATE_MESSAGE)
-  end
+  describe "with server reply" do
+    let :server_messages do
+      [
+        ":dummy 001 foo :Welcome to the Internet Relay Network",
+        ":dummy 002 foo :Your host is dummy",
+        ":dummy 003 foo :This server was created now",
+        ":dummy 004 foo dummy"
+      ]
+    end
 
-  it "can send a notice to an irc channel" do
-    CarrierPigeon.send(
-      :uri => "irc://foo@localhost:16667/#test",
-      :message => "test",
-      :notice => true
-    )
-    @server_received.must_equal(NOTICE)
-  end
+    it "can send a private message to an irc channel" do
+      CarrierPigeon.send(
+        :uri => "irc://foo@localhost:16667/#test",
+        :message => "test"
+      )
+      @server_received.must_equal(PRIVATE_MESSAGE)
+    end
 
-  it "can join an irc channel and send a private message" do
-    CarrierPigeon.send(
-      :uri => "irc://foo@localhost:16667/#test",
-      :message => "test",
-      :join => true
-    )
-    @server_received.must_equal(JOIN)
-  end
+    it "can send a notice to an irc channel" do
+      CarrierPigeon.send(
+        :uri => "irc://foo@localhost:16667/#test",
+        :message => "test",
+        :notice => true
+      )
+      @server_received.must_equal(NOTICE)
+    end
 
-  it "can join an irc channel with a password and send a private message" do
-    CarrierPigeon.send(
-      :uri => "irc://foo@localhost:16667/#test",
-      :message => "test",
-      :channel_password => "bar",
-      :join => true
-    )
-    @server_received.must_equal(JOIN_PASSWORD)
-  end
+    it "can join an irc channel and send a private message" do
+      CarrierPigeon.send(
+        :uri => "irc://foo@localhost:16667/#test",
+        :message => "test",
+        :join => true
+      )
+      @server_received.must_equal(JOIN)
+    end
 
-  it "can identify with nickserv and send a private message to an irc channel" do
-    CarrierPigeon.send(
-      :uri => "irc://foo@localhost:16667/#test",
-      :message => "test",
-      :nickserv_password => "bar"
-    )
-    @server_received.must_equal(NICKSERV_PASSWORD)
-  end
+    it "can join an irc channel with a password and send a private message" do
+      CarrierPigeon.send(
+        :uri => "irc://foo@localhost:16667/#test",
+        :message => "test",
+        :channel_password => "bar",
+        :join => true
+      )
+      @server_received.must_equal(JOIN_PASSWORD)
+    end
 
-  it "can require registration and send a private message to an irc channel" do
-    CarrierPigeon.send(
-      :uri => "irc://foo@localhost:16667/#test",
-      :message => "test",
-      :register_first => true
-    )
-    @server_received.must_equal(REGISTER)
-  end
+    it "can identify with nickserv and send a private message to an irc channel" do
+      CarrierPigeon.send(
+        :uri => "irc://foo@localhost:16667/#test",
+        :message => "test",
+        :nickserv_password => "bar"
+      )
+      @server_received.must_equal(NICKSERV_PASSWORD)
+    end
 
-  it "must be provided an irc uri" do
-    lambda {
-      CarrierPigeon.send(:message => "test")
-    }.must_raise RuntimeError
-  end
+    it "must be provided an irc uri" do
+      lambda {
+        CarrierPigeon.send(:message => "test")
+      }.must_raise RuntimeError
+    end
 
-  it "must be provided an irc message" do
-    lambda {
-      CarrierPigeon.send(:uri => "irc://foo@localhost:16667/#test")
-    }.must_raise RuntimeError
+    it "must be provided an irc message" do
+      lambda {
+        CarrierPigeon.send(:uri => "irc://foo@localhost:16667/#test")
+      }.must_raise RuntimeError
+    end
   end
 
+  describe "with server PING before initial reply" do
+    let :server_messages do
+      [
+        "PING :dummy",
+        ":dummy 001 foo :Welcome to the Internet Relay Network",
+        ":dummy 002 foo :Your host is dummy",
+        ":dummy 003 foo :This server was created now",
+        ":dummy 004 foo dummy"
+      ]
+    end
+
+    it "must reply with PONG" do
+      CarrierPigeon.send(
+        :uri => "irc://foo@localhost:16667/#test",
+        :message => "test"
+      )
+      @server_received.must_equal(PONG)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrier-pigeon
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Sean Porter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-29 00:00:00 -07:00
+date: 2013-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency