journal: simplified irc logging

[user/henk/code/ruby/rbot.git] / lib / rbot / rbotconfig.rb

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index a282d77090b1641f7dd4226bb772d2bda705ed44..eb55f96533e24eda007f39ce61e8c5c268b7e2f2 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -1,4 +1,5 @@
 module Irc
+class Bot
   module Config
     unless defined?(@@datadir)
       @@datadir = nil
@@ -26,12 +27,12 @@ module Irc
       begin
         debug "trying to load rubygems"
         require 'rubygems'
-        debug "loaded rubygems, looking for rbot-#$version"
-        if $version =~ /(.*)-svn\Z/
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
           version = $1
         else
           version = $version
         end
+        debug "loaded rubygems, looking for rbot version #{$version} (rbot-#{version})"
         gemname, gem = Gem.source_index.find{|name, spec| spec.name == 'rbot' && spec.version.version == version}
         debug "got gem #{gem}"
         if gem && path = gem.full_gem_path
@@ -66,3 +67,4 @@ module Irc
     end
   end
 end
+end