git/svn: check if our git rev corresponds to some svn rev

[user/henk/code/ruby/rbot.git] / bin / rbot

diff --git a/bin/rbot b/bin/rbot
index 14b57d7ceacdf64e3ccd70bcef3d479b99610a36..98bc333938d2bb9168b88487b095f7b1e44c6358 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,30 +21,87 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# Most of the string processing across rbot is done against IRC messages, which
+# do not have a well-defined encoding. Although many clients are now using
+# UTF-8, there is no guarantee that an arbitrary string received from IRC will
+# be UTF-8 encoded. We have to force ASCII (byte-wise/charset agnostic)
+# matching because otherwise some strings can give problems: in particular, for
+# example, the bytesequence "\340\350\354\362\371" (that is the aeiou vowels,
+# each with a grave accent) will cause the string to be considered up to the
+# "\354" (i with grave accent) only: so either the rest of the message is
+# ignored, or the matching fails.
+$KCODE = 'a'
+
 $VERBOSE=true
 
 require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version="0.9.10-svn"
+$version="0.9.11-svn"
 $opts = Hash.new
 
+if $version =~ /svn/
+  if defined?(SVN_DIR) and File.exists?(File.join(SVN_DIR, '.git'))
+    $version.sub!('svn', 'git')
+
+    git_out = `git status`
+
+    git_out.match(/^# On branch (.*)\n/)
+    branch = $1.dup || "unknown"
+    changed = git_out.match(/^# Change(.*)\n/)
+    rev = "revision "
+    git_out = `git log -1 --pretty=format:"%h%n%b"`.split("\n")
+    rev << git_out.first
+    if git_out.last.match(/^git-svn-id: \S+@(\d+)/)
+      rev << "(svn #{$1})"
+    end
+    rev << ", local changes" if changed
+
+    $version << " (#{branch} branch, #{rev})"
+  else
+    up = File.dirname(__FILE__) + "/.."
+    rev = " (unknown revision)"
+    begin
+      svn_out = `svn info #{up}`
+      if svn_out =~ /Last Changed Rev: (\d+)/
+        rev = " (revision #{$1}"
+      end
+      svn_st = `svn st #{up}`
+      if svn_st =~ /^[MDA] /
+        rev << ", local changes"
+      end
+      rev << ")"
+    rescue => e
+      puts e.inspect
+    end
+    $version += rev
+  end
+end
+
 orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
+  ["--background", "-b", GetoptLong::NO_ARGUMENT],
   ["--debug", "-d", GetoptLong::NO_ARGUMENT],
   ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+  ["--loglevel",  "-l", GetoptLong::REQUIRED_ARGUMENT],
   ["--trace",  "-t", GetoptLong::REQUIRED_ARGUMENT],
+  ["--pidfile", "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--version", "-v", GetoptLong::NO_ARGUMENT]
 )
 
 $debug = false
+$daemonize = false
+
 opts.each {|opt, arg|
   $debug = true if(opt == "--debug")
+  $daemonize = true if(opt == "--background")
   $opts[opt.sub(/^-+/, "")] = arg
 }
 
+$cl_loglevel = $opts["loglevel"].to_i if $opts["loglevel"]
+
 if ($opts["trace"])
   set_trace_func proc { |event, file, line, id, binding, classname|
     if classname.to_s == $opts["trace"]
@@ -57,7 +114,7 @@ defaultlib = File.expand_path(File.dirname($0) + '/../lib')
 
 if File.directory? "#{defaultlib}/rbot"
   unless $:.include? defaultlib
-    $:.push defaultlib
+    $:.unshift defaultlib
   end
 end
   
@@ -79,11 +136,13 @@ if ($opts["help"])
   puts "  -h, --help         this message"
   puts "  -v, --version      version information"
   puts "  -d, --debug        enable debug messages"
+  puts "  -b, --background   background (daemonize) the bot"
+  puts "  -p, --pidfile      write the bot pid to this file"
   puts "config directory defaults to ~/.rbot"
   exit 0
 end
 
-if(bot = Irc::IrcBot.new(ARGV.shift, :argv => orig_opts))
+if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
   # just run the bot
   bot.mainloop
 end