From: Giuseppe Bilotta Date: Thu, 19 Jun 2008 16:38:07 +0000 (+0200) Subject: rbotconfig: be aware that -git versions also have revision information X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c6c8cb17afbaee0ccf1373d5b866d2d46efe4fcc;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git rbotconfig: be aware that -git versions also have revision information --- diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb index 97f8173e..692113a9 100644 --- a/lib/rbot/rbotconfig.rb +++ b/lib/rbot/rbotconfig.rb @@ -27,12 +27,12 @@ class Bot begin debug "trying to load rubygems" require 'rubygems' - debug "loaded rubygems, looking for rbot-#$version" - if $version =~ /(.*)-(svn|git)\Z/ + if $version =~ /^(.*)-git( .*)?$/ 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