percy 0.0.5 → 0.0.6

data/README.md

@@ -1,4 +1,4 @@
-# Percy 0.0.5
+# Percy 0.0.6
 
 ## Configuring and starting the bot
 
@@ -36,10 +36,10 @@ No variables.
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
-env[:channel]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
+env[:channel]<br />
 env[:message]</tt>
 
 ### Query message
@@ -48,9 +48,9 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
 env[:message]</tt>
 
 ### Join
@@ -59,9 +59,9 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
 env[:channel]</tt>
 
 ### Part
@@ -70,10 +70,10 @@ env[:channel]</tt>
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
-env[:channel]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
+env[:channel]<br />
 env[:message]</tt>
 
 ### Quit
@@ -82,9 +82,9 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
 env[:message]</tt>
 
 ### Nickchange
@@ -93,9 +93,9 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
 env[:new_nick]</tt>
 
 ### Kick
@@ -104,11 +104,11 @@ env[:new_nick]</tt>
     end
 Variables:
 
-<tt>env[:nick]
-env[:user]
-env[:host]
-env[:channel]
-env[:victim]
+<tt>env[:nick]<br />
+env[:user]<br />
+env[:host]<br />
+env[:channel]<br />
+env[:victim]<br />
 env[:reason]</tt>
 
 ## Availabe Methods

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/percy.rb

@@ -8,7 +8,7 @@ require 'thread'
 Thread.abort_on_exception = true
 
 class Percy
-  VERSION = 'Percy 0.0.5 (http://github.com/tbuehlmann/percy)'
+  VERSION = 'Percy 0.0.6 (http://github.com/tbuehlmann/percy)'
   
   Config = Struct.new(:server, :port, :password, :nick, :username, :verbose, :logging)
   
@@ -67,6 +67,35 @@ class Percy
     raw "MODE #{recipient} #{option}"
   end
   
+  # returns all users on a specific channel
+  def users_on(channel)
+    add_observer
+    raw "NAMES #{channel}"
+    
+    begin
+      Timeout::timeout(10) do # try 10 seconds to retrieve the users of <channel>
+        start = 0
+        ending = @temp_socket.length
+        
+        loop do
+          for line in start..ending do
+            if @temp_socket[line] =~ /^:\S+ 353 \S+ = #{channel} :/
+              return $'.split(' ')
+            end
+          end
+          
+          sleep 0.25
+          start = ending
+          ending = @temp_socket.length
+        end
+      end
+    rescue Timeout::Error
+      return false
+    ensure
+      remove_observer
+    end
+  end
+  
   # get the channel limit of a channel
   def channel_limit(channel)
     add_observer
@@ -74,13 +103,19 @@ class Percy
     
     begin
       Timeout::timeout(10) do # try 10 seconds to retrieve l mode of <channel>
+        start = 0
+        ending = @temp_socket.length
+        
         loop do
-          @temp_socket.each do |line|
-            if line =~ /^:\S+ 324 \S+ #{channel} .*l.* (\d+)/
+          for line in start..ending do
+            if @temp_socket[line] =~ /^:\S+ 324 \S+ #{channel} .*l.* (\d+)/
               return $1.to_i
             end
           end
-          sleep 0.5
+          
+          sleep 0.25
+          start = ending
+          ending = @temp_socket.length
         end
       end
     rescue Timeout::Error
@@ -97,15 +132,21 @@ class Percy
     
     begin
       Timeout::timeout(10) do
+        start = 0
+        ending = @temp_socket.length
+        
         loop do
-          @temp_socket.each do |line|
-            if line =~ /^:\S+ 311 \S+ (#{nick}) /i
+          for line in start..ending do
+            if @temp_socket[line] =~ /^:\S+ 311 \S+ (#{nick}) /i
               return $1
             elsif line =~ /^:\S+ 401 \S+ #{nick} /i
               return false
             end
           end
-          sleep 0.5
+          
+          sleep 0.25
+          start = ending
+          ending = @temp_socket.length
         end
       end
     rescue Timeout::Error
@@ -200,29 +241,6 @@ class Percy
     end
   end
   
-  # returns all users on a specific channel
-  def users_on(channel)
-    add_observer
-    raw "NAMES #{channel}"
-    
-    begin
-      Timeout::timeout(10) do # try 10 seconds to retrieve the users of <channel>
-        loop do
-          @temp_socket.each do |line|
-            if line =~ /^:\S+ 353 \S+ = #{channel} :/
-              return $'.split(' ')
-            end
-          end
-          sleep 0.5
-        end
-      end
-    rescue Timeout::Error
-      return false
-    ensure
-      remove_observer
-    end
-  end
-  
   # parses incoming traffic
   def parse(type, env = nil)
     case type
@@ -236,7 +254,7 @@ class Percy
             end
           rescue => e
               if @error_logger
-                @error_logger.error(e.message)              
+                @error_logger.error(e.message)
                 e.backtrace.each do |line|
                   @error_logger.error(line)
                 end
@@ -253,7 +271,7 @@ class Percy
               method[:proc].call(env)
             rescue => e
               if @error_logger
-                @error_logger.error(e.message)              
+                @error_logger.error(e.message)
                 e.backtrace.each do |line|
                   @error_logger.error(line)
                 end
@@ -286,7 +304,7 @@ class Percy
               method[:proc].call(env)
             rescue => e
               if @error_logger
-                @error_logger.error(e.message)              
+                @error_logger.error(e.message)
                 e.backtrace.each do |line|
                   @error_logger.error(line)
                 end
@@ -303,7 +321,7 @@ class Percy
             block.call(env)
           rescue => e
             if @error_logger
-              @error_logger.error(e.message)              
+              @error_logger.error(e.message)
               e.backtrace.each do |line|
                 @error_logger.error(line)
               end
@@ -319,7 +337,7 @@ class Percy
             block.call(env)
           rescue => e
             if @error_logger
-              @error_logger.error(e.message)              
+              @error_logger.error(e.message)
               e.backtrace.each do |line|
                 @error_logger.error(line)
               end
@@ -335,7 +353,7 @@ class Percy
             block.call(env)
           rescue => e
             if @error_logger
-              @error_logger.error(e.message)              
+              @error_logger.error(e.message)
               e.backtrace.each do |line|
                 @error_logger.error(line)
               end
@@ -351,7 +369,7 @@ class Percy
             block.call(env)
           rescue => e
             if @error_logger
-              @error_logger.error(e.message)              
+              @error_logger.error(e.message)
               e.backtrace.each do |line|
                 @error_logger.error(line)
               end
@@ -367,7 +385,7 @@ class Percy
             block.call(env)
           rescue => e
             if @error_logger
-              @error_logger.error(e.message)              
+              @error_logger.error(e.message)
               e.backtrace.each do |line|
                 @error_logger.error(line)
               end
@@ -438,7 +456,7 @@ class Percy
         @connected = false
       end
     rescue => e
-      @error_logger.error(e.message)              
+      @error_logger.error(e.message)
       e.backtrace.each do |line|
         @error_logger.error(line)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: percy
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - "Tobias B\xC3\xBChlmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +01:00
+date: 2009-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: []