X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=3d4a054832f27c0f8d737af47fca708ebb860612;hb=7cd9be2587b25a8f2db06d8d933fcd3e20be5d06;hp=9af50916cda67e8a76ffac12877bf01ebfa60ebb;hpb=20b78c45b2e514c9c022e25c7c1d6b0cb0f3769c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 9af50916..3d4a0548 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,53 +21,77 @@
 # 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.
 
+$KCODE = 'u'
+
 $VERBOSE=true
 
 require 'etc'
 require 'getoptlong'
 require 'fileutils'
-require 'rbconfig'
 
-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
-  
-$debug = true
-$version="0.9.8"
+$version="0.9.10-svn"
 $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],
-  ["--version", "-v", GetoptLong::NO_ARGUMENT]
+  ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+  ["--trace",  "-t", GetoptLong::REQUIRED_ARGUMENT],
+  ["--version", "-v", GetoptLong::NO_ARGUMENT],
+  ["--background", "-b", 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
 }
 
+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
+
+defaultlib = File.expand_path(File.dirname($0) + '/../lib')
+
+if File.directory? "#{defaultlib}/rbot"
+  unless $:.include? defaultlib
+    $:.push defaultlib
+  end
+end
+  
+begin
+  require 'rbot/ircbot'
+rescue LoadError => e
+  puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"
+  puts e
+  exit 2
+end
+
 if ($opts["version"])
   puts "rbot #{$version}"
   exit 0
 end
 
-if(bot = Irc::IrcBot.new(ARGV.shift))
-  if($opts["help"])
-    # query bot help from the commandline
-    puts bot.help($opts["help"])
-  else
-    # just run the bot
-    bot.mainloop
-  end
+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 "  -b, --background   background (daemonize) the bot"
+  puts "config directory defaults to ~/.rbot"
+  exit 0
+end
+
+if(bot = Irc::IrcBot.new(ARGV.shift, :argv => orig_opts))
+  # just run the bot
+  bot.mainloop
 end