X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=8fba53d6c3a908029532278635bbb52647068268;hb=7449580c5e83e290942ebe38cc157a339224e70d;hp=9b0de6775454d61f46fded6737b3a79cebb17449;hpb=2a96c9198c1f6e13407d0999083f6ce5e0bc06fa;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 9b0de677..8fba53d6 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,49 +21,99 @@
 # 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 'rbot/ircbot'
+require 'fileutils'
 
-$debug = true
-$version="0.9.8"
+$version="0.9.11-svn"
 $opts = Hash.new
 
-# print +message+ if debugging is enabled
-def debug(message=nil)
-  print "DEBUG: #{message}\n" if($debug && message)
-  #yield
+if $version =~ /svn/
+  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 =~ /^M /
+      rev << ", local changes"
+    end
+    rev << ")"
+  rescue => e
+    puts e.inspect
+  end
+  $version += rev
 end
 
+orig_opts = ARGV.dup
+
 opts = GetoptLong.new(
-  [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
-  [ "--help",  "-h", GetoptLong::OPTIONAL_ARGUMENT ]
+  ["--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],
+  ["--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
 }
 
-botclass = ARGV.shift
-user = Etc.getlogin
-botclass = "/home/#{user}/.rbot" unless(botclass);
-
-unless FileTest.directory? botclass
-  # TODO copy in samples/templates from install directory
-  puts "no #{botclass} directory found, creating from templates.."
-  # copy DATA/rbot/templates to botclass
+$cl_loglevel = $opts["loglevel"].to_i
 
+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
 
-if(bot = Irc::IrcBot.new(botclass))
-  if($opts["help"])
-    puts bot.help($opts["help"])
-  else
-    # run the bot
-    bot.mainloop
+defaultlib = File.expand_path(File.dirname($0) + '/../lib')
+
+if File.directory? "#{defaultlib}/rbot"
+  unless $:.include? defaultlib
+    $:.unshift 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 ($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