Ruby-IRC 1.0.11 → 1.0.12

data/lib/IRC.rb

@@ -13,7 +13,7 @@ require 'IRCUtil'
 class IRC
   @channels = nil
   # Create a new IRC Object instance
-  def initialize( nick, server, port, realname='RBot')
+  def initialize( nick, server, port, realname='RBot', options = {})
     @nick = nick
     @server = server
     @port = port
@@ -21,9 +21,8 @@ class IRC
     @channels = Array.new(0)
     # Some good default Event handlers. These can and will be overridden by users.
     # Thses make changes on the IRCbot object. So they need to be here.
-    
-    # Topic events can come on two tags, so we create on proc to handle them.
 
+    # Topic events can come on two tags, so we create one proc to handle them.
     topic_proc = Proc.new { |event|
       self.channels.each { |chan| 
         if chan == event.channel
@@ -34,7 +33,7 @@ class IRC
     
     IRCEvent.add_handler('332', topic_proc)
     IRCEvent.add_handler('topic', topic_proc)
-
+    @@options = options;
   
   end
   
@@ -64,7 +63,7 @@ class IRC
     trap("INT", quithandler) 
     trap("TERM", quithandler)
 
-    IRCConnection.handle_connection(@server, @port, @nick, @realname) do
+    IRCConnection.handle_connection(@server, @port, @nick, @realname, @@options) do
       # Log in information moved to IRCConnection
       @threads = []
       IRCConnection.main do |event|
@@ -75,6 +74,8 @@ class IRC
         else
           thread_event(event)
         end
+        # Memory leak patch thanks to Patrick Sinclair
+        @threads.delete_if {|thr| thr.stop? }
       end
       @threads.each {|thr| thr.join }
     end

data/lib/{IRC.rb.~1.8.~ → IRC.rb.~1.10.~}

@@ -13,7 +13,7 @@ require 'IRCUtil'
 class IRC
   @channels = nil
   # Create a new IRC Object instance
-  def initialize( nick, server, port, realname='RBot')
+  def initialize( nick, server, port, realname='RBot', options = {})
     @nick = nick
     @server = server
     @port = port
@@ -21,9 +21,8 @@ class IRC
     @channels = Array.new(0)
     # Some good default Event handlers. These can and will be overridden by users.
     # Thses make changes on the IRCbot object. So they need to be here.
-    
-    # Topic events can come on two tags, so we create on proc to handle them.
 
+    # Topic events can come on two tags, so we create one proc to handle them.
     topic_proc = Proc.new { |event|
       self.channels.each { |chan| 
         if chan == event.channel
@@ -34,7 +33,7 @@ class IRC
     
     IRCEvent.add_handler('332', topic_proc)
     IRCEvent.add_handler('topic', topic_proc)
-
+    @@options = options;
   
   end
   
@@ -64,15 +63,19 @@ class IRC
     trap("INT", quithandler) 
     trap("TERM", quithandler)
 
-    IRCConnection.handle_connection(@server, @port, @nick, @realname) do
+    IRCConnection.handle_connection(@server, @port, @nick, @realname, @@options) do
       # Log in information moved to IRCConnection
-      threads = []
+      @threads = []
       IRCConnection.main do |event|
-        threads << Thread.new(event) {|localevent|
-          localevent.process
-        }
+        if event.kind_of?(Array)
+          event.each {|event|
+            thread_event(event)
+          }
+        else
+          thread_event(event)
+        end
       end
-      threads.each {|thr| thr.join }
+      @threads.each {|thr| thr.join }
     end
   end
   
@@ -150,4 +153,10 @@ class IRC
   def get_user_info(user)
     IRCConnection.send_to_server("WHO #{user}")
   end
+  private
+  def thread_event (event)
+    @threads << Thread.new(event) {|localevent|
+      localevent.process
+    }
+  end
 end

data/lib/IRCConnection.rb

@@ -8,11 +8,15 @@ class IRCConnection
   @@last_send     = Time.now.to_f
   @@message_delay = 0.2 # Default delay to 1 fifth of a second.
   # Creates a socket connection and then yields.
-  def IRCConnection.handle_connection(server, port, nick='ChangeMe', realname='MeToo' )
+  def IRCConnection.handle_connection(server, port, nick='ChangeMe', realname='MeToo', options = nil)
     @server = server;
     @port = port
     @nick = nick
     @realname = realname
+    @@options = options 
+    if options.nil? 
+      @@options = Array.new(0)
+    end
     socket = create_tcp_socket(server, port)
     add_IO_socket(socket) {|sock| 
       begin
@@ -22,7 +26,7 @@ class IRCConnection
         # after sleeping for 10 second.
         remove_IO_socket(sock)
         sleep 10
-        handle_connection(@server, @port, @nick, @realname)
+        handle_connection(@server, @port, @nick, @realname, @@options)
       end
     }
     send_to_server "NICK #{nick}"
@@ -34,7 +38,18 @@ class IRCConnection
   end
   
   def IRCConnection.create_tcp_socket(server, port)
-    @@socket = TCPsocket.open(server, port)
+    # Now with SSL Support. Thanks to dominiek@digigen.nl for the idea on this.
+    tcpsocket = TCPsocket.open(server, port) 
+    if @@options[:use_ssl]
+      ssl_context = OpenSSL::SSL::SSLContext.new()
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @@socket = OpenSSL::SSL::SSLSocket.new(tcpsocket, ssl_context)
+      @@socket.sync = true
+      @@socket.connect
+    else
+      @@socket = tcpsocket
+    end
+
     if block_given?
       yield
       @@socket.close
@@ -72,12 +87,11 @@ class IRCConnection
     if !read_sockets.nil?
       read_sockets[0].each {|sock|
         if sock.eof? && sock == @@socket
-          p "Detected Socket Close"
           remove_IO_socket(sock)
           sleep 10
           handle_connection(@server, @port, @nick, @realname)
         else
-          yield @@events[sock.to_i].call(sock)
+          yield @@events[sock.object_id.to_i].call(sock)
         end
       }
     end
@@ -108,7 +122,7 @@ class IRCConnection
   # Adds a new socket to the list of sockets to monitor for new data.
   def IRCConnection.add_IO_socket(socket, &event_generator)
     @@readsockets.push(socket)
-    @@events[socket.to_i] = event_generator
+    @@events[socket.object_id.to_i] = event_generator
   end
 
   def IRCConnection.remove_IO_socket(sock)

data/lib/{IRCConnection.rb.~1.4.~ → IRCConnection.rb.~1.6.~}

@@ -1,15 +1,22 @@
 
 # Handles connection to IRC Server
 class IRCConnection
-  @@quit = 0
-  @@readsockets = Array.new(0)
-  @@events      = Hash.new()
+  @@quit          = 0
+  @@readsockets   = Array.new(0)
+  @@output_buffer = Array.new(0)
+  @@events        = Hash.new()
+  @@last_send     = Time.now.to_f
+  @@message_delay = 0.2 # Default delay to 1 fifth of a second.
   # Creates a socket connection and then yields.
-  def IRCConnection.handle_connection(server, port, nick='ChangeMe', realname='MeToo' )
+  def IRCConnection.handle_connection(server, port, nick='ChangeMe', realname='MeToo', options = nil)
     @server = server;
     @port = port
     @nick = nick
     @realname = realname
+    @@options = options 
+    if options.nil? 
+      @@options = Array.new(0)
+    end
     socket = create_tcp_socket(server, port)
     add_IO_socket(socket) {|sock| 
       begin
@@ -19,7 +26,7 @@ class IRCConnection
         # after sleeping for 10 second.
         remove_IO_socket(sock)
         sleep 10
-        handle_connection(@server, @port, @nick, @realname)
+        handle_connection(@server, @port, @nick, @realname, @@options)
       end
     }
     send_to_server "NICK #{nick}"
@@ -31,7 +38,18 @@ class IRCConnection
   end
   
   def IRCConnection.create_tcp_socket(server, port)
-    @@socket = TCPsocket.open(server, port)
+    # Now with SSL Support. Thanks to dominiek@digigen.nl for the idea on this.
+    tcpsocket = TCPsocket.open(server, port) 
+    if @@options[:use_ssl]
+      ssl_context = OpenSSL::SSL::SSLContext.new()
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @@socket = OpenSSL::SSL::SSLSocket.new(tcpsocket, ssl_context)
+      @@socket.sync = true
+      @@socket.connect
+    else
+      @@socket = tcpsocket
+    end
+
     if block_given?
       yield
       @@socket.close
@@ -42,9 +60,16 @@ class IRCConnection
   
   # Sends a line of text to the server
   def IRCConnection.send_to_server(line)
+    puts "sending line #{line}"
     @@socket.write(line + "\n")
   end
   
+  # Adds data an output buffer. This let's us keep a handle on how
+  # fast we send things. Yay.
+  def IRCConnection.output_push(line)
+    @@output_buffer.push(line)
+  end
+
   # This loop monitors all IO_Sockets IRCConnection controls
   # (including the IRC socket) and yields events to the IO_Sockets
   # event handler. 
@@ -59,24 +84,39 @@ class IRCConnection
   # Makes one single loop pass, checking all sockets for data to read,
   # and yields the data to the sockets event handler.
   def IRCConnection.do_one_loop
-    read_sockets = select(@@readsockets, nil, nil, nil);
-    read_sockets[0].each {|sock|
-      if sock.eof? && sock == @@socket
-        p "Detected Socket Close"
-        remove_IO_socket(sock)
-        sleep 10
-        handle_connection(@server, @port, @nick, @realname)
-      else
-        yield @@events[sock.to_i].call(sock)
+    read_sockets = select(@@readsockets, nil, nil, 0.1);
+    if !read_sockets.nil?
+      puts "STUFF TO READ!"
+      read_sockets[0].each {|sock|
+        if sock.eof? && sock == @@socket
+          p "Detected Socket Close"
+          remove_IO_socket(sock)
+          sleep 10
+          handle_connection(@server, @port, @nick, @realname)
+        else
+          yield @@events[sock.object_id.to_i].call(sock)
+        end
+      }
+    end
+    if @@output_buffer.length > 0
+      timer = Time.now.to_f
+      if (timer > @@last_send + @@message_delay) 
+        message = @@output_buffer.shift();
+        if !message.nil?
+          IRCConnection.send_to_server(message);
+          @@last_send = timer
+        end
       end
-    }
+    end
   end
 
   # Ends connection to the irc server
   def IRCConnection.quit
     @@quit = 1
   end 
-
+  def IRCConnection.delay=(delay)
+    @@message_delay = delay.to_f
+  end
   # Retrieves user info from the server
   def IRCConnection.get_user_info(user)
     IRCConnection.send_to_server("WHOIS #{user}")
@@ -85,10 +125,10 @@ class IRCConnection
   # Adds a new socket to the list of sockets to monitor for new data.
   def IRCConnection.add_IO_socket(socket, &event_generator)
     @@readsockets.push(socket)
-    @@events[socket.to_i] = event_generator
+    @@events[socket.object_id.to_i] = event_generator
   end
 
-  def IRCConnection.remove_IO_socket(socket)
+  def IRCConnection.remove_IO_socket(sock)
     sock.close
     @@readsockets.delete_if {|item| item == sock }
   end

data/lib/IRCEvent.rb

@@ -26,7 +26,6 @@ class IRCEvent
     # mess_parts[1] is the message that was sent
     @message = mess_parts[1]
     @stats = mess_parts[0].scan(/[-`\^\{\}\[\]\w.\#\@\+]+/)
-    
     if @stats[0].match(/^PING/)
       @event_type = 'ping'
     elsif @stats[1] && @stats[1].match(/^\d+/)
@@ -45,9 +44,12 @@ class IRCEvent
     @channel = @stats[3] if @stats[3] && !@channel
     @target  = @stats[5] if @stats[5]
     @mode    = @stats[4] if @stats[4]
+    if @mode.nil? && @event_type == 'mode'
+      # Server modes (like +i) are sent in the 'message' part, and not
+      # the 'stat' part of the message.
+      @mode = @message
+    end
 
-    
-    
     # Unfortunatly, not all messages are created equal. This is our
     # special exceptions section
     if @event_type == 'join'
@@ -83,7 +85,6 @@ class IRCEvent
       handled = 1
     end
     if !handled
-      # puts "No handler for event type #@event_type in #{self.class}"
     end
   end
 end

data/lib/{IRCEvent.rb.~1.8.~ → IRCEvent.rb.~1.10.~}

@@ -25,8 +25,7 @@ class IRCEvent
     # mess_parts[0] is server info
     # mess_parts[1] is the message that was sent
     @message = mess_parts[1]
-    @stats = mess_parts[0].scan(/[-\w.\#\@\+]+/)
- 
+    @stats = mess_parts[0].scan(/[-`\^\{\}\[\]\w.\#\@\+]+/)
     if @stats[0].match(/^PING/)
       @event_type = 'ping'
     elsif @stats[1] && @stats[1].match(/^\d+/)
@@ -45,9 +44,14 @@ class IRCEvent
     @channel = @stats[3] if @stats[3] && !@channel
     @target  = @stats[5] if @stats[5]
     @mode    = @stats[4] if @stats[4]
+    if @mode.nil? && @event_type == 'mode'
+      # Server modes (like +i) are sent in the 'message' part, and not
+      # the 'stat' part of the message.
+      @mode = @message
+    end
 
-    
-    
+    puts "Line: #{line}"
+    puts "Breakdown #{@stats.join(",")}"
     # Unfortunatly, not all messages are created equal. This is our
     # special exceptions section
     if @event_type == 'join'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: Ruby-IRC
 version: !ruby/object:Gem::Version 
-  version: 1.0.11
-date: 2007-11-08 00:00:00 -08:00
+  version: 1.0.12
+date: 2008-06-10 00:00:00 -07:00
 summary: An IRC Client library
 require_paths: 
-- lib
+  - lib
 email: cboyer@musiciansfriend.com
 homepage: http://www.pulpreligion.org
 rubyforge_project: 
@@ -18,39 +18,34 @@ bindir: bin
 has_rdoc: "true"
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 post_install_message: 
 authors: 
-- Chris Boyer
+  - Chris Boyer
 files: 
-- lib/IRCEvent.rb
-- lib/IRC.rb
-- lib/IRC.rb.~1.8.~
-- lib/IRCChannel.rb
-- lib/IRCConnection.rb
-- lib/IRCUser.rb
-- lib/IRCUtil.rb
-- lib/eventmap.yml
-- lib/IRCConnection.rb.~1.4.~
-- lib/IRCEvent.rb.~1.8.~
-- README
+  - lib/eventmap.yml
+  - lib/IRC.rb
+  - lib/IRC.rb.~1.10.~
+  - lib/IRCChannel.rb
+  - lib/IRCConnection.rb
+  - lib/IRCConnection.rb.~1.6.~
+  - lib/IRCEvent.rb
+  - lib/IRCEvent.rb.~1.10.~
+  - lib/IRCUser.rb
+  - lib/IRCUtil.rb
+  - README
 test_files: []
-
 rdoc_options: []
-
 extra_rdoc_files: 
-- README
+  - README
 executables: []
-
 extensions: []
-
 requirements: []
-
-dependencies: []
-
+dependencies: []