rbot now properly identifies as the 'next version svn', and the gem package is built...

diff --git a/Rakefile b/Rakefile
index 80b6dd8c32dd932cab12cceeebd819ced30525d7..00355b064cfc7c095bf46ca6e7535816c7a879ea 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ task :default => [:repackage]
 
 spec = Gem::Specification.new do |s|
   s.name = 'rbot'
-  s.version = '0.9.9'
+  s.version = '0.9.10'
   s.summary = <<-EOF
     A modular ruby IRC bot.
   EOF

diff --git a/bin/rbot b/bin/rbot
index 37ef427cfcbd071ce787cc6b5aee87b099788d30..14b57d7ceacdf64e3ccd70bcef3d479b99610a36 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -27,7 +27,7 @@ require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version="0.9.10"
+$version="0.9.10-svn"
 $opts = Hash.new
 
 orig_opts = ARGV.dup

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 01f66307b512085d9228665e08f6d7623d53522c..de7161692141573da8ea006df7326d3b99cdff1a 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}"