david-minibot 0.0.1 → 0.1.0

data/TODO

@@ -9,6 +9,7 @@ TODO:
 * Detect when using a registered nick. 
 * Add ability to reply both to public (by prefixing the username) and private messages 
 * Bot should reconnect upon disconnection
-* Logging.
-* Error handling.
-* Signal trapping for graceful exiting.
+* IRC protocol error handling (probably each command should return its own errors).
+* Trap signals.
+* Use non blocking IO for logging when available.
+* Find out what's the problem with heinlein.freenode.net

data/lib/minibot/commands.rb

@@ -12,19 +12,34 @@ module MiniBot
       topic = author = timestamp = nil
       server.write "TOPIC #{channel}", *EXPECTED_REPLIES_TOPIC do |code, reply|
         if code == RPL_TOPIC
-          topic = reply
+          channel, topic = reply.split /\s+/, 2
         elsif code == RPL_TOPIC_META
-          author, timestamp = *reply.split
+          channel, author, timestamp = *reply.split
         end
       end
 
-      [ topic, author, timestamp && Time.at(timestamp.to_i) ] 
+      [ topic && topic[1 .. -1], author, timestamp && Time.at(timestamp.to_i) ] 
+    end
+
+    def say(target, message)
+    end
+
+    def set_user(username, realname)
+      @server.write "USER #{username} 0 xxx :#{realname}"
+    end
+
+    def set_nick(nick)
+      @server.write "NICK #{nick}"
+    end
+
+    def nickserv(command)
+      @server.write "NICKSERV #{command}"
     end
 
     private
 
     def pong
-      write "PONG #{@host_name}"
+      @server.write "PONG #{@host_name}"
     end
   end
 end

data/lib/minibot/daemon.rb

@@ -5,39 +5,53 @@ module MiniBot
     include Events
     include Commands
 
-    attr_reader :config, :server
-
-    DEFAULTS = {
-      :port => 6667,
-      :channels => []
-    }
+    attr_reader :server
 
     def run
       begin
-        connect @config[:server], @config[:port]
-        authenticate @config[:nick], @config[:username], @config[:realname]
-        join *@config[:channels]
+        connect @servername, @port
+        login @username, @realname
+        identify @nick, @nickserv_pwd
         main_loop
+      rescue Exception => e
+        handle_exception(e)
+        raise e
       ensure
         disconnect
       end
     end
 
+    protected
+
+    def handle_exception(e)
+    end
+
     private
 
-    def connect(server, port)
+    def initialize(config)
+      @servername = config[:server]
+      @port = config[:port] || 6667
+      @nick = config[:nick]
+      @nickserv_pwd = config[:nickserv_pwd]
+      @username = config[:username] || @nick
+      @realname = config[:realname] || @nick
+    end
+
+    def connect(server, port = 6667)
       @server = Server.connect server, port
     end
 
-    def disconnect
-      @server.disconnect
+    def login(username, realname)
+      set_user username, realname
     end
 
-    def initialize(config)
-      @config = DEFAULTS.merge config
+    def identify(nick, password = nil)
+      set_nick(nick)
+      nickserv("identify #{password}") if password
+    end
 
-      @config[:username] ||= @config[:nick]
-      @config[:realname] ||= @config[:nick]
+    def disconnect
+      @server.disconnect
     end
 
     def main_loop
@@ -45,11 +59,6 @@ module MiniBot
         dispatch msg
       end
     end
-
-    def authenticate(nick, username, realname)
-      @server.write "USER #{username} 0 xxx :#{realname}"
-      @server.write "NICK #{nick}"
-    end
   end
 end
 

data/lib/minibot/events.rb

@@ -41,7 +41,7 @@ module MiniBot
     def error(num, message)
     end
 
-    private
+    protected
 
     def dispatch(srv_msg)
       if match = /^:(\w+)!.+ PRIVMSG (\S+) :([^\001].+)/.match(srv_msg)

data/lib/minibot/logger.rb

@@ -0,0 +1,44 @@
+module MiniBot
+  class Logger
+    @levels = {}
+
+    class << self
+      def with_level(level, &block)
+        @levels[level] = block
+      end
+
+      attr_reader :levels
+    end
+
+    attr_reader :level
+
+    def write(str)
+      time = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+      @target.printf "<%s> [%s] %s\n",time, level, str
+      @target.flush
+    end
+
+    def level=(level)
+      @level = level.to_sym
+      self.class.levels[@level].call(self)
+    end
+
+    private
+
+    def initialize(file_name_or_io)
+      @target = if String === file_name_or_io
+        File.new(file_name_or_io, "w")
+      else
+        file_name_or_io
+      end
+    end
+
+    def close
+      @target.close
+    end
+  end
+end
+
+module Kernel
+  attr_accessor :logger
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: david-minibot
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - David Leal
@@ -9,7 +9,7 @@ autorequire: minibot
 bindir: bin
 cert_chain: []
 
-date: 2008-06-13 00:00:00 -07:00
+date: 2008-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/minibot/commands.rb
 - lib/minibot/daemon.rb
 - lib/minibot/server.rb
+- lib/minibot/logger.rb
 - lib/minibot/events.rb
 - lib/minibot/constants.rb
 - lib/minibot.rb
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A mini Ruby IRC bot framework