rbot 0.9.14 → 0.9.15

data/AUTHORS

@@ -1,10 +1,10 @@
 Original Author
 o Tom Gilbert (giblet) <tom@linuxbrit.co.uk>
 
-Ruthless Tyrant (yes, that means 'project lead')
+Ruthless Tyrant (yes, that means 'project leader')
 o Giuseppe "Oblomov" Bilotta (tango_) <giuseppe.bilotta@gmail.com>
 
-Sanity keeper
+Sanity keeper (aka 'my main role here is to bitch a lot about even the legitimate patches')
 o Dmitry Kim (jsn) <dmitry dot kim at gmail dot com>
 
 YAML & Multilingual expert, blame collector
@@ -13,6 +13,9 @@ o Yaohan Chen (hagabaka) <yaohan.chen@gmail.com>
 Insanity keeper
 o Mark Kretschmann (markey) <markey@web.de>
 
+Pusher (aka 'my main role here is to bitch a lot about the delay in the releases')
+o Raine Virta (rane_) <raine.virta@gmail.com>
+
 Chuck Norris trainer
 o Chris Gahan (epitron) <chris@ill-logic.com>
 
@@ -28,6 +31,7 @@ o Jesse Keys (jessekeys) <jesse@teranetworks.de>
 o Jan Wikholm (unfo-) <jw@jw.fi>
 o Moritz Augsburger (moemoe) <rbot@moritz.augsburger.name>
 o Alexander Beisig <alexander.beisig@gmx.de>
+o Casey Link (Ramblurr) <unnamedrambler@gmail.com>
 
 Module contributors
 o dice.rb  - David Dorward (Dorward) <david@david.us-lot.org>

data/REQUIREMENTS

@@ -2,7 +2,12 @@ Ruby modules needed for rbot
 ============================
 
 Core requirements
-      bdb (berkley db)      http://raa.ruby-lang.org/project/bdb/
+      tokyocabinet          for "tc" DB adaptor
+                            http://1978th.net/tokyocabinet/
+                            you can install Ruby bindings via "gem install tokyocabinet",
+                            but this still requires libtokyocabinet to be installed system-wide
+      bdb (berkeley db)      for "bdb" DB adaptor or converting from it
+                            http://raa.ruby-lang.org/project/bdb/
                             (which requires libdb4.x or better, formerly from
                             www.sleepycat.com, now at
                             http://www.oracle.com/technology/products/berkeley-db/index.html)
@@ -11,6 +16,7 @@ Core requirements
                             have a libdb-ruby packaged (or similar).
                             For Windows instructions, check at the bottom
                             of this file.
+
       net/http 1.2+
       net/https             (for debian, this will also need libopenssl-ruby)
       socket

data/Rakefile

@@ -4,38 +4,16 @@ require 'rake/gempackagetask'
 
 task :default => [:buildext]
 
-spec = Gem::Specification.new do |s|
-  s.name = 'rbot'
-  s.version = '0.9.14'
-  s.summary = <<-EOF
-    A modular ruby IRC bot.
-  EOF
-  s.description = <<-EOF
-    A modular ruby IRC bot specifically designed for ease of extension via plugins.
-  EOF
-  s.requirements << 'Ruby, version 1.8.0 (or newer)'
-
-  #  s.files = Dir.glob("**/*").delete_if { |item| item.include?(".svn") }
-  s.files = FileList['lib/**/*.rb', 'bin/*', 'data/rbot/**/*', 'AUTHORS', 'COPYING', 'README', 'REQUIREMENTS', 'TODO', 'ChangeLog', 'INSTALL',  'Usage_en.txt', 'setup.rb', 'po/*.pot', 'po/**/*.po'].to_a.delete_if {|item| item == ".svn"}
-  s.bindir = 'bin'
-  s.executables = ['rbot', 'rbot-remote']
-  s.default_executable = 'rbot'
-  s.extensions = 'Rakefile'
-
-#  s.autorequire = 'rbot/ircbot'
-  s.has_rdoc = true
-  s.rdoc_options = ['--exclude', 'post-install.rb',
-  '--title', 'rbot API Documentation', '--main', 'README', 'README']
-
-  s.author = 'Tom Gilbert'
-  s.email = 'tom@linuxbrit.co.uk'
-  s.homepage = 'http://ruby-rbot.org'
-  s.rubyforge_project = 'rbot'
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
+SPECFILE = 'rbot.gemspec'
+# The Rakefile is also used after installing the gem, to build
+# the .mo files. Since in this case the SPECFILE is not available,
+# we must (and can) skip defining the gem packaging tasks.
+if File.exist? SPECFILE
+  spec = eval(File.read(SPECFILE), nil, SPECFILE)
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+  end
 end
 
 # normalize a po/pot file

data/bin/rbot

@@ -47,7 +47,7 @@ require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version ||= '0.9.14'
+$version ||= '0.9.15'
 $version_timestamp ||= 0
 $opts = Hash.new
 
@@ -98,6 +98,11 @@ rescue LoadError => e
   exit 2
 end
 
+# ruby 1.9 specific fixes
+unless RUBY_VERSION < '1.9'
+  require 'rbot/compat19'
+end
+
 if ($opts["version"])
   puts "rbot #{$version}"
   exit 0

data/bin/svnwatch-postcommit-hook

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+# post-commit - a hook to talk to the svnwatch rbot plugin
+# author(s): Robby Russell and Ben Bleything of the PDX.rb
+# slightly modified to handle multiple repositorys by Daniel Hedberg
+# This file should be placed in the repository's hooks directory
+
+require 'drb'
+
+# Configuration Options
+chan = '#channel' 	#IRC channel that you want rbot to send notices to
+
+@conf = { 
+  :port => '7666',       # 7666 (you will need this to be the same in post-commit)
+  :host => '192.168.130.5',  # localhost, don't set to remote ip unless you know what you are doing
+}
+
+chan = '#svn-hardware'
+
+
+# Okay.  So we get two args from svn.
+#
+# [1] - repo path
+# [2] - revision number
+#
+# We then use this information to gather relevant data about the commit
+# and do with it as we please.
+
+path = ARGV[0]
+rev = ARGV[1]
+
+if (path.nil? || rev.nil?)
+  puts "Usage: post-commit <repo path> <rev number>"
+  exit
+end
+
+path = File.expand_path(path)
+
+DRb.start_service
+bot = DRbObject.new(nil, "druby://#{@conf[:host]}:#{@conf[:port]}")
+
+# The array contains this data:
+# [0]: committer
+# [1]: timestamp of commit
+# [2]: Size of log entry, in bytes
+# [3]: Log message
+info_array = `svnlook info --revision #{rev} #{path}`.strip.split(/\n/, 4)
+
+log = `svn log -v -r #{rev} file://#{path}`
+
+# dumb idea, it would wrap too many lines if multiple files...
+#changed = `svnlook changed -r #{rev} #{path}`.strip
+
+# guess what the repository name is
+repos = path.split(/\//).last
+
+commit_info = { :author     => info_array[0],
+                :revision   => rev,
+                :repository => repos,
+                :log        => log,
+                :chan       => chan,
+              }
+
+begin
+  bot.svn_commit commit_info
+rescue
+
+end
+exit 0

data/data/rbot/contrib/plugins/stats.rb

@@ -19,10 +19,10 @@
 
 class StatsPlugin < Plugin
 
-	@@commands = { 
+	@@commands = {
 		"stats" => "handle_stats",
 		"track" => "handle_track",
-		"untrack" => "handle_untrack", 
+		"untrack" => "handle_untrack",
 		"listtokens" => "handle_listtokens",
 		"rmabuser" => "handle_rmabuser"
 	}
@@ -61,7 +61,7 @@ class StatsPlugin < Plugin
 			m.reply "What a crazy fool!  Did you mean |help stats?"
 			return
 		end
-		
+
 		meth = self.method(@@commands[m.plugin])
 		meth.call(m)
 	end

data/data/rbot/contrib/plugins/vandale.rb

@@ -16,7 +16,7 @@ class VanDalePlugin < Plugin
 		ret = Array.new
 		Utils.safe_exec("/usr/local/bin/gnuvd", m.params).each{|line| if line.length > 5 then ret << line end}
 		m.reply ret.delete_at(0)
-		while ret[0] =~ /^[[:alpha:]_]*[0-9]/ 
+		while ret[0] =~ /^[[:alpha:]_]*[0-9]/
 			m.reply ret.delete_at(0)
 		end
 		while ret[0] =~ /^[0-9]/

data/data/rbot/filters/rss.rb

@@ -0,0 +1,72 @@
+#-- vim:sw=2:et
+#++
+
+rss_type :blog do |s|
+  author = s[:author] ? (s[:author] + " ") : ""
+  abt = s[:category] ? "about #{s[:category]} " : ""
+  line1 = "%{handle}%{date}%{author}blogged %{abt}at %{link}"
+  line2 = "%{handle}%{title} - %{desc}"
+  make_stream(line1, line2, s, :author => author, :abt => abt)
+end
+
+rss_type :forum do |s|
+  author = s[:author] ? (s[:author] + " ") : ""
+  abt = s[:category] ? "on #{s[:category]} " : ""
+  line1 = "%{handle}%{date}%{author}posted %{abt}at %{link}"
+  line2 = "%{handle}%{title} - %{desc}"
+  make_stream(line1, line2, s, :author => author, :abt => abt)
+end
+
+rss_type :git do |s|
+  author = s[:author].sub(/@\S+?\s*>/, "@...>") + " " if s[:author]
+  line1 = "%{handle}%{date}%{author}committed %{title}%{at}%{link}"
+  make_stream(line1, nil, s, :author => author)
+end
+
+rss_type :gmane do |s|
+  line1 = "%{handle}%{date}Message %{title} sent by %{author}. %{desc}"
+  make_stream(line1, nil, s)
+end
+
+rss_type :headlines do |s|
+  line1 = (s[:handle].empty? ? "%{date}" : "%{handle}") << "%{title}"
+  make_stream(line1, nil, s)
+end
+
+rss_type :news do |s|
+  line1 = "%{handle}%{date}%{title}%{at}%{link}" % s
+  line2 = "%{handle}%{date}%{desc}" % s
+  make_stream(line1, line2, s)
+end
+
+rss_type :photoblog do |s|
+  author = s[:author] ? (s[:author] + " ") : ""
+  abt = s[:category] ? "under #{s[:category]} " : ""
+  line1 = "%{handle}%{date}%{author}added an image %{abt}at %{link}"
+  line2 = "%{handle}%{title} - %{desc}"
+  make_stream(line1, line2, s, :author => author, :abt => abt)
+end
+
+rss_type :trac do |s|
+  author = s[:author].sub(/@\S+?\s*>/, "@...>") + ": " if s[:author]
+  line1 = "%{handle}%{date}%{author}%{title}%{at}%{link}"
+  line2 = nil
+  unless s[:item].title =~ /^(?:Changeset \[(?:[\da-f]+)\]|\(git commit\))/
+    line2 = "%{handle}%{date}%{desc}"
+  end
+  make_stream(line1, line2, s, :author => author)
+end
+
+rss_type :wiki do |s|
+  line1 = "%{handle}%{date}%{title}%{at}%{link}"
+  line1 << "has been edited by %{author}. %{desc}"
+  make_stream(line1, nil, s)
+end
+
+rss_type :"/." do |s|
+  dept = "(from the #{s[:item].slash_department} dept) " rescue nil
+  sec = " in section #{s[:item].slash_section}" rescue nil
+  line1 = "%{handle}%{date}%{dept}%{title}%{at}%{link} "
+  line1 << "(posted by %{author}%{sec})"
+  make_stream(line1, nil, s, :dept => dept, :sec => sec)
+end

data/data/rbot/languages/finnish.lang

@@ -0,0 +1,50 @@
+okay:
+  okei
+  selvä :)
+  ok!
+  tehty
+  toki
+  valmis
+dunno:
+  mitäh?
+  en tiedä
+  emt
+  ei hajuakaan
+  ei tietoa
+  hä?
+  häh?
+  älä multa kysy
+dunno_about_X:
+  en tiedä mikä %s on
+  mikä on %s?
+  %s? mikä se on?
+insult:
+  %s: :(
+  %s: vihaan sua :(
+  %s: kuole senkin paska!
+  %s: nyt loukkasit minua :'(
+hello:
+  moi :)
+  terve
+  hei
+  päivää
+hello_X:
+  terve %s :)
+  %s: terve
+  %s: moi :)
+  %s: hei
+  moi %s
+  %s: mitä kuuluu?
+welcome:
+  ole hyvä :)
+thanks:
+  kiitti
+  kiitos :)
+  tänks
+thanks_X:
+  %s: kiitos
+  %s: kiitti :)
+quit:
+  moikka
+  hyvästi
+  näkemiin

data/data/rbot/plugins/alias.rb

@@ -38,8 +38,8 @@ class AliasPlugin < Plugin
 
   def initialize
     super
-    @data_path = "#{@bot.botclass}/alias/"
-    @data_file = "#{@data_path}/aliases.yaml"
+    @data_path = datafile
+    @data_file = File.join(@data_path, 'aliases.yaml')
     # hash of alias => command entries
     data = nil
     aliases = if File.exist?(@data_file) &&
@@ -58,10 +58,10 @@ class AliasPlugin < Plugin
 	warning _("Invalid alias entry %{alias} : %{command} in %{filename}: %{reason}") %
                 {:alias => a, :command => c, :filename => @data_file, :reason => $1}
       end
-    end 
-  end 
+    end
+  end
 
-  def save 
+  def save
     FileUtils.mkdir_p(@data_path)
     Utils.safe_save(@data_file) {|f| f.write @aliases.to_yaml}
   end
@@ -110,7 +110,7 @@ class AliasPlugin < Plugin
     command.scan(/<(\w+)>/).flatten.to_set ==
       text.split.grep(/\A[:*](\w+)\Z/) {$1}.to_set or
       raise AliasDefinitionError.new(_('The arguments in alias must match the substitutions in command, and vice versa'))
-    
+
     begin
       map text, :action => :"alias_handle<#{text}>", :auth_path => 'run'
     rescue

data/data/rbot/plugins/autorejoin.rb

@@ -1,26 +1,65 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: Autorejoin
+
 class AutoRejoinPlugin < Plugin
   Config.register Config::BooleanValue.new('rejoin.insult',
     :default => true,
     :desc => "Determines if the bot will insult whoever kicked it, after rejoin")
+  Config.register Config::BooleanValue.new('rejoin.kick',
+    :default => false,
+    :desc => "Determines if the bot will kick whoever kicked it, after rejoin")
+  Config.register Config::ArrayValue.new('rejoin.no_kick_list',
+    :default => ["owner"],
+    :desc => "List of botusers that can kick the bot without being kicked")
+
+
+  def initialize
+    super
+    @should_kick = Hash.new
+  end
 
   def help(plugin, topic="")
     "performs an automatic rejoin if the bot is kicked from a channel"
   end
 
   def kick(m)
+    password = m.channel.mode[:k].value
+
     if m.address?
+      if @bot.config['rejoin.kick'] and not @bot.config['rejoin.no_kick_list'].include? m.source.botuser.username
+        @should_kick[m.channel.downcase] = m.sourcenick
+      end
       r = rand(10)
       if r > 0
 	@bot.timer.add_once(r) {
-	  @bot.join m.channel
+	  @bot.join m.channel, password
 	  @bot.say(m.channel, @bot.lang.get("insult") % m.sourcenick) if @bot.config['rejoin.insult']
 	}
       else
-	@bot.join m.channel
+	@bot.join m.channel, password
 	@bot.say(m.channel, @bot.lang.get("insult") % m.sourcenick) if @bot.config['rejoin.insult']
       end
     end
   end
+
+  def modechange(m)
+    # if we got opped on a channel we want to kick somebody from,
+    # do the kicking
+
+    # getting opped on a channel is a channel mode change, so bail out if this
+    # is not a channel mode change
+    return unless m.target.kind_of? Channel
+    # bail out if we are not op, too
+    return unless @bot.myself.is_op?(m.target)
+    # bail out if there's nobody to kick
+    to_kick = @should_kick.delete(m.target.downcase)
+    return unless to_kick
+    # kick the evil user that kicked us
+    @bot.kick m.target, to_kick, _("for kicking me out earlier")
+  end
+
 end
 
 plugin = AutoRejoinPlugin.new