butler 1.8.3 → 1.9.0

data/data/butler/plugins/games/countdown.rb

@@ -6,12 +6,19 @@
 
 
 
-def on_countdown
-	return answer(usage) if @message.arguments.length < 2
-	answer = Answers[rand(Answers.length)]
-	@butler.irc.action(_(:shake), message.channel ? message.channel : message.from)
-	sleep(1.5)
-	answer(answer)
+def on_countdown(params)
+	params.from  ||= 3
+	params.to    ||= 0
+	params.final ||= _(:go)
+	if params.from > params.to then
+		params.from.downto(params.to+1) { |i|
+			answer(:count, :value => i)
+			sleep(1)
+		}
+		answer(params.final)
+	else
+		answer(:illegal)
+	end
 end
 
 __END__
@@ -25,16 +32,18 @@ __END__
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
 :strings:
-:xmap:
-  :on_countdown
-    :en:
-    - countdown :from
-    - countdown from :from :to
-    - countdown from :from to :to
-    - countdown from :from
+  :count:
+    en: '<%= value %>...'
+  :illegal:
+    en: 'Illegal countdown, from must be bigger than to'
+  :go:
+    en: 'Go!'
+:map:
+  :on_countdown:
+     en: countdown [from :from@+Integer] [to :to@+Integer] [saying +final]
 :usage:
   en: |
-    ![b]countdown![o]
+    ![b]countdown![o] [from] :from [to :to]
 :help:
   en:
     "": |

data/data/butler/plugins/games/eightball.rb

@@ -6,8 +6,6 @@
 
 
 
-trigger "8ball"
-
 Answers = [:yes, :no, :notgood, :signs_yes, :signs_no, :why_ask, :unclear]
 
 def on_trigger
@@ -20,35 +18,45 @@ end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Ask butler a question and get an answer from the magic eightball.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
+:help:
+  en:
+    "": |
+      Ask butler a question and get an answer from the magic eightball.
+:revision:
+  :plugin: 1
 :strings:
   :shake:
     en: 'Shakes the magic 8-ball...'
+    de: 'Schüttelt den magischen 8-ball...'
   :yes:
     en: 'Yes.'
+    de: 'Ja.'
   :no:
-    en: 'no.'
+    en: 'No.'
+    de: 'Nein.'
   :notgood:
     en: 'Outlook is not so good.'
+    de: 'Die Aussichten stehen schlecht.'
   :signs_yes:
     en: 'All signs point to yes.'
-  :signs no:
+    de: 'Alle Zeichen deuten auf ja.'
+  :signs_no:
     en: 'All signs point to no.'
+    de: 'Alle Zeichen deuten auf nein.'
   :why_ask:
-    en: 'Why the hell are you asking me?'
+    en: 'Why the hell are you asking ![b]me![o]?'
+    de: 'Warum zur Hölle fragst du ![b]mich![o] das?'
   :unclear:
     en: 'The answer is unclear.'
+    de: 'Die Antwort ist unklar.'
+:summary:
+  en: Ask butler a question and get an answer from the magic eightball.
+:trigger:
+  en: 8ball
 :usage:
   en: |
     ![b]8ball![o] *![c(blue)]question![o]
-:help:
-  en:
-    "": |
-      Ask butler a question and get an answer from the magic eightball.

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

@@ -6,8 +6,6 @@
 
 
 
-trigger "roll"
-
 def on_trigger
 	answer(:roll, :result => roll(@message.post_arguments[1]))
 end
@@ -33,20 +31,10 @@ end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Roll dices.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-  :roll:
-    en: "You rolled: <%= result.join(', ') %>"
-:usage:
-  en: |
-    ![b]roll![o] *![c(blue)]dice serie![o]
 :help:
   en:
     "": |
@@ -57,3 +45,15 @@ __END__
       3d10 rolls 3 dices with 10 sides and shows the sum.
     "chances": |
       Chances are esentially 100 sided dices.
+:revision:
+  :plugin: 1
+:strings:
+  :roll:
+    en: "You rolled: <%= result.join(', ') %>"
+:summary:
+  en: Roll dices.
+:trigger:
+  en: roll
+:usage:
+  en: |
+    ![b]roll![o] *![c(blue)]dice serie![o]

data/data/butler/plugins/irc/join.rb

@@ -6,8 +6,6 @@
 
 
 
-trigger "join"
-
 def on_trigger
 	return answer(usage) unless @message.arguments[1]
 	answer(:joining, :name => @message.arguments[1])
@@ -27,6 +25,8 @@ __END__
 :strings:
   :joining:
     en: Joining channel <%= name %>.
+:trigger:
+  en: join
 :usage:
   en: |
     ![b]join![o] ![c(green)]channel![o]

data/data/butler/plugins/irc/notice.rb

@@ -6,8 +6,6 @@
 
 
 
-trigger "notice"
-
 def on_trigger
 	return answer(usage) if @message.arguments.length < 3
 	@butler.irc.notice(@message.post_arguments[2], @message.arguments[1])
@@ -16,21 +14,23 @@ end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Let butler send a notice to a user or channel
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
+:help:
+  "":
+    en: |
+      Let butler send a notice to a user or channel.
+:revision:
+  :plugin: 1
 :strings:
   :sent:
     en: Sent the message
+:summary:
+  en: Let butler send a notice to a user or channel
+:trigger:
+  en: notice
 :usage:
   en: |
     ![b]notice![o] (![c(green)]nick![o] | ![c(green)]channel![o])
-:help:
-  "":
-    en: |
-      Let butler send a notice to a user or channel.

data/data/butler/plugins/irc/part.rb

@@ -6,8 +6,6 @@
 
 
 
-trigger "part"
-
 def on_trigger
 	return answer(usage) unless @message.arguments[1]
 	answer(:parting, :name => @message.arguments[1])
@@ -16,23 +14,25 @@ end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Let Butler part from channels
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-  :parting:
-    en: Parting channel <%= name %>.
-:usage:
-  en: |
-    ![b]part![o] ![c(green)]channel![o]
 :help:
   en:
     "": |
       You can use 'join' to let butler part from channels.
     "related": |
       Related triggers: join.
+:revision:
+  :plugin: 1
+:strings:
+  :parting:
+    en: Parting channel <%= name %>.
+:summary:
+  en: Let Butler part from channels
+:trigger:
+  en: part
+:usage:
+  en: |
+    ![b]part![o] ![c(green)]channel![o]

data/data/butler/plugins/irc/privmsg.rb

@@ -6,8 +6,6 @@
 
 
 
-trigger "privmsg"
-
 def on_trigger
 	return answer(usage) if @message.arguments.length < 3
 	@butler.irc.privmsg(@message.post_arguments[2], @message.arguments[1])
@@ -16,21 +14,23 @@ end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Let butler send a private message to a user or channel
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
+:help:
+  en:
+    "": |
+      Let butler send a private message to a user or channel.
+:revision:
+  :plugin: 1
 :strings:
   :sent:
     en: Sent the message
+:summary:
+  en: Let butler send a private message to a user or channel
+:trigger:
+  en: privmsg
 :usage:
   en: |
     ![b]privmsg![o] (![c(green)]nick![o] | ![c(green)]channel![o])
-:help:
-  en:
-    "": |
-      Let butler send a private message to a user or channel.

data/data/butler/plugins/irc/quit.rb

@@ -6,31 +6,31 @@
 
 
 
-trigger "quit"
-
 def on_trigger
 	@butler.irc.quit(@message.post_arguments[1] || localize(:default_reason))
 end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-:summary:
-  en: Lets Butler quit from IRC and disconnect from the server.
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:strings:
-  :default_reason:
-    en: I was terminated! Bye!
-:usage:
-  en: |
-    ![b]quit![o] [*![c(blue)]reason![o]]
 :help:
   en:
     "": |
       You can use 'quit' to let butler quit from irc and disconnect.
     "related": |
       Related triggers: reconnect.
+:revision:
+  :plugin: 1
+:strings:
+  :default_reason:
+    en: I was terminated! Bye!
+:summary:
+  en: Lets Butler quit from IRC and disconnect from the server.
+:trigger:
+  en: quit
+:usage:
+  en: |
+    ![b]quit![o] [*![c(blue)]reason![o]]

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

@@ -6,7 +6,7 @@
 
 
 
-def on_voice(params)
+def on_devoice(params)
 	channel = params.channel || message.channel
 	nicks   = params.user    || [message.from.nick]
 

data/data/butler/plugins/public/help.rb

@@ -16,13 +16,17 @@ def on_trigger
 			help = help[@message.language] || help["en"]
 			if @message.arguments.last == "+" then
 				topics = help.keys.sort[1..-1].map { |t| "'#{t}'" }.columnize(5)
-				answer(:topics, :topics => topics)
+				unless topics.empty?
+					answer(:topics, :topics => topics)
+				else
+					answer(:notopics)
+				end
 			else
 				key = @message.arguments[2..-1].join(" ")
 				if help = help[key] then
 					answer(help.result(self))
 				else
-					answer(key.empty? ? :nohelp : :notopic, :topic => key)
+					answer(:nohelp) if key.empty?
 				end
 			end
 		else
@@ -55,6 +59,8 @@ __END__
     en: "Plugin doesn't provide help for '<%= topic %>'."
   :nolang:
     en: "Plugin doesn't provide help for '<%= topic %>' in that language."
+  :notopics:
+    en: "Plugin doesn't provide any topics"
   :topics:
     en: |
       Topics for the plugin:
@@ -65,5 +71,5 @@ __END__
   en:
     "": |
       help gives help about itself or a command.
-      If + is the last argument, it will list the available help topics.
-      Use 'plugins list' to get a list of available commands.
+      Call 'help plugin +' to list the available help topics.
+      Use 'list plugins' to get a list of available plugins.

data/data/butler/plugins/service/define.rb

@@ -12,15 +12,16 @@ require 'cgi'
 
 Query = "http://www.google.com/search?client=butler&rls=%s&q=define:+%s&ie=UTF-8&oe=UTF-8"
 
-trigger "define"
-
 def on_trigger
 	word     = @message.post_arguments[1]
 	doc      = Hpricot(open(Query%[@message.language, CGI.escape(word)]))
-	see_also = (doc/"//font[1]/p/a")[5..-1].map { |e| e.inner_text }
-	found    = (doc/"//ul/font/li").find { |e| (e/"//a").inner_text.include?("wikipedia.org") }
+	see_also = (doc/"//font[1]/p/a")
+	see_also = see_also && see_also[5..-1]
+	see_also = see_also && see_also.map { |e| e.inner_text }
+	found    = (doc/"//ul/font/li")
+	found    = found && found.find { |e| (e/"//a").inner_text.include?("wikipedia.org") }
 	if found then
-		more('![b]word![o]', found.inner_text.sub(%r{\w+\.wikipedia\.org/wiki/.*?$}, ''))
+		answer_with_lead("![b]#{word}![o]", found.inner_text.sub(%r{\w+\.wikipedia\.org/wiki/.*?$}, ''))
 	else
 		answer(:not_found, :search_string => word)
 	end
@@ -28,20 +29,22 @@ end
 
 __END__
 --- 
-:revision:
-  :plugin: 1
-  :configuration: 1
-:summary:
-  en: "Use googles define: to find the definition of words."
 :about:
   :mail: "apeiros@gmx.net"
   :version: "1.0.0"
   :author: "Stefan Rusterholz"
-:usage:
-  en: "![b]define![o] *search_string"
 :help:
   en:
     "": "Use googles define: to find the definition of words."
+:revision:
+  :plugin: 2
+  :configuration: 1
 :strings:
   :not_found:
-    en: No search result for '<%= search_string %>'.
+    en: No search result for '<%= search_string %>'.
+:summary:
+  en: "Use googles define: to find the definition of words."
+:trigger:
+  en: define
+:usage:
+  en: "![b]define![o] *search_string"