Add get_cached method to httputil. No need to download the same page over and over...

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

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 01f66307b512085d9228665e08f6d7623d53522c..212df9902eecf05a7fce03c77d5f7e30d31879e3 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -16,7 +16,12 @@ module Irc
         debug "trying to load rubygems"
         require 'rubygems'
         debug "loaded rubygems, looking for rbot-#$version"
-        gemname, gem = Gem.source_index.find{|name, spec| spec.name == 'rbot' && spec.version.version == $version}
+        if $version =~ /(.*)-svn\Z/
+          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 "installed via rubygems to #{path}"
@@ -34,7 +39,7 @@ module Irc
         require 'rbot/pkgconfig'
         @@datadir = PKGConfig::DATADIR
       rescue LoadError
-        puts "fatal - no way to determine data dir"
+        error "fatal - no way to determine data dir"
         exit 2
       end
     end