Ruby-IRC 1.0.12 → 1.0.13

data/lib/IRC.rb

@@ -122,7 +122,11 @@ class IRC
 
   # send CTCP
   def send_ctcp(to, type, message)
-    IRCConnection.send_to_server("privmsg #{to} :\001#{type} #{message}");
+    IRCConnection.send_to_server("privmsg #{to} :\001#{type} #{message}\001");
+  end
+
+  def send_ctcpreply(to, type, message)
+    send_notice(to, "\001#{type} #{message}\001")
   end
   
   # Quits the IRC Server

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

@@ -74,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
@@ -120,7 +122,11 @@ class IRC
 
   # send CTCP
   def send_ctcp(to, type, message)
-    IRCConnection.send_to_server("privmsg #{to} :\001#{type} #{message}");
+    IRCConnection.send_to_server("privmsg #{to} :\001#{type} #{message}\001");
+  end
+
+  def send_ctcpreply(to, type, message)
+    send_notice(to, "\001#{type} #{message}\001")
   end
   
   # Quits the IRC Server

data/lib/IRCConnection.rb

@@ -1,4 +1,5 @@
 
+
 # Handles connection to IRC Server
 class IRCConnection
   @@quit          = 0
@@ -39,8 +40,9 @@ class IRCConnection
   
   def IRCConnection.create_tcp_socket(server, port)
     # Now with SSL Support. Thanks to dominiek@digigen.nl for the idea on this.
-    tcpsocket = TCPsocket.open(server, port) 
+    tcpsocket = TCPSocket.open(server, port) 
     if @@options[:use_ssl]
+      require 'openssl' # Only require OpenSSL if we need to use it.
       ssl_context = OpenSSL::SSL::SSLContext.new()
       ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
       @@socket = OpenSSL::SSL::SSLSocket.new(tcpsocket, ssl_context)

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

@@ -60,7 +60,6 @@ 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
   
@@ -86,10 +85,8 @@ class IRCConnection
   def IRCConnection.do_one_loop
     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)

data/lib/IRCEvent.rb

@@ -25,7 +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+/)
@@ -34,7 +34,7 @@ class IRCEvent
     else
       @event_type = @stats[2].downcase if @stats[2]
     end
-    
+
     if @event_type != 'ping'
       @from    = @stats[0] 
       @user    = IRCUser.create_user(@from)

metadata

@@ -1,51 +1,76 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: Ruby-IRC
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
-date: 2008-06-10 00:00:00 -07:00
-summary: An IRC Client library
-require_paths: 
-  - lib
-email: cboyer@musiciansfriend.com
-homepage: http://www.pulpreligion.org
-rubyforge_project: 
-description: 
-autorequire: IRC
-default_executable: 
-bindir: bin
-has_rdoc: "true"
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-  version: 
+  hash: 13
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 13
+  version: 1.0.13
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-  - Chris Boyer
-files: 
-  - 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
+- Chris Boyer
+autorequire: IRC
+bindir: bin
+cert_chain: []
+
+date: 2010-05-28 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: 
+email: cboyer@musiciansfriend.com
 executables: []
+
 extensions: []
+
+extra_rdoc_files: 
+- README
+files: 
+- lib/eventmap.yml
+- lib/IRC.rb
+- lib/IRC.rb.~1.12.~
+- lib/IRCChannel.rb
+- lib/IRCConnection.rb
+- lib/IRCConnection.rb.~1.7.~
+- lib/IRCEvent.rb
+- lib/IRCUser.rb
+- lib/IRCUtil.rb
+- README
+has_rdoc: true
+homepage: http://www.pulpreligion.org
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-dependencies: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: An IRC Client library
+test_files: []
+

data/lib/IRCEvent.rb.~1.10.~

@@ -1,94 +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.\#\@\+]+/)
-    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
-    # FIXME: this list would probably be more accurate to exclude commands than to include them
-    @hostmask = @stats[1] if %W(topic privmsg join).include? @event_type
-    @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'
-      @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
-