plugin(script): remove deprecated $SAFE

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

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 1c10e5af2506ab8795dfaac5d99578bd309b8e23..d6f6bcdeca67dfa74a38d2fac8f82f152991aba6 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -27,15 +27,15 @@ class Bot
       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
-        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
+        debug "loaded rubygems, looking for rbot version #{$version} (rbot-#{version})"
+        gem = Gem::Specification.find{|spec| spec.name == 'rbot' && spec.version.version == version}
+        if gem
+          path = gem.full_gem_path
           debug "installed via rubygems to #{path}"
           @@datadir = "#{path}/data/rbot"
           @@coredir = "#{path}/lib/rbot/core"