Thu Aug 04 23:03:30 BST 2005 Tom Gilbert <tom@linuxbrit.co.uk>

[user/henk/code/ruby/rbot.git] / lib / rbot / config.rb

diff --git a/lib/rbot/config.rb b/lib/rbot/config.rb
index a452292651d74896ce38bec46172c21af984c196..957c63a3fd68966bef5f40d5667e52d3a475f602 100644 (file)
--- a/lib/rbot/config.rb
+++ b/lib/rbot/config.rb
@@ -120,6 +120,13 @@ module Irc
       super
       @values = params[:values]
     end
+    def values
+      if @values.instance_of?(Proc)
+        return @values.call(BotConfig.bot)
+      else
+        return @values
+      end
+    end
     def parse(string)
       unless @values.include?(string)
         raise ArgumentError, "invalid value #{string}, allowed values are: " + @values.join(", ")
@@ -127,7 +134,7 @@ module Irc
       string
     end
     def desc
-      "#{@desc} [valid values are: " + @values.join(", ") + "]"
+      "#{@desc} [valid values are: " + values.join(", ") + "]"
     end
   end
 
@@ -229,6 +236,7 @@ module Irc
       value = params[:value].to_s
       unless @@items.has_key?(key)
         m.reply "no such config key #{key}"
+        return
       end
       begin
         @@items[key].set_string(value)
@@ -263,7 +271,7 @@ module Irc
       end
     end
     def usage(m,params)
-      m.reply "incorrect usage, try '#{@bot.nick}: help config'"
+      m.reply "incorrect usage, try '#{@@bot.nick}: help config'"
     end
 
     # bot:: parent bot class