X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=b7a6207f7e09368189aae6d4ce484704eb63654e;hb=e91f8ebc7067fd8e46b1426f6d5b66e3349c7bd2;hp=6add221efa2e84874343c0f543f888cb011606fe;hpb=4342c61392590ea9b9f3fb648ab70d5f3c6a5a95;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 6add221e..b7a6207f 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,30 +21,67 @@
 # 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.9 svn"
+$version="0.9.11-svn"
 $opts = Hash.new
 
+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(
+  ["--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
 }
 
+$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"]
@@ -53,10 +90,19 @@ if ($opts["trace"])
   }
 end
 
+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 for loading\n - did you install rbot using setup.rb?"
+  puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"
+  puts e
   exit 2
 end
 
@@ -70,11 +116,12 @@ 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 "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