rhuidean 1.1.0 → 1.1.2

data/lib/rhuidean.rb

@@ -9,7 +9,7 @@ module Rhuidean
     # Version number
     V_MAJOR  = 1
     V_MINOR  = 1
-    V_PATCH  = 0
+    V_PATCH  = 2
 
     VERSION  = "#{V_MAJOR}.#{V_MINOR}.#{V_PATCH}"
 end

data/lib/rhuidean/client.rb

@@ -192,14 +192,15 @@ class Client
     #
     def read
         begin
-            ret = @socket.readpartial(8192)
-        rescue Errno::EAGAIN
+            ret = @socket.read_nonblock(8192)
+        rescue IO::WaitReadable
             retry
-        rescue EOFError, SystemCallError
+        rescue Exception
             ret = nil # Dead
         end
 
         if not ret or ret.empty?
+            log(:info, "read error from #@server: #{e}") if e
             @eventq.post(:dead)
             return
         end
@@ -232,11 +233,11 @@ class Client
         begin
             # Use shift because we need it to fall off immediately.
             while line = @sendq.shift
+                log(:debug, "<- #{line}")
                 line += "\r\n"
-                log(:debug, line)
-                @socket.write(line)
+                @socket.write_nonblock(line)
             end
-        rescue Errno::EAGAIN
+        rescue IO::WaitReadable
             retry
         rescue Exception
             @eventq.post(:dead)
@@ -281,7 +282,7 @@ class Client
         @recvq.each do |line|
             line.chomp!
 
-            log(:debug, line)
+            log(:debug,"-> #{line}")
 
             m = IRC_RE.match(line)
 

data/lib/rhuidean/loggable.rb

@@ -7,6 +7,42 @@
 # encoding: utf-8
 
 module Loggable
+
+    #
+    # I use this to override the log formatting.
+    # There's no documented way to do this; I had to figure it out.
+    # That means this could break, and it's not "right."
+    #
+    class Formatter
+        FORMAT = "%s, [%s] %s: %s\n"
+        PN_RE  = /\:in \`.+\'/
+
+        ######
+        public
+        ######
+
+        #
+        # Called by Logger to format the message.
+        # ---
+        # severity:: String
+        # time:: Time
+        # progname:: String
+        # msg:: strictly anything, for us String
+        #
+        def call(severity, time, progname, msg)
+            datetime = time.strftime('%m/%d %H:%M:%S')
+
+            # Include filename, line number, and method name in debug
+            if severity == "DEBUG"
+                progname.gsub!(PN_RE, '')
+                progname.gsub!('block in ', '')
+                "[%s] %s: %s\n" % [datetime, progname, msg]
+            else
+                "[%s] %s\n" % [datetime, msg]
+            end
+        end
+    end
+
     ##
     # Logs a regular message.
     # ---
@@ -34,7 +70,7 @@ module Loggable
         # Set to false/nil to disable logging...
         return unless @logger
 
-        @logger.datetime_format = '%m/%d %H:%M:%S '
+        @logger.formatter = Formatter.new
     end
 
     def log_level=(level)

data/lib/rhuidean/stateful_client.rb

@@ -179,7 +179,7 @@ class StatefulClient < Client
             @users[user.nickname] ||= user
 
             @channels[m.target].add_user(user)
-            log(:info, "join: #{user} -> #{m.target}")
+            log(:info, "do_join(): #{user} -> #{m.target}")
         end
     end
 
@@ -196,12 +196,12 @@ class StatefulClient < Client
 
             @channels.delete(chan.name)
 
-            log(:info, "parted: #{chan.name}")
+            log(:info, "do_part(): #{chan.name}")
         else
             user = @users[m.origin_nick]
 
             @channels[m.target].delete_user(user)
-            log(:info, "part: #{user.nickname} -> #{m.origin_nick}")
+            log(:info, "do_part(): #{user.nickname} -> #{m.origin_nick}")
 
             delete_user(user) if user.channels.empty?
         end
@@ -222,7 +222,7 @@ class StatefulClient < Client
             channel.users.delete(m.origin_nick)
         end
 
-        log(:info, "nick: #{m.origin_nick} -> #{m.target}")
+        log(:info, "do_nick(): #{m.origin_nick} -> #{m.target}")
     end
 
     def do_kick(m)
@@ -238,12 +238,12 @@ class StatefulClient < Client
 
             @channels.delete(chan.name)
 
-            log(:info, "kicked: #{chan.name}")
+            log(:info, "do_kick(): #{chan.name}")
         else
             user = @users[m.params[0]]
 
             @channels[m.target].delete_user(user)
-            log(:info, "kick: #{user.nickname} -> #{m.origin_nick}")
+            log(:info, "do_kick(): #{user.nickname} -> #{m.origin_nick}")
 
             delete_user(user) if user.channels.empty?
         end
@@ -258,7 +258,7 @@ class StatefulClient < Client
             user.channels.each { |name, chan| chan.delete_user(user) }
 
             delete_user(user)
-            log(:info, "quit: #{user.nickname}")
+            log(:info, "do_quit(): #{user.nickname}")
         end
     end
 
@@ -294,7 +294,7 @@ class StatefulClient < Client
             end
 
             chan.add_user(user)
-            log(:debug, "names: #{user} -> #{chan}")
+            log(:debug, "do_rpl_namereply(): #{user} -> #{chan}")
         end
     end
 end

data/test/tc_client.rb

@@ -42,7 +42,6 @@ class TestClient < Test::Unit::TestCase
                 c.realname = 'rhuidean unit tester'
 
                 c.logger   = nil
-                c.debug    = false
             end
         end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Eric Will
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -05:00
+date: 2010-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,10 +32,10 @@ files:
 - lib/rhuidean.rb
 - lib/rhuidean/client.rb
 - lib/rhuidean/timer.rb
-- lib/rhuidean/event.rb
+- lib/rhuidean/stateful_channel.rb
 - lib/rhuidean/methods.rb
+- lib/rhuidean/event.rb
 - lib/rhuidean/numeric.rb
-- lib/rhuidean/stateful_channel.rb
 - lib/rhuidean/stateful_client.rb
 - lib/rhuidean/stateful_user.rb
 - lib/rhuidean/loggable.rb