ichverstehe-isaac 0.2.4 → 0.2.5

data/isaac.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "isaac"
-  s.version  = "0.2.4"
-  s.date     = "2009-04-01"
+  s.version  = "0.2.5"
+  s.date     = "2009-04-25"
   s.summary  = "The smallish DSL for writing IRC bots"
   s.email    = "harry@vangberg.name"
   s.homepage = "http://github.com/ichverstehe/isaac"

data/lib/isaac.rb

@@ -119,25 +119,25 @@ module Isaac
     def parse(input)
       puts "<< #{input}" if @bot.config.verbose
       case input.chomp
-      when /^:\S+ 00([1-4])/
-        @registration << $1.to_i
+      when /(^:\S+ )?00([1-4])/
+        @registration << $2.to_i
         if registered?
           @queue.unlock
           @bot.dispatch(:connect)
         end
-      when /^:(\S+)!\S+ PRIVMSG \S+ :?\001VERSION\001/
-        message "NOTICE #{$1} :\001VERSION #{@bot.config.version}\001"
+      when /(^:(\S+)!\S+ )?PRIVMSG \S+ :?\001VERSION\001/
+        message "NOTICE #{$2} :\001VERSION #{@bot.config.version}\001"
       when /^PING (\S+)/
         @queue.unlock
         message "PONG #{$1}"
-      when /^:(\S+)!(\S+) PRIVMSG (\S+) :?(.*)/
-        env = { :nick => $1, :userhost => $2, :channel => $3, :message => $4 }
+      when /(^:(\S+)!(\S+) )?PRIVMSG (\S+) :?(.*)/
+        env = { :nick => $2, :userhost => $3, :channel => $4, :message => $5 }
         type = env[:channel].match(/^#/) ? :channel : :private
         @bot.dispatch(type, env)
-      when /^:\S+ ([4-5]\d\d) \S+ (\S+)/
-        env = {:error => $1.to_i, :message => $1, :nick => $2, :channel => $2}
+      when /(^:\S+ )?([4-5]\d\d) \S+ (\S+)/
+        env = {:error => $2.to_i, :message => $2, :nick => $3, :channel => $3}
         @bot.dispatch(:error, env)
-      when /^:\S+ PONG/
+      when /(^:\S+ )?PONG/
         @queue.unlock
       end
     end
@@ -178,7 +178,7 @@ module Isaac
     end
 
     def transfered_after_next_send
-      @transfered + @queue.first.size + 1 # the 1 is for \n
+      @transfered + @queue.first.size + 2 # the 2 is for \r\n
     end
 
     def exceed_limit?
@@ -187,7 +187,11 @@ module Isaac
 
     def lock_and_ping
       lock
-      @socket.puts "PING :#{@server}"
+      @socket.print "PING :#{@server}\r\n"
+    end
+
+    def next_message
+      @queue.shift.to_s.chomp + "\r\n"
     end
 
     def invoke
@@ -196,7 +200,7 @@ module Isaac
           lock_and_ping; break
         else
           @transfered = transfered_after_next_send
-          @socket.puts @queue.shift
+          @socket.print next_message
           # puts ">> #{msg}" if @bot.config.verbose
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ichverstehe-isaac
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: []