blur 1.4 → 1.4.1

data/library/blur.rb

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

data/library/blur/client.rb

@@ -10,6 +10,7 @@ module Blur
     
     def initialize options
       @options   = options
+      @scripts   = []
       @networks  = []
       @callbacks = {}
       @connected = true
@@ -18,6 +19,7 @@ module Blur
         @networks.<< Network.new options
       end
       
+      load_scripts
       trap 2, &method(:quit)
     end
     
@@ -41,6 +43,23 @@ module Blur
       end
     end
     
+    def load_scripts
+      script_path = File.dirname $0
+      
+      Dir.glob("#{script_path}/scripts/*.rb").each do |path|
+        script = Script.new path
+        script.client = self
+        
+        @scripts << script
+      end
+    end
+    
+    def unload_scripts
+      @scripts.each do |script|
+        script.unload!
+      end.clear
+    end
+    
     def quit signal
       @networks.each do |network|
         network.transmit :QUIT, "Got SIGINT?"
@@ -64,7 +83,7 @@ module Blur
             network.transcieve
             sleep 0.05
           rescue StandardError => exception
-            puts "#{network} threw an exception: #{exception.class.name} #{exception.message} #{exception.backtrace.to_s}"
+            puts "\e[1m\e[31merror:\e[39m #{exception.message}\e[0m"
             
             network.disconnect if network.connected?
             @networks.delete network
@@ -79,6 +98,14 @@ module Blur
       @callbacks[name].each do |callback|
         callback.call *args
       end if @callbacks[name]
+      
+      @scripts.each do |script|
+        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"
+        end
+      end
     end
     
     def catch name, &block

data/library/blur/enhancements.rb

@@ -1,7 +1,11 @@
 # encoding: utf-8
 
 class Exception
-  def line; backtrace.first.match(/^.*?:(\d+):/)[1].to_i end
+  Pattern = /^.*?:(\d+):/
+  
+  def line
+    backtrace[0].match(Pattern)[1].to_i + 1
+  end
 end
 
 class String

data/library/blur/handling.rb

@@ -52,11 +52,13 @@ module Blur
       # Someone send a message
       def got_privmsg network, command
         return if command.sender.is_a? String # Ignore all server privmsgs
-        
         name, message = command.params
         
         if channel = network.channel_by_name(name)
           if user = channel.user_by_nick(command.sender.nickname)
+            user.name = command.sender.username
+            user.host = command.sender.hostname
+            
             emit :message, user, channel, message
           else
             # Odd… this shouldn't happen

data/library/blur/network/channel.rb

@@ -3,7 +3,7 @@
 module Blur
   class Network
     class Channel
-      attr_accessor :name, :users
+      attr_accessor :name, :users, :network
 
       def initialize name, network = nil, users = []
         @name    = name

data/library/blur/network/connection.rb

@@ -21,6 +21,8 @@ module Blur
       def terminate
         @socket.close
         @socket = nil
+        @buffer = ""
+        @queue.clear
       end
       
       def transmit command

data/library/blur/network/user.rb

@@ -9,8 +9,8 @@ module Blur
         @nick = nick.sub /^[@|~|\+|%|&]/, ''
       end
       
-      def synchronize sender
-        @nick, @name, @host = sender.nickname, sender.username, sender.hostname
+      def say message
+        @channel.network.say self, message
       end
       
       def inspect

data/library/blur/script.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+module Blur
+  class Script < Module
+    attr_accessor :name, :author, :version, :path, :client
+    
+    def evaluated?; @evaluated end
+    
+    def initialize path
+      @path = path
+      @evaluated = false
+      
+      if evaluate and @evaluated
+        cache.load if Cache.exists? @name
+        
+        __send__ :loaded if respond_to? :loaded
+      end
+    end
+    
+    def Script name, version = [1,0], author = nil, &block
+      @name    = name
+      @author  = author
+      @version = version
+      
+      instance_eval &block
+      
+      true
+    end
+    
+    def unload!
+      @cache.save if @cache
+      
+      __send__ :unloaded if respond_to? :unloaded
+    end
+    
+    def cache
+      @cache ||= Cache.new self
+    end
+    
+    def inspect
+      %{#<#{self.class.name} @name=#{@name.inspect} @version=#{@version.inspect} @author=#{@author.inspect}>}
+    end
+    
+  private
+  
+    def evaluate
+      if module_eval File.read(@path), File.basename(@path), 0
+        @evaluated = true
+      end
+    rescue Exception => exception
+      puts "\e[1m#{File.basename @path}:#{exception.line}: \e[31merror:\e[39m #{exception.message}\e[0m"
+    end
+  end
+end

data/library/blur/script/cache.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+module Blur
+  class Script < Module
+    class Cache
+      
+      def self.path
+        %{#{File.dirname File.expand_path $0}/cache}
+      end
+      
+      def self.exists? name
+        File.exists? "#{path}/#{name}.yml"
+      end
+      
+      def [] key; @hash[key] ||= {} end
+      def []= key, value; @hash[key] = value end
+      
+      def initialize script
+        @hash   = {}
+        @script = script
+      end
+      
+      def save
+        directory = File.dirname path
+        
+        unless File.directory? directory
+          Dir.mkdir directory
+        end
+        
+        File.open path, ?w do |file|
+          YAML.dump @hash, file
+        end
+      end
+      
+      def load
+        if yaml = YAML.load_file(path)
+          @hash = yaml
+        end
+      rescue
+        File.unlink path
+      end
+      
+      def to_s; @hash end
+      
+    private
+    
+      def path
+        %{#{Cache.path}/#{@script.name}.yml}
+      end
+    end
+  end
+end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  version: "1.4"
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Mikkel Kroman
@@ -13,7 +14,7 @@ autorequire:
 bindir: executables
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +35,8 @@ files:
 - library/blur/network/connection.rb
 - library/blur/network/user.rb
 - library/blur/network.rb
+- library/blur/script/cache.rb
+- library/blur/script.rb
 - library/blur.rb
 has_rdoc: true
 homepage: