weechat 0.0.2 → 0.0.3

data/ChangeLog

@@ -1,5 +1,42 @@
+2009-12-24  Dominik Honnef  <dominikho@gmx.net>
+
+	* lib/weechat.rb (Weechat): bumped version to 0.0.3
+
+	* lib/weechat/buffer.rb (Weechat::Buffer.find): added method for finding buffers
+
+	* lib/weechat/channel.rb (Weechat::IRC::Channel.channels)
+	(Weechat::IRC::Channel.find): added methods for finding channels
+
+	* lib/weechat/user.rb (Weechat::IRC::User#==): made user comparable
+
+	* lib/weechat/hooks.rb: added signal hooks
+	* lib/weechat/hooks/signal.rb (Weechat::Hooks::Signal): added signal hooks
+	* lib/weechat.rb (Weechat::Helper#signal_callback): added signal hooks
+
+2009-12-23  Dominik Honnef  <dominikho@gmx.net>
+
+
+	* lib/weechat/hook.rb (Weechat::Hook)
+	(Weechat::Hook::compute_free_id): rewrote uid generation
+
+	* lib/weechat.rb (Weechat::Helper#modifier_callback): added support for specific modifiers
+	* lib/weechat/modifier.rb (Weechat::Modifier::inherited): added support for specific modifiers
+	* lib/weechat/modifier.rb (Weechat::Modifiers::Print): added Print modifier
+
+
+	* lib/weechat/channel.rb (Weechat::IRC::Channel#get_infolist): fixed parsing
+
 2009-12-21  Dominik Honnef  <dominikho@gmx.net>
 
+	* lib/weechat/line.rb (Weechat::Line#parse): fix line parsing
+
+	* lib/weechat/info.rb: fixed comments
+	* lib/weechat/command.rb: fixed comments
+	* lib/weechat/modifier.rb: fixed comments
+
+	* lib/weechat/script.rb (Weechat::Script::Skeleton::InstanceMethods#weechat_init):
+	fixed version comparison
+
 	* Rakefile: bumped version to 0.0.2
 	* lib/weechat.rb (Weechat): bumped version to 0.0.2
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 
-VERSION = "0.0.2"
+VERSION = "0.0.3"
 
 spec = Gem::Specification.new do |s|
   s.name              = "weechat"

data/lib/weechat.rb

@@ -6,7 +6,7 @@ end
 require 'pp'
 
 module Weechat
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
   module Helper
     def command_callback(id, buffer, args)
       Weechat::Command.find_by_id(id).call(Weechat::Buffer.new(buffer), args)
@@ -41,6 +41,26 @@ module Weechat
       Weechat::Hooks::Print.find_by_id(id).call(buffer, date, tags, displayed, highlight, prefix, message)
     end
 
+    # TODO add IRC parser
+    # TODO add support for filters
+    # TODO add support for ignores
+    # TODO add support for infolists by pointer
+    #
+    SignalCallbackTransformations = {
+      [/irc_(channel|pv)_opened/, /^logger_(start|stop|backlog)$/,
+       /^buffer_(closing|closed|lines_hidden|moved|opened|renamed|switch)$/,
+       /^buffer_(title|type)_changed$/,
+       /^buffer_localvar_(added|changed|removed)$/] => lambda { |v| Weechat::Buffer.new(v) },
+      [/irc_server_(connecting|connected|disconnected)/] => lambda { |v| Weechat::Server.new(v) },
+      [/weechat_(highlight|pv)/] => lambda { |v| Weechat::Line.parse(v) },
+      [/window_(scrolled|unzooming|unzoomed|zooming|zoomed)/] => lambda { |v| Weechat::Window.new(v) },
+    }
+
+    def signal_callback(id, signal, data)
+      data = Weechat::Utilities.apply_transformation(signal, data, SignalCallbackTransformations)
+      Weechat::Hooks::Signal.find_by_id(id).call(signal, data)
+    end
+
     def config_callback(id, option, value)
       ret = Weechat::Hooks::Config.find_by_id(id).call(option, value)
     end
@@ -89,9 +109,12 @@ module Weechat
     }
 
     def modifier_callback(id, modifier, modifier_data, s)
+      klass = Weechat::Modifiers::Mappings[modifier] || Weechat::Modifier
       modifier_data = Weechat::Utilities.apply_transformation(modifier, modifier_data, ModifierCallbackTransformations)
       args = modifier_data + [Weechat::Line.parse(s)]
-      ret = Weechat::Modifier.find_by_id(id).call(*args)
+      callback = klass.find_by_id(id)
+      callback ||= Weechat::Modifier.find_by_id(id)
+      ret = callback.call(*args)
       return Weechat::Utilities.apply_transformation(modifier, ret, ModifierCallbackRTransformations).to_s
     end
   end

data/lib/weechat/buffer.rb

@@ -143,6 +143,7 @@ module Weechat
       [:notify] => lambda {|v| NOTIFY_LEVELS[v] },
       [:text_search] => lambda {|v| [:none, :backward, :foward][v] },
       [:type] => lambda {|v| [:formatted, :free][v]},
+      [:plugin] => lambda {|v| Weechat::Plugin.new(v)},
     }.freeze
 
     # The transformation procedures that get applied to values before they
@@ -190,6 +191,13 @@ module Weechat
         self.new(ptr)
       end
 
+      def find(plugin, name)
+        plugin = Weechat::Plugin.from_name(plugin) if plugin.is_a?(String)
+        buffers.find {|buffer|
+          buffer.name == name && buffer.plugin == plugin
+        }
+      end
+
       # Returns a list of all buffers
       #
       # @return [Array<Buffer>]
@@ -310,8 +318,8 @@ module Weechat
       # @raise [Exception::DuplicateBufferName] In case a buffer with that name already exists
       def create(name, input_callback, close_callback)
         @callbacks << {
-          :input_callback => Callback.new(input_callback),
-          :close_callback => Callback.new(close_callback),
+          :input_callback => EvaluatedCallback.new(input_callback),
+          :close_callback => EvaluatedCallback.new(close_callback),
         }
         id = @callbacks.size - 1
         ptr = Weechat.buffer_new(name.to_s, "input_callback", id.to_s, "close_callback", id.to_s)

data/lib/weechat/callback.rb

@@ -4,6 +4,12 @@ module Weechat
       @callback = callback
     end
 
+    def call(*args)
+      return Weechat::Utilities.safe_call {@callback.call(*args)}
+    end
+  end
+
+  class EvaluatedCallback < Callback
     def call(*args)
       return Weechat::Utilities.evaluate_call {@callback.call(*args)}
     end

data/lib/weechat/channel.rb

@@ -12,6 +12,19 @@ module Weechat
 
       init_properties
 
+      class << self
+        def channels
+          Weechat::Buffer.all.select {|b| b.channel?}.map{|b| b.channel}
+        end
+        alias_method :all, :channels
+
+        def find(server, channel)
+          server  = server.name if server.respond_to?(:name)
+          channel = channel.name if channel.respond_to?(:name)
+          Weechat::Buffer.find("irc", "#{server}.#{channel}")
+        end
+      end
+
       attr_reader :buffer
       def initialize(buffer)
         @buffer = Buffer.new(buffer.to_s)
@@ -22,11 +35,11 @@ module Weechat
       end
 
       def get_infolist
-        Weechat::IRC::Server.all.map{|server|
-          Weechat::Infolist.parse("irc_channel", "", server.name).find{|channel|
-            channel[:buffer] == @ptr
-          }
-        }.compact
+        list = Weechat::Infolist.parse("irc_channel", "", server.name).select{|channel|
+          channel[:buffer] == @ptr
+        }
+
+        list.empty? ? [{}] : list
       end
 
       def server

data/lib/weechat/command.rb

@@ -1,6 +1,4 @@
 module Weechat
-  # Note: As opposed to plain WeeChat, we properly parse arguments
-  # given to a command, like a shell would.
   class Command < Hook
     attr_reader :command
     attr_reader :description
@@ -46,7 +44,7 @@ module Weechat
       end
 
       @command[0..0] = '' if @command[0..0] == '/'
-      @callback         = Callback.new(callback)
+      @callback         = EvaluatedCallback.new(callback)
       @ptr              = Weechat.hook_command(@command,
                                        @description.to_s,
                                        @args.to_s,

data/lib/weechat/hook.rb

@@ -3,17 +3,21 @@ module Weechat
   # callback, which then calls the appropriate callback.
   class Hook
     include Weechat::Pointer
+    @@unique_id = 0
 
     @hook_classes = [self]
-    def self.inherited(by)
-      by.init
-      @hook_classes << by
-    end
+    class << self
+      def inherited(by)
+        by.init
+        @hook_classes << by
+      end
 
-    def self.hooks; @hooks; end
+      def hooks; @hooks; end
+      alias_method :all, :hooks
 
-    def self.init
-      @hooks = {}
+      def init
+        @hooks = {}
+      end
     end
 
     init
@@ -29,7 +33,7 @@ module Weechat
     end
 
     def callback=(callback)
-      @callback = Callback.new(callback)
+      @callback = EvaluatedCallback.new(callback)
     end
 
     class << self
@@ -78,8 +82,9 @@ module Weechat
       @hooks[id.to_i]
     end
 
+    # Returns a new, unique ID.
     def self.compute_free_id
-      (@hooks.keys.max || -1) + 1
+      @@unique_id += 1
     end
 
     def self.register(hook)

data/lib/weechat/hooks.rb

@@ -6,3 +6,4 @@ end
 require 'weechat/hooks/command_run.rb'
 require 'weechat/hooks/print.rb'
 require 'weechat/hooks/config.rb'
+require 'weechat/hooks/signal.rb'

data/lib/weechat/hooks/command_run.rb

@@ -14,7 +14,7 @@ module Weechat
                       command.to_s
                     end
 
-        @callback = Callback.new(callback)
+        @callback = EvaluatedCallback.new(callback)
         @ptr      = Weechat.hook_command_run(@command, "command_run_callback", id.to_s)
         if also_arguments
           @ptr2 = Weechat.hook_command_run("#@command *", "command_run_callback", id.to_s)

data/lib/weechat/hooks/config.rb

@@ -3,7 +3,7 @@ module Weechat
     class Config < Hook
       def initialize(option, &callback)
         super
-        @callback = Callback.new(callback)
+        @callback = EvaluatedCallback.new(callback)
         @ptr      = Weechat.hook_config(option, "config_callback", id.to_s)
       end
     end

data/lib/weechat/hooks/print.rb

@@ -6,7 +6,7 @@ module Weechat
         buffer = buffer.ptr if buffer.respond_to?(:ptr)
         tags = tags.join(",")
         strip_colors = Weechat.bool_to_integer(strip_colors)
-        @callback = Callback.new(callback)
+        @callback = EvaluatedCallback.new(callback)
         @ptr      = Weechat.hook_print(buffer, tags, message, strip_colors, "print_callback", id.to_s)
       end
     end

data/lib/weechat/hooks/signal.rb

@@ -0,0 +1,11 @@
+module Weechat
+  module Hooks
+    class Signal < Hook
+      def initialize(signal='*', &callback)
+        super
+        @callback = EvaluatedCallback.new(callback)
+        @ptr      = Weechat.hook_signal(signal, "signal_callback", id.to_s)
+      end
+    end
+  end
+end

data/lib/weechat/info.rb

@@ -1,6 +1,4 @@
 module Weechat
-  # Note: As opposed to plain WeeChat, we properly parse arguments
-  # given to a command, like a shell would.
   class Info < Hook
     attr_reader :name
     attr_reader :description

data/lib/weechat/line.rb

@@ -13,7 +13,11 @@ module Weechat
         when 0
           parts = ["", ""]
         when 1
-          parts.unshift ""
+          if line =~ /\t(\t+)\Z/
+            parts << $1
+          else
+            parts.unshift ""
+          end
         when 2
         else
           parts = [parts[0], parts[1..-1].join("\t")]

data/lib/weechat/modifier.rb

@@ -1,14 +1,14 @@
 module Weechat
-  # Note: As opposed to plain WeeChat, we properly parse arguments
-  # given to a command, like a shell would.
   class Modifier < Hook
+    def self.inherited(by)
+      Hook.inherited(by)
+    end
+
     attr_reader :modifier
     def initialize(modifier, &callback)
       super
       @modifier = modifier.to_s
-      @callback         = callback # we do not use the Callback class
-                                   # here because we need the return
-                                   # value of the callback
+      @callback         = Callback.new(callback)
       @ptr              = Weechat.hook_modifier(modifier, "modifier_callback", id.to_s)
     end
 
@@ -21,4 +21,29 @@ module Weechat
       alias_method :exec, :call
     end
   end
+
+  module Modifiers
+    class Print < Weechat::Modifier
+      class PrintModifierCallback < Weechat::Callback
+        def call(plugin, buffer, tags, line)
+          begin
+            ret = @callback.call(plugin, buffer, tags, line)
+          rescue => e
+            Weechat::Utilities.format_exception(e)
+            return line
+          end
+          return ret
+        end
+      end # PrintModifierCallback
+
+      def initialize(&callback)
+        super("weechat_print", &callback)
+        @callback = PrintModifierCallback.new(callback)
+      end
+    end # Print
+
+    Mappings = {
+      'weechat_print' => Print,
+    }
+  end # Modifiers
 end

data/lib/weechat/process.rb

@@ -12,7 +12,7 @@ module Weechat
       @command  = command
       @collect  = collect
       @stdout, @stderr = [], []
-      @callback = Callback.new(callback)
+      @callback = EvaluatedCallback.new(callback)
       @ptr      = Weechat.hook_process(command, timeout, "process_callback", id.to_s)
     end
 

data/lib/weechat/script.rb

@@ -26,7 +26,7 @@ module Weechat
 
       module InstanceMethods
         def weechat_init
-          if (self.script[:gem_version].split('.') <=> Weechat::VERSION.split('.')) > 0
+          if (self.script[:gem_version].split('.').map{|i| i.to_i} <=> Weechat::VERSION.split('.').map{|i| i.to_i}) > 0
             Weechat.puts "This script ('#{self.script[:name]}') "\
             "requires a version of the weechat ruby gem of at least #{self.script[:gem_version]}. "\
             "You are currently using the version #{Weechat::VERSION}"

data/lib/weechat/timer.rb

@@ -6,7 +6,7 @@ module Weechat
     def initialize(interval, max=0, align=0, &block)
       super
       @remaining= nil
-      @callback = Callback.new(block)
+      @callback = EvaluatedCallback.new(block)
       @interval = interval
       @align    = align
       @max      = max

data/lib/weechat/user.rb

@@ -19,6 +19,12 @@ module Weechat
       alias_method :opped?, :op?
       alias_method :voiced?, :voice?
 
+      def ==(other)
+        @name == other.name && @host == other.host && @channel == other.channel
+      end
+      alias_method :eql?, "=="
+      alias_method :equal?, :eql?
+
       def op
         @channel.exec("/op #@name")
       end

data/lib/weechat/utilities.rb

@@ -1,5 +1,25 @@
 module Weechat
   module Utilities
+    def self.format_exception(e)
+      prefix = Weechat.prefix("error")
+
+      line1 = e.backtrace[0] + ": " + e.message + " (" + e.class.name + ")"
+      backtrace =  "    " + e.backtrace[1..-1].join("\n    ")
+
+      Weechat.puts("#{prefix}error in evaluated call: #{line1}")
+      Weechat.puts("#{prefix}#{backtrace}")
+    end
+
+    def self.safe_call
+      begin
+        ret = yield
+      rescue => e
+        format_exception(e)
+        return Weechat::WEECHAT_RC_ERROR
+      end
+      ret
+    end
+
     def self.evaluate_call
       begin
         yield
@@ -10,13 +30,7 @@ module Weechat
       rescue Weechat::Exception::WEECHAT_RC_ERROR
         return Weechat::WEECHAT_RC_ERROR
       rescue => e
-        prefix = Weechat.prefix("error")
-
-        line1 = e.backtrace[0] + ": " + e.message + " (" + e.class.name + ")"
-        backtrace =  "    " + e.backtrace[1..-1].join("\n    ")
-
-        Weechat.puts("#{prefix}error in evaluated call: #{line1}")
-        Weechat.puts("#{prefix}#{backtrace}")
+        format_exception(e)
         return Weechat::WEECHAT_RC_ERROR
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weechat
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dominik Honnef
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
+date: 2009-12-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -47,6 +47,7 @@ files:
 - lib/weechat/hooks/print.rb
 - lib/weechat/hooks/config.rb
 - lib/weechat/hooks/command_run.rb
+- lib/weechat/hooks/signal.rb
 - lib/weechat/line.rb
 - lib/weechat/exceptions.rb
 - lib/weechat/command.rb