blur 1.6 → 1.6.2.pre

data/library/blur.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'pp'
 require 'yaml'
 require 'majic'
 require 'socket'
@@ -26,7 +27,7 @@ require 'blur/script/messageparsing'
 # It can be by handlers, scripts, communications, and what have you.
 module Blur
   # The major and minor version-values of Blur.
-  Version = "1.6"
+  Version = "1.6.2.pre"
 
   # Instantiates a client with given options and then makes the client instance
   # evaluate the given block to form a DSL.

data/library/blur/client.rb

@@ -8,7 +8,7 @@ module Blur
   # It stores networks, scripts and callbacks, and is also encharge of
   # distributing the incoming commands to the right networks and scripts.
   class Client
-    include Handling
+    include Handling, Logging
     
     # @return [Array] the options that is passed upon initialization.
     attr_accessor :options
@@ -57,7 +57,7 @@ module Blur
     # @param [Network] network the network that received the command.
     # @param [Network::Command] command the received command.
     def got_command network, command
-      puts "<- #{network.inspect ^ :bold} | #{command}"
+      log "#{'←' ^ :green} #{command.name.to_s.ljust(8, ' ') ^ :light_gray} #{command.params.map(&:inspect).join ' '}"
       name = :"got_#{command.name.downcase}"
       
       if respond_to? name
@@ -110,15 +110,19 @@ module Blur
     # @param [...] args Arguments that is passed to the event-handler.
     # @private
     def emit name, *args
-      @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 ("#{File.basename script.__path}:#{exception.line}" ^ :bold) + ": #{"error:" ^ :red} #{exception.message}"
+      EM.defer do
+        @callbacks[name].each do |callback|
+          callback.call *args
+        end if @callbacks[name]
+
+        scripts = @scripts.select{|script| script.__emissions.include? name }
+        
+        scripts.each do |script|
+          begin
+            script.__send__ name, *args
+          rescue Exception => exception
+            log.error "#{File.basename(script.__path) << " - " << exception.message ^ :bold} on line #{exception.line.to_s ^ :bold}"
+          end
         end
       end
     end

data/library/blur/handling.rb

@@ -79,8 +79,14 @@ module Blur
         if channel = network.channel_by_name(name)
           emit :topic_change, channel, topic
           channel.topic = topic
-        else
+        else          
           channel = Network::Channel.new name, network, []
+
+          if network.fish? and network.options[:fish].key? name
+            keyphrase = network.options[:fish][name]
+            channel.encryption = Encryption::FiSH.new keyphrase
+          end
+          
           emit :topic_change, channel, topic
           channel.topic = topic
           
@@ -134,7 +140,7 @@ module Blur
                 message = channel.encryption.decrypt message[4..-1]
               end
             rescue Encryption::BadInputError
-              # …
+              puts "-!- FiSH: #{$!.message}"
             rescue => exception
               puts "-!- There was a problem with the FiSH encryption, disabling"
 

data/library/blur/network.rb

@@ -6,6 +6,8 @@ module Blur
   # Although the connection is a part of the network module, it is mainly used
   # for network-related structures, such as {User}, {Channel} and {Command}.
   class Network
+    include Logging
+    
     # +ConnectionError+ should only be triggered from within {Connection}.
     class ConnectionError < StandardError; end
 
@@ -73,7 +75,7 @@ module Blur
         message = "+OK #{recipient.encryption.encrypt message}"
       end
 
-      transmit :PRIVMSG, recipient, message
+      transmit :PRIVMSG, recipient.to_s, message
     end
     
     # Called when the network connection has enough data to form a command.
@@ -126,7 +128,7 @@ module Blur
     # @param [...] arguments all the prepended parameters.
     def transmit name, *arguments
       command = Command.new name, arguments
-      puts "-> #{inspect ^ :bold} | #{command}"
+      log "#{'→' ^ :red} #{command.name.to_s.ljust(8, ' ') ^ :light_gray} #{command.params.map(&:inspect).join ' '}"
       
       @connection.send_data "#{command}\r\n"
     end

data/library/blur/network/command.rb

@@ -61,7 +61,7 @@ module Blur
         else
           @sender = prefix
         end
-      end 
+      end
 
       # Convert it to an IRC-compliant line.
       #

data/library/blur/script.rb

@@ -9,6 +9,12 @@ module Blur
   # @todo add examples in the documentation
   # @see Script#Script
   class Script < Module
+    include Logging
+
+    Emissions = [:connection_ready, :topic_change, :user_rename, :message,
+                 :private_message, :user_entered, :user_left, :user_quit,
+                 :user_kicked, :topic, :user_mode, :channel_mode]
+
     # @return the name of the script.
     attr_accessor :__name
     # @return the author of the script.
@@ -20,6 +26,8 @@ module Blur
     # Can be used inside the script to act with the client itself.
     # @return [Network::Client] the client delegate.
     attr_accessor :__client
+    # @return [Array] a list of handled emissions.
+    attr_accessor :__emissions
     
     # Check to see if the script has been evaluated.
     def evaluated?; @__evaluated end
@@ -28,9 +36,14 @@ module Blur
     def initialize path
       @__path = path
       @__evaluated = false
+      @__emissions = []
       
       if evaluate and @__evaluated
         cache.load if Cache.exists? @__name
+
+        Emissions.each do |emission|
+          @__emissions.push emission if respond_to? emission
+        end
         
         __send__ :loaded if respond_to? :loaded
       end
@@ -76,17 +89,17 @@ module Blur
     
     # Convert it to a debug-friendly format.
     def inspect
-      %{#<#{self.class.name} @name=#{@__name.inspect} @version=#{@__version.inspect} @author=#{@__author.inspect}>}
+      File.basename @__path
     end
     
   private
   
     # Attempt to evaluate the contents of the script.
     def evaluate
-      module_eval File.read(@__path), File.basename(@__path), 0
+      instance_eval File.read(@__path), File.basename(@__path), 0
       @__evaluated = true
     rescue Exception => exception
-      puts "#{File.basename(@__path) ^ :bold}:#{exception.line.to_s ^ :bold}: #{"error:" ^ :red} #{exception.message ^ :bold}"
+      log.error "#{exception.message ^ :bold} on line #{exception.line.to_s ^ :bold}"
     end
   end
 end

data/library/blur/script/messageparsing.rb

@@ -30,6 +30,10 @@ module Blur
     module MessageParsing
       # The prefix that turns it into a possible command.
       MessageTrigger = "."
+
+      def self.extended klass
+        warn "#{File.realpath __FILE__}: MessageParsing will be deprecated in the future, use Fantasy."
+      end
       
       # Handle all calls to the scripts +message+ method, check to see if
       # the message containts a valid command, serialize it and pass it to

metadata

@@ -1,73 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blur
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  version: "1.6"
+version: !ruby/object:Gem::Version
+  version: 1.6.2.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Mikkel Kroman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-30 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: majic
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19385580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: crypt19
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19385580
+- !ruby/object:Gem::Dependency
+  name: crypt19
+  requirement: &19401480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19401480
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &19401020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        version: "0.12"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
-  version_requirements: *id003
-description: "    An event-driven IRC-framework in and for Ruby. Is extensible and supports script with (re)loading functionality during runtime.\n"
+  prerelease: false
+  version_requirements: *19401020
+description: ! '    An event-driven IRC-framework in and for Ruby. Is extensible and
+  supports script with (re)loading functionality during runtime.
+
+'
 email: mk@maero.dk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - library/blur.rb
 - library/blur/client.rb
+- library/blur/encryption.rb
+- library/blur/encryption/base64.rb
+- library/blur/encryption/fish.rb
 - library/blur/enhancements.rb
 - library/blur/handling.rb
 - library/blur/network.rb
@@ -78,40 +68,29 @@ files:
 - library/blur/script.rb
 - library/blur/script/cache.rb
 - library/blur/script/messageparsing.rb
-- library/blur/encryption/fish.rb
-- library/blur/encryption/base64.rb
-- library/blur/encryption.rb
-has_rdoc: true
 homepage: https://github.com/mkroman/blur
-licenses: 
+licenses:
 - ISC
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - library
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An event-driven IRC-framework for Ruby.
 test_files: []
-