rhuidean 0.2.4 → 0.2.5

data/lib/rhuidean/client.rb

@@ -14,7 +14,7 @@ module IRC
 class Client
     ##
     # constants
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
 
     ##
     # instance attributes
@@ -193,8 +193,8 @@ class Client
             ret = @socket.readpartial(8192)
         rescue Errno::EAGAIN
             retry
-        rescue EOFError
-            ret = nil
+        rescue Errno::ETIMEDOUT, EOFError
+            ret = nil # Dead
         end
 
         unless ret
@@ -349,7 +349,15 @@ class Client
 
             writefd = [@socket] unless @sendq.empty?
 
-            ret = IO.select([@socket], writefd, [], 10)
+            # Ruby's threads suck. In theory, the timers should
+            # manage themselves in separate threads. Unfortunately,
+            # Ruby has a global lock and the scheduler isn't great, so
+            # this tells select() to timeout when the next timer needs to run.
+            timeout = (Timer.next_time - Time.now.to_f).round(0).to_i
+            timeout = 1 if timeout == 0 # Don't want 0, that's forever
+            timeout = 60 if timeout < 0 # Less than zero means no timers
+
+            ret = IO.select([@socket], writefd, [], timeout)
 
             next unless ret
 
@@ -464,7 +472,7 @@ class Message
     ##
     # instance attributes
     attr_reader :client, :ctcp, :origin, :params, :raw, :target
-    attr_reader :origin_nick
+    attr_reader :origin_nick, :origin_user, :origin_host
 
     #
     # Creates a new Message. We use these to represent the old
@@ -476,7 +484,7 @@ class Message
 
         # Is the origin a user? Let's make this a little more simple...
         if m = ORIGIN_RE.match(@origin)
-            @origin_nick = m[1]
+            @origin_nick, @origin_user, @origin_host = m[1..3]
         end
 
         # Reformat it a bit if it's a CTCP.

data/lib/rhuidean/timer.rb

@@ -15,7 +15,7 @@ class Timer
 
     ##
     # instance attributes
-    attr_reader :time, :repeat
+    attr_reader :time, :timeout, :repeat
 
     #
     # Creates a new timer to be executed within +10 seconds of +time+.
@@ -26,9 +26,10 @@ class Timer
     # returns:: +self+
     #
     def initialize(time, repeat = false, &block)
-        @time   = time.to_i
-        @repeat = repeat
-        @block  = block
+        @time    = time.to_i
+        @timeout = Time.now.to_f + @time
+        @repeat  = repeat
+        @block   = block
 
         @@timers << self
 
@@ -61,6 +62,15 @@ class Timer
         new(time, false, &block)
     end
 
+    #
+    # Returns the Unix timestamp of the next time a timer should run
+    # ---
+    # returns:: minimum timer interval, see above
+    #
+    def Timer.next_time
+        @@timers.collect { |t| t.timeout }.min
+    end
+
     #
     # Stops all timers.
     # ---
@@ -93,6 +103,7 @@ class Timer
         loop do
             sleep(@time)
             @block.call
+            @timeout = Time.now.to_f + @time if @repeat
             break unless @repeat
         end
 

data/rakefile

@@ -10,7 +10,7 @@
     require 'rake/' + m
 end
 
-VER = '0.2.4'
+VER = '0.2.5'
 
 #
 # Default task - unit tests.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhuidean
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Eric Will
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 -04:00
+date: 2010-10-01 00:00:00 -04:00
 default_executable: 
 dependencies: []