net-yail 1.4.2 → 1.4.3

data/lib/net/yail/irc_bot.rb

@@ -24,6 +24,7 @@ class IRCBot
   #   If set, :loud and :silent options are ignored.
   # * <tt>:log_io</tt>: Optional, ignored if you specify your own :log - sends given object to
   #   Logger's constructor.  Must be filename or IO object.
+  # * <tt>:use_ssl</tt>: Defaults to false.  If true, attempts to use SSL for connection.
   def initialize(options = {})
     @start_time = Time.now
     @options = options

data/lib/net/yail/yail-version.rb

@@ -1,5 +1,5 @@
 module Net
   class YAIL
-    VERSION = '1.4.2'
+    VERSION = '1.4.3'
   end
 end

data/lib/net/yail.rb

@@ -290,6 +290,7 @@ class YAIL
   #   If set, :loud and :silent options are ignored.
   # * <tt>:log_io</tt>: Optional, ignored if you specify your own :log - sends given object to
   #   Logger's constructor.  Must be filename or IO object.
+  # * <tt>:use_ssl</tt>: Defaults to false.  If true, attempts to use SSL for connection.
   def initialize(options = {})
     @me                 = ''
     @nicknames          = options[:nicknames]
@@ -302,6 +303,7 @@ class YAIL
     @log_loud           = options[:loud] || false
     @throttle_seconds   = options[:throttle_seconds] || 1
     @password           = options[:server_password]
+    @ssl                = options[:use_ssl] || false
 
     # Special handling to avoid mucking with Logger constants if we're using a different logger
     if options[:log]
@@ -331,6 +333,7 @@ class YAIL
     # Build our socket - if something goes wrong, it's immediately a dead socket.
     begin
       @socket = TCPSocket.new(@address, @port)
+      setup_ssl if @ssl
     rescue StandardError => boom
       @log.fatal "+++ERROR: Unable to open socket connection in Net::YAIL.initialize: #{boom.inspect}"
       @dead_socket = true
@@ -418,11 +421,32 @@ class YAIL
 
   private
 
+  # If user asked for SSL, this is where we set it all up
+  def setup_ssl
+    require 'openssl'
+    ssl_context = OpenSSL::SSL::SSLContext.new()
+    ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
+    @socket.sync = true
+    @socket.connect
+  end
+
+  # Depending on protocol (SSL vs. not), reads atomic messages from socket.  This could be the
+  # start of more generic message reading for other protocols, but for now reads a single line
+  # for IRC and any number of lines from SSL IRC.
+  def read_socket_messages
+    # Simple non-ssl socket == return a single line
+    return [@socket.gets] unless @ssl
+
+    # SSL socket == return all lines available
+    return @socket.readpartial(Buffering::BLOCK_SIZE).split($/).collect {|message| message}
+  end
+
   # Reads incoming data - should only be called by io_loop, and only when
   # we've already ensured that data is, in fact, available.
   def read_incoming_data
     begin
-      line = @socket.gets
+      messages = read_socket_messages.compact
     rescue StandardError => boom
       @dead_socket = true
       @log.fatal "+++ERROR in read_incoming_data -> @socket.gets: #{boom.inspect}"
@@ -430,19 +454,21 @@ class YAIL
     end
 
     # If we somehow got no data here, the socket is closed.  Run away!!!
-    if !line
+    if !messages || messages.empty?
       @dead_socket = true
       return
     end
 
-    line.chomp!
-
-    @log.debug "+++INCOMING: #{line}"
+    # Chomp and push each message
+    for message in messages
+      message.chomp!
+      @log.debug "+++INCOMING: #{message.inspect}"
 
-    # Only synchronize long enough to push our incoming string onto the
-    # input buffer
-    @input_buffer_mutex.synchronize do
-      @input_buffer.push(line)
+      # Only synchronize long enough to push our incoming string onto the
+      # input buffer
+      @input_buffer_mutex.synchronize do
+        @input_buffer.push(message)
+      end
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Jeremy Echols
@@ -14,7 +14,7 @@ autorequire: net/yail
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -04:00
+date: 2010-09-20 00:00:00 -04:00
 default_executable: 
 dependencies: []