Ruby-IRC 1.0.6 → 1.0.7

data/lib/IRC.rb

@@ -26,9 +26,7 @@ class IRC
 
     topic_proc = Proc.new { |event|
       self.channels.each { |chan| 
-        puts "Examine channel #{chan.name} for #{event.channel}"
         if chan == event.channel
-          puts "Setting topic: #{event.message}"
           chan.topic = event.message
         end
       }
@@ -62,11 +60,19 @@ class IRC
   # method. Events yielded from the IRCConnection handler are
   # processed and then control is returned to IRCConnection
   def connect
+    quithandler = lambda { send_quit(); IRCConnection.quit }
+    trap("INT", quithandler) 
+    trap("TERM", quithandler)
+
     IRCConnection.handle_connection(@server, @port, @nick, @realname) do
       # Log in information moved to IRCConnection
+      threads = []
       IRCConnection.main do |event|
-        event.process
+        threads << Thread.new(event) {|localevent|
+          localevent.process
+        }
       end
+      threads.each {|thr| thr.join }
     end
   end
   

data/lib/IRCConnection.rb

@@ -6,8 +6,22 @@ class IRCConnection
   @@events      = Hash.new()
   # Creates a socket connection and then yields.
   def IRCConnection.handle_connection(server, port, nick='ChangeMe', realname='MeToo' )
+    @server = server;
+    @port = port
+    @nick = nick
+    @realname = realname
     socket = create_tcp_socket(server, port)
-    add_IO_socket(socket) {|sock| IRCEvent.new(sock.readline.chomp) }
+    add_IO_socket(socket) {|sock| 
+      begin
+        IRCEvent.new(sock.readline.chomp) 
+      rescue Errno::ECONNRESET
+        # Catches connection reset by peer, attempts to reconnect
+        # after sleeping for 10 second.
+        remove_IO_socket(sock)
+        sleep 10
+        handle_connection(@server, @port, @nick, @realname)
+      end
+    }
     send_to_server "NICK #{nick}"
     send_to_server "USER #{nick} 8 * :#{realname}"
     if block_given?
@@ -46,8 +60,15 @@ class IRCConnection
   # 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| 
-      yield @@events[sock.to_i].call(sock)
+    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)
+      end
     }
   end
 
@@ -66,6 +87,11 @@ class IRCConnection
     @@readsockets.push(socket)
     @@events[socket.to_i] = event_generator
   end
+
+  def IRCConnection.remove_IO_socket(socket)
+    sock.close
+    @@readsockets.delete_if {|item| item == sock }
+  end
 end
 
 

data/lib/IRCEvent.rb

@@ -82,7 +82,7 @@ class IRCEvent
       handled = 1
     end
     if !handled
-      puts "No handler for event type #@event_type in #{self.class}"
+      # puts "No handler for event type #@event_type in #{self.class}"
     end
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Ruby-IRC
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
-date: 2006-12-08 00:00:00 -08:00
+  version: 1.0.7
+date: 2006-12-14 00:00:00 -08:00
 summary: An IRC Client library
 require_paths: 
 - lib
@@ -35,10 +35,6 @@ files:
 - lib/IRCUser.rb
 - lib/IRCUtil.rb
 - lib/eventmap.yml
-- lib/IRCEvent.rb.~1.5.~
-- lib/IRCConnection.rb.~1.2.~
-- lib/#IRCEvent.rb#
-- lib/IRC.rb.~1.4.~
 - README
 test_files: []
 

data/lib/#IRCEvent.rb#

@@ -1,89 +0,0 @@
-require 'yaml'
-
-# This is a lookup class for IRC event name mapping
-class EventLookup
-  @@lookup = YAML.load_file("#{File.dirname(__FILE__)}/eventmap.yml")
-  
-  # returns the event name, given a number
-  def EventLookup::find_by_number(num)
-    return @@lookup[num.to_i]
-  end
-end
-
-
-# Handles an IRC generated event.
-# Handlers are for the IRC framework to use
-# Callbacks are for users to add.
-# Both handlers and callbacks can be called for the same event.
-class IRCEvent
-  @@handlers = { 'ping' => lambda {|event| IRCConnection.send_to_server("PONG #{event.message}") } }
-  @@callbacks = Hash.new()
-  attr_reader :hostmask, :message, :event_type, :from, :channel, :target, :mode, :stats
-  def initialize (line)
-    line.sub!(/^:/, '')
-    mess_parts = line.split(':', 2);
-    # 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.\#\@]+/)
-    puts "Event: #{line}"
-    if @stats[0].match(/^PING/)
-      @event_type = 'ping'
-    elsif @stats[1] && @stats[1].match(/^\d+/)
-      @event_type = EventLookup::find_by_number(@stats[1]);
-      @channel = @stats[3]
-    else
-      @event_type = @stats[2].downcase if @stats[2]
-    end
-    
-    if @event_type != 'ping'
-      @from    = @stats[0] 
-      @user    = IRCUser.create_user(@from)
-    end
-    @hostmask = @stats[1] if %W(privmsg join).include? @event_type
-    @channel = @stats[3] if @stats[3] && !@channel
-    @target  = @stats[5] if @stats[5]
-    @mode    = @stats[4] if @stats[4]
-    
-    
-    
-    # Unfortunatly, not all messages are created equal. This is our
-    # special exceptions section
-    if @event_type == 'join'
-      @channel = @message
-    end
-    
-  end
-  
-  # Adds a callback for the specified irc message.
-  def IRCEvent.add_callback(message_id, &callback)
-    @@callbacks[message_id] = callback
-  end
-  
-  # Adds a handler to the handler function hash.
-  def IRCEvent.add_handler(message_id, proc=nil, &handler)
-    if block_given?
-      @@handlers[message_id] = handler
-    elsif proc
-      @@handlers[message_id] = proc
-    end
-  end
-  
-  # Process this event, preforming which ever handler and callback is specified
-  # for this event.
-  def process 
-    handled = nil
-    if @@handlers[@event_type]
-      @@handlers[@event_type].call(self)
-      handled = 1
-    end
-    if @@callbacks[@event_type]
-      @@callbacks[@event_type].call(self)
-      handled = 1
-    end
-    if !handled
-      puts "No handler for event type #@event_type in #{self.class}"
-    end
-  end
-end
-

data/lib/IRC.rb.~1.4.~

@@ -1,138 +0,0 @@
-
-require 'socket'
-require 'IRCConnection'
-require 'IRCEvent'
-require 'IRCChannel'
-require 'IRCUser'
-require 'IRCUtil'
-
-
-
-# Class IRC is a master class that handles connection to the irc
-# server and pasring of IRC events, through the IRCEvent class. 
-class IRC
-  @channels = nil
-  # Create a new IRC Object instance
-  def initialize( nick, server, port, realname='RBot')
-    @nick = nick
-    @server = server
-    @port = port
-    @realname = realname
-    @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_proc = Proc.new { |event|
-      self.channels.each { |chan| 
-        puts "Examine channel #{chan.name} for #{event.channel}"
-        if chan == event.channel
-          puts "Setting topic: #{event.message}"
-          chan.topic = event.message
-        end
-      }
-    }
-    
-    IRCEvent.add_handler('332', topic_proc)
-    IRCEvent.add_handler('topic', topic_proc)
-
-  
-  end
-  
-  attr_reader :nick, :server, :port
-  
-  # Join a channel, adding it to the list of joined channels
-  def add_channel channel
-    join(channel)
-    self
-  end
-  
-  # Returns a list of channels joined
-  def channels
-    @channels
-  end
-  
-  # Alias for IRC.connect
-  def start
-    self.connect
-  end
-  
-  # Open a connection to the server using the IRC Connect
-  # method. Events yielded from the IRCConnection handler are
-  # processed and then control is returned to IRCConnection
-  def connect
-    IRCConnection.handle_connection(@server, @port) do
-      IRCConnection.send_to_server "NICK #{@nick}"
-      IRCConnection.send_to_server "USER #{@nick} 8 * :#{@realname}"
-      IRCConnection.main do |event|
-        event.process
-      end
-    end
-  end
-  
-  # Joins a channel on a server.
-  def join(channel)
-    if (IRCConnection.send_to_server("JOIN #{channel}"))
-      @channels.push(IRCChannel.new(channel));
-    end
-  end
-  
-  # Leaves a channel on a server
-  def part(channel)
-    if (IRCConnection.send_to_server("PART #{channel}")) 
-      @channels.delete_if {|chan| chan.name == channel }
-    end
-  end
-  
-  # Sends a private message, or channel message
-  def send_message(to, message)
-    IRCConnection.send_to_server("privmsg #{to} :#{message}");
-  end
-  
-  # Sends a notice
-  def send_notice(to, message)
-    IRCConnection.send_to_server("NOTICE #{to} :#{message}");
-  end
-  
-  # performs an action
-  def send_action(to, action)
-    send_ctcp(to, 'ACTION', action);
-  end
-
-  # send CTCP
-  def send_ctcp(to, type, message)
-    IRCConnection.send_to_server("privmsg #{to} :\001#{type} #{message}");
-  end
-  
-  # Quits the IRC Server
-  def send_quit
-    IRCConnection.send_to_server("QUIT : Quit ordered by user")
-  end
-  
-  # Ops selected user.
-  def op(channel, user)
-    IRCConnection.send_to_server("MODE #{channel} +o #{user}")
-  end
-  
-  # Changes the current nickname
-  def ch_nick(nick)
-    IRCConnection.send_to_server("NICK #{nick}")
-    @nick = nick
-  end
-  
-  # Removes operator status from a user
-  def deop(channel, user)
-    IRCConnection.send_to_server("MODE #{channel} -o #{user}")
-  end
-  
-  # Changes target users mode
-  def mode(channel, user, mode)
-    IRCConnection.send_to_server("MODE #{channel} #{mode} #{user}")
-  end
-  
-  # Retrievs user information from the server
-  def get_user_info(user)
-    IRCConnection.send_to_server("WHO #{user}")
-  end
-end

data/lib/IRCConnection.rb.~1.2.~

@@ -1,59 +0,0 @@
-
-# Handles connection to IRC Server
-class IRCConnection
-  @@quit = 0
-  @@readsockets = Array.new(0)
-  @@events      = Hash.new()
-  # Creates a socket connection and then yields.
-  def IRCConnection.handle_connection(server, port)
-    @@server = server
-    @@port = port
-    @@socket = TCPsocket.open(server, port)
-    add_IO_socket(@@socket) {|sock| IRCEvent.new(sock.readline.chomp) }
-    yield
-    @@socket.close
-  end
-  
-  # Sends a line of text to the server
-  def IRCConnection.send_to_server(line)
-    @@socket.write(line + "\n")
-  end
-  
-  # This loop monitors all IO_Sockets IRCConnection controls
-  # (including the IRC socket) and yields events to the IO_Sockets
-  # event handler. 
-  def IRCConnection.main
-    while(@@quit == 0)
-      do_one_loop { |event|
-        yield event
-      }
-    end
-  end
-
-  # 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| 
-      yield @@events[sock.to_i].call(sock)
-    }
-  end
-
-  # Ends connection to the irc server
-  def IRCConnection.quit
-    @@quit = 1
-  end 
-
-  # Retrieves user info from the server
-  def IRCConnection.get_user_info(user)
-    IRCConnection.send_to_server("WHOIS #{user}")
-  end
-
-  # 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
-  end
-end
-
-

data/lib/IRCEvent.rb.~1.5.~

@@ -1,89 +0,0 @@
-require 'yaml'
-
-# This is a lookup class for IRC event name mapping
-class EventLookup
-  @@lookup = YAML.load_file("#{File.dirname(__FILE__)}/eventmap.yml")
-  
-  # returns the event name, given a number
-  def EventLookup::find_by_number(num)
-    return @@lookup[num.to_i]
-  end
-end
-
-
-# Handles an IRC generated event.
-# Handlers are for the IRC framework to use
-# Callbacks are for users to add.
-# Both handlers and callbacks can be called for the same event.
-class IRCEvent
-  @@handlers = { 'ping' => lambda {|event| IRCConnection.send_to_server("PONG #{event.message}") } }
-  @@callbacks = Hash.new()
-  attr_reader :hostmask, :message, :event_type, :from, :channel, :target, :mode, :stats
-  def initialize (line)
-    line.sub!(/^:/, '')
-    mess_parts = line.split(':', 2);
-    # 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.\#\@]+/)
-    puts "Event: #{line}"
-    if @stats[0].match(/^PING/)
-      @event_type = 'ping'
-    elsif @stats[1] && @stats[1].match(/^\d+/)
-      @event_type = EventLookup::find_by_number(@stats[1]);
-      @channel = @stats[3]
-    else
-      @event_type = @stats[2].downcase if @stats[2]
-    end
-    
-    if @event_type != 'ping'
-      @from    = @stats[0] 
-      @user    = IRCUser.create_user(@from)
-    end
-    @hostmask = @stats[1] if %W(privmsg join).include? @event_type
-    @channel = @stats[3] if @stats[3] && !@channel
-    @target  = @stats[5] if @stats[5]
-    @mode    = @stats[4] if @stats[4]
-
-    
-    
-    # Unfortunatly, not all messages are created equal. This is our
-    # special exceptions section
-    if @event_type == 'join'
-      @channel = @message
-    end
-    
-  end
-  
-  # Adds a callback for the specified irc message.
-  def IRCEvent.add_callback(message_id, &callback)
-    @@callbacks[message_id] = callback
-  end
-  
-  # Adds a handler to the handler function hash.
-  def IRCEvent.add_handler(message_id, proc=nil, &handler)
-    if block_given?
-      @@handlers[message_id] = handler
-    elsif proc
-      @@handlers[message_id] = proc
-    end
-  end
-  
-  # Process this event, preforming which ever handler and callback is specified
-  # for this event.
-  def process 
-    handled = nil
-    if @@handlers[@event_type]
-      @@handlers[@event_type].call(self)
-      handled = 1
-    end
-    if @@callbacks[@event_type]
-      @@callbacks[@event_type].call(self)
-      handled = 1
-    end
-    if !handled
-      puts "No handler for event type #@event_type in #{self.class}"
-    end
-  end
-end
-