blur 1.5.1 → 1.5.2

data/library/blur.rb

@@ -1,13 +1,15 @@
 # encoding: utf-8
 
 require 'yaml'
+require 'majic'
 require 'socket'
 require 'ostruct'
+require 'openssl'
 
 Dir.glob("#{File.dirname __FILE__}/blur/**/*.rb").each &method(:require)
 
 module Blur
-  class << Version = [1,5,1]
+  class << Version = [1,5,2]
     def to_s; join '.' end
   end
 

data/library/blur/client.rb

@@ -15,9 +15,7 @@ module Blur
       @callbacks = {}
       @connected = true
       
-      @options[:networks].each do |options|
-        @networks.<< Network.new options
-      end
+      @networks = @options[:networks].map { |options| Network.new options }
       
       load_scripts
       trap 2, &method(:quit)
@@ -35,7 +33,7 @@ module Blur
     end
     
     def got_command network, command
-      puts "<- \e[1m#{network}\e[0m | #{command}"
+      puts "<- #{network.inspect ^ :bold} | #{command}"
       name = :"got_#{command.name.downcase}"
       
       if respond_to? name
@@ -68,6 +66,7 @@ module Blur
       end
       
       @connected = false
+      unload_scripts
       
       exit 0
     end
@@ -78,15 +77,17 @@ module Blur
       puts "Starting run loop ..."
       
       while @connected
-        @networks.each do |network|
+        @networks.select(&:connected?).each do |network|
           begin
             network.transcieve
             sleep 0.05
           rescue StandardError => exception
-            puts "\e[1m\e[31merror:\e[39m #{exception.message}\e[0m"
-            
-            network.disconnect if network.connected?
-            @networks.delete network
+            if network.connected?
+              network.disconnect
+              emit :connection_terminated, network
+            end
+
+            puts "#{"Network error" ^ :red} (#{exception.class.name}): #{exception.message}"
           end
         end
       end
@@ -103,7 +104,7 @@ module Blur
         begin
           script.__send__ name, *args if script.respond_to? name
         rescue Exception => exception
-          puts "\e[1m#{File.basename script.path}:#{exception.line}: \e[31merror:\e[39m #{exception.message}\e[0m"
+          puts ("#{File.basename script.path}:#{exception.line}" ^ :bold) + ": #{"error:" ^ :red} #{exception.message}"
         end
       end
     end

data/library/blur/handling.rb

@@ -22,7 +22,7 @@ module Blur
         
         if channel = network.channel_by_name(name)
           users.each do |user|
-            user.channel = channel   
+            user.channel = channel
             channel.users << user
           end
         else
@@ -88,6 +88,7 @@ module Blur
         if channel = network.channel_by_name(name)
           user.name = command.sender.username
           user.host = command.sender.hostname
+          user.channel = channel
           
           channel.users << user
           

data/library/blur/network.rb

@@ -3,15 +3,18 @@
 module Blur
   class Network
     class ConnectionError < StandardError; end
+
     attr_accessor :options, :channels, :delegate, :connection
 
     def connected?; @connection.established? end
     
+    def ssl?; @options[:secure] == true end
     def host; @options[:hostname] end
-    def port; @options[:port] ||= (@options[:secure] == true) ? 6697 : 6667 end
+    def port; @options[:port] ||= ssl? ? 6697 : 6667 end
 
     def initialize options = {}
-      @options = options
+      @options  = options
+      @channels = []
       
       unless options[:nickname]
         raise ArgumentError, "nickname is missing from the network's option block"
@@ -21,7 +24,6 @@ module Blur
       @options[:realname] ||= @options[:username]
       @options[:channels] ||= []
 
-      @channels   = []
       @connection = Connection.new self, host, port
     end
     
@@ -43,6 +45,7 @@ module Blur
 
     def connect
       @connection.establish
+      @connection.enable_ssl OpenSSL::SSL::VERIFY_NONE if ssl?
       
       transmit :PASS, @options[:password] if @options[:password]
       transmit :NICK, @options[:nickname]
@@ -55,7 +58,7 @@ module Blur
     
     def transmit name, *arguments
       command = Command.new name, arguments
-      puts "-> \e[1m#{self}\e[0m | #{command}"
+      puts "-> #{inspect ^ :bold} | #{command}"
       
       @connection.transmit command
     end
@@ -65,7 +68,7 @@ module Blur
     end
     
     def to_s
-      %{#<#{self.class.name} "#{host}:#{port}">}
+      %{#<#{self.class.name} "#{host}":#{port}>}
     end
   end
 end

data/library/blur/network/channel.rb

@@ -40,6 +40,10 @@ module Blur
       def inspect
         %{#<#{self.class.name} @name=#{@name.inspect} @users=#{@users.inspect}}
       end
+      
+      def to_yaml options = {}
+        @name.to_yaml options
+      end
 
       def to_s
         @name

data/library/blur/network/connection.rb

@@ -3,7 +3,7 @@
 module Blur
   class Network 
     class Connection
-      def established?; @socket and not (@socket.closed? or @socket.eof?) end
+      def established?; @socket and not @socket.closed? end
       
       def initialize delegate, host = nil, port = nil
         @host     = host
@@ -17,11 +17,21 @@ module Blur
       def establish
         @socket = TCPSocket.new @host, @port
       end
+
+      def enable_ssl validator
+        @secure = true
+
+        context = OpenSSL::SSL::SSLContext.new
+        context.set_params verify_mode: validator
+
+        sslsocket = OpenSSL::SSL::SSLSocket.new @socket, context
+        sslsocket.sync = true
+        sslsocket.connect_nonblock
+      end
       
       def terminate
-        @socket.close
-        @socket = nil
-        @buffer = ""
+        @socket = nil if @socket.close
+        @buffer.clear
         @queue.clear
       end
       
@@ -31,7 +41,7 @@ module Blur
       
       def transcieve
         readable, writable = IO.select [@socket], [@socket]
-        
+
         # If the socket is ready to recieve, do so.
         if socket = readable.first
           @buffer.<< socket.read_nonblock 512
@@ -44,7 +54,18 @@ module Blur
         
         # If it's ready to write, do that too until the outoing queue is empty.
         if socket = writable.first
-          socket.write_nonblock "#{command}\n" while command = @queue.shift
+          while command = @queue.shift
+            socket.write_nonblock "#{command}\n"
+          end
+        end
+
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+        puts "Insecure connection would block"
+      rescue OpenSSL::SSL::SSLError
+        if $!.message == "read would block"
+          puts "Secure connection would block"
+        else
+          raise $!
         end
       end
     end

data/library/blur/network/user.rb

@@ -47,6 +47,10 @@ module Blur
       def inspect
         %{#<#{self.class.name} @nick=#{@nick.inspect} @channel=#{@channel.name.inspect}>}
       end
+
+      def to_yaml options = {}
+        @nick.to_yaml options
+      end
       
       def to_s
         @nick

data/library/blur/script.rb

@@ -28,9 +28,10 @@ module Blur
     end
     
     def unload!
-      @cache.save if @cache
-      
+      cache.save if @cache
       __send__ :unloaded if respond_to? :unloaded
+
+      @cache = nil
     end
 
     def script name
@@ -51,7 +52,7 @@ module Blur
       module_eval File.read(@path), File.basename(@path), 0
       @evaluated = true
     rescue Exception => exception
-      puts "\e[1m#{File.basename @path}:#{exception.line}: \e[31merror:\e[39m #{exception.message}\e[0m"
+      puts "#{File.basename(@path) ^ :bold}:#{exception.line.to_s ^ :bold}: #{"error:" ^ :red} #{exception.message ^ :bold}"
     end
   end
 end

data/library/blur/script/cache.rb

@@ -12,7 +12,7 @@ module Blur
         File.exists? "#{path}/#{name}.yml"
       end
       
-      def [] key; @hash[key] ||= {} end
+      def [] key; @hash[key] end
       def []= key, value; @hash[key] = value end
       
       def initialize script
@@ -49,4 +49,4 @@ module Blur
       end
     end
   end
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: blur
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 1
-  version: 1.5.1
+  prerelease: 
+  version: 1.5.2
 platform: ruby
 authors: 
 - Mikkel Kroman
@@ -14,7 +10,7 @@ autorequire:
 bindir: executables
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +26,6 @@ files:
 - library/blur.rb
 - library/blur/client.rb
 - library/blur/enhancements.rb
-- library/blur/handling.rb
 - library/blur/network.rb
 - library/blur/network/channel.rb
 - library/blur/network/command.rb
@@ -39,6 +34,7 @@ files:
 - library/blur/script.rb
 - library/blur/script/cache.rb
 - library/blur/script/messageparsing.rb
+- library/blur/handling.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -53,23 +49,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Extensible IRC library