X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=d2863756af2cc712888f4065fbf5093db80f13c1;hb=e7558ab501d89ed4d04ff69b58344aec8de50844;hp=6f08fe5725bb3aa34068d1cc0b29a2709e119e1b;hpb=21949774b91eaec6ecde4eaa8ad121e2c0a36b87;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 6f08fe57..d2863756 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -23,22 +23,20 @@
 
 $VERBOSE=true
 
+require 'etc'
 require 'getoptlong'
-require 'rbot/ircbot'
+require 'fileutils'
 
-$debug = true
-$version="0.9.8"
+$version="0.9.9"
 $opts = Hash.new
 
-# print +message+ if debugging is enabled
-def debug(message=nil)
-  print "DEBUG: #{message}\n" if($debug && message)
-  #yield
-end
+orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
-  [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
-  [ "--help",  "-h", GetoptLong::OPTIONAL_ARGUMENT ]
+  ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+  ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+  ["--trace",  "-t", GetoptLong::REQUIRED_ARGUMENT],
+  ["--version", "-v", GetoptLong::NO_ARGUMENT]
 )
 
 opts.each {|opt, arg|
@@ -46,19 +44,37 @@ opts.each {|opt, arg|
   $opts[opt.sub(/^-+/, "")] = arg
 }
 
-botclass = ARGV.shift
-botclass = "rbotconf" unless(botclass);
+if ($opts["trace"])
+  set_trace_func proc { |event, file, line, id, binding, classname|
+    if classname.to_s == $opts["trace"]
+      printf "TRACE: %8s %s:%-2d %10s %8s\n", event, File.basename(file), line, id, classname
+    end
+  }
+end
+
+begin
+  require 'rbot/ircbot'
+rescue LoadError => e
+  puts "Error: couldn't find the rbot/ircbot module for loading\n - did you install rbot using install.rb?"
+  exit 2
+end
+
+if ($opts["version"])
+  puts "rbot #{$version}"
+  exit 0
+end
 
-unless FileTest.directory? botclass
-  # TODO copy in samples/templates from install directory
+if ($opts["help"])
+  puts "usage: rbot [options] [config directory]"
+  puts "  -h, --help         this message"
+  puts "  -v, --version      version information"
+  puts "  -d, --debug        enable debug messages"
+  puts "config directory defaults to ~/.rbot"
+  exit 0
 end
 
-if(bot = Irc::IrcBot.new(botclass))
-  if($opts["help"])
-    puts bot.help($opts["help"])
-  else
-    # run the bot
-    bot.mainloop
-  end
+if(bot = Irc::IrcBot.new(ARGV.shift, :argv => orig_opts))
+  # just run the bot
+  bot.mainloop
 end