gorp 0.22.2 → 0.23.0

data/Manifest

@@ -0,0 +1,16 @@
+Manifest
+README
+Rakefile
+gorp.gemspec
+lib/gorp.rb
+lib/gorp/commands.rb
+lib/gorp/edit.rb
+lib/gorp/env.rb
+lib/gorp/net.rb
+lib/gorp/output.css
+lib/gorp/output.rb
+lib/gorp/rails.env
+lib/gorp/rails.rb
+lib/gorp/test.rb
+lib/gorp/xml.rb
+lib/version.rb

data/Rakefile

@@ -27,6 +27,7 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
     rack-mount
     rack-test
     rake
+    thor
     sqlite3-ruby
     tzinfo
   )

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.22.2"
+  s.version = "0.23.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = %q{2010-01-17}
+  s.date = %q{2010-02-25}
   s.description = %q{    Enables the creation of scenarios that involve creating a rails project,
     starting and stoppping of servers, generating projects, editing files,
     issuing http requests, running of commands, etc.  Output is captured as
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack-mount>, [">= 0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
     else
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack-mount>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
     end
@@ -61,6 +63,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack-mount>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
   end

data/lib/gorp/commands.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'builder'
-require 'open3'
 require 'time'
 
 module Gorp
@@ -50,9 +49,10 @@ module Gorp
       $x.p message.gsub(/(^|\n)\s+/, ' ').strip, :class=>'overview'
     end
 
-    def desc message
-      $x.p message, :class=>'desc'
+    def note message
+      $x.p message, :class=>'note'
     end
+    alias :desc :note
 
     def log type, message
       Gorp.log type, message
@@ -89,11 +89,11 @@ module Gorp
       end
     end
 
-    def db statement, hilight=[]
+    def db statement, highlight=[]
       log :db, statement
       $x.pre "sqlite3> #{statement}", :class=>'stdin'
       cmd = "sqlite3 --line db/development.sqlite3 #{statement.inspect}"
-      popen3 cmd, hilight
+      popen3 cmd, highlight
     end
 
     def ruby args
@@ -109,14 +109,61 @@ module Gorp
     end
 
     def console script
+      if File.exist? 'script/rails'
+        console_cmd = 'script/rails console'
+      else
+        console_cmd = 'script/console'
+      end
+
       open('tmp/irbrc','w') {|fh| fh.write('IRB.conf[:PROMPT_MODE]=:SIMPLE')}
-      cmd "echo #{script.inspect} | IRBRC=tmp/irbrc ruby script/console"
+      if RUBY_PLATFORM =~ /cygwin/i
+        open('tmp/irbin','w') {|fh| fh.write(script.gsub('\n',"\n")+"\n")}
+        cmd "IRBRC=tmp/irbrc ruby #{console_cmd} < tmp/irbin"
+        FileUtils.rm_rf 'tmp/irbin'
+      else
+        cmd "echo #{script.inspect} | IRBRC=tmp/irbrc ruby #{console_cmd}"
+      end
       FileUtils.rm_rf 'tmp/irbrc'
     end
 
-    def cmd args, hilight=[]
-      log :cmd, args
-      $x.pre args, :class=>'stdin'
+    def generate *args
+      if args.length == 1
+        ruby "script/generate #{args.first}"
+      else
+        if args.last.respond_to? :keys
+          args.push args.pop.map {|key,value| "#{key}:#{value}"}.join(' ')
+        end
+        args.map! {|arg| arg.inspect.include?('\\') ? arg.inspect : arg}
+        ruby "script/generate #{args.join(' ')}"
+      end
+    end
+
+    def runner *args
+      ruby "script/runner #{args.join(' ')}"
+    end
+
+    def cmd args, opts={}
+      if args =~ /^ruby script\/(\w+)/ and File.exist?('script/rails')
+        unless File.exist? "script/#{$1}"
+          args.sub! 'ruby script/performance/', 'ruby script/'
+          args.sub! 'ruby script/', 'ruby script/rails '
+        end
+      end
+
+      if RUBY_PLATFORM =~ /w32/
+        args.gsub! '/', '\\' unless args =~ /http:/
+	args.sub! /^cp -v/, 'xcopy /i /f /y'
+	args.sub! /^ls -p/, 'dir/w'
+	args.sub! /^ls/, 'dir'
+	args.sub! /^cat/, 'type'
+      end
+
+      as = opts[:as] || args
+      as = as.sub('ruby script/rails ', 'rails ')
+
+      log :cmd, as
+      $x.pre as, :class=>'stdin'
+
       if args == 'rake db:migrate'
 	Dir.chdir 'db/migrate' do
 	  date = '20100301000000'
@@ -128,22 +175,31 @@ module Gorp
 	end
       end
       args += ' -C' if args == 'ls -p'
-      popen3 args, hilight
+      popen3 args, opts[:highlight] || []
     end
 
-    def popen3 args, hilight=[]
+    def popen3 args, highlight=[]
       Open3.popen3(args) do |pin, pout, perr|
 	terr = Thread.new do
-	  $x.pre! perr.readline.chomp, :class=>'stderr' until perr.eof?
+          begin
+	    $x.pre! perr.readline.chomp, :class=>'stderr' until perr.eof?
+          rescue EOFError
+          end
 	end
 	pin.close
 	until pout.eof?
-	  line = pout.readline
-	  if hilight.any? {|pattern| line.include? pattern}
+          begin
+	    line = pout.readline
+          rescue EOFError
+            break
+          end
+
+	  if highlight.any? {|pattern| line.include? pattern}
 	    outclass='hilight'
 	  elsif line =~ /\x1b\[\d/
-	    line.gsub! /\x1b\[1m\x1b\[3\dm(.*?)\x1b\[0m/, '\1'
 	    outclass = 'logger'
+	    outclass = 'stderr' if line =~ /\x1b\[31m/
+	    line.gsub! /(\x1b\[1m)?\x1b\[3\dm(.*?)\x1b\[0m/, '\2'
 	  else
 	    outclass='stdout'
 	  end

data/lib/gorp/edit.rb

@@ -7,6 +7,29 @@ class String
   end
 end
 
+unless defined? instance_exec # Rails, Ruby 1.9
+  class Proc #:nodoc:
+    def bind(object)
+      block, time = self, Time.now
+      (class << object; self end).class_eval do
+        method_name = "__bind_#{time.to_i}_#{time.usec}"
+        define_method(method_name, &block)
+        method = instance_method(method_name)
+        remove_method(method_name)
+        method
+      end.bind(object)
+    end
+  end
+
+  module Gorp
+    module StringEditingFunctions
+      def instance_exec(*arguments, &block)
+        block.bind(self)[*arguments]
+      end
+    end
+  end
+end
+
 module Gorp
   module StringEditingFunctions
     def highlight
@@ -43,7 +66,7 @@ module Gorp
       end
     end
 
-    def edit(from, *options)
+    def edit(from, *options, &block)
       if from.instance_of? String
         from = Regexp.new('.*' + Regexp.escape(from) + '.*')
       end
@@ -52,21 +75,23 @@ module Gorp
 
       sub!(from) do |base|
         base.extend Gorp::StringEditingFunctions
-        yield base if block_given?
+        base.instance_exec(base, &block) if block_given?
         base.highlight if options.include? :highlight
         base.mark(options.last[:mark]) if options.last.respond_to? :keys
         base
       end
     end
 
-    def dcl(name, *options)
+    def dcl(name, *options, &block)
+      options[-1] = {:mark => name} if options.last == :mark
+
       re = Regexp.new '^(\s*)(class|def|test)\s+"?' + name +
         '"?.*?\n\1end\n', Regexp::MULTILINE
       raise IndexError.new('regexp not matched') unless match(re)
 
       self.sub!(re) do |lines|
         lines.extend Gorp::StringEditingFunctions
-        yield lines if block_given?
+        lines.instance_exec(lines, &block) if block_given?
         lines.mark(options.last[:mark]) if options.last.respond_to? :[]
         lines
       end
@@ -106,8 +131,8 @@ module Gorp
   end
 end
 
-def edit filename, tag=nil
-  $x.pre "edit #{filename}", :class=>'stdin'
+def edit filename, tag=nil, &block
+  $x.pre "edit #{filename.gsub('/',FILE_SEPARATOR)}", :class=>'stdin'
 
   stale = File.mtime(filename) rescue Time.now-2
   data = open(filename) {|file| file.read} rescue ''
@@ -115,7 +140,7 @@ def edit filename, tag=nil
 
   begin
     data.extend Gorp::StringEditingFunctions
-    yield data if block_given?
+    data.instance_exec(data, &block) if block_given?
 
     # ensure that the file timestamp changed
     now = Time.now
@@ -136,18 +161,18 @@ def edit filename, tag=nil
     log :edit, filename
 
     include = tag.nil?
-    hilight = false
+    highlight = false
     data.split("\n").each do |line|
       if line =~ /START:(\w+)/
         include = true if $1 == tag
       elsif line =~ /END:(\w+)/
         include = false if $1 == tag
       elsif line =~ /START_HIGHLIGHT/
-        hilight = true
+        highlight = true
       elsif line =~ /END_HIGHLIGHT/
-        hilight = false
+        highlight = false
       elsif include
-        if hilight or ! before.include?(line)
+        if highlight or ! before.include?(line)
           outclass='hilight'
         else
           outclass='stdout'

data/lib/gorp/env.rb

@@ -1,6 +1,16 @@
 require 'fileutils'
 require 'pathname'
 
+unless RUBY_PLATFORM =~ /mingw32/
+  require 'open3'
+  FILE_SEPARATOR = '/'
+  DEV_NULL = '/dev/null'
+else
+  require 'win32/open3'
+  FILE_SEPARATOR = '\\'
+  DEV_NULL = 'NUL'
+end
+
 # determine port
 if ARGV.find {|arg| arg =~ /--port=(\d+)/}
   $PORT=$1.to_i
@@ -34,17 +44,21 @@ module Gorp
     cmd "#{$ruby} -v"
     cmd 'gem -v'
     Dir.chdir(File.join($WORK, $rails_app.to_s)) do
-      caches = Dir['vendor/gems/ruby/*/cache']
-      if caches.empty?
+      if $bundle
+        cmd 'bundle show'
+      else
         cmd 'gem list'
         cmd 'echo $RUBYLIB | sed "s/:/\n/g"'
-      else
-        cmd 'gem list | grep "^bundler "'
-        caches.each {|cache| cmd "ls #{cache}"}
       end
     end
 
-    cmd Gorp.which_rails($rails) + ' -v'
+    if File.exist? 'Gemfile'
+      rake 'about'
+    elsif File.exist? 'script/rails'
+      cmd 'ruby script/rails application -v'
+    else
+      cmd Gorp.which_rails($rails) + ' -v'
+    end
  
     if $rails != 'rails'
       Dir.chdir($rails) do
@@ -61,11 +75,13 @@ module Gorp
         end
       end
     end
+  rescue
   end
 
   def self.log type, message
     type = type.to_s.ljust(5).upcase
     $stdout.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S] #{type} #{message}")
+    $stdout.flush
   end
 
   def self.path *segments

data/lib/gorp/net.rb

@@ -108,8 +108,8 @@ def post path, form, options={}
 
       # find matching button by action
       xform = xforms.find do |element|
-        next unless element.attribute('action').to_s.include?('?')
-        query = CGI.parse(URI.parse(element.attribute('action').to_s).query)
+        next unless element['action'].include?('?')
+        query = CGI.parse(URI.parse(element['action']).query)
         query.all? {|key,values| values.include?(form[key].to_s)}
       end
 
@@ -117,7 +117,7 @@ def post path, form, options={}
       xform ||= xforms.find do |element|
         form.all? do |name, value| 
           element.search('.//input | .//textarea | ..//select').any? do |input|
-            input.attribute('name').to_s==name.to_s
+            input['name']==name.to_s
           end
         end
       end
@@ -126,16 +126,15 @@ def post path, form, options={}
       xform ||= xforms.find do |element|
         form.all? do |name, value| 
           element.search('.//input[@type="submit"]').any? do |input|
-            input.attribute('value').to_s==form['submit']
+            input['value']==form['submit']
           end
         end
       end
 
       # match based on action itself
       xform ||= xforms.find do |element|
-        form.all? do |name, value| 
-          element.attribute('action').to_s.include?(path)
-        end
+        action=CGI.unescape(element['action'])
+        form.all? {|name, value| action.include? "#{name}=#{value}"}
       end
 
       # look for a commit button
@@ -143,8 +142,8 @@ def post path, form, options={}
 
       return unless xform
 
-      path = xform.attribute('action').to_s unless
-        xform.attribute('action').to_s.empty?
+      path = xform['action'] unless xform['action'].empty?
+      path = CGI::unescapeHTML(path)
       $x.pre "post #{path}", :class=>'stdin'
 
       $x.ul do

data/lib/gorp/output.css

@@ -19,8 +19,8 @@ ul a:hover {text-decoration: underline; color: #000;
 a.toc h2 {background-color: #981A21; color:#FFF; padding: 6px}
 ul a:visited {color: #000}
 h2 {clear: both}
-p.desc {font-style: italic}
+p.note {font-style: italic}
 p.overview {border-width: 2px; border-color: #000;
   border-style: solid; border-radius: 4em;
   background-color: #CCF; margin: 1.5em 1.5em; padding: 1em 2em; 
--webkit-border-radius: 4em; -moz-border-radius: 4em;}
+-webkit-border-radius: 1.5em; -moz-border-radius: 4em;}

data/lib/gorp/output.rb

@@ -11,7 +11,7 @@ at_exit do
   $x.html :xmlns => 'http://www.w3.org/1999/xhtml' do
     $x.header do
       $x.title $title
-      $x.meta 'http-equiv'=>'text/html; charset=UTF-8'
+      $x.meta 'charset'=>'utf-8'
       $x.style :type => "text/css" do
         open(File.join(File.dirname(__FILE__), 'output.css')) do |file|
           $x.text! file.read.gsub(/^/, '      ')

data/lib/gorp/rails.env

@@ -5,13 +5,16 @@
 # What it does is ensure that requires of things like 'active_script' are
 # satisfied by the vendored rails, and not by whatever gems you have
 # installed.
+#
+# if vendor/rails is not present, the provided boot.rb procedure will be run
+# unchanged.  If bundler is ever run on this application, this file will be
+# overwritten, and therefore will not interfere with bundling operations.
 
-vendor = File.expand_path(File.dirname(File.dirname(__FILE__)))
-vendor_rails = File.join(vendor, 'rails')
+require 'rubygems'
 
-if File.exist? vendor_rails
-  require 'rubygems'
+vendor_rails = File.expand_path('../../vendor/rails', __FILE__)
 
+if File.exist? vendor_rails
   Dir.chdir(vendor_rails) do
     rails_version = open('railties/lib/rails/version.rb') do |file|
       eval(file.read.gsub(/\s*(module|end).*\n/, '').downcase)
@@ -34,8 +37,17 @@ if File.exist? vendor_rails
       Gem.source_index.add_spec spec
     end
   end
-end
 
-module Gem
-  @loaded_stacks = Hash.new { |h,k| h[k] = [] }
+  module Gem
+    @loaded_stacks = Hash.new { |h,k| h[k] = [] }
+  end
+
+  module Bundler
+    def self.require *args
+    end
+  end
+else
+  require 'bundler'
+  Bundler.setup
 end
+

data/lib/gorp/rails.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'open3'
 require 'builder'
 require 'stringio'
 require 'time'
@@ -45,21 +44,26 @@ end
 
 # verify version of rails
 if $rails =~ /^rails( |$)/
-  `#{$rails} -v 2>/dev/null`
+  `#{$rails} -v 2>#{DEV_NULL}`
 else
-  `ruby #{$rails}/railties/bin/rails -v 2>/dev/null`
+  `ruby #{$rails}/railties/bin/rails -v 2>#{DEV_NULL}`
 end
 
 if $?.success?
   # setup vendored environment
-  FileUtils.mkdir_p File.join($WORK, 'vendor', 'gems')
   FileUtils.rm_f File.join($WORK, 'vendor', 'rails')
   if $rails =~ /^rails( |$)/
-    FileUtils.rm_f File.join($WORK, 'vendor', 'gems', 'environment.rb')
+    FileUtils.rm_f File.join($WORK, '.bundle', 'environment.rb')
   else
-    FileUtils.ln_s $rails, File.join($WORK, 'vendor', 'rails')
+    FileUtils.mkdir_p File.join($WORK, 'vendor')
+    begin
+      FileUtils.ln_s $rails, File.join($WORK, 'vendor', 'rails')
+    rescue NotImplementedError
+      FileUtils.cp_r $rails, File.join($WORK, 'vendor', 'rails')
+    end
+    FileUtils.mkdir_p File.join($WORK, '.bundle')
     FileUtils.cp File.join(File.dirname(__FILE__), 'rails.env'),
-      File.join($WORK, 'vendor', 'gems', 'environment.rb')
+      File.join($WORK, '.bundle', 'environment.rb')
   end
 else
   puts "Install rails or specify path to git clone of rails as the " + 
@@ -67,7 +71,10 @@ else
   Process.exit!
 end
 
-$bundle = ARGV.include?('bundle') || ARGV.include?('--bundle')
+# http://redmine.ruby-lang.org/issues/show/2717
+$bundle = File.exist?(File.join($rails, 'Gemfile'))
+$bundle = true  if ARGV.include?('--bundle')
+$bundle = false if ARGV.include?('--vendor')
 
 module Gorp
   # determine which version of rails is running
@@ -89,10 +96,11 @@ module Gorp
       log :rails, name
 
       # determine how to invoke rails
-      rails = Gorp.which_rails $rails
+      rails = Gorp.which_rails($rails)
+      rails.sub! 'ruby ', 'ruby -rubygems '
 
-      opt = ($bundle ? ' --dev' : '')
-      $x.pre "#{rails} #{name}#{opt}", :class=>'stdin'
+      opt = (ARGV.include?('--dev') ? ' --dev' : '')
+      $x.pre "#{rails.gsub('/',FILE_SEPARATOR)} #{name}#{opt}", :class=>'stdin'
       popen3 "#{rails} #{name}#{opt}"
 
       # canonicalize the reference to Ruby
@@ -111,42 +119,17 @@ module Gorp
 
       if $rails != 'rails' and File.directory?($rails)
         if File.exist? 'Gemfile'
-          if $bundle
-            if ENV['RUBYLIB'] or ARGV.include?('--system')
-              gem=open('Gemfile') {|file| file.read}
-
-              gem.sub! /gem "rails", :path => "(.*)"/ do
-                rails = "directory \"#{$1}\", :glob => '{*/,}*.gemspec'\n"
-
-                version = open("#{$1}/railties/lib/rails/version.rb") do |file|
-                  eval(file.read.gsub(/\s*(module|end).*\n/, '').downcase)
-                end
-
-                if ARGV.include?('--system')
-                  rails = <<-EOF.gsub(/^\s+/,'') + rails
-                    @environment.clear_sources
-                    @environment.add_source SystemGemSource.instance
-                  EOF
-                end
+          gemfile=open('Gemfile') {|file| file.read}
+          gemfile[/gem 'rails',()/,1] = " :path => #{$rails.inspect} #"
+          gemfile[/^()source/, 1] = '# '
 
-                if ENV['RUBYLIB']
-                  ENV['RUBYLIB'].split(File::PATH_SEPARATOR).each do |lib|
-                    rails << "directory #{lib.sub(/\/lib$/,'').inspect}\n"
-                  end
-                end
-
-                rails + "gem \"rails\", #{version.inspect}"
-              end
-
-              open('Gemfile','w') {|file| file.write gem}
-            end
-
-            cmd 'gem bundle --only default'
+          open('Gemfile','w') {|file| file.write gemfile}
+          if $bundle
+            cmd "bundle install"
           else
-            system 'mkdir -p vendor/gems'
             cmd "ln -s #{$rails} vendor/rails"
-            system "cp #{__FILE__.sub(/\.rb$/,'.env')} " +
-              "vendor/gems/environment.rb"
+            system "mkdir -p .bundle"
+            system "cp #{__FILE__.sub(/\.rb$/,'.env')} .bundle/environment.rb"
           end
         else
           system 'mkdir -p vendor'
@@ -174,10 +157,18 @@ module Gorp
       end
 
       if $server
-        Process.kill "INT", $server
-        Process.wait($server)
-        $server = nil
+        if $server.respond_to?(:process_id)
+          # Windows
+          Process.kill 1, $server.process_id
+          Process.waitpid($server.process_id) rescue nil
+        else
+          # UNIX
+          Process.kill "INT", $server
+          Process.wait($server)
+        end
       end
+    ensure
+      $server = nil
     end
 
     # start/restart a rails server in a separate process
@@ -191,7 +182,20 @@ module Gorp
 	$x.h3 'Start the server.'
       end
 
-      $server = fork
+      if File.exist? 'script/rails'
+	rails_server = "#{$ruby} script/rails server --port #{$PORT}"
+      else
+	rails_server = "#{$ruby} script/server --port #{$PORT}"
+      end
+
+      if RUBY_PLATFORM !~ /mingw32/
+        $server = fork
+      else
+        require 'win32/process'
+        $server = Process.create(:app_name => rails_server)
+        # :startup_info => {:stdout => File.open('NUL','w+')}
+      end
+
       if $server
 	# wait for server to start
 	60.times do
@@ -211,7 +215,7 @@ module Gorp
 	#
 	unless ENV['GATEWAY_INTERFACE'].to_s =~ /CGI/
 	  STDOUT.reopen '/dev/null', 'a'
-	  exec "#{$ruby} script/server --port #{$PORT}"
+          exec rails_server
 	end
 
 	# alternatives to the above, with backtrace

data/lib/gorp/test.rb

@@ -7,8 +7,8 @@ require 'gorp/commands'
 class Gorp::TestCase < Test::Unit::TestCase
   def self.suite
     # Deferred loading of Rails infrastructure
-    if File.exist? "#{$WORK}/vendor/gems/environment.rb"
-      require "#{$WORK}/vendor/gems/environment.rb"
+    if File.exist? "#{$WORK}/.bundle/environment.rb"
+      require "#{$WORK}/.bundle/environment.rb"
     end
 
     require 'active_support'
@@ -100,7 +100,7 @@ class Gorp::TestCase < Test::Unit::TestCase
     # reattach anchors
     @@sections.each do |key,value|
       next unless key =~ /^\d/
-      @@sections[key] = "<a class=\"toc\" name=\"section-#{key}\">#{value}"
+      @@sections[key] = "<a class=\"toc\" id=\"section-#{key}\">#{value}"
     end
 
     # report version
@@ -145,7 +145,7 @@ class Gorp::TestCase < Test::Unit::TestCase
   @@base = Object.new.extend(Gorp::Commands)
   include Gorp::Commands
 
-  %w(cmd get post rake ruby).each do |method|
+  %w(cmd get post rake ruby console).each do |method|
     define_method(method) do |*args, &block|
       before = $x.target.length
       @@base.send method, *args
@@ -186,7 +186,9 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
 
     tickets = {
       'rails' => 'https://rails.lighthouseapp.com/projects/8994/tickets/',
-      'ruby'  => 'http://redmine.ruby-lang.org/issues/show/'
+      'ruby'  => 'http://redmine.ruby-lang.org/issues/show/',
+      'bundler'  => 'http://github.com/carlhuda/bundler/issues/issue/',
+      'will_paginate' => 'http://github.com/mislav/will_paginate/issues#issue/'
     }
 
     if fault.respond_to? :location
@@ -220,10 +222,10 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       x = Builder::XmlMarkup.new(:indent => 2)
       x.li do
         x.a "Section #{name}", :href => "#section-#{name}"
-        if fault.message =~ /RuntimeError: Ticket (\d+): (.*)/ 
+        if fault.message =~ /RuntimeError: Ticket (\w+):(\d+): (.*)/ 
           x.text! '['
-          x.a "Ticket #{$1}", :href => tickets+$1
-          x.text! ']: ' + $2
+          x.a "Ticket #{$2}", :href => tickets[$1]+$2
+          x.text! ']: ' + $3
         else
           x.text! ': '
           x.tt fault.message.sub(".\n<false> is not true",'').

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 22
-    TINY  = 2
+    MINOR = 23
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.22.2
+  version: 0.23.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   type: :runtime