percy 1.1.1 → 1.2.0

data/README.md

@@ -1,4 +1,4 @@
-# Percy 1.1.1
+# Percy 1.2.0
 
 ## Configuring and starting the bot
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/percy.rb

@@ -42,7 +42,7 @@ class Percy
     attr_accessor :traffic_logger, :connected
   end
   
-  VERSION = 'Percy 1.1.1 (http://github.com/tbuehlmann/percy)'
+  VERSION = 'Percy 1.2.0 (http://github.com/tbuehlmann/percy)'
   
   Config = Struct.new(:server, :port, :password, :nick, :username, :verbose, :logging, :reconnect, :reconnect_interval)
   
@@ -143,20 +143,25 @@ class Percy
     @config.nick
   end
   
-  # returns all users on a specific channel
+  # returns all users on a specific channel as array: ['Foo', 'bar', 'The_Librarian']
   def self.users_on(channel)
-    self.add_observer
+    actual_length = self.add_observer
     self.raw "NAMES #{channel}"
+    channel = Regexp.escape(channel)
     
     begin
-      Timeout::timeout(10) do # try 10 seconds to retrieve the users of <channel>
-        start = 0
+      Timeout::timeout(30) do # try 30 seconds to retrieve the users of <channel>
+        start = actual_length
         ending = @temp_socket.length
+        users = []
         
         loop do
           for line in start..ending do
-            if @temp_socket[line] =~ /^:\S+ 353 \S+ = #{channel} :/
-              return $'.split(' ')
+            case @temp_socket[line]
+            when /^:\S+ 353 .+ #{channel} :/i
+              users << $'.split(' ')
+            when /^:\S+ 366 .+ #{channel}/i
+              return users.flatten.uniq.map { |element| element.gsub(/[!@%+]/, '') } # removing all modes
             end
           end
           
@@ -166,7 +171,41 @@ class Percy
         end
       end
     rescue Timeout::Error
-      return false
+      return []
+    ensure
+      self.remove_observer
+    end
+  end
+  
+  # returns all users on a specific channel as array (with status): ['@Foo', '+bar', 'The_Librarian', '!Frank']
+  def self.users_with_status_on(channel)
+    actual_length = self.add_observer
+    self.raw "NAMES #{channel}"
+    channel = Regexp.escape(channel)
+    
+    begin
+      Timeout::timeout(30) do # try 30 seconds to retrieve the users of <channel>
+        start = actual_length
+        ending = @temp_socket.length
+        users = []
+        
+        loop do
+          for line in start..ending do
+            case @temp_socket[line]
+            when /^:\S+ 353 .+ #{channel} :/i
+              users << $'.split(' ')
+            when /^:\S+ 366 .+ #{channel}/i
+              return users.flatten.uniq
+            end
+          end
+          
+          sleep 0.25
+          start = ending
+          ending = @temp_socket.length
+        end
+      end
+    rescue Timeout::Error
+      return []
     ensure
       self.remove_observer
     end
@@ -174,17 +213,17 @@ class Percy
   
   # get the channel limit of a channel
   def self.channel_limit(channel)
-    self.add_observer
+    actual_length = self.add_observer
     self.raw "MODE #{channel}"
     
     begin
       Timeout::timeout(10) do # try 10 seconds to retrieve l mode of <channel>
-        start = 0
+        start = actual_length
         ending = @temp_socket.length
         
         loop do
           for line in start..ending do
-            if @temp_socket[line] =~ /^:\S+ 324 \S+ #{channel} .*l.* (\d+)/
+            if @temp_socket[line] =~ /^:\S+ 324 \S+ #{Regexp.escape(channel)} .*l.* (\d+)/
               return $1.to_i
             end
           end
@@ -203,19 +242,19 @@ class Percy
   
   # check whether an user is online
   def self.is_online(nick)
-    self.add_observer
+    actual_length = self.add_observer
     self.raw "WHOIS #{nick}"
     
     begin
       Timeout::timeout(10) do
-        start = 0
+        start = actual_length
         ending = @temp_socket.length
         
         loop do
           for line in start..ending do
-            if @temp_socket[line] =~ /^:\S+ 311 \S+ (#{nick}) /i
+            if @temp_socket[line] =~ /^:\S+ 311 \S+ (#{Regexp.escape(nick)}) /i
               return $1
-            elsif line =~ /^:\S+ 401 \S+ #{nick} /i
+            elsif line =~ /^:\S+ 401 \S+ #{Regexp.escape(nick)} /i
               return false
             end
           end
@@ -252,6 +291,8 @@ class Percy
     @mutex_observer.synchronize do
       @observers += 1
     end
+    
+    return @temp_socket.length - 1 # so the loop knows where to begin to search for patterns
   end
   
   # remove observer

metadata

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