zmb 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/zmb

@@ -76,7 +76,7 @@ def wizard(zmb, plugin)
     
     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."
-      return wizard zmb, plugin
+      return wizard(zmb, plugin)
     end
     
     zmb.setup(plugin.name, instance)

data/lib/zmb.rb

@@ -203,6 +203,7 @@ class Zmb
       '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),
     }
   end
   
@@ -236,7 +237,7 @@ class Zmb
     if not @instances.has_key?(instance) then
       load(instance) ? "#{instance} loaded" : "#{instance} did not load correctly"
     else
-      "Instance already #{instance}"
+      "Instance already loaded #{instance}"
     end
   end
   
@@ -249,11 +250,13 @@ class Zmb
     @instances.keys.join(', ')
   end
   
-  def setup_command(e, plugin, instance)
+  def setup_command(e, plugin, instance=nil)
+    instance = plugin if not instance
+    
     if setup(plugin, instance) then
       object = @plugin_manager.plugin plugin
       result = ["Instance saved, please use the set command to override the default configuration for this instance."]
-      result += d.map{ |k,v| "#{k} - #{v['help']} (default=#{v['default']})" } if object.respond_to? 'wizard'
+      result += object.wizard.map{ |k,v| "#{k} - #{v['help']} (default=#{v['default']})" } if object.respond_to? 'wizard'
       result.join("\n")
     else
       "plugin not found"
@@ -264,6 +267,11 @@ class Zmb
     settings = @settings.setting(instance)
     settings[key] = value
     @settings.save(instance, settings)
+    
+    if @instances.has_key?(instance) and @instances[instance].respond_to?('update') then
+      @instances[instance].update(key, value)
+    end
+    
     "#{key} set to #{value} for #{instance}"
   end
   
@@ -293,4 +301,9 @@ class Zmb
     @plugin_manager.add_plugin_source source
     "#{source} added to plugin manager"
   end
+  
+  def refresh_command(e)
+    @plugin_manager.refresh_plugin_sources
+    "Refreshed plugin sources"
+  end
 end

data/lib/zmb/commands.rb

@@ -27,7 +27,7 @@ class Command
       'incorrect arguments'
     rescue Exception
       if e.respond_to?('user') and e.user.respond_to?('admin?') and e.user.admin? and e.private? then
-        "#{$!.message}\n#{$!.inspect}"
+        "#{$!.message}\n#{$!.inspect}\n#{$!.backtrace[0..2].join("\n")}"
       else
         "command failed"
       end

data/lib/zmb/plugin.rb

@@ -43,8 +43,9 @@ class PluginManager
   
   def refresh_plugin_sources
     sources = @plugin_sources
-    @plugin_sources = nil
-    @plugins = nil
+    
+    @plugins = Array.new
+    @plugin_sources = Array.new
     
     sources.each{|directory| add_plugin_source directory}
   end

data/plugins/commands.rb

@@ -4,6 +4,7 @@ class Commands
   attr_accessor :cmds, :cc
   
   def initialize(sender, settings={})
+    @delegate = sender
     @cmds = Hash.new
     
     @cc = settings['cc'] if settings.has_key?('cc')
@@ -82,10 +83,29 @@ class Commands
     instance.commands.each{|command, cmd| @cmds.delete(command)} if instance.respond_to?('commands')
   end
   
+  def split_seperators(data)
+    if data.include?("\n") then
+      data.split("\n")
+    elsif data.include?(',') then
+      data.split(',')
+    elsif data.include?(' ') then
+      data.split(' ')
+    else
+      data
+    end
+  end
+  
   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),
     }
   end
   
@@ -101,6 +121,18 @@ class Commands
     end
   end
   
+  def instance(e, inst)
+    if @delegate.instances.has_key?(inst) then
+      if @delegate.instances[inst].respond_to?('commands') then
+        @delegate.instances[inst].commands.keys.join(', ')
+      else
+        "No commands availible for #{inst}"
+      end 
+    else
+      "No instance found for #{inst}"
+    end
+  end
+  
   def control_command(e, cc=nil)
     if cc then
       @cc = cc
@@ -110,6 +142,30 @@ class Commands
     
     "Control command set to #{@cc}"
   end
+  
+  def evaluate(e, string)
+    "#{eval string}"
+  end
+  
+  def count(e, data)
+    "#{split_seperators(data).size}"
+  end
+  
+  def grep(e, search, data)
+    split_seperators(data).reject{ |d| not d.include?(search) }.join(', ')
+  end
+  
+  def not_command(e, search, data)
+    split_seperators(data).reject{ |d| d.include?(search) }.join(', ')
+  end
+  
+  def tail(e, data)
+    split_seperators(data).reverse[0..2].join(', ')
+  end
+  
+  def echo(e, data)
+    "#{data}"
+  end
 end
 
 Plugin.define do

data/plugins/idle.rb

@@ -0,0 +1,50 @@
+class Idle
+  def initialize(sender, settings)
+    @channels = Hash.new
+  end
+  
+  def to_json(*a)
+    { 'plugin' => 'idle' }.to_json(*a)
+  end
+  
+  def event(sender, e)
+    if e.message? and e.respond_to?('channel') then
+      @channels[e.channel] = Time.now if not e.message.include?('idle')
+    end
+  end
+  
+  def commands
+    require 'zmb/commands'
+    {
+      'idle' => Command.new(self, :idle, 1, 'How idle has a channel been?'),
+    }
+  end
+  
+  def idle(e, channel=nil)
+    channel = e.channel if not channel
+    
+    if not @channels.has_key?(channel) then
+      "I have not seen any messages in #{channel}"
+    else
+      diff = Time.now - @channels[channel]
+      
+      if diff < 60 then
+        msg = "#{Integer(diff)} seconds ago"
+      elsif diff < 3600 then
+        msg = "#{Integer(diff/60)} minutes ago"
+      elsif diff < 86400 then
+        msg = "about #{Integer(diff/3600)} hours ago"
+      else
+        msg = "#{Integer(diff/86400)} days ago"
+      end
+      
+      "Last message in #{channel} was #{msg}"
+    end
+  end
+end
+
+Plugin.define do
+  name 'idle'
+  description 'Let\'s you see how idle a channel has been'
+  object Idle
+end

data/plugins/irc.rb

@@ -3,7 +3,7 @@ require 'socket'
 require 'zmb/timer'
 
 class Event
-  attr_accessor :delegate, :command, :args, :name, :userhost, :message
+  attr_accessor :delegate, :command, :args, :name, :userhost, :message, :channel
   
   def initialize(sender, line)
     puts line
@@ -114,9 +114,14 @@ class IrcConnection
     {
       'join' => PermCommand.new('admin', self, :join_command),
       'part' => PermCommand.new('admin', self, :part_command),
+      'cycle' => PermCommand.new('admin', self, :cycle_command),
+      'topic' => PermCommand.new('admin', self, :topic_command, 2),
+      'kick' => PermCommand.new('admin', self, :kick_command, 2),
+      'channels' => PermCommand.new('admin', self, :channels_command),
       'raw' => PermCommand.new('admin', self, :raw_command),
       'nick' => PermCommand.new('admin', self, :nick_command),
       'tell' => PermCommand.new('admin', self, :tell_command, 2),
+      'reconnect' => PermCommand.new('admin', self, :reconnect_command),
     }
   end
   
@@ -198,31 +203,68 @@ class IrcConnection
   end
   
   def join_command(e, channel)
-    join channel
+    e.delegate.join channel
     "#{channel} joined"
   end
   
   def part_command(e, channel)
-    part channel
+    e.delegate.part channel
     "left #{channel}"
   end
   
+  def cycle_command(e, channel=nil)
+    channel = e.channel if not channel
+    e.delegate.part channel
+    e.delegate.join channel
+    "#{channel} cycled"
+  end
+  
+  def topic_command(e, channel, topic=nil)
+    if not topic then
+      topic = channel
+      channel = e.channel
+    end
+    
+    e.delegate.write "TOPIC #{channel} :#{topic}"
+  end
+  
+  def kick_command(e, channel, nick=nil)
+    if not nick then
+      nick = channel
+      channel = e.channel
+    end
+    
+    e.delegate.write "KICK #{channel} #{nick}"
+  end
+  
+  def channels_command(e)
+    if e.delegate.channels.size > 0 then
+      "Channels: #{e.delegate.channels.join(", ")}"
+    else
+      "I am not in any channels"
+    end
+  end
+  
   def raw_command(e, line)
-    write line
+    e.delegate.write line
     nil
   end
   
   def nick_command(e, nick)
-    write "NICK #{nick}"
+    e.delegate.write "NICK #{nick}"
     "Nick changed to #{nick}"
   end
   
   def tell_command(e, to, message)
-    msg = msg.split("\n") if not msg.respond_to?('each')
-    msg.each{ |m| message(to, m) }
+    message = message.split("\n") if not message.respond_to?('each')
+    message.each{ |m| e.delegate.message(to, m) }
     nil
   end
   
+  def reconnect_command(e, message='Reconnect')
+    e.delegate.write "QUIT :#{message}"
+  end
+  
   def running(sender)
     connect
   end

data/plugins/poll.rb

@@ -0,0 +1,102 @@
+class Poll
+  def initialize(sender, settings={})
+    @polls = Hash.new
+    @polls = settings['polls'] if settings.has_key?('polls')
+  end
+  
+  def to_json(*a)
+    { 'plugin' => 'poll', 'polls' => @polls }.to_json(*a)
+  end
+  
+  def add(slug, poll)
+    @polls[slug] = {'poll' => poll, 'options' => [], 'votes' => {}}
+  end
+  
+  def add_opt(slug, option)
+    @polls[slug]['options'] << option
+  end
+  
+  def add_vote(username, slug, option)
+    @polls[slug]['votes'][username] = option
+  end
+  
+  def poll_opt?(slug, opt)
+    @polls[slug]['options'].values_at(opt)[0] != nil
+  end
+  
+  def poll_count(slug, opt)
+    @polls[slug]['votes'].reject{ |k,v| v != opt }.size
+  end
+  
+  def commands
+    require 'zmb/commands'
+    {
+      'poll-add' => PermCommand.new('admin', self, :add_command, 2),
+      'poll-opt' => PermCommand.new('admin', self, :opt_command, 2),
+      'poll-del' => PermCommand.new('admin', self, :del_command),
+      'vote' => Command.new(self, :vote_command, 2),
+      'polls' => Command.new(self, :polls_command, 0),
+      'poll' => Command.new(self, :poll_command, 1),
+    }
+  end
+  
+  def add_command(e, slug, poll)
+    add(slug, poll)
+    "#{poll} added as #{slug}"
+  end
+  
+  def opt_command(e, slug, option)
+    add_opt(slug, option)
+    "#{option} added to #{slug}"
+  end
+  
+  def del_command(e, slug)
+    @polls.delete(slug)
+    "#{slug} deleted"
+  end
+  
+  def vote_command(e, slug, option)
+    return "permission denied" if not e.user.authenticated?
+    
+    begin
+      opt = Integer(option)-1
+    rescue ArgumentError
+      return "Option must be a number"
+    end
+    
+    if @polls.has_key?(slug) then
+      if poll_opt?(slug, opt) then
+        add_vote(e.user.username, slug, opt)
+        "Vote added"
+      else
+        "Option #{opt+1} doesn't exist for #{slug}"
+      end
+    else
+      "#{slug}: poll doesn't exist"
+    end
+  end
+  
+  def polls_command(e)
+    if @polls.size > 0 then
+      @polls.map{ |k,v| "#{k}: #{v['poll']}"}.join("\n")
+    else
+      "No polls found"
+    end
+  end
+  
+  def poll_command(e, slug)
+    if @polls.has_key?(slug) then
+      poll = @polls[slug]
+      x = 0
+      "#{poll['poll']}\n" + poll['options'].map{ |o| "#{x += 1}: #{o} (#{poll_count(slug, x-1)})" }.join("\n")
+    else
+      "#{slug}: poll doesn't exist"
+    end
+  end
+end
+
+Plugin.define do
+  name 'poll'
+  description 'voting plugin'
+  object Poll
+end

data/zmb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmb}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kylef"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-03-03}
   s.default_executable = %q{zmb}
   s.description = %q{ZMB, messenger bot}
   s.email = %q{inbox@kylefuller.co.uk}
@@ -34,8 +34,10 @@ Gem::Specification.new do |s|
      "lib/zmb/timer.rb",
      "plugins/bank.rb",
      "plugins/commands.rb",
+     "plugins/idle.rb",
      "plugins/irc.rb",
      "plugins/nickserv.rb",
+     "plugins/poll.rb",
      "plugins/quote.rb",
      "plugins/relay.rb",
      "plugins/system.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zmb
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - kylef
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +00:00
+date: 2010-03-03 00:00:00 +00:00
 default_executable: zmb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,10 @@ files:
 - lib/zmb/timer.rb
 - plugins/bank.rb
 - plugins/commands.rb
+- plugins/idle.rb
 - plugins/irc.rb
 - plugins/nickserv.rb
+- plugins/poll.rb
 - plugins/quote.rb
 - plugins/relay.rb
 - plugins/system.rb