weechat 0.0.1 → 0.0.2

data/ChangeLog

@@ -0,0 +1,62 @@
+2009-12-21  Dominik Honnef  <dominikho@gmx.net>
+
+	* Rakefile: bumped version to 0.0.2
+	* lib/weechat.rb (Weechat): bumped version to 0.0.2
+
+	* lib/weechat/channel.rb (Weechat::IRC::Channel#nicks): added support for users
+	* lib/weechat/host.rb (Weechat::IRC::Host): added support for users
+	* lib/weechat/user.rb (Weechat::IRC::User): added support for users
+
+	* lib/weechat/channel.rb (Weechat::IRC::Channel#join)
+	(Weechat::IRC::Channel#rejoin): added support for channel
+	passwords
+	(Weechat::IRC::Channel#command, Weechat::IRC::Channel#send): added
+	support for sending commands/messages to channels
+
+	* lib/weechat/pointer.rb (Weechat::Pointer#initialize): fixed
+	pointer comparison
+
+	* lib/weechat/script/config.rb (Weechat::Script::Config#set):
+	fixed memory leak
+	* lib/weechat/properties.rb (Weechat::Properties::InstanceMethods#set_property):
+	fixed memory leak
+	* lib/weechat/option.rb (Weechat::Option): fixed memory leak
+	* lib/weechat/property.rb (Weechat::Property): fixed memory leak
+
+2009-12-18  Dominik Honnef  <dominikho@gmx.net>
+
+	* lib/weechat/channel.rb (Weechat::IRC::Channel): added support
+	for channels
+	* lib/weechat/buffer.rb (Weechat::Buffer#channel)
+	(Weechat::Buffer#channel?): added support for channels
+
+	* lib/weechat.rb (Weechat::Helper#get_buffer): put logic of
+	determining buffer into own method, changed methods accordingly
+	(Weechat::Helper#puts_y): added support for print_y
+
+	* lib/weechat/server.rb (Weechat::IRC::Server#initialize): use a
+	proper exception use existing properties architecture
+
+	* lib/weechat/buffer.rb: style changes wrt exceptions
+	* lib/weechat/properties.rb: style changes wrt exceptions
+	(Weechat::Properties::InstanceMethods#valid_property): fixed check
+	for values that are false
+	(Weechat::Properties::InstanceMethods#to_h): tweak performance by
+	reusing infolist
+
+	* lib/weechat/rubyext/object.rb (Object#__class__): added
+	__class__ as an alias for class
+	* lib/weechat/blankslate.rb (Blankslate): use Object#__class__
+
+	* lib/weechat/blankslate.rb (Blankslate): don't undef object_id
+	anymore
+
+2009-12-14  Dominik Honnef  <dominikho@gmx.net>
+
+	* lib/weechat/server.rb (Weechat::IRC::Server.servers): renamed
+	Server.buffers to Server.servers
+
+2009-12-14  Dominik Honnef  <dominikho@gmx.net>
+	* *: initial release
+	* lib/weechat.rb (Weechat): bumped version to 0.0.1
+

data/Rakefile

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

data/TODO

@@ -79,7 +79,7 @@ display:
 [x] color
 [x] print
 [ ] print_date_tags
-[ ] print_y
+[x] print_y
 [x] log_print
 
 hooks:
@@ -163,11 +163,11 @@ info_get
   [x] weechat_sharedir
 
 infolists:
-[ ] infolist_new
-[ ] infolist_new_var_integer
-[ ] infolist_new_var_string
-[ ] infolist_new_var_pointer
-[ ] infolist_new_var_time
+[/] infolist_new
+[/] infolist_new_var_integer
+[/] infolist_new_var_string
+[/] infolist_new_var_pointer
+[/] infolist_new_var_time
 [x] infolist_get
 [x] infolist_next
 [-] infolist_prev
@@ -185,4 +185,4 @@ upgrade:
 [ ] upgrade_close
 
 Functionality:
-[ ] if a buffer is a channel, get nicks, usercount, topic, etc
+[x] if a buffer is a channel, get nicks, usercount, topic, etc

data/lib/weechat.rb

@@ -6,7 +6,7 @@ end
 require 'pp'
 
 module Weechat
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   module Helper
     def command_callback(id, buffer, args)
       Weechat::Command.find_by_id(id).call(Weechat::Buffer.new(buffer), args)
@@ -97,6 +97,17 @@ module Weechat
   end
 
   class << self
+    def get_buffer(buffer = nil)
+      case buffer
+      when nil
+        ""
+      when :current
+        Weechat::Buffer.current
+      else
+        buffer
+      end
+    end
+
     def exec(command, buffer=nil)
       Weechat.command(buffer.to_s, command)
     end
@@ -104,18 +115,17 @@ module Weechat
     alias_method :execute, :exec
 
     def puts(text, buffer = nil)
-      buffer = case buffer
-               when nil
-                 ""
-               when :current
-                 Weechat::Buffer.current
-               else
-                 buffer
-               end
+      buffer = get_buffer(buffer)
       Weechat.print(buffer.to_s, text.to_s)
       nil # to mimic Kernel::puts
     end
 
+    def puts_y(text, line, buffer = nil)
+      buffer = get_buffer(buffer)
+      Weechat.print_y(text.to_s, line, buffer.to_s)
+      nil # to mimic Kernel::puts
+    end
+
     def p(object, buffer = nil)
       self.puts(object.inspect, buffer)
     end
@@ -212,6 +222,9 @@ require 'weechat/input.rb'
 require 'weechat/buffer.rb'
 require 'weechat/window.rb'
 require 'weechat/server.rb'
+require 'weechat/channel.rb'
+require 'weechat/user.rb'
+require 'weechat/host.rb'
 require 'weechat/infolist.rb'
 require 'weechat/color.rb'
 require 'weechat/plugin.rb'

data/lib/weechat/blankslate.rb

@@ -1,13 +1,3 @@
-class NullOutput
-  def write(*args)
-  end
-end
-
 class Blankslate
-  alias_method :__class__, :class
-
-  old_stderr = $stderr.dup
-  $stderr = NullOutput.new
-  instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-  $stderr = old_stderr
+  instance_methods.each { |m| undef_method m unless m =~ /^__/ || m.to_s == 'object_id' }
 end

data/lib/weechat/buffer.rb

@@ -159,11 +159,11 @@ module Weechat
       },
       [:notify] => lambda {|v|
         i = NOTIFY_LEVELS.index(v)
-        i or raise Exception::InvalidPropertyValue.new(v.to_s)
+        i or raise Exception::InvalidPropertyValue, v.to_s
       },
       [:type] => lambda {|v|
         v = v.to_s
-        raise Exception::InvalidPropertyValue.new(v) if !["formatted", "free"].include?(v)
+        raise Exception::InvalidPropertyValue, v if !["formatted", "free"].include?(v)
         v
       },
     }.freeze
@@ -316,7 +316,7 @@ module Weechat
         id = @callbacks.size - 1
         ptr = Weechat.buffer_new(name.to_s, "input_callback", id.to_s, "close_callback", id.to_s)
         if ptr.empty?
-          raise Exception::DuplicateBufferName(name.to_s)
+          raise Exception::DuplicateBufferName, name.to_s
         else
           @callbacks[-1][:ptr] = ptr
           Buffer.new(ptr)
@@ -357,9 +357,15 @@ module Weechat
     #
     # @return [Boolean]
     def channel?
-      # get all servers
-      # get all channels of all servers
-      # return true of pointer equal
+      self.localvar_type == "channel"
+    end
+
+    # Returns the channel associated with the buffer.
+    #
+    # @raise [Exception::NotAChannel]
+    # @return [IRC::Channel]
+    def channel
+      IRC::Channel.new(self)
     end
 
     # Send a command to the current buffer.

data/lib/weechat/channel.rb

@@ -0,0 +1,72 @@
+module Weechat
+  module IRC
+    class Channel
+      include Weechat::Pointer
+      extend Weechat::Properties
+
+      @transformations = {
+      }.freeze
+
+      @mappings = {
+      }.freeze
+
+      init_properties
+
+      attr_reader :buffer
+      def initialize(buffer)
+        @buffer = Buffer.new(buffer.to_s)
+        @ptr    = @buffer.ptr
+        if not ["channel"].include?(@buffer.localvar_type)
+          raise Exception::NotAChannel, buffer.ptr
+        end
+      end
+
+      def get_infolist
+        Weechat::IRC::Server.all.map{|server|
+          Weechat::Infolist.parse("irc_channel", "", server.name).find{|channel|
+            channel[:buffer] == @ptr
+          }
+        }.compact
+      end
+
+      def server
+        IRC::Server.new(@buffer.localvar_server)
+      end
+
+      def part(reason="")
+        @buffer.command("/part #{self.name} #{reason}")
+      end
+
+      def join(password = "")
+        @buffer.command("/join #{self.name} #{password}")
+      end
+
+      def rejoin(password = "")
+        part(reason)
+        join(password)
+      end
+      alias_method :cycle, :rejoin
+
+      def nicks
+        Weechat::Infolist.parse("irc_nick", "",
+                                "#{self.server.name},#{self.name}").map {|user|
+          IRC::User.new(user.merge({:channel => self}))
+        }
+      end
+      alias_method :users, :nicks
+
+      def command(*parts)
+        @buffer.command(*parts)
+      end
+      alias_method :send_command, :command
+      alias_method :exec, :command
+      alias_method :execute, :command
+
+      def send(*text)
+        @buffer.send(*text)
+      end
+      alias_method :privmsg, :send
+      alias_method :say, :send
+    end
+  end
+end

data/lib/weechat/exceptions.rb

@@ -27,5 +27,11 @@ module Weechat
     class WEECHAT_RC_OK < ::Exception; end
     class WEECHAT_RC_ERROR < ::Exception; end
     class WEECHAT_RC_OK_EAT < ::Exception; end
+
+    # This exception gets raised when one tries to receive the channel
+    # of a buffer which does not represent one.
+    class NotAChannel < RuntimeError; end
+
+    class UnknownServer < RuntimeError; end
   end
 end

data/lib/weechat/host.rb

@@ -0,0 +1,16 @@
+module Weechat
+  module IRC
+    class Host
+      attr_reader :user
+      attr_reader :host
+      def initialize(string)
+        @user, @host = string.split("@")
+      end
+
+      def identd?
+        @user[0..0] != "~"
+      end
+      alias_method :ident?, :identd?
+    end
+  end
+end

data/lib/weechat/infolist.rb

@@ -1,5 +1,42 @@
 module Weechat
   class Infolist
+    # class Item
+    #   def initialize(infolist)
+    #     @ptr = Weechat.infolist_new_item(infolist.ptr)
+    #   end
+
+    #   def []=(name, value)
+    #     type = case value
+    #            when String
+    #              value = value.to_s
+    #              'string'
+    #            when Numeric
+    #              'integer'
+    #            when Weechat::Pointer
+    #              value = value.ptr
+    #              'pointer'
+    #            when Date, Time, DateTime
+    #              # TODO implement time
+    #            else
+    #              value= value.to_s
+    #              'string'
+    #            end
+
+    #     m = "infolist_new_var_#{type}"
+    #     Weechat.__send__(m, name.to_s, value)
+    #   end
+    # end
+
+    # attr_reader :ptr
+    # def initialize
+    #   @ptr = Weechat.infolist_new
+    #   @items = Hash.new {|hash, key| hash[key] = Infolist::Item.new(self)}
+    # end
+
+    # def [](item)
+    #   @items[item]
+    # end
+
     def self.parse(type, ptr="", arguments="")
       infolist_ptr = Weechat.infolist_get(type, ptr, arguments)
       ret = []

data/lib/weechat/option.rb

@@ -4,18 +4,21 @@ module Weechat
     # blankslate... breaks things
 
 
-    def self.options
-      @options
-    end
-
     def initialize(config, option)
-      self.__class__.options << [config, option, self]
       @old_obj     = config.__get(option)
-      @config = config
-      @option = option
+      @config      = config
+      @option      = option
       @frozen      = false
     end
 
+    def __config__
+      @config
+    end
+
+    def __option__
+      @option
+    end
+
     def __freeze__
       @frozen = true
     end

data/lib/weechat/pointer.rb

@@ -12,7 +12,7 @@ module Weechat
     end
 
     def ==(other)
-      @ptr == other.ptr
+      other.respond_to?(:ptr) and @ptr == other.ptr
     end
     alias_method :eql?, "=="
     alias_method :equal?, "=="

data/lib/weechat/properties.rb

@@ -90,7 +90,7 @@ module Weechat
       # @see #get_infolist_property
       # @see #set_property
       def get_property(property)
-        raise Exception::UnknownProperty.new(property) unless valid_property?(property)
+        raise Exception::UnknownProperty, property unless valid_property?(property)
         case ret = __get_property(property)
         when true, false, nil
           ret
@@ -109,7 +109,7 @@ module Weechat
         elsif valid_property?(property, :infolist)
           v = get_infolist_property(property)
         else
-          raise Exception::UnknownProperty.new(property)
+          raise Exception::UnknownProperty, property
         end
 
         return self.class.apply_transformation(property, v)
@@ -125,7 +125,7 @@ module Weechat
       # @see #get_infolist_property
       def get_integer_property(property)
         property = property.to_s
-        raise Exception::UnknownProperty.new(property) unless valid_property?(property, :integer)
+        raise Exception::UnknownProperty, property unless valid_property?(property, :integer)
         get_integer(property)
       end
 
@@ -149,7 +149,7 @@ module Weechat
       # @see #set_string_property
       def get_string_property(property)
         property = property.to_s
-        raise Exception::UnknownProperty.new(property) unless valid_property?(property, :string)
+        raise Exception::UnknownProperty, property unless valid_property?(property, :string)
         get_string(property)
       end
 
@@ -181,7 +181,7 @@ module Weechat
       def get_infolist_property(property)
         property = property.to_sym
         values = get_infolist.first
-        raise Exception::UnknownProperty.new(property.to_s) unless values[property]
+        raise Exception::UnknownProperty, property.to_s unless values.has_key?(property)
         values[property]
       end
 
@@ -207,14 +207,14 @@ module Weechat
       # @see #set
       def set_property(property, v, freeze = false)
         property = property.to_s
-        raise Exception::UnsettableProperty.new(property) unless settable_property?(property)
+        raise Exception::UnsettableProperty, property unless settable_property?(property)
         v = Utilities.apply_transformation(property, v, self.class.rtransformations)
 
         set(property, v)
         if freeze
-          Property.properties.each do |prop|
-            if prop[0..1] == [@ptr, property]
-              prop[2].__freeze__
+          ObjectSpace.each_object(Weechat::Property).each do |prop|
+            if prop.__weechat_obj__.ptr == @ptr and prop.__property__ == property
+              prop.__freeze__
             end
           end
         end
@@ -228,7 +228,7 @@ module Weechat
       # @see #set
       def set_string_property(property, v)
         property = property.to_s
-        raise Exception::UnsettableProperty.new(property) unless settable_property?(property)
+        raise Exception::UnsettableProperty, property unless settable_property?(property)
         set(property, v)
       end
 
@@ -268,7 +268,7 @@ module Weechat
         when :localvar
           property =~ /^localvar_.+$/
         when :infolist
-          get_infolist.first[property.to_sym]
+          get_infolist.first.has_key?(property.to_sym)
         end
       end
 
@@ -294,7 +294,7 @@ module Weechat
         end
 
         get_infolist.first.each do |property, value|
-          prop = __get_property(property)
+          prop = self.class.apply_transformation(property, value)
           h[property] = prop
         end
 

data/lib/weechat/property.rb

@@ -3,13 +3,8 @@ module Weechat
     @properties = [] # we can't use a Hash because hashing
                      # blankslate... breaks things
 
-    
-    def self.properties
-      @properties
-    end
 
     def initialize(weechat_obj, property)
-      self.__class__.properties << [weechat_obj.ptr, property, self]
       @old_obj     = weechat_obj.__get_property(property)
       @weechat_obj = weechat_obj
       @property    = property
@@ -17,6 +12,14 @@ module Weechat
       @frozen      = false
     end
 
+    def __weechat_obj__
+      @weechat_obj
+    end
+
+    def __property__
+      @property
+    end
+
     def __freeze__
       @frozen = true
     end
@@ -40,7 +43,7 @@ module Weechat
           @old_obj = obj
         end
       end
-      
+
       ret
     end
   end

data/lib/weechat/rubyext/object.rb

@@ -7,4 +7,6 @@ class Object
   def self.from_weechat_config(v)
     YAML.load(v)
   end
+
+  alias_method :__class__, :class
 end

data/lib/weechat/script/config.rb

@@ -119,9 +119,9 @@ module Weechat
         value = value.to_weechat_config
         Weechat.config_set_plugin(option.to_s, value)
         if freeze
-          Option.options.each do |opt|
-            if opt[0..1] == [self, option]
-              opt[2].__freeze__
+          ObjectSpace.each_object(Weechat::Option).each do |opt|
+            if opt.__config__ == self and opt.__option__ == option
+              opt.__freeze__
             end
           end
         end

data/lib/weechat/server.rb

@@ -4,8 +4,10 @@ require 'date'
 module Weechat
   module IRC
     class Server
+      extend Weechat::Properties
+
       attr_reader :name
-      PROCESSORS = {
+      @transformations = {
         [:buffer] => lambda {|b|
           if b.empty?
             nil
@@ -13,79 +15,76 @@ module Weechat
             Weechat::Buffer.new(b)
           end
         },
-        [:ipv6, :ssl, :ssl_verify,
-         :autoconnect, :autoreconnect,
-         :autorejoin, :temp_server,
-         :is_connected, :ssl_connected,
-         :reconnect_join, :disable_autojoin,
-         :is_away] => lambda {|i| i == 0 ? false : true },
-        [:reconnect_start, :command_time,
-         :away_time, :lag_next_check,
-         :last_user_message] => lambda {|v| DateTime.parse(v)},
-      }
+        [:ipv6, :ssl, :ssl_verify, :autoconnect, :autoreconnect,
+         :autorejoin, :temp_server, :is_connected, :ssl_connected,
+         :reconnect_join, :disable_autojoin, :is_away] => lambda {|v|
+          Weechat.integer_to_bool(v)
+        },
+        [:reconnect_start, :command_time, :away_time, :lag_next_check,
+         :last_user_message] => lambda {|v| Date.parse(v) },
+        [:nicks] => lambda {|v| v.split(",") }
+      }.freeze
 
-      MAPPINGS = {
+      @mappings = {
+        :ipv6? => :ipv6,
+        :ssl?  => :ssl,
         :autoconnect? => :autoconnect,
         :autoreconnect? => :autoreconnect,
         :autorejoin? => :autorejoin,
         :temp_server? => :temp_server,
         :connected? => :is_connected,
         :ssl_connected? => :ssl_connected,
-        :reconnect_join? => :reconnect_join,
-      }
+        :join_on_reconnect? => :reconnect_join,
+        :away? => :is_away,
+      }.freeze
+
+      init_properties
 
       def autojoin?
         !disable_autojoin
       end
 
+      attr_reader :ptr
       def initialize(name)
-        @name = name
+        @ptr = @name = name.to_s
+        raise Exception::UnknownServer, name if get_infolist.empty?
       end
 
       class << self
         alias_method :from_name, :new
-      end
 
-      def self.buffers
-        servers = []
-        Weechat::Infolist.parse("irc_server").each do |server|
-          servers << Server.new(server[:name])
+        def servers
+          servers = []
+          Weechat::Infolist.parse("irc_server").each do |server|
+            servers << Server.new(server[:name])
+          end
+          servers
         end
-        servers
-      end
-      class << self
-        alias_method :all, :buffers
+        alias_method :all, :servers
       end
 
-      # TODO method for creating a new server
+      def channels
+        channels = []
+        Weechat::Infolist.parse("irc_channel", "", @name).each do |channel|
+          channels << IRC::Channel.new(channel[:buffer])
+        end
+        channels
+      end
 
-      def data
-        Weechat::Infolist.parse("irc_server", "", @name).first
+      def connect
+        return false if connected?
+        Weechat.exec("/connect #{@name}")
       end
 
-      def respond_to?(m)
-        if data.has_key?(m.to_sym)
-          true
-        else
-          super
-        end
+      def disconnect
+        return false if not connected?
+        self.buffer.exec("/disconnect #{@name}")
       end
 
-      def method_missing(m, *args)
-        m = MAPPINGS[m] || m
-        properties = data
-        if properties.has_key?(m) and args.size == 0
-          v = properties[m]
-          PROCESSORS.each do |key, value|
-            if key.include?(m)
-              v = value.call(v)
-              break
-            end
-          end
-          return v
-        else
-          super
-        end
+      # TODO method for creating a new server
+
+      def get_infolist
+        Weechat::Infolist.parse("irc_server", "", @name)
       end
     end
   end

data/lib/weechat/user.rb

@@ -0,0 +1,64 @@
+module Weechat
+  module IRC
+    class User
+      attr_reader :name
+      attr_reader :host
+      attr_reader :flags
+      attr_reader :color
+      attr_reader :channel
+      def initialize(args = {})
+        @name = args[:name]
+        @host = IRC::Host.new(args[:host])
+        @flags, @color, @channel = args.values_at(:flags, :color, :channel)
+      end
+
+      %w(chanowner? chanadmin? chanadmin2? op?
+         halfop? voice? away? chanuser?).each_with_index do |method, bit|
+        define_method(method) {(@flags & (2 ** bit)) > 0}
+      end
+      alias_method :opped?, :op?
+      alias_method :voiced?, :voice?
+
+      def op
+        @channel.exec("/op #@name")
+      end
+
+      def halfop
+        @channel.exec("/halfop #@name")
+      end
+
+      def voice
+        @channel.exec("/voice #@name")
+      end
+
+      def deop
+        @channel.exec("/deop #@name")
+      end
+
+      def dehalfop
+        @channel.exec("/dehalfop #@name")
+      end
+
+      def devoice
+        @channel.exec("/devoice #@name")
+      end
+
+      def kick(reason="")
+        @channel.exec("/kick #@name #{reason}")
+      end
+
+      def ban
+        @channel.exec("/ban #@name")
+      end
+
+      def unban
+        @channel.exec("/unban #@name")
+      end
+
+      def kickban(reason="")
+        kick(reason)
+        ban
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weechat
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dominik Honnef
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 +01:00
+date: 2009-12-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -50,13 +50,16 @@ files:
 - lib/weechat/line.rb
 - lib/weechat/exceptions.rb
 - lib/weechat/command.rb
+- lib/weechat/channel.rb
 - lib/weechat/info.rb
 - lib/weechat/process.rb
 - lib/weechat/property.rb
 - lib/weechat/server.rb
 - lib/weechat/input.rb
 - lib/weechat/hooks.rb
+- lib/weechat/host.rb
 - lib/weechat/timer.rb
+- lib/weechat/user.rb
 - lib/weechat.rb
 - COPYING
 - TODO