zmb 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/zmb

@@ -80,7 +80,7 @@ def wizard(zmb, plugin)
     zmb.setup(plugin.name, instance)
     obj = zmb.plugin_manager.plugin plugin.name
     if obj.respond_to?('wizard') then
-      settings = zmb.settings.setting(instance)
+      settings = zmb.settings_manager.setting(instance)
       settings['plugin'] = plugin.name
       
       obj.wizard.each do |key, value|
@@ -90,7 +90,7 @@ def wizard(zmb, plugin)
         end
       end
       
-      zmb.settings.save(instance, settings)
+      zmb.settings_manager.save(instance, settings)
     end
     zmb.load instance
   end

data/lib/zmb.rb

@@ -10,11 +10,10 @@ end
 require 'zmb/plugin'
 require 'zmb/settings'
 require 'zmb/event'
-require 'zmb/commands'
 require 'zmb/timer'
 
 class Zmb
-  attr_accessor :instances, :plugin_manager, :settings_manager
+  attr_accessor :instances, :plugin_manager, :settings_manager, :plugin_sources
   
   def plugin
     'zmb'
@@ -34,12 +33,16 @@ class Zmb
     @timers = Array.new
     timer_add(Timer.new(self, :save, 120.0, true)) # Save every 2 minutes
     
-    @settings_manager.get('zmb', 'plugin_sources', []).each{|source| @plugin_manager.add_plugin_source source}
-    
-    if @plugin_manager.plugin_sources.empty? then
-      @plugin_manager.add_plugin_source File.join(File.expand_path(File.dirname(File.dirname(__FILE__))), 'plugins')
+    plugin_dir = File.join(@settings_manager.directory, 'plugins')
+    if not File.exist?(plugin_dir) then
+      FileUtils.makedirs(plugin_dir)
     end
     
+    @plugin_sources = @settings_manager.get('zmb', 'plugin_sources', [])
+    @plugin_sources.each{ |source| @plugin_manager.add_plugin_source source }
+    @plugin_manager.add_plugin_source File.join(File.expand_path(File.dirname(File.dirname(__FILE__))), 'plugins')
+    @plugin_manager.add_plugin_source plugin_dir
+    
     @settings_manager.get('zmb', 'plugin_instances', []).each{|instance| load instance}
     
     @running = false
@@ -51,7 +54,7 @@ class Zmb
   
   def settings
     {
-      'plugin_sources' => @plugin_manager.plugin_sources,
+      'plugin_sources' => @plugin_sources,
       'plugin_instances' => @instances.keys,
     }
   end
@@ -310,6 +313,7 @@ class Zmb
   end
   
   def addsource_command(e, source)
+    @plugin_sources << source
     @plugin_manager.add_plugin_source source
     "#{source} added to plugin manager"
   end

data/plugins/alias.rb

@@ -0,0 +1,45 @@
+class Alias
+  attr_accessor :aliases
+  
+  def initialize(sender, settings)
+    @aliases = settings['aliases'] if settings.has_key?('aliases')
+    @aliases = Hash.new if not @aliases
+  end
+  
+  def settings
+    { 'aliases' => @aliases }
+  end
+  
+  def commands
+    {
+      'alias' => [:add, 2, { :permission => 'admin' }],
+      'unalias' => [:del, 1, { :permission => 'admin' }],
+      'aliases' => [:aliases, 0, { :permission => 'admin' }]
+    }
+  end
+  
+  def add(e, a, command)
+    @aliases[a] = command
+    "#{a} aliased"
+  end
+  
+  def del(e, command)
+    @aliases.delete(command)
+    "#{command} deleted"
+  end
+  
+  def aliases(e)
+    @aliases.keys.join(", ")
+  end
+  
+  def pre_event(sender, e)
+    if e.message? then
+      @aliases.each{ |a, c| e.message.sub!(a, c) if e.message =~ /^#{a}/ }
+    end
+  end
+end
+
+Plugin.define do
+  name 'alias'
+  object Alias
+end

data/plugins/bank.rb

@@ -39,7 +39,11 @@ class Account
 end
 
 class Event
-  attr_accessor :bank
+  attr_accessor :banks
+  
+  def bank
+    banks.account(@user.username) if respond_to?('user') and @user.respond_to?('username')
+  end
 end
 
 class Bank
@@ -69,7 +73,8 @@ class Bank
   end
   
   def pre_event(sender, e)
-    e.bank = account(e.user.username) if e.respond_to?('user') and e.user.respond_to?('username')
+    e.banks = self
+    #e.bank = account(e.user.username) if e.respond_to?('user') and e.user.respond_to?('username')
   end
   
   def commands

data/plugins/commands.rb

@@ -1,5 +1,3 @@
-require 'zmb/commands'
-
 class Commands
   attr_accessor :cmds, :cc
   
@@ -8,7 +6,7 @@ class Commands
     @cmds = Hash.new
     
     @cc = s['cc'] if s.has_key?('cc')
-    @cc = '!' if @cc == nil
+    @cc = '.' if @cc == nil
     
     sender.instances.each{ |key, instance| plugin_loaded(key, instance) }
   end
@@ -32,11 +30,10 @@ class Commands
       line = e.message.clone
     end
     
-    # Encode escaped quotation marks
-    line.gsub!(/\\"|\\'/) { |m| m =~ /^\\"$/ ? "\000d\000" : "\000s\000" }
-    
-    # Encode pipes inside quotation marks
-    line.gsub!(/"\w*\|\w*"/) { |m| m.sub('|', "\000p\000") }
+    # Encode escaped quotation marks and pipes
+    line.gsub!('\"', "\000d\000")
+    line.gsub!("\\'", "\000s\000")
+    line.gsub!('\|', "\000p\000")
     
     # Check there are a even amount of "" and ''
     if ((line.count("'") % 2) == 1) and ((line.count('""') % 2) == 1) then
@@ -55,9 +52,9 @@ class Commands
       
       # Decode escape quotation marks and pipes inside the args
       args.each do |arg|
-        arg.sub!("\000d\000", '"')
-        arg.sub!("\000s\000", "'")
-        arg.sub!("\000p\000", '|')
+        arg.gsub!("\000d\000", '"')
+        arg.gsub!("\000s\000", "'")
+        arg.gsub!("\000p\000", '|')
       end
       
       cmd = args.delete_at(0)
@@ -198,14 +195,18 @@ class Commands
     if cc then
       @cc = cc
     else
-      @cc = '!'
+      @cc = '.'
     end
     
     "Control command set to #{@cc}"
   end
   
   def evaluate(e, string)
-    "#{eval string}"
+    begin
+      "#{eval string}"
+    rescue Exception
+      "#{$!.message}\n#{$!.inspect}"
+    end
   end
   
   def count(e, data)

data/plugins/file.rb

@@ -0,0 +1,57 @@
+class FileIO
+  def initialize(sender, s); end
+  
+  def commands
+    {
+      'cat' => [:cat, 1, {
+        :permission => 'admin',
+        :help => 'View a file',
+        :usage => '/home/zynox/file' }],
+      'write' => [:write, 2, {
+        :permission => 'admin',
+        :help => 'Write to a file',
+        :usage => '/home/zynox/hello Hello world!' }],
+      'append' => [:append, 2, {
+        :permission => 'admin',
+        :help => 'Add data to the end of a file',
+        :usage => '/home/zynox/hello Another hello world!' }],
+    }
+  end
+  
+  def cat(e, file)
+    begin
+      File.read(File.expand_path(file))
+    rescue
+      "file not found or access denied"
+    end
+  end
+  
+  def write(e, file, data)
+    begin
+      f = File.open(File.expand_path(file), 'w')
+      f.write(data)
+      'data written'
+    rescue
+      'access denied'
+    ensure
+      f.close unless f.nil?
+    end
+  end
+  
+  def append(e, file, data)
+    begin
+      f = File.open(File.expand_path(file), 'a')
+      f.write(data)
+      'data written to end of file'
+    rescue
+      'access denied'
+    ensure
+      f.close unless f.nil?
+    end
+  end
+end
+
+Plugin.define do
+  name 'file'
+  object FileIO
+end

data/plugins/gcalc.rb

@@ -0,0 +1,36 @@
+require 'uri'
+
+class GCalc
+  def initialize(sender, settings); end
+  
+  def commands
+    {
+      'gcalc' => [:calc, 1, {
+        :help => 'Execute a expression using google calculator.',
+        :example => '1 + 2' }]
+    }
+  end
+  
+  def calc(e, search)
+    http = Net::HTTP.new('www.google.com', 80)
+    resp, body = http.start do |h|
+        h.get("/search?q=#{URI.escape(search, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}")
+    end
+    
+    if resp.code == '200' then
+      if body.include?('<img src=/images/calc_img.gif width=40 height=30 alt="">')
+        body.split('<img src=/images/calc_img.gif width=40 height=30 alt="">')[1].split('<b>')[1].split('</b>')[0].sub('<font size=-2> </font>', '').sub('&#215;', '*').sub('<sup>', '**').sub('</sup>', '')
+      else
+        'Your expression can\'t be evaluated by the google calculator'
+      end
+    else
+      "http error (#{resp.code})"
+    end
+  end
+end
+
+Plugin.define do
+  name 'gcalc'
+  description 'Execute a expression using google calculator.'
+  object GCalc
+end

data/plugins/irc.rb

@@ -28,6 +28,7 @@ class Event
       when 'join'
         @userhost, @channel = args.split(' ', 2)
         @name, @userhost = @userhost.split('!', 2)
+        @channel = @channel[1..-1]
       when 'part'
         @userhost, @channel = args.split(' ', 2)
         @name, @userhost = @userhost.split('!', 2)
@@ -113,7 +114,7 @@ class IrcConnection
       'port' => { 'help' => 'Port', 'default' => 6667 },
       'nick' => { 'help' => 'Nickname', 'default' => 'zmb' },
       'name' => { 'help' => 'Name', 'default' => 'zmb' },
-      'realname' => { 'help' => 'Realname', 'default' => 'zmb' },
+      'realname' => { 'help' => 'Realname', 'default' => 'Unknown' },
       'password' => { 'help' => 'If the ircd requires a password, enter this here.', 'default' => nil },
     }
   end
@@ -165,7 +166,7 @@ class IrcConnection
   def perform
     write "PASS #{@password}" if @password
     write "NICK #{@nick}" if @nick
-    write "USER #{@name} 0 0 :#{@realname}" if @name and @realname
+    write "USER #{@name} 0 * :#{@realname}" if @name and @realname
   end
   
   def write(line)
@@ -217,7 +218,9 @@ class IrcConnection
       # Catch some events
       case e.command
         when 'ping' then write "PONG #{e.args[1..-1]}"
-        when '001' then @channels.each{ |channel| write "JOIN #{channel}" }
+        when '001' then
+          sleep 0.1
+          @channels.each{ |channel| write "JOIN #{channel}" }
         when 'nick' then tmp, @nick = e.args.split(' :', 2)
         when '433' then
           @nick="#{@nick}_"

data/plugins/poll.rb

@@ -30,12 +30,31 @@ class Poll
   
   def commands
     {
-      'poll-add' => [:add_command, 2, { :permission => 'admin' }],
-      'poll-opt' => [:opt_command, 2, { :permission => 'admin' }],
-      'poll-del' => [:del_command, 1, { :permission => 'admin' }],
-      'vote' => [:vote_command, 2],
-      'polls' => [:polls_command, 0],
-      'poll' => :poll_command,
+      'poll-add' => [:add_command, 2, {
+        :permission => 'admin',
+        :help => 'Add a poll',
+        :usage => 'id poll',
+        :example => 'colour Red, yellow or blue?' }],
+      'poll-opt' => [:opt_command, 2, {
+        :permission => 'admin',
+        :help => 'Add a option to a poll',
+        :usage => 'id option',
+        :example => 'colour Red' }],
+      'poll-del' => [:del_command, 1, {
+        :permission => 'admin',
+        :help => 'Delete a poll',
+        :usage => 'id',
+        :example => 'colour' }],
+      'vote' => [:vote_command, 2, {
+        :help => 'Vote on a poll',
+        :usage => 'id option',
+        :example => 'colour 1' }],
+      'polls' => [:polls_command, 0, {
+        :help => 'List all poll\'s' }],
+      'poll' => [:poll_command, 1, {
+        :help => 'List a poll',
+        :usage => 'id',
+        :example => 'colour' }],
     }
   end
   

data/plugins/quote.rb

@@ -33,14 +33,14 @@ class Quote
         :help => 'Show a random quote or the quote with matching id',
         :usage => '<id>' }],
       'quote-add' => [:add_command, 1, {
-        :help => 'Add a quote'
-        :example => 'zynox: Hello!'}],
+        :help => 'Add a quote',
+        :example => 'zynox: Hello!' }],
       'quote-del' => [:del_command, 1, { 
         :help => 'Delete a quote by id',
         :example => '7'}],
       'quote-count' =>[:count_command, 0, {
         :help => 'Show amount of quotes' }],
-      'quote-last' => [:last_command, 0, { :help => 'Show the last quote'),
+      'quote-last' => [:last_command, 0, { :help => 'Show the last quote' }],
       'quote-search' => [:search_command, 1, {
         :help => 'Search to find a quote',
         :usage => 'search' }],

data/plugins/random.rb

@@ -0,0 +1,49 @@
+class Random
+  def initialize(sender, settings); end
+  
+  def split_seperators(data)
+    if data.class == Array then
+      data
+    elsif data.include?("\n") then
+      data.split("\n").map{ |arg| arg.strip }
+    elsif data.include?(',') then
+      data.split(',').map{ |arg| arg.strip }
+    elsif data.include?(' ') then
+      data.split(' ')
+    else
+      data
+    end
+  end
+  
+  def commands
+    {
+      'random' => :random,
+      'yesno' => [:yesno, 0],
+      'headstails' => [:coinflip, 0],
+      'coinflip' => [:coinflip, 0],
+      'dice' => [:dice, 0],
+    }
+  end
+  
+  def random(e, args)
+    items = split_seperators(args)
+    "#{items[rand(items.size)]}"
+  end
+  
+  def yesno(e)
+    random(e, ['yes', 'no'])
+  end
+  
+  def coinflip(e)
+    random(e, ['heads', 'tails'])
+  end
+  
+  def dice(e)
+    "#{rand(6) + 1}"
+  end
+end
+
+Plugin.define do
+  name 'random'
+  object Random
+end

data/plugins/system.rb

@@ -2,7 +2,6 @@ class System
   def initialize(sender, s) ;end
   
   def commands
-    require 'zmb/commands'
     {
       'uptime' => [:uptime, 0, { :help => 'Server uptime' }],
       'date' => [:date, 0, { :help => 'Display the server date/time' }],

data/plugins/url.rb

@@ -29,9 +29,17 @@ class URL
     end
   end
   
+  def http_uri(url, type='get')
+    u = URI.parse(url)
+    u.path = '/' if u.path.size == 0
+    u.query = '' if not u.query
+    http(u.host, u.port, u.path, type, u.query)
+  end
+  
   def commands
     {
       'head' => :head,
+      'url' => [:get, 1, { :permission => 'admin' }],
       'bitly' => :bitly,
       'isgd' => :isgd,
       'tinyurl' => :tinyurl,
@@ -42,11 +50,8 @@ class URL
   end
   
   def head(e, url)
-    u = URI.parse(url)
-    u.path = '/' if u.path.size == 0
-    u.query = '' if not u.query
+    resp = http_uri(url, 'head')
     
-    resp = http(u.host, u.port, u.path, 'head', u.query)
     if resp.code == "301" or resp.code == "302" then
       "#{resp.code} - #{resp['location']}"
     elsif resp.code == "404" then
@@ -56,6 +61,11 @@ class URL
     end
   end
   
+  def get(e, url)
+    resp, body = http_uri(url)
+    body
+  end
+  
   def bitly(e, link)
     resp, body = http('bit.ly', 80, '/api', 'get', { :url => link })
     body
@@ -85,8 +95,6 @@ class URL
       :authorization => 'burger'
     }})
     
-    puts resp.code
-    
     if resp.code == '302' then
       resp['location']
     else

data/plugins/usermodes.rb

@@ -43,19 +43,21 @@ class Usermodes
         :help => 'Apply a usermode to a user when they join a channel',
         :usage => 'instance channel user mode',
         :example => 'efnet #zmb zynox o' }],
-      'usermode-del' => [:usermode_del, 4  , {
+      'usermode-del' => [:usermode_del, 4, {
         :permission => 'admin',
         :help => 'Delete a usermode',
         :usage => 'instance channel user mode',
         :example => 'efnet #zmb zynox o' }],
-      'usermodes' => [:usermodes, 2    , {
+      'usermodes' => [:usermodes, 2, {
         :permission => 'admin',
         :help => 'List all usermodes for a channel',
         :usage => 'instance channel',
         :example => 'efnet #zmb' }],
-      'usermodes-ls' => [:usermodes_ls      , {
+      'usermodes-ls' => [:usermodes_ls, {
         :permission => 'admin',
         :help => 'List all channels usermodes are applied to' }],
+      'enforce' => [:enforce, 0, { :permission => 'authenticated' }],
+      'vanish' => [:vanish, 0, { :permission => 'authenticated' }],
     }
   end
   
@@ -81,6 +83,22 @@ class Usermodes
   def usermodes_ls(e)
     @usermodes.keys.map{ |k| k.split(':', 2) }.map{ |i,c| "#{i} - #{c}" }.join("\n")
   end
+  
+  def enforce(e)
+    if @usermodes.has_key?(k = e.delegate.instance + ':' + e.channel) and e.user.authenticated? and @usermodes[k].has_key?(e.user.username) then
+      @usermodes[k][e.user.username].each{ |mode| e.delegate.write "MODE #{e.channel} +#{mode} #{e.name}" }
+    end
+    
+    "usermodes enforced"
+  end
+  
+  def vanish(e)
+    if @usermodes.has_key?(k = e.delegate.instance + ':' + e.channel) and e.user.authenticated? and @usermodes[k].has_key?(e.user.username) then
+      @usermodes[k][e.user.username].each{ |mode| e.delegate.write "MODE #{e.channel} -#{mode} #{e.name}" }
+    end
+    
+    "usermodes vanished"
+  end
 end
 
 Plugin.define do

data/plugins/users.rb

@@ -1,11 +1,11 @@
 class Event
-  attr_accessor :user
+  attr_accessor :user, :users
 end
 
 class User
   require 'digest/sha1'
   
-  attr_accessor :username, :password, :userhosts, :permissions, :seen
+  attr_accessor :username, :password, :userhosts, :permissions, :seen, :users
   
   def to_json(*a)
     {'username' => @username, 'password' => @password, 'userhosts' => @userhosts, 'permissions' => @permissions, 'seen' => @seen}.to_json(*a)
@@ -21,6 +21,10 @@ class User
     user
   end
   
+  def to_s
+    @username
+  end
+  
   def initialize(username=nil, password=nil, userhost=nil)
     @username = username
     @password = Digest::SHA1.hexdigest(password) if password
@@ -51,7 +55,7 @@ class User
   end
   
   def admin?
-    @permissions.include?("owner") or @permissions.include?("admin")
+    @permissions.include?('owner') or @permissions.include?('admin')
   end
   
   def permission?(permission)
@@ -103,20 +107,18 @@ class Users
   end
   
   def pre_event(sender, e)
-    e.user = user(e.userhost) if e.respond_to?('userhost') and not e.user
-    e.user.seen = Time.now if e.user.respond_to?('seen')
-  end
-  
-  def create_user(username, password=nil, userhost=nil)
-    user = User.new(username, password, userhost)
-    @users << user
-    user
+    e.user = user(e.userhost) if not e.user and e.respond_to?('userhost')
+    e.user.seen = Time.now if e.user.respond_to?('seen=')
+    e.users = self
+    
+    #e.instance_variable_set(:@user, user(e.userhost)) if e.respond_to?('userhost')
+    #def e.user; user(e.userhost); end
   end
   
   def commands
     {
       'meet' => [:meet, 1, { :help => 'Meet a user' }],
-      'forget' => [:forget, 0, {
+      'forget' => [:forget, 1, {
         :help => 'Forget about a user',
         :permission => 'authenticated' }],
       'permit' => [:permit, 2, {
@@ -132,6 +134,8 @@ class Users
       'perms' => [:perms, 0, {
         :permission => 'authenticated',
         :help => 'List all the permissions you have' }],
+      'group' => [:group, 1, {
+        :permission => 'admin' }],
       'merge' => [:merge, 2, {
         :permission => 'admin',
         :help => 'Merge two users together, give user a the permissions and useragents of b and then delete b',
@@ -148,9 +152,14 @@ class Users
         :help => 'Logout from your account, this will remove your current userhost from your account.' }],
       'whoami' => [:whoami, 0, { :help => 'Who are you logged in as?' }],
       'userhosts' => [:userhosts, 0, {
+        :permission => 'authenticated',
         :help => 'List all the userhosts associated with your account.' }],
-      'adduserhost' => [:adduserhost, 1, { :help => 'Add a userhost to your account.' }],
-      'rmuserhost' => [:rmuserhost, 1, { :help => 'Remove a userhost to your account.' }],
+      'adduserhost' => [:adduserhost, 1, {
+        :permission => 'authenticated',
+        :help => 'Add a userhost to your account.' }],
+      'rmuserhost' => [:rmuserhost, 1, {
+        :permission => 'authenticated',
+        :help => 'Remove a userhost to your account.' }],
       'names' => [:names, 1, {
         :help => 'List all the users',
         :usage => '<search>' }],
@@ -166,23 +175,23 @@ class Users
   end
   
   def meet(e, username=nil)
-    if e.user.admin? and username then
-      return "#{username} already exists" if user!(username)
-      user = create_user(username)
-      "Hello #{username}"
-    elsif not e.user.authenticated? then
-      return "#{e.sender} already exists" if user!(e.sender)
-      if e.respond_to?('userhost') and e.respond_to?('user') then
-        user = create_user(e.name, nil, e.userhost)
-      end
-      "Hello #{user.username}"
+    username = e.name if not e.user.admin?
+    
+    if not user!(username) then
+      @users << user = User.new(username)
+      user.userhosts << e.userhost if not e.user.admin? and e.respond_to?('userhost')
+      "Hello #{e.user}"
     else
-      "You already have an account #{e.user.username}"
+      "You already have an account #{e.user}"
     end
   end
   
-  def forget(e)
-    "user #{@e.users.delete(e.user).username} deleted"
+  def forget(e, username=nil)
+    if e.user.admin? and username then
+      "user #{@users.delete(user(username))} deleted"
+    else
+      "user #{@users.delete(e.user)} deleted"
+    end
   end
   
   def permit(e, username, permission)
@@ -204,7 +213,11 @@ class Users
   end
   
   def perms(e)
-    e.user.permissions.empty? ? "#{e.user.username} has no permissions" : e.user.permissions.join(', ')
+    e.user.permissions.empty? ? "#{e.user} has no permissions" : e.user.permissions.join(', ')
+  end
+  
+  def group(e, group)
+    @users.reject{ |user| not user.permissions.include?(group) }.join(', ')
   end
   
   def merge(e, username, other_username)
@@ -214,7 +227,7 @@ class Users
     if user and other_user then
       user.concat other_user 
       @users.delete other_user
-      "#{other_user.username} now merged into #{user.username}"
+      "#{other_user} now merged into #{user}"
     else
       'User(s) do not exist'
     end
@@ -222,7 +235,7 @@ class Users
   
   def password(e, password)
     e.user.password = password
-    "#{e.user.username} password has been set to #{password}"
+    "#{e.user} password has been set to #{password}"
   end
   
   def login(e, username, password)
@@ -230,7 +243,7 @@ class Users
     
     if user and user.password?(password) then
       user.userhosts << e.userhost
-      "#{e.userhost} added to your account #{user.username}"
+      "#{e.userhost} added to your account #{user}"
     else
       'user and/or password is incorrect'
     end
@@ -242,28 +255,28 @@ class Users
   end
   
   def whoami(e)
-    e.user.authenticated? ? "#{e.user.username}" : 'nobody'
+    e.user.authenticated? ? "#{e.user}" : 'nobody'
   end
   
   def userhosts(e)
-    e.user.userhosts.empty? ?  "#{e.user.username} has no userhosts" : e.user.userhosts.join(', ')
+    e.user.userhosts.empty? ?  "#{e.user} has no userhosts" : e.user.userhosts.join(', ')
   end
   
   def adduserhost(e, userhost)
     e.user.userhosts << userhost
-    "#{userhost} added to #{e.user.username}"
+    "#{userhost} added to #{e.user}"
   end
   
   def rmuserhost(e, userhost)
     if e.user.userhosts.delete(userhost) then
-      "#{userhost} deleted from #{e.user.username}"
+      "#{userhost} deleted from #{e.user}"
     else
-      "#{e.user.username} doesn't have #{userhost}"
+      "#{e.user} doesn't have #{userhost}"
     end
   end
   
   def names(e, search=nil)
-    users = @users.map{|user| user.username}
+    users = @users.map{ |user| user.username }
     users = users.grep(/#{search}/i) if search
     
     if users.empty? then
@@ -273,7 +286,7 @@ class Users
     end
   end
   
-  def seen(e, username=nil)
+  def seen(e, username)
     if user = user!(username) and user.seen then
       diff = Time.now - user.seen
       
@@ -293,21 +306,21 @@ class Users
     end
   end
   
-  def sudo(e, search, command)
-    if user = user!(search) then
+  def sudo(e, username, command)
+    if user = user!(username) then
       new_event = e.clone
       new_event.user = user
       new_event.message = @delegate.instances['commands'].cc + command
       @delegate.event(self, new_event)
       nil
     else
-      "#{search}: Username or userhost not found"
+      "#{username}: User not found"
     end
   end
 end
 
 Plugin.define do 
-  name "users"
-  description "users manager"
+  name 'users'
+  description 'user accounts/permissions system'
   object Users
 end

data/zmb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmb}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kylef"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-18}
   s.default_executable = %q{zmb}
   s.description = %q{ZMB, messenger bot}
   s.email = %q{inbox@kylefuller.co.uk}
@@ -31,17 +31,21 @@ Gem::Specification.new do |s|
      "lib/zmb/plugin.rb",
      "lib/zmb/settings.rb",
      "lib/zmb/timer.rb",
+     "plugins/alias.rb",
      "plugins/announce.rb",
      "plugins/autorejoin.rb",
      "plugins/bank.rb",
      "plugins/commands.rb",
      "plugins/dns.rb",
+     "plugins/file.rb",
+     "plugins/gcalc.rb",
      "plugins/idle.rb",
      "plugins/irc.rb",
      "plugins/log.rb",
      "plugins/nickserv.rb",
      "plugins/poll.rb",
      "plugins/quote.rb",
+     "plugins/random.rb",
      "plugins/relay.rb",
      "plugins/security.rb",
      "plugins/system.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zmb
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - kylef
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +00:00
+date: 2010-03-18 00:00:00 +00:00
 default_executable: zmb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,17 +54,21 @@ files:
 - lib/zmb/plugin.rb
 - lib/zmb/settings.rb
 - lib/zmb/timer.rb
+- plugins/alias.rb
 - plugins/announce.rb
 - plugins/autorejoin.rb
 - plugins/bank.rb
 - plugins/commands.rb
 - plugins/dns.rb
+- plugins/file.rb
+- plugins/gcalc.rb
 - plugins/idle.rb
 - plugins/irc.rb
 - plugins/log.rb
 - plugins/nickserv.rb
 - plugins/poll.rb
 - plugins/quote.rb
+- plugins/random.rb
 - plugins/relay.rb
 - plugins/security.rb
 - plugins/system.rb