butler 1.8.1 → 1.8.2

data/data/butler/plugins/core/plugins.rb

@@ -8,7 +8,7 @@
 
 require 'ruby/array/columnize'
 
-#trigger "plugins"
+
 
 def on_load_plugin(param)
 	if plugin_name = @butler.plugins.identify(param.plugin_name) then
@@ -39,55 +39,33 @@ def on_unload_plugin(param)
 end
 
 def on_list_plugins(param)
-	return answer(usage) unless %w(active inactive all).include?(param.which)
-	plugins = @butler.plugins.send(param.which).sort.columnize(5)
-	answer(param.which.to_sym, :plugins => plugins)
-end
-
-# 37
-def on_trigger
-	case @message.arguments[1]
-		when nil
-			answer(usage)
-
-		when "groups"
-			return answer(unknown(2)) if @message.arguments[2]
-			groups = @butler.plugins.groups.sort.columnize(5)
-			answer(:groups, :groups => groups)
-
-		when "names"
-			return answer(unknown(2)) if @message.arguments[2]
-			names = @butler.plugins.all.sort.columnize(5)
-			answer(:names, :names => names)
-			
-		when "active"
-
-
-		else
-			unknown(1)
+	param.which ||= "all"
+	plugins = @butler.plugins.send(param.which.downcase).sort.columnize(5)
+	if plugins.empty? then
+		answer("none_in_#{param.which}".to_sym)
+	else
+		answer(param.which.to_sym, :plugins => plugins)
 	end
 end
 
 __END__
 --- 
-:revision:
-  :plugin: 2
-:summary:
-  en: Plugin management
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
+:help:
+  en:
+    "": "Plugins is responsible for loading, unloading and listing available plugins."
 :map:
   :on_load_plugin:
-    en:
-      load plugin :plugin_name
+    en: load plugin :plugin_name
   :on_unload_plugin:
-    en:
-      unload plugin :plugin_name
+    en: unload plugin :plugin_name
   :on_list_plugins:
-    en:
-      list :which plugins
+    en: list [:which{all,active,inactive}] plugins
+:revision:
+  :plugin: 2
 :strings:
   :groups:
     en: |
@@ -109,6 +87,12 @@ __END__
     en: |
       All plugins:
       <%= plugins %>
+  :none_in_active:
+    en: No active plugins.
+  :none_in_inactive:
+    en: No inactive plugins.
+  :none_in_all:
+    en: No plugins.
   :load:
     en: Loaded '<%= plugin_name %>'.
   :unload:
@@ -123,12 +107,10 @@ __END__
     en: |
       An exception occured while unloading '<%= plugin_name %>':
       <%= exception %> in <%= exception.backtrace.first.sub(/.*?(lib|butler)/, '\1') %>
-
+:summary:
+  en: Plugin management
 :usage:
   en: |
     'load plugin' ![c(blue)]name![o]
     'unload plugin' ![c(blue)]name![o]
     'list' [![c(blue)]type![o]] 'plugins' 
-:help:
-  en:
-    "": "Plugins is responsible for loading, unloading and listing available plugins."

data/data/butler/plugins/dev/bleakhouse.rb

@@ -0,0 +1,46 @@
+#--
+# Copyright 2007 by Stefan Rusterholz.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+def self.logfile
+	@logfile
+end
+
+def self.on_load
+	@logfile   = @butler.path.log+'/bleakhouse.log'
+	@bl_logger = BleakHouse::Logger.new
+	File.delete(@logfile) if File.exist?(@logfile)
+end
+
+def self.snapshot(*args)
+	@bl_logger.snapshot(@logfile, *args)
+end
+
+def on_trigger
+	plugin.snapshot('plugin', false)
+	answer(:done, :file => plugin.logfile)
+end
+
+__END__
+--- 
+:about:
+  :mail: "apeiros@gmx.net"
+  :version: "1.0.0"
+  :author: "Stefan Rusterholz"
+:help:
+  en:
+    "": Inspect butlers memory usage, requires butler to run via ruby-bleak-house.
+:revision:
+  :plugin: 1
+:strings:
+  :done:
+    en: "Snapshot taken. The file is in <%= file %>."
+:summary:
+  en: Inspect butlers memory usage.
+:trigger:
+  en: bleakhouse
+:usage:
+  en: |
+    ![b]bleakhouse![o]

data/data/butler/plugins/games/roll.rb

@@ -15,7 +15,7 @@ end
 def dices(dices, sides)
   dices = 1 if dices.zero?
   sides = 6 if sides.zero?
-  (0..dices).inject { |sum,i| sum+rand(sides) }
+  (0..dices).inject { |sum,i| sum+rand(sides)+1 }
 end
 
 def chance(from, to)

data/data/butler/plugins/operator/deop.rb

@@ -6,36 +6,31 @@
 
 
 
-trigger "deop"
+def on_deop(params)
+	channel = params.channel || message.channel
+	nicks   = params.user    || [message.from.nick]
 
-def on_trigger
-	channels, nicks = [], message.arguments[1..-1]
-	channames = @butler.channels.channel_names
-
-	channels << nicks.pop while channames.include?(nicks.last.downcase)
-	nicks    << @message.from.nick if nicks.empty?
-	channels << @message.channel.to_str if channels.empty?
-
-	channels.each { |channel|
-		@butler.irc.deop(channel, *nicks)
-	}
+	@butler.irc.deop(channel, *nicks)
 end
 
+
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Revoke a users op via butler.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-:usage:
-  en: |
-    ![b]deop![o] [![c(green)]nick![o] ...] [![c(green)]channel![o] ...]
 :help:
   en:
     "": |
       Revoke a users op via butler.
+:map:
+  :on_deop:
+    en: "deop [*user@Nick] [in :channel@Channel]"
+:revision:
+  :plugin: 1
+:summary:
+  en: Revoke a users op via butler.
+:usage:
+  en: |
+    ![b]deop![o] [![c(green)]nick![o] ...] [in ![c(green)]channel![o]]

data/data/butler/plugins/operator/devoice.rb

@@ -6,36 +6,30 @@
 
 
 
-trigger "devoice"
+def on_voice(params)
+	channel = params.channel || message.channel
+	nicks   = params.user    || [message.from.nick]
 
-def on_trigger
-	channels, nicks = [], message.arguments[1..-1]
-	channames = @butler.channels.channel_names
-
-	channels << nicks.pop while channames.include?(nicks.last.downcase)
-	nicks    << @message.from.nick if nicks.empty?
-	channels << @message.channel.to_str if channels.empty?
-
-	channels.each { |channel|
-		@butler.irc.devoice(channel, *nicks)
-	}
+	@butler.irc.devoice(channel, *nicks)
 end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Revoke a users voice via butler.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-:usage:
-  en: |
-    ![b]devoice![o] [![c(green)]nick![o] ...] [![c(green)]channel![o] ...]
 :help:
   en:
     "": |
       Revoke a users voice via butler.
+:map:
+  :on_devoice:
+    en: "devoice [*user@Nick] [in :channel@Channel]"
+:revision:
+  :plugin: 1
+:summary:
+  en: Revoke a users voice via butler.
+:usage:
+  en: |
+    ![b]devoice![o] [![c(green)]nick![o] ...] [![c(green)]channel![o] ...]

data/data/butler/plugins/operator/limit.rb

@@ -6,42 +6,77 @@
 
 
 
-extend OnHandlers
-
-trigger "limit"
-
 configuration(
 	"channels" => []
 )
+@channels = {}
+
+every minute do
+	@config["channels"].each { |channel|
+		next unless channel = @butler.channels[channel]
+		limit(channel)
+	}
+end
+
+def self.limit(channel)
+	new_limit = channel.users.length+4
+	unless new_limit == @channels[channel.to_str] then
+		@butler.irc.mode(channel, "+l #{new_limit}")
+		@channels[channel.to_str] = new_limit
+	end
+end
 
-def on_mode(*args)
+def self.unlimit(channel)
+	@butler.irc.mode(channel, "-l")
+	@channels.delete(channel.to_str)
 end
 
-def on_trigger
-	limit = @message.arguments[1].downcase
-	limit = limit == "off" ? nil : Integer(limit)
-rescue
-	answer(:invalid_limit, :limit => limit)
+def on_limit(param)
+	plugin.config.synchronize {
+		plugin.config["channels"] |= param.channels.map { |channel| channel.to_str }
+	}
+	param.channels.each { |channel|
+		next unless channel = @butler.channels[channel]
+		plugin.limit(channel)
+	}
+	answer(:limiting, :channels => param.channels)
+end
+
+def on_unlimit(param)
+	plugin.config.synchronize {
+		plugin.config["channels"] = plugin.config["channels"] - param.channels.map { |channel| channel.to_str }
+	}
+	param.channels.each { |channel|
+		next unless channel = @butler.channels[channel]
+		plugin.unlimit(channel)
+	}
+	answer(:unlimiting, :channels => param.channels)
 end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: A slowly shifting channel-limit to avoid join-floods.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-  :invalid_limit:
-    en: |
-      <%= limit %> is not a valid limit, use either 'off' or a positive number.
-:usage:
-  en: |
-    ![b]limit![o] ('off' | ![c(green)]int![o]) *![c(green)]channel![o] ...
 :help:
   en:
     "": |
       A slowly shifting channel-limit to avoid join-floods.
+:map:
+  :on_limit:
+    en: limit *channels@Channel
+  :on_unlimit:
+    en: unlimit *channels@Channel
+:revision:
+  :plugin: 1
+:strings:
+  :limiting:
+    en: Limiting channels <%= channels.join(', ') %>.
+  :unlimiting:
+    en: No longer limiting channels <%= channels.join(', ') %>.
+:summary:
+  en: A slowly shifting channel-limit to avoid join-floods.
+:usage:
+  en: |
+    (![b]limit![o]|![b]unlimit![o]) ![c(green)]channel![o] ...

data/data/butler/plugins/operator/op.rb

@@ -6,36 +6,31 @@
 
 
 
-trigger "op"
+def on_op(params)
+	channel = params.channel || message.channel
+	nicks   = params.user    || [message.from.nick]
 
-def on_trigger
-	channels, nicks = [], message.arguments[1..-1]
-	channames = @butler.channels.channel_names
-
-	channels << nicks.pop while channames.include?(nicks.last.downcase)
-	nicks    << @message.from.nick if nicks.empty?
-	channels << @message.channel.to_str if channels.empty?
-
-	channels.each { |channel|
-		@butler.irc.op(channel, *nicks)
-	}
+	@butler.irc.op(channel, *nicks)
 end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Grant a user op via butler.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-:usage:
-  en: |
-    ![b]op![o] [![c(green)]nick![o] ...] [![c(green)]channel![o] ...]
 :help:
   en:
     "": |
       Grant a user op via butler.
+:map:
+  :on_op:
+    en: "op [*user@Nick] [in :channel@Channel]"
+:revision:
+  :plugin: 1
+:strings:
+:summary:
+  en: Grant users op via butler.
+:usage:
+  en: |
+    ![b]op![o] [![c(green)]nick![o] ...] [in ![c(green)]channel![o]]

data/data/butler/plugins/operator/voice.rb

@@ -6,36 +6,31 @@
 
 
 
-trigger "voice"
+def on_voice(params)
+	channel = params.channel || message.channel
+	nicks   = params.user    || [message.from.nick]
 
-def on_trigger
-	channels, nicks = [], message.arguments[1..-1]
-	channames = @butler.channels.channel_names
-
-	channels << nicks.pop while channames.include?(nicks.last.downcase)
-	nicks    << @message.from.nick if nicks.empty?
-	channels << @message.channel.to_str if channels.empty?
-
-	channels.each { |channel|
-		@butler.irc.voice(channel, *nicks)
-	}
+	@butler.irc.voice(channel, *nicks)
 end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Grant a user voice via butler.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-:usage:
-  en: |
-    ![b]voice![o] [![c(green)]nick![o] ...] [![c(green)]channel![o] ...]
 :help:
   en:
     "": |
       Grant a user voice via butler.
+:map:
+  :on_voice:
+    en:
+     "voice [*user@Nick] [in :channel@Channel]"
+:revision:
+  :plugin: 1
+:summary:
+  en: Grant a user voice via butler.
+:usage:
+  en: |
+    ![b]voice![o] [![c(green)]nick![o] ...] [in ![c(green)]channel![o]]