zmb 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/zmb

@@ -6,11 +6,12 @@ require 'zmb'
 require 'optparse'
 
 class AdminUser
-  attr_accessor :username, :userhosts
+  attr_accessor :username, :userhosts, :permissions
   
   def initialize
     @username = 'admin'
     @userhosts = []
+    @permissions = ['admin']
   end
   
   def admin?
@@ -27,10 +28,11 @@ class AdminUser
 end
 
 class Event
-  attr_accessor :message
+  attr_accessor :message, :user
   
   def initialize(message)
     @message = message
+    @user = AdminUser.new
   end
   
   def message?
@@ -41,10 +43,6 @@ class Event
     true
   end
   
-  def user
-    AdminUser.new
-  end
-  
   def reply(msg)
     puts "> #{msg}"
   end

data/lib/zmb.rb

@@ -14,13 +14,19 @@ require 'zmb/commands'
 require 'zmb/timer'
 
 class Zmb
-  attr_accessor :instances, :plugin_manager, :settings
+  attr_accessor :instances, :plugin_manager, :settings_manager
+  
+  def plugin
+    'zmb'
+  end
   
   def initialize(config_dir)
+    @debug = true
+    
     @plugin_manager = PluginManager.new
-    @settings = Settings.new(config_dir)
+    @settings_manager = Settings.new(config_dir)
     
-    @instances = {'core/zmb' => self}
+    @instances = {'zmb' => self}
     @sockets = Hash.new
     
     @minimum_timeout = 0.5 # Half a second
@@ -28,13 +34,13 @@ class Zmb
     @timers = Array.new
     timer_add(Timer.new(self, :save, 120.0, true)) # Save every 2 minutes
     
-    @settings.get('core/zmb', 'plugin_sources', []).each{|source| @plugin_manager.add_plugin_source source}
+    @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')
     end
     
-    @settings.get('core/zmb', 'plugin_instances', []).each{|instance| load instance}
+    @settings_manager.get('zmb', 'plugin_instances', []).each{|instance| load instance}
     
     @running = false
   end
@@ -43,24 +49,26 @@ class Zmb
     @running
   end
   
-  def to_json(*a)
+  def settings
     {
       'plugin_sources' => @plugin_manager.plugin_sources,
       'plugin_instances' => @instances.keys,
-    }.to_json(*a)
+    }
   end
   
   def save
-    @instances.each{ |k,v| @settings.save(k, v) }
+    @instances.each{ |k,v| @settings_manager.save(k, v) }
   end
   
   def load(key)
     return true if @instances.has_key?(key)
     
-    if p = @settings.get(key, 'plugin') then
+    if p = @settings_manager.get(key, 'plugin') then
       object = @plugin_manager.plugin(p)
       return false if not object
-      @instances[key] = object.new(self, @settings.setting(key))
+      @instances[key] = object.new(self, @settings_manager.setting(key))
+      @instances[key].class.send(:define_method, :plugin) { p }
+      @instances[key].class.send(:define_method, :instance) { key }
       post! :plugin_loaded, key, @instances[key]
       true
     else
@@ -71,7 +79,7 @@ class Zmb
   def unload(key, tell=true)
     return false if not @instances.has_key?(key)
     instance = @instances.delete(key)
-    @settings.save key, instance
+    @settings_manager.save key, instance
     socket_delete instance
     timer_delete instance
     instance.unloaded if instance.respond_to?('unloaded') and tell
@@ -172,38 +180,42 @@ class Zmb
     object = @plugin_manager.plugin plugin
     return false if not object
     
-    settings = Hash.new
-    settings['plugin'] = plugin
+    s = Hash.new
+    s['plugin'] = plugin
     
     if object.respond_to? 'wizard' then
       d = object.wizard
-      d.each{ |k,v| settings[k] = v['default'] if v.has_key?('default') and v['default'] }
+      d.each{ |k,v| s[k] = v['default'] if v.has_key?('default') and v['default'] }
     end
     
-    @settings.save instance, settings
+    @settings_manager.save instance, s
     
     true
   end
   
   def event(sender, e)
-    post! :pre_event, sender, e
-    post! :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
+    end
   end
   
   def commands
     {
-      'reload' => PermCommand.new('admin', self, :reload_command),
-      'unload' => PermCommand.new('admin', self, :unload_command),
-      'load' => PermCommand.new('admin', self, :load_command),
-      'save' => PermCommand.new('admin', self, :save_command, 0),
-      'loaded' => PermCommand.new('admin', self, :loaded_command, 0),
-      'setup' => PermCommand.new('admin', self, :setup_command, 2),
-      'set' => PermCommand.new('admin', self, :set_command, 3),
-      'get' => PermCommand.new('admin', self, :get_command, 2),
-      'clone' => PermCommand.new('admin', self, :clone_command, 2),
-      'reset' => PermCommand.new('admin', self, :reset_command),
-      'addsource' => PermCommand.new('admin', self, :addsource_command),
-      'refresh' => PermCommand.new('admin', self, :refresh_command),
+      'reload' => [:reload_command, 1, { :permission => 'admin' }],
+      'unload' => [:unload_command, 1, { :permission => 'admin' }],
+      'load' => [:load_command, 1, { :permission => 'admin' }],
+      'save' => [:save_command, 0, { :permission => 'admin' }],
+      'loaded' => [:loaded_command, 0, { :permission => 'admin' }],
+      'setup' => [:setup_command, 2, { :permission => 'admin' }],
+      'set' => [:set_command, 3, { :permission => 'admin' }],
+      'get' => [:get_command, 2, { :permission => 'admin' }],
+      'clone' => [:clone_command, 2, { :permission => 'admin' }],
+      'reset' => [:reset_command, 1, { :permission => 'admin' }],
+      'addsource' => [:addource_command, 1, { :permission => 'admin' }],
+      'refresh' => [:refresh_command, 1, { :permission => 'admin' }],
     }
   end
   
@@ -212,7 +224,7 @@ class Zmb
       sockets = Array.new
       @sockets.each{ |sock,delegate| sockets << sock if delegate == @instances[instance] }
       unload(instance, false)
-      reloaded = @plugin_manager.reload_plugin(@settings.get(instance, 'plugin'))
+      reloaded = @plugin_manager.reload_plugin(@settings_manager.get(instance, 'plugin'))
       load(instance)
       
       sockets.each{ |socket| @sockets[socket] = @instances[instance] }
@@ -264,9 +276,9 @@ class Zmb
   end
   
   def set_command(e, instance, key, value)
-    settings = @settings.setting(instance)
+    settings = @settings_manager.setting(instance)
     settings[key] = value
-    @settings.save(instance, settings)
+    @settings_manager.save(instance, settings)
     
     if @instances.has_key?(instance) and @instances[instance].respond_to?('update') then
       @instances[instance].update(key, value)
@@ -276,7 +288,7 @@ class Zmb
   end
   
   def get_command(e, instance, key)
-    if value = @settings.get(instance, key) then
+    if value = @settings_manager.get(instance, key) then
       "#{key} is #{value} for #{instance}"
     else
       "#{instance} or #{instance}/#{key} not found."
@@ -284,8 +296,8 @@ class Zmb
   end
   
   def clone_command(e, instance, new_instance)
-    if (settings = @settings.setting(instance)) != {} then
-      @settings.save(new_instance, settings)
+    if (settings = @settings_manager.setting(instance)) != {} then
+      @settings_manager.save(new_instance, settings)
       "The settings for #{instance} were copied to #{new_instance}"
     else
       "No settings for #{instance}"
@@ -293,7 +305,7 @@ class Zmb
   end
   
   def reset_command(e, instance)
-    @settings.save(instance, {})
+    @settings_manager.save(instance, {})
     "Settings for #{instance} have been deleted."
   end
   

data/lib/zmb/settings.rb

@@ -6,6 +6,8 @@ rescue LoadError
 end
 
 class Settings
+  attr_accessor :directory
+  
   def initialize(directory)
     if not File.exist?(directory) then
       FileUtils.makedirs(directory)
@@ -40,9 +42,13 @@ class Settings
     end
   end
   
-  def save(key, data)
+  def save(key, instance)
     f = File.open setting_path(key), 'w'
-    f.write data.to_json
+    s = instance
+    s = {} if instance.class != Hash
+    s = instance.settings if instance.respond_to?('settings')
+    s['plugin'] = instance.plugin if instance.respond_to?('plugin')
+    f.write s.to_json
     f.close
   end
 end

data/lib/zmb/timer.rb

@@ -3,17 +3,22 @@ class Timer
   
   attr_accessor :delegate
   
-  def initialize(delegate, symbol, interval, repeat=false) # interval is in seconds (decimals accepted)
+  def initialize(delegate, symbol, interval, repeat=false, data=nil) # interval is in seconds (decimals accepted)
     @delegate = delegate
     @symbol = symbol
     @interval = interval
     @repeat = repeat
+    @data = data
     
     @fire_at = Time.now + interval
   end
 
   def fire(sender)
-    @delegate.send @symbol
+    if @data then
+      @delegate.send @symbol, @data
+    else
+      @delegate.send @symbol
+    end
 
     if not @repeat
       sender.timer_delete(self) if sender.respond_to?('timer_delete')

data/plugins/announce.rb

@@ -0,0 +1,101 @@
+require 'zmb/timer'
+
+class Announce
+  def initialize(sender, s)
+    @delegate = sender
+    @announcements = Hash.new
+    @announcements = s['announcements'] if s.has_key?('announcements')
+    @autoindex = 1
+    @autoindex = s['autoindex'] if s.has_key?('autoindex')
+    
+    @announcements.keys.each{ |id| timer(id) }
+  end
+  
+  def settings
+    { 'announcements' => @announcements, 'autoindex' => @autoindex }
+  end
+  
+  def add(instance, location, interval, message)
+    @announcements["#{@autoindex}"] = {
+      'instance' => instance,
+      'location' => location,
+      'interval' => Integer(interval),
+      'message' => message,
+    }
+    
+    @autoindex += 1
+    @autoindex - 1
+  end
+  
+  def exec(id)
+    if (a = @announcements.fetch("#{id}", false)) and (i = @delegate.instances.fetch(a['instance'], false)) then
+      i = @delegate.instances[a['instance']]
+      i.message(a['location'], a['message']) if i.respond_to?('message')
+    end
+  end
+  
+  def timer(id)
+    a = @announcements["#{id}"]
+    a['timer'] = Timer.new(self, :exec, a['interval'], true, id)
+    @delegate.timer_add(a['timer'])
+  end
+  
+  def delete(id)
+    if (a = @announcements.fetch("#{id}", false)) then
+      @delegate.timer_delete(a['timer']) if a.has_key?('timer')
+      @announcements.delete("#{id}")
+      true
+    else
+      false
+    end
+  end
+  
+  def commands
+    {
+      'announcements' => [:announcements, 0, {
+        :permission => 'admin',
+        :help => 'List all the id\'s for' }],
+      'announcement' => [:announcement, 1, { :permission => 'admin' }],
+      'announce' => [:announce, 4, {
+        :permission => 'admin',
+        :help => 'Add a announcement',
+        :usage => 'instance location interval message',
+        :example => 'efnet #zmb 600 Check github for the latest updates!' }],
+      'announce-del' => [:announce_del, 1, { :permission => 'admin' }],
+    }
+  end
+  
+  def announcements(e)
+    if @announcements.size == 0 then
+      'no announcements'
+    else
+      @announcements.keys.join(', ')
+    end
+  end
+  
+  def announcement(e, id)
+    if (a = @announcements.fetch(id, false)) then
+      "'#{a['message']}' every #{a['interval']} seconds in #{a['instance']}/#{a['location']}"
+    else
+      'announcement not found'
+    end
+  end
+  
+  def announce(e, *args)
+    "Announcement added \##{add(*args)}"
+  end
+  
+  def announce_del(e, id)
+    if delete(id) then
+      "#{id} deleted"
+    else
+      "#{id} not found"
+    end
+  end
+end
+
+Plugin.define do
+  name 'announce'
+  description 'Send message to a channel automatically in a certain amount of time'
+  object Announce
+end

data/plugins/autorejoin.rb

@@ -0,0 +1,15 @@
+class AutoRejoin
+  def initialize(sender, s); end
+  
+  def event(sender, e)
+    if e.command == 'kick' then
+      e.delegate.write("JOIN #{e.channel}") if e.delegate.nick == e.name
+    end
+  end
+end
+
+Plugin.define do
+  name 'autorejoin'
+  description 'auto rejoin a irc channel once we have been kicked'
+  object AutoRejoin
+end

data/plugins/bank.rb

@@ -45,13 +45,13 @@ end
 class Bank
   attr_accessor :accounts
   
-  def initialize(sender, settings={})
-    @accounts = settings['accounts'].map{ |acc| Account.create_settings(acc) } if settings.has_key?('accounts')
+  def initialize(sender, s={})
+    @accounts = s['accounts'].map{ |acc| Account.create_settings(acc) } if s.has_key?('accounts')
     @accounts = Array.new if not @accounts
   end
   
-  def to_json(*a)
-    { 'accounts' => @accounts, 'plugin' => 'bank' }.to_json(*a)
+  def settings
+    { 'accounts' => @accounts }
   end
   
   def create(username)
@@ -73,10 +73,12 @@ class Bank
   end
   
   def commands
-    require 'zmb/commands'
     {
-      'balance' => AuthCommand.new(self, :balance, 0, 'See how much funds you have.'),
-      'transfer' => AuthCommand.new(self, :transfer, 2, 'Transfer funds to another account'),
+      'balance' => [:balance, 0, { :help => 'See how much funds you have.' }],
+      'transfer' => [:transfer, 2, {
+        :help => 'Transfer funds to another account',
+        :usage => 'user amount',
+        :example => 'zynox 20' }],
     }
   end
   

data/plugins/commands.rb

@@ -3,22 +3,18 @@ require 'zmb/commands'
 class Commands
   attr_accessor :cmds, :cc
   
-  def initialize(sender, settings={})
+  def initialize(sender, s={})
     @delegate = sender
     @cmds = Hash.new
     
-    @cc = settings['cc'] if settings.has_key?('cc')
+    @cc = s['cc'] if s.has_key?('cc')
     @cc = '!' if @cc == nil
     
-    @cmds.merge!(commands)
-    
-    sender.post('commands').each do |command|
-      @cmds.merge!(command)
-    end
+    sender.instances.each{ |key, instance| plugin_loaded(key, instance) }
   end
   
-  def to_json(*a)
-    { 'cc' => @cc, 'plugin' => 'commands' }.to_json(*a)
+  def settings
+    { 'cc' => @cc }
   end
   
   def self.wizard
@@ -65,29 +61,70 @@ class Commands
       end
       
       cmd = args.delete_at(0)
-      
-      if @cmds.has_key?(cmd) then
-        args << input if input
-        input = @cmds[cmd].run(e, args)
-      end
+      args << input if input
+      input = execute(cmd, e, args)
     end
     
     e.reply(input) if input
   end
   
+  def execute(cmd, e, args)
+    return if not @cmds.has_key?(cmd)
+    
+    c = @cmds[cmd]
+    
+    if c[2] == 0 then
+      args = Array.new
+    elsif args.size > c[2]
+      a = args.first c[2]-1 # Take one under amount of commands
+      a << args[c[2]-1..-1].join(' ')
+      args = a
+    end
+    
+    # User permissions
+    if (kwargs = c.at(3)) and kwargs.has_key?(:permission) then
+      if not e.respond_to?('user')
+        return 'user module not loaded'
+      elsif kwargs[:permission] == 'authenticated' then
+        return 'permission denied' if not e.user.authenticated?
+      elsif not e.user.permission?(kwargs[:permission])
+        return 'permission denied'
+      end
+    end
+    
+    begin
+      c[0].send(c[1], e, *args)
+    rescue ArgumentError
+      'incorrect arguments'
+    rescue Exception
+      if e.respond_to?('user') and e.user.admin? and e.private? then
+        "#{$!.message}\n#{$!.inspect}\n#{$!.backtrace[0..2].join("\n")}"
+      else
+        'command failed'
+      end
+    end
+  end
+  
   def plugin_loaded(key, instance)
-    @cmds.merge!(instance.commands) if instance.respond_to?('commands')
+    if instance.respond_to?('commands') then
+      instance.commands.each do |k,v|
+        v = [v] if v.class != Array
+        v.insert(0, instance)
+        v << 1 if v.size == 2 # add default command amount
+        @cmds[k] = v
+      end
+    end
   end
   
   def plugin_unloaded(key, instance)
-    instance.commands.each{|command, cmd| @cmds.delete(command)} if instance.respond_to?('commands')
+    @cmds = @cmds.reject{ |k,v| v[0] == instance }
   end
   
   def split_seperators(data)
     if data.include?("\n") then
-      data.split("\n")
+      data.split("\n").map{ |arg| arg.strip }
     elsif data.include?(',') then
-      data.split(',')
+      data.split(',').map{ |arg| arg.strip }
     elsif data.include?(' ') then
       data.split(' ')
     else
@@ -97,31 +134,42 @@ class Commands
   
   def commands
     {
-      'help' => Command.new(self, :help),
-      'instance' => Command.new(self, :instance, 1, 'List all commands availible for a instance.'),
-      'cc' => PermCommand.new('admin', self, :control_command),
-      'eval' => PermCommand.new('admin', self, :evaluate),
-      'count' => Command.new(self, :count),
-      'grep' => Command.new(self, :grep, 2),
-      'not' => Command.new(self, :not_command, 2),
-      'tail' => Command.new(self, :tail),
-      'echo' => Command.new(self, :echo),
+      'help' => :help,
+      'instance' => [:instance_command, 1, { :help => 'List all commands availible for a instance.'}],
+      'which' => [:which, 1, { :help => 'Find which plugin handles a command' }],
+      'cc' => [:control_command, 1, { :permission => 'admin' }],
+      'eval' => [:evaluate, 1, { :permission => 'admin' }],
+      'count' => :count,
+      'grep' => [:grep, 2],
+      'not' => [:not_command, 2],
+      'tail' => :tail,
+      'echo' => :echo,
+      'reverse' => :reverse,
     }
   end
   
   def help(e, command=nil)
     if command then
-      if @cmds.has_key?(command) and @cmds[command].help? then
-        "#{command}: #{@cmds[command].help}"
-      else
+      h = []
+      
+      if @cmds.has_key?(command) and (kwargs = @cmds[command].at(3)).respond_to?('has_key?') then
+        h << "#{command}: #{kwargs[:help]}" if kwargs.has_key?(:help)
+        h << "Usage: #{command} #{kwargs[:usage]}" if kwargs.has_key?(:usage)
+        h << "Example: #{command} #{kwargs[:example]}" if kwargs.has_key?(:example)
+      end
+      
+      if h.size == 0 then
         'Command not found or no help availible for the command.'
+      else
+        h.join("\n")
       end
     else
-      @cmds.keys.join(', ')
+      cmds = @cmds.reject{ |k,v| ((kwargs = v.at(3)) and kwargs.has_key?(:permission)) and not e.user.permission?(kwargs[:permission]) }
+      cmds.keys.join(', ')
     end
   end
   
-  def instance(e, inst)
+  def instance_command(e, inst)
     if @delegate.instances.has_key?(inst) then
       if @delegate.instances[inst].respond_to?('commands') then
         @delegate.instances[inst].commands.keys.join(', ')
@@ -133,6 +181,19 @@ class Commands
     end
   end
   
+  def which(e, command)
+    if @cmds.has_key?(command) then
+      c = @cmds[command][0]
+      if c.respond_to?('instance') and c.plugin != c.instance then
+        "#{c.plugin} (#{c.instance})"
+      else
+        c.plugin
+      end
+    else
+      'command not found'
+    end
+  end
+  
   def control_command(e, cc=nil)
     if cc then
       @cc = cc
@@ -166,6 +227,10 @@ class Commands
   def echo(e, data)
     "#{data}"
   end
+  
+  def reverse(e, data)
+    data.reverse
+  end
 end
 
 Plugin.define do