zmb 0.3.1 → 0.3.2

data/README.markdown

@@ -13,7 +13,7 @@ zmb is a complete messenger bot supporting irc, and command line interface.
 
 This command will use the default settings location of ~/.zmb, you can pass `-s <PATH>` to change this.
 
-	zmb --create
+	zmb --wizard
 
 ### Launching the bot
 	zmb --daemon
@@ -27,7 +27,7 @@ You can run zmb in a shell mode to test plugins without even connecting to any i
 ### Included plugins
 
 - IRC - Connect to a IRC server
-- Quote - Quotes
+- Quote
 - Poll - Voting system
 - Relay - Relay between servers and/or channels
 - Users - User management
@@ -39,6 +39,10 @@ You can run zmb in a shell mode to test plugins without even connecting to any i
 - Security - Hashes, rot13, and morse code
 - Random - Pick a random value from a list, yes or no, coinflip
 - URL - Dpaste, pastie, bitly, tinyurl, isgd
+- Translate - Translate a message into another language
+- RSS - Subscribe and watch RSS/ATOM feeds
+- Usermodes - Auto opping, voicing users in a channel
+- Weather - Get the weather for a town/city
 - Bank - Points system
 
 #### Other features
@@ -50,5 +54,3 @@ You can run zmb in a shell mode to test plugins without even connecting to any i
 ### Support
 
 You can find support at #zmb @ efnet.
-
-For complete documentation please visit [Documentation](http://kylefuller.co.uk/projects/zmb/)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/zmb

@@ -6,25 +6,11 @@ require 'zmb'
 require 'optparse'
 
 class AdminUser
-  attr_accessor :username, :userhosts, :permissions
-  
-  def initialize
-    @username = 'admin'
-    @userhosts = []
-    @permissions = ['admin']
-  end
-  
-  def admin?
-    true
-  end
-  
-  def permission?(perm)
-    true
-  end
-  
-  def authenticated?
-    true
-  end
+  def username; 'admin'; end
+  def userhost; 'admin@zmb'; end
+  def admin?; true; end
+  def permission?(perm); true; end
+  def authenticated?; true; end
 end
 
 class Event
@@ -32,34 +18,63 @@ class Event
   
   def initialize(message)
     @message = message
-    @user = AdminUser.new
-  end
-  
-  def message?
-    true
-  end
-  
-  def private?
-    true
-  end
-  
-  def reply(msg)
-    puts "> #{msg}"
   end
   
-  def name
-    "admin"
+  def message?; true; end
+  def private?; true; end
+  def name; "admin"; end
+  def user; AdminUser.new; end
+  def reply(msg); notice "#{msg}"; end
+end
+
+class Tty
+  class <<self
+    def blue; color 34; end
+    def red; color 31; end
+    def yellow; color 33 ; end
+    def reset; escape 0; end
+    
+  private
+    def color n
+      escape "0;#{n}"
+    end
+    def bold n
+      escape "1;#{n}"
+    end
+    def underline n
+      escape "4;#{n}"
+    end
+    def escape n
+      "\033[#{n}m" if $stdout.tty?
+    end
   end
 end
 
-def ask(question)
-  puts "#{question} (yes/no)"
+def question(message)
+  print "#{Tty.blue}[ #{Tty.yellow}?? #{Tty.blue}]#{Tty.reset} #{message}"
+end
+
+def warning(message)
+  puts "#{Tty.blue}[ #{Tty.yellow}** #{Tty.blue}]#{Tty.reset} #{message}"
+end
+
+def error(message)
+  puts "#{Tty.blue}[ #{Tty.red}!! #{Tty.blue}]#{Tty.reset} #{message}"
+end
+
+def notice(message)
+  puts "#{Tty.blue}[#{Tty.reset} ok #{Tty.blue}]#{Tty.reset} #{message}"
+end
+
+def question_bool(message)
+  question(message + ' (yes/no): ')
   answer = gets.chomp
   answer == 'yes' or answer == 'y'
 end
 
-def get_value(question)
-  puts question
+def question_string(message='')
+  message += ': ' unless message == ''
+  question(message)
   answer = gets.chomp
   
   return nil if answer == ''
@@ -69,15 +84,15 @@ end
 def wizard(zmb, plugin)
   STDOUT.flush
   
-  if ask("Would you like to add the #{plugin.name} plugin? #{plugin.description}") then
+  if question_bool("Would you like to add the #{plugin.name} plugin? #{plugin.description}") then
     if plugin.multi_instances? then
-      instance = get_value("What would you like to name this instance of #{plugin.name}?")
+      instance = question_string("What would you like to name this instance of #{plugin.name}?")
     else
       instance = plugin.name
     end
     
     if not instance then
-      puts "Must supply instance name, if this plugin should only be loaded once such as commands or users then you can call it that."
+      notice "Must supply instance name, if this plugin should only be loaded once such as commands or users then you can call it that."
       return wizard(zmb, plugin)
     end
     
@@ -89,7 +104,7 @@ def wizard(zmb, plugin)
       
       obj.wizard.each do |key, value|
         if value.has_key?('help') then
-          set = get_value("#{value['help']} (default=#{value['default']})")
+          set = question_string("#{value['help']} (default=#{value['default']})")
           settings[key] = set if set
         end
       end
@@ -105,6 +120,11 @@ options = {}
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: zmb [options]"
   
+  opts.on('-h', '--help', 'Displays this usage screen') do
+    puts optparse
+    exit
+  end
+  
   options[:settings] = nil
   opts.on('-s', '--settings SETTING', 'Use a settings folder') do |settings|
     options[:settings] = settings
@@ -115,13 +135,13 @@ optparse = OptionParser.new do |opts|
     options[:daemon] = true
   end
   
-  options[:create] = false
-  opts.on('-c', '--create', 'Create a new ZMB settings file') do
-    options[:create] = true
+  options[:wizard] = false
+  opts.on('-w', '--wizard', 'Interactively create a new config file') do
+    options[:wizard] = true
   end
   
   options[:shell] = false
-  opts.on('-b', '--shell', 'Create a commands shell') do
+  opts.on('-S', '--shell', 'Create a commands shell') do
     options[:shell] = true
   end
   
@@ -130,9 +150,15 @@ optparse = OptionParser.new do |opts|
     options[:command] = line
   end
   
-  options[:fork] = false
-  opts.on('-f', '--fork', 'Detach (fork) ZMB (for use with -d daemon)') do
-    options[:fork] = true
+  options[:foreground] = false
+  opts.on('-f', '--foreground', 'Don\'t fork into the background') do
+    options[:foreground] = true
+  end
+  
+  options[:debug] = false
+  opts.on('-D', '--daemon', 'Output debugging information (Implies -f)') do
+    options[:foreground] = true
+    options[:debug] = true
   end
 end
 
@@ -140,33 +166,33 @@ optparse.parse!
 
 if not options[:settings] then
   options[:settings] = File.expand_path('~/.zmb')
-  puts "No settings file specified, will use #{options[:settings]}"
+  notice "No settings file specified, will use #{options[:settings]}"
 end
 
 zmb = Zmb.new(options[:settings])
 
-if options[:create] then
+if options[:wizard] then
   STDOUT.flush
   
   zmb.save
   
-  while ask('Would you like to add additional plugin sources?')
-    source = get_value('Which path?')
+  while question_bool('Would you like to add additional plugin sources?')
+    source = question_string('Which path?')
     if source and File.exists?(source) then
       zmb.plugin_manager.add_plugin_source source
-      puts 'Source added'
+      notice "Source added"
       zmb.save
     else
-      puts 'Invalid source'
+      warning "Invalid source directory, does this folder exist?"
     end
   end
   
   zmb.plugin_manager.plugins.reject{ |plugin| zmb.instances.has_key? plugin.name }.each{ |plugin| wizard(zmb, plugin) }
   
-  if zmb.instances.has_key?('users') and ask('Would you like to add a admin user?') then
-    username = get_value('Username:')
-    password = get_value('Password:')
-    userhost = get_value('Userhost: (Leave blank for none)')
+  if zmb.instances.has_key?('users') and question_bool('Would you like to add a admin user?') then
+    username = question_string('Username:')
+    password = question_string('Password:')
+    userhost = question_string('Userhost: (Leave blank for none)')
     zmb.instances['users'].create_user(username, password, userhost).permit('admin')
   end
   
@@ -183,18 +209,22 @@ if options[:shell] then
   
   begin
     while 1
-      zmb.event(nil, Event.new(gets.chomp))
+      zmb.event(nil, Event.new(question_string))
     end
   rescue Interrupt
     zmb.save
+    puts
+    warning "Exiting"
   end
 end
 
+zmb.debug = options[:debug]
+
 if options[:daemon] then
-  if options[:fork] then
-    Process.detach(fork { STDOUT.reopen(File.open('/dev/null','w')); zmb.run })
-    puts "ZMB detached"
-  else
+  if options[:foreground] then
     zmb.run
+    warning "Exiting"
+  else
+    notice "Forking into the background (pid: #{zmb.run_fork})"
   end
 end

data/lib/zmb.rb

@@ -14,16 +14,21 @@ require 'zmb/event'
 require 'zmb/timer'
 
 class Zmb
-  attr_accessor :instances, :plugin_manager, :settings_manager, :plugin_sources
+  attr_accessor :instances, :plugin_manager, :settings_manager, :plugin_sources, :debug
   
   def plugin
     'zmb'
   end
   
+  def instance
+    'zmb'
+  end
+  
   def initialize(config_dir)
-    @debug = true
+    @debug = false
+    @running = false
     
-    @plugin_manager = PluginManager.new
+    @plugin_manager = PluginManager.new(self)
     @settings_manager = Settings.new(config_dir)
     
     @instances = {'zmb' => self}
@@ -45,8 +50,9 @@ class Zmb
     @plugin_manager.add_plugin_source plugin_dir
     
     @settings_manager.get('zmb', 'plugin_instances', []).each{|instance| load instance}
+    @debug = @settings_manager.get('zmb', 'debug', false)
     
-    @running = false
+    trap("HUP") { @plugin_manager.refresh_plugin_sources; load "commands"; load "users" }
   end
   
   def running?
@@ -57,13 +63,39 @@ class Zmb
     {
       'plugin_sources' => @plugin_sources,
       'plugin_instances' => @instances.keys,
+      'debug' => @debug,
     }
   end
   
   def save
+    debug(self, "Saving settings")
     @instances.each{ |k,v| @settings_manager.save(k, v) }
   end
   
+  def debug(sender, message, exception=nil)
+    return unless @debug
+    line = Array.new
+    
+    if sender then
+      if sender.respond_to?('instance') then
+        line << "(#{sender.instance})"
+      elsif sender == self
+        line << "(core)"
+      elsif sender == plugin_manager
+        line << "(plugins)"
+      else
+        line << "(#{sender})"
+      end
+    else
+      line << "(unknown)"
+    end
+    
+    line << message
+    line << exception if exception
+    
+    puts line.join(' ')
+  end
+  
   def load(key)
     return true if @instances.has_key?(key)
     
@@ -91,6 +123,7 @@ class Zmb
   end
   
   def run
+    debug(self, 'Start runloop')
     post! :running, self
     
     @running = true
@@ -100,10 +133,30 @@ class Zmb
         timer_run
       end
     rescue Interrupt
+      debug(self, 'Runloop interrupted')
       save
     end
   end
   
+  def run_fork
+    @running = false
+    pid = fork {
+      STDIN.reopen(File.open('/dev/null','r'))
+      STDOUT.reopen(File.open('/dev/null','w'))
+      STDERR.reopen(File.open('/dev/null','w'))
+      run
+    }
+    
+    Process.detach(pid)
+    debug(self, 'zmb Forked')
+    pid
+  end
+  
+  def fork_command(e=nil)
+    run_fork
+    "Forked"
+  end
+  
   def timeout
     if timer_timeout > @maximum_timeout
       if @sockets.size < 1 then
@@ -119,6 +172,7 @@ class Zmb
   end
   
   def socket_add(delegate, socket)
+    debug(delegate, "Socked added")
     @sockets[socket] = delegate
   end
   
@@ -139,7 +193,9 @@ class Zmb
       result[0].select{|sock| @sockets.has_key?(sock)}.each do |sock|
         if sock.eof? then
           @sockets[sock].disconnected(self, sock) if @sockets[sock].respond_to?('disconnected')
+          sock.close
           socket_delete sock
+          debug(@sockets[sock], "Socket EOF")
         else
           @sockets[sock].received(self, sock, sock.gets()) if @sockets[sock].respond_to?('received')
         end
@@ -148,6 +204,7 @@ class Zmb
   end
   
   def timer_add(timer)
+    debug(timer.delegate, "Timer added (#{timer.symbol})")
     @timers << timer
   end
   
@@ -161,14 +218,23 @@ class Zmb
   end
   
   def timer_run
-    @timers.select{|timer| timer.timeout <= 0.0 and timer.respond_to?("fire") }.each{|timer| timer.fire(self)}
+    @timers.select{|timer| timer.timeout <= 0.0 and timer.respond_to?("fire") }.each do |timer|
+      debug(timer.delegate, "Timer #{timer.symbol} fired")
+      timer.fire(self)
+    end
   end
   
   def post(signal, *args)
     results = Array.new
     
     @instances.select{|name, instance| instance.respond_to?(signal)}.each do |name, instance|
-      results << instance.send(signal, *args) rescue nil
+      begin
+        result = instance.send(signal, *args)
+        break if result == :halt
+        results << result
+      rescue Exception
+        debug(instance, "Sending signal `#{signal}` failed", $!)
+      end
     end
     
     results
@@ -176,7 +242,11 @@ class Zmb
   
   def post!(signal, *args) # This will exclude the plugin manager
     @instances.select{|name, instance| instance.respond_to?(signal) and instance != self}.each do |name, instance|
-      instance.send(signal, *args) rescue nil
+      begin
+        break if instance.send(signal, *args) == :halt
+      rescue Exception
+        debug(instance, "Sending signal `#{signal}` failed", $!)
+      end
     end
   end
   
@@ -198,8 +268,6 @@ class Zmb
   end
   
   def event(sender, e)
-    puts e.line if @debug and e.respond_to?('line')
-    
     Thread.new do
       post! :pre_event, sender, e
       post! :event, sender, e
@@ -221,6 +289,14 @@ class Zmb
       'addsource' => [:addource_command, 1, { :permission => 'admin' }],
       'refresh' => [:refresh_command, 1, { :permission => 'admin' }],
       'quit' => [:quit_command, 0, { :permission => 'admin' }],
+      'debug' => [:debug_command, 0, {
+        :permission => 'admin',
+        :help => 'Toggle debug' }],
+      'stdout' => [:stdout_command, {
+        :permission => 'admin',
+        :usage => '/dev/null' }],
+      'fork' => [:fork_command, 0, {
+        :permission => 'admin' }],
     }
   end
   
@@ -331,4 +407,19 @@ class Zmb
     @running = false
     instances.keys.each{ |i| unload(i) }
   end
+  
+  def debug_command(e)
+    @debug = (not @debug)
+    
+    if @debug then
+      "Debugging enabled"
+    else
+      "Debugging disabled"
+    end
+  end
+  
+  def stdout_command(e, out)
+    STDOUT.reopen(File.open(out,'w'))
+    "STDOUT set to #{out}"
+  end
 end

data/lib/zmb/plugin.rb

@@ -1,7 +1,8 @@
 class PluginManager
   attr_accessor :plugin_sources, :plugins
   
-  def initialize
+  def initialize(delegate=nil)
+    @delegate = delegate
     @plugins = Array.new
     @plugin_sources = Array.new
   end
@@ -22,7 +23,7 @@ class PluginManager
       definition.definitition_file = File.expand_path(file)
       @plugins << definition
     rescue Exception
-      nil
+      @delegate.debug(self, "Cannot load source `#{file}`", $!)
     end
   end
   
@@ -35,9 +36,7 @@ class PluginManager
     ]
     
     definition_files.map do |file|
-      begin
-        load_plugin_source(file)
-      end
+      load_plugin_source(file)
     end
   end
   

data/lib/zmb/settings.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 begin
   require 'json'
 rescue LoadError

data/lib/zmb/timer.rb

@@ -1,7 +1,7 @@
 class Timer
   require 'date'
   
-  attr_accessor :delegate
+  attr_accessor :delegate, :symbol
   
   def initialize(delegate, symbol, interval, repeat=false, data=nil) # interval is in seconds (decimals accepted)
     @delegate = delegate
@@ -21,7 +21,7 @@ class Timer
         @delegate.send @symbol
       end
     rescue Exception
-      
+      sender.debug(@delegate, "Timer #{@symbol} failed", $!)
     end
 
     if not @repeat

data/lib/zmb/utils.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 class String
   def self.random(len=8)
     characters = ('a'..'z').to_a + ('1'..'9').to_a
@@ -112,10 +114,10 @@ class Hash
     map { |k, v| 
       if v.instance_of?(Hash)
         v.map { |sk, sv|
-          "#{k}[#{sk}]=#{sv}"
+          "#{k}[#{sk}]=#{CGI.escape(sv)}"
         }.join('&')
       else
-        "#{k}=#{v}"
+        "#{k}=#{CGI.escape(v)}"
       end
     }.join('&')
   end

data/plugins/alias.rb

@@ -49,5 +49,6 @@ end
 
 Plugin.define do
   name 'alias'
+  description 'Alias a command as another command'
   object Alias
 end

data/plugins/autovoice.rb

@@ -0,0 +1,38 @@
+class AutoVoice
+  def initialize(sender, s)
+    @settings = s
+    @settings['noperm'] = true unless @settings.has_key?('noperm')
+  end
+  
+  def event(sender, e)
+    if e.command == 'join' and e.respond_to?('user') then
+      if @settings['noperm'] or e.user.permission?('autovoice') then
+        e.delegate.write "MODE #{e.channel} +v #{e.name}"
+      end
+    end
+  end
+  
+  def commands
+    {
+      'autovoice' => [:autovoice, 0, {
+        :permission => 'admin',
+        :help => 'Toggle the permission setting for autovoice'
+      }]
+    }
+  end
+  
+  def autovoice(e)
+    @settings['noperm'] = (not @settings['noperm'])
+    if @settings['noperm'] then
+      "No permissions are required to be autovoiced"
+    else
+      "The permission `autovoice` is required to be autovoiced"
+    end
+  end
+end
+
+Plugin.define do
+  name 'autovoice'
+  description 'Auto voice everyone joining a channel where zmb has op'
+  object AutoVoice
+end

data/plugins/commands.rb

@@ -125,11 +125,14 @@ class Commands
       elsif c.has_key?(:proc) then
         c[:proc].call(e, *args)
       else
+        delegate(self, "Bad command definition (#{cmd})")
         "Bad command definition"
       end
     rescue ArgumentError
       'incorrect arguments'
     rescue Exception
+      @delegate.debug(c.has_key?(:instance) ? c[:instance] : self, "Command #{cmd} failed", $!)
+      
       if e.respond_to?('user') and e.user.admin? and e.private? then
         "#{$!.message}\n#{$!.inspect}\n#{$!.backtrace[0..2].join("\n")}"
       else
@@ -172,13 +175,21 @@ class Commands
       'help' => :help,
       'instance' => [:instance_command, { :help => 'List all commands availible for a instance.'}],
       'which' => [:which, { :help => 'Find which plugin handles a command' }],
-      'cc' => [:control_command, { :permission => 'admin' }],
-      'eval' => [:evaluate, { :permission => 'admin' }],
-      'ieval' => [:instance_evaluate, 2, { :permission => 'admin' }],
-      'count' => lambda { |e, data| "#{data.split_seperators.size}" },
-      'grep' => [:grep, 2],
-      'not' => [:not_command, 2],
-      'tail' => :tail,
+      'cc' => [:control_command, {
+        :permission => 'admin',
+        :help => 'Set the control character for commands' }],
+      'eval' => [:evaluate, {
+        :permission => 'admin',
+        :help => 'Evaluate ruby code' }],
+      'ieval' => [:instance_evaluate, 2, {
+        :permission => 'admin',
+        :help => 'Evaluate ruby on on a instance',
+        :usage => 'commands @cc' }],
+      'count' => [lambda { |e, data| "#{data.split_seperators.size}" }, {
+        :help => 'Count the amount of items in a list' } ],
+      'grep' => [:grep, 2, { :help => 'print lines matching a pattern' } ],
+      'not' => [:not_command, 2, { :help => 'Opposite to grep' } ],
+      'tail' => [:tail, { :help => 'List the last three items in a list' }],
       'echo' => [:echo, { :example => 'Hello, {username}' }],
       'reverse' => lambda { |e, data| data.reverse },
       'first' => lambda { |e, data| data.split_seperators.first },

data/plugins/dns.rb

@@ -6,9 +6,18 @@ class DNS
   
   def commands
     {
-      'dns' => lambda { |e, host| Resolv.new.getaddress(host) },
-      'rdns' => :rdns,
-      'whois' => [:whois, 1, { :help => 'perform a whois on a domain' }],
+      'dns' => [lambda { |e, host| Resolv.new.getaddress(host) }, {
+        :help => 'Lookup the ip address for a domain',
+        :usage => 'domain',
+        :example => 'apple.com' }],
+      'rdns' => [:rdns, {
+        :help => 'Perform a reverse dns on a host',
+        :usage => 'ip',
+        :example => '17.149.160.49' }],
+      'whois' => [:whois, 1, {
+        :help => 'perform a whois on a domain',
+        :usage => 'domain',
+        :example => 'apple.com' }],
     }
   end
   

data/plugins/file.rb

@@ -53,5 +53,6 @@ end
 
 Plugin.define do
   name 'file'
+  description 'Plugin to read/write to files'
   object FileIO
 end

data/plugins/irc.rb

@@ -4,6 +4,7 @@ require 'zmb/timer'
 
 class Event
   attr_accessor :delegate, :command, :args, :name, :userhost, :message, :channel, :line
+  attr_accessor :nick
   
   def initialize(sender, line)
     @line = line
@@ -34,7 +35,7 @@ class Event
         @name, @userhost = @userhost.split('!', 2)
       when 'kick'
         @userhost, @channel, @name, @message = args.split(' ', 4)
-        nick, @userhost = @userhost.split('!', 2)
+        @nick, @userhost = @userhost.split('!', 2)
         @message = @message[1..-1]
     end
   end
@@ -206,8 +207,10 @@ class IrcConnection
   
   def write(line)
     begin
+      @delegate.debug(self, "> #{line}")
       @socket.write line + "\r\n" if @socket
     rescue
+      @delegate.debug(self, "Disconnected at write")
       disconnected(self, nil)
     end  
   end
@@ -235,6 +238,7 @@ class IrcConnection
     @buffer = '' if @buffer == nil
     
     while line != nil do
+      @delegate.debug(self, "< #{line}")
       e = Event.new(self, line)
       
       # Catch some events

data/plugins/linecount.rb

@@ -44,5 +44,6 @@ end
 
 Plugin.define do
   name 'linecount'
+  description 'Count the amount of lines users type'
   object LineCount
 end

data/plugins/log.rb

@@ -11,15 +11,32 @@ class Log
     File.join(path, "#{channel}-#{Time.now.strftime('%d%m%Y')}.log")
   end
   
+  def time
+    t = Time.now
+    "#{sprintf("%.2i", t.hour)}:#{sprintf("%.2i", t.min)}:#{sprintf("%.2i", t.sec)}"
+  end
+  
+  def log(instance, channel, message)
+    File.open(log_file(instance, channel), 'a+') { |f| f.write("[#{time}] #{message}" + "\n") }
+  end
+  
   def event(sender, e)
-    if e.respond_to?('channel') and e.respond_to?('line') and e.channel then
-      File.open(log_file(e.delegate.instance, e.channel), 'a+') { |f| f.write(e.line + "\n") }
+    if e.respond_to?('channel') and e.channel then
+      if e.command == 'join' then
+        log(e.delegate.instance, e.channel, "*** Joins: #{e.name} (#{e.userhost})")
+      elsif e.command == 'part'
+        log(e.delegate.instance, e.channel, "*** Parts: #{e.name} (#{e.userhost})")
+      elsif e.command  == 'kick'
+        log(e.delegate.instance, e.channel, "*** #{e.nick} was kicked by #{e.name} (#{e.message})")
+      elsif e.message?
+        log(e.delegate.instance, e.channel, "#{e.name}: #{e.message}")
+      end
     end
   end
 end
 
 Plugin.define do
   name 'log'
-  description 'log everything received from irc'
+  description 'Log every message to a log file'
   object Log
 end

data/plugins/random.rb

@@ -3,11 +3,14 @@ class Random
   
   def commands
     {
-      'random' => :random,
-      'yesno' => [:yesno, 0],
-      'headstails' => [:coinflip, 0],
-      'coinflip' => [:coinflip, 0],
-      'dice' => [lambda { |e| "#{rand(6) + 1}" }, 0],
+      'random' => [:random, {
+        :help => 'Select a item randomly from a list',
+        :usage => 'item 1, item 2, item 3',
+        :example => 'egg, tomatoe, sausage' }],
+      'yesno' => [:yesno, 0, { :help => 'yes or no?' }],
+      'headstails' => [:coinflip, 0, { :help => 'Flip a coin' }],
+      'coinflip' => [:coinflip, 0, { :help => 'Flip a coin' }],
+      'dice' => [lambda { |e| "#{rand(6) + 1}" }, 0, { :help => 'Roll a dice' }],
     }
   end
   
@@ -27,5 +30,6 @@ end
 
 Plugin.define do
   name 'random'
+  description 'Commands for coinflips, dice, yesno, random'
   object Random
 end

data/plugins/rss.rb

@@ -27,16 +27,17 @@ class Feeds
           rss = RSS::Parser.parse(feed['feed'].get().body, false)
           rss.items.each do |item|
             link = item.link.to_s
-            link = $1 if link =~ /href="([\w:\/\.\?]*)"/
+            link = $1 if link =~ /\b(([\w-]+:\/\/?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/)))/
             
             break if feed['link'] == link
             @delegate.instances[feed['instance']].message(feed['sender'], "RSS: #{item.title.to_s.gsub(/<\/?[^>]*>/, "")} (#{link})")
           end
           
           link = rss.items[0].link.to_s
-          link = $1 if link =~ /href="([\w:\/\.\?]*)"/
+          link = $1 if link =~ /\b(([\w-]+:\/\/?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/)))/
           feed['link'] = link
       rescue Exception
+        @delegate.debug(self, "Feed #{feed['feed']} failed", $!)
         @delegate.instances[feed['instance']].message(feed['sender'], "RSS: #{feed['feed']} failed")
       end
     end
@@ -112,5 +113,6 @@ end
 
 Plugin.define do
   name 'rss'
+  description 'Subscribe and watch RSS/ATOM feeds'
   object Feeds
 end

data/plugins/translate.rb

@@ -13,8 +13,8 @@ class Translate
   def translate(e, to, from, message)
     request = JSON.parse("http://ajax.googleapis.com/ajax/services/language/translate".get({
       :v => '1.0',
-      :key => 'ABQIAAAAhwR5TtcQxY9fSuKy7yrBJhQ-sC4I4KvMQ8RG81t2M9sVc21w2xQUb9Dipx99m8XrHBsa3OctXe2rQw',
-      :langpair => "#{to}%7C#{from}",
+      :key => 'ABQIAAAAtWAKkpCW6vL4tULVhqm_ZxQVlmwHIG1k2CM6GldPK9kOhyhAchSCYvJg4eFXVQuYYE7r4s1oNbga9A',
+      :langpair => "#{to}|#{from}",
       :q => message
     }).body)
     
@@ -30,5 +30,6 @@ end
 
 Plugin.define do
   name 'translate'
+  description 'Translate a message into another language'
   object Translate
 end

data/plugins/url.rb

@@ -1,6 +1,5 @@
 require 'uri'
 require 'net/http'
-require 'cgi'
 
 class URL
   def initialize(sender, s) ;end
@@ -9,9 +8,9 @@ class URL
     {
       'head' => :head,
       'url' => [:get, { :permission => 'admin' }],
-      'bitly' => :bitly,
-      'isgd' => :isgd,
-      'tinyurl' => :tinyurl,
+      'bitly' => [:bitly, { :help => 'Shorten a URL' }],
+      'isgd' => [:isgd, { :help => 'Shorten a URL' }],
+      'tinyurl' => [:tinyurl, { :help => 'Shorten a URL' }],
       'dpaste' => :dpaste,
       'pastie' => :pastie_command,
       'ppastie' => [:private_pastie_command, { :help => 'Create a private pastie' }],
@@ -54,7 +53,7 @@ class URL
   
   def pastie(data, is_private=false, format='plaintext')
     resp, body = 'http://pastie.org/pastes'.post({ :paste => {
-      :body => CGI.escape(data),
+      :body => data,
       :parser => format,
       :restricted => is_private,
       :authorization => 'burger'

data/plugins/usermodes.rb

@@ -27,7 +27,7 @@ class Usermodes
   end
   
   def event(sender, e)
-    if e.command == 'join' and e.respond_to?('user') then
+    if e.command == 'join' and e.respond_to?('user') and not e.user.anonymous? then
       if @usermodes.has_key?(k = e.delegate.instance + ':' + e.channel) then
         if @usermodes[k].has_key?(e.user.username) then
           @usermodes[k][e.user.username].each{ |mode| e.delegate.write "MODE #{e.channel} +#{mode} #{e.name}" }

data/plugins/users.rb

@@ -238,7 +238,7 @@ class Users
   def pre_event(sender, e)
     e.users = self
     e.user = user(e.userhost, true) if not e.user and e.respond_to?('userhost')
-    e.user.saw(e)
+    e.user.saw(e) unless e.user.anonymous?
   end
   
   def commands
@@ -322,7 +322,11 @@ class Users
       'networks' => [:networks, 0, { :help => 'List all availible networks' }],
       'profile' => [:profile, 1, {
         :permission => 'authenticated' }],
-      'message' => [:message, 2, { :permission => 'authenticated' }]
+      'message' => [:message, 2, { :permission => 'authenticated' }],
+      'broadcast' => [:broadcast, {
+        :permission => 'admin',
+        :help => 'Broadcast a message to every user',
+        :usage => 'message' }],
     }
   end
   
@@ -455,7 +459,9 @@ class Users
   end
   
   def seen(e, username)
-    if user = user!(username) and user.seen then
+    if username == e.user.username then
+      "Are you looking for yourself?"
+    elsif user = user!(username) and user.seen then
       "#{username} last seen #{user.seen.since_words}"
     else
       "#{username} has never been seen"
@@ -558,6 +564,14 @@ class Users
       "no such user"
     end
   end
+  
+  def broadcast(e, message)
+    @users.each do |user|
+      user.send(message)
+    end
+    
+    "Message broadcasted to all #{@users.count} users"
+  end
 end
 
 Plugin.define do 

data/plugins/vouch.rb

@@ -90,5 +90,6 @@ end
 
 Plugin.define do
   name 'vouch'
+  description 'Make users require votes from another user to activate their account'
   object Vouch
 end

data/plugins/weather.rb

@@ -6,7 +6,10 @@ class Weather
   
   def commands
     {
-      'weather' => [:weather, 1],
+      'weather' => [:weather, 1, {
+        :help => 'Check the weather',
+        :usage => 'location',
+        :example => 'Cupertino' }],
     }
   end
   
@@ -21,28 +24,33 @@ class Weather
       end
     end
     
-    location = location.sub(' ', '+')
     xml_data = 'http://www.google.com/ig/api'.get({ :weather => location }).body
     doc = REXML::Document.new(xml_data)
     
-    info = doc.root.elements['weather/forecast_information']
-    city = info.elements['city'].attributes['data']
-    
-    current = doc.root.elements['weather/current_conditions']
-    condition = current.elements['condition'].attributes['data']
-    temp = current.elements['temp_c'].attributes['data']
-    humidity = current.elements['humidity'].attributes['data']
-    wind_condition = current.elements['wind_condition'].attributes['data']
-    
-    tomorrow = doc.root.elements['weather/forecast_conditions']
-    tomorrow_cond = tomorrow.elements['condition'].attributes['data']
-    
-    "#{condition} #{temp}c #{humidity} #{wind_condition} for #{city}\n"+
-    "Forcast for tomorrow #{tomorrow_cond}"
+    begin
+      info = doc.root.elements['weather/forecast_information']
+      city = info.elements['city'].attributes['data']
+      
+      current = doc.root.elements['weather/current_conditions']
+      condition = current.elements['condition'].attributes['data']
+      temp_c = current.elements['temp_c'].attributes['data']
+      temp_f = current.elements['temp_f'].attributes['data']
+      humidity = current.elements['humidity'].attributes['data']
+      wind_condition = current.elements['wind_condition'].attributes['data']
+      
+      tomorrow = doc.root.elements['weather/forecast_conditions']
+      tomorrow_cond = tomorrow.elements['condition'].attributes['data']
+      
+      "#{condition} #{temp_c}C/#{temp_f}F #{humidity} #{wind_condition} for #{city}\n"+
+      "Forcast for tomorrow #{tomorrow_cond}"
+    rescue NoMethodError
+      "Command failed, maybe the location is invalid?"
+    end
   end
 end
 
 Plugin.define do
   name 'weather'
+  description 'Get the weather for a town/city'
   object Weather
 end

data/zmb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmb}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kylef"]
-  s.date = %q{2010-07-05}
+  s.date = %q{2010-07-18}
   s.default_executable = %q{zmb}
   s.description = %q{ZMB, messenger bot}
   s.email = %q{inbox@kylefuller.co.uk}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "plugins/alias.rb",
      "plugins/announce.rb",
      "plugins/autorejoin.rb",
+     "plugins/autovoice.rb",
      "plugins/bank.rb",
      "plugins/commands.rb",
      "plugins/countdown.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zmb
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - kylef
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +01:00
+date: 2010-07-18 00:00:00 +01:00
 default_executable: zmb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - plugins/alias.rb
 - plugins/announce.rb
 - plugins/autorejoin.rb
+- plugins/autovoice.rb
 - plugins/bank.rb
 - plugins/commands.rb
 - plugins/countdown.rb