raibo 0.0.3 → 0.0.4

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 Botfile
+/tags

data/bin/raibo

@@ -57,5 +57,5 @@ b = Raibo::Bot.new(server,
                    :nick    => options.nick,
                    :channel => options.channel,
                    :verbose => options.verbose)
-b.instance_eval(File.read(options.botfile))
+b.load_config_file(options.botfile)
 b.run

data/lib/raibo.rb

@@ -7,3 +7,4 @@ require 'raibo/version'
 require 'raibo/connection'
 require 'raibo/bot'
 require 'raibo/message'
+require 'raibo/dsl'

data/lib/raibo/bot.rb

@@ -1,27 +1,34 @@
 module Raibo
   class Bot
-    def initialize(*args)
-      @handlers = []
+    attr_accessor :docs
 
+    def initialize(*args)
       if args.first.is_a?(Raibo::Connection)
         @connection = args.shift
       else
         @connection = Raibo::Connection.new(*args)
       end
-    end
 
-    def use(handler=nil, &block)
-      @handlers.push(handler || block)
+      reset
     end
 
-    def match(regexp, &block)
+    def reset
+      @handlers = []
+      @docs = []
+      @dsl = Raibo::DSL.new(self, @connection)
+
       use do |msg|
-        if msg.body =~ regexp
-          exec_with_var_arity($~, msg, &block)
+        if msg.body == '!help'
+          @bot.help
         end
       end
     end
 
+    def use(handler=nil, &block)
+      @handlers.push(handler || block)
+      @docs.concat(handler.docs) if handler.respond_to?(:docs)
+    end
+
     def run(async=false)
       if async
         @thread = Thread.new { run_sync }
@@ -40,6 +47,16 @@ module Raibo
       @thread.alive? if @thread
     end
 
+    def load_config_file(filename)
+      @dsl.instance_eval(IO.read(filename), filename)
+    end
+
+    def help
+      width = [15, @docs.map(&:first).map(&:length).max].max
+
+      @connection.say(*@docs.map { |cmd, desc| "%-#{width}s  %s" % [cmd, desc] })
+    end
+
     private
       def run_sync
         @connection.open
@@ -54,10 +71,14 @@ module Raibo
             end
           end
           @handlers.each do |handler|
-            if handler.is_a?(Proc)
-              break if @connection.instance_exec(message, &handler)
-            else
-              break if handler.call(@connection, message)
+            begin
+              if handler.is_a?(Proc)
+                break if @dsl.instance_exec(message, &handler)
+              else
+                break if handler.call(@connection, message)
+              end
+            rescue Exception => e
+              @connection.say e.inspect
             end
           end
         end

data/lib/raibo/connection.rb

@@ -57,8 +57,8 @@ module Raibo
       send "PART #{channel}"
     end
 
-    def say(msg)
-      msg(@channel, msg)
+    def say(*msgs)
+      msgs.each { |msg| msg(@channel, msg) }
     end
 
     def msg(dest, msg)
@@ -69,14 +69,5 @@ module Raibo
       puts "<-- #{str}" if @verbose
       @connection.puts(str)
     end
-
-    def exec_with_var_arity(*args, &block)
-      arity = block.arity
-      if arity <= 0
-        instance_eval(&block)
-      else
-        instance_exec(*args.take(block.arity), &block)
-      end
-    end
   end
 end

data/lib/raibo/dsl.rb

@@ -0,0 +1,38 @@
+module Raibo
+  class DSL
+    def initialize(bot, connection)
+      @bot = bot
+      @connection = connection
+    end
+
+    def use(handler=nil, &block)
+      @bot.use(handler, &block)
+    end
+
+    def match(regexp, &block)
+      use do |msg|
+        if msg.body =~ regexp
+          exec_with_var_arity($~, msg, &block)
+        end
+      end
+    end
+
+    def doc(cmd, desc='')
+      @bot.docs << [cmd, desc]
+    end
+
+    def method_missing(meth, *args, &block)
+      @connection.__send__(meth, *args, &block)
+    end
+
+    private
+      def exec_with_var_arity(*args, &block)
+        arity = block.arity
+        if arity <= 0
+          instance_eval(&block)
+        else
+          instance_exec(*args.take(block.arity), &block)
+        end
+      end
+  end
+end

data/lib/raibo/version.rb

@@ -1,3 +1,3 @@
 module Raibo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,29 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: raibo
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-17 00:00:00 -07:00
-default_executable: 
+date: 2011-08-30 00:00:00.000000000Z
 dependencies: []
-
-description: ""
-email: 
+description: ''
+email:
 - rwfitzge@gmail.com
-executables: 
+executables:
 - raibo
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -32,39 +27,36 @@ files:
 - lib/raibo.rb
 - lib/raibo/bot.rb
 - lib/raibo/connection.rb
+- lib/raibo/dsl.rb
 - lib/raibo/message.rb
 - lib/raibo/version.rb
 - raibo.gemspec
 - spec/message_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: raibo
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A simple IRC library
-test_files: 
+test_files:
 - spec/message_spec.rb
 - spec/spec_helper.rb