gorp 0.21.2 → 0.22.0

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.21.2"
+  s.version = "0.22.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-08}
+  s.date = %q{2010-01-09}
   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

data/lib/gorp/commands.rb

@@ -55,12 +55,13 @@ module Gorp
     end
 
     def log type, message
-      type = type.to_s.ljust(5).upcase
-      $stdout.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S] #{type} #{message}")
+      Gorp.log type, message
     end
 
+    @@section_number = 0
     def head number, title
-      $section = "#{number} #{title}"
+      $section = "#{number} #{title}".strip
+      number ||= (@@section_number+=1)
       log '====>', $section
 
       $x.a(:class => 'toc', :id => "section-#{number}") {$x.h2 $section}
@@ -96,7 +97,11 @@ module Gorp
     end
 
     def ruby args
-      cmd "ruby #{args}"
+      if args == 'script/server'
+        restart_server
+      else
+        cmd "ruby #{args}"
+      end
     end
 
     def rake args
@@ -194,3 +199,21 @@ module Gorp
     end
   end
 end
+
+# 1.8.8dev workaround for http://redmine.ruby-lang.org/issues/show/2468
+x = Builder::XmlMarkup.new
+x.a('b')
+if x.target!.include?('*')
+  class Fixnum
+    def xchr(escape=true)
+      n = XChar::CP1252[self] || self
+      case n
+      when 0x9, 0xA, 0xD, (0x20..0xD7FF), (0xE000..0xFFFD), (0x10000..0x10FFFF)
+        XChar::PREDEFINED[n] or 
+          (n<128 ? n.chr : (escape ? "&##{n};" : [n].pack('U*')))
+      else
+        '*'
+      end
+    end
+  end
+end

data/lib/gorp/edit.rb

@@ -115,8 +115,9 @@ def edit filename, tag=nil
 
   begin
     data.extend Gorp::StringEditingFunctions
-    yield data
+    yield data if block_given?
 
+    # ensure that the file timestamp changed
     now = Time.now
     usec = now.usec/1000000.0
     sleep 1-usec if now-usec <= stale

data/lib/gorp/env.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pathname'
 
 # determine port
 if ARGV.find {|arg| arg =~ /--port=(\d+)/}
@@ -61,4 +62,13 @@ module Gorp
       end
     end
   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}")
+  end
+
+  def self.path *segments
+    Pathname.new($WORK).join(*segments).relative_path_from(Pathname.new($BASE))
+  end
 end

data/lib/gorp/output.rb

@@ -67,8 +67,6 @@ at_exit do
         end
       ensure
         if e.class != SystemExit
-	  $cleanup.call if $cleanup
-  
           # terminate server
           Gorp::Commands.stop_server
   
@@ -98,7 +96,7 @@ at_exit do
     "<ul class=\"todos\">\n#{$todos.target!.gsub(/^/,' '*6)}    </ul>"
   $x.target!.gsub! '<strong/>', '<strong></strong>'
   $x.target!.gsub! /(<textarea[^>]+)\/>/, '\1></textarea>'
-  log :WRITE, "#{$output}.html"
+  log :WRITE, Gorp.path("#{$output}.html")
   open("#{$WORK}/#{$output}.html",'w') { |file| file.write $x.target! }
   
   # run tests

data/lib/gorp/rails.rb

@@ -40,7 +40,7 @@ elsif File.directory?(ARGV.first.to_s.split(File::PATH_SEPARATOR).first.to_s)
 
   $rails = File.expand_path($rails)
 else
-  $rails = 'rails'
+  $rails = ENV['GORP_RAILS'] || 'rails'
 end
 
 # verify version of rails
@@ -67,7 +67,7 @@ else
   Process.exit!
 end
 
-$bundle = ARGV.include?('bundle') or ARGV.include?('--bundle')
+$bundle = ARGV.include?('bundle') || ARGV.include?('--bundle')
 
 module Gorp
   # determine which version of rails is running
@@ -176,11 +176,12 @@ module Gorp
 
     # start/restart a rails server in a separate process
     def restart_server
-      log :server, 'restart'
       if $server
+        log :server, 'restart'
 	$x.h3 'Restart the server.'
         Gorp::Commands.stop_server
       else
+        log :CMD, 'ruby script/server'
 	$x.h3 'Start the server.'
       end
 

data/lib/gorp/test.rb

@@ -4,34 +4,7 @@ require 'gorp/env'
 require 'gorp/rails'
 require 'gorp/commands'
 
-module Gorp
-  class BuilderTee < BlankSlate
-    def initialize(one, two)
-      @one = one
-      @two = two
-    end
-
-    def method_missing sym, *args, &block
-      if sym == :<<
-        @one << args.first
-        @two << args.first
-      else
-        @one.method_missing sym, *args, &block
-        @two.method_missing sym, *args, &block
-      end
-    end
-
-    def pre! *args
-      $semaphore.synchronize do
-        @one.pre *args
-        @two.pre *args
-      end
-    end
-  end
-end
-
 class Gorp::TestCase < Test::Unit::TestCase
-
   def self.suite
     # Deferred loading of Rails infrastructure
     if File.exist? "#{$WORK}/vendor/gems/environment.rb"
@@ -61,7 +34,13 @@ class Gorp::TestCase < Test::Unit::TestCase
   end
 
   def self.test(name, &block)
-    define_method("test_#{name.gsub(/\s+/,'_')}".to_sym, &block)
+    define_method("test_#{name.gsub(/\s+/,'_')}".to_sym) do
+      self.class.herald self, name
+      instance_eval &block
+    end
+  end
+
+  def self.herald instance, name
   end
 
   # micro DSL allowing the definition of optional tests
@@ -88,8 +67,9 @@ class Gorp::TestCase < Test::Unit::TestCase
   def ticket number, info
     return if info[:match] and not @raw =~ info[:match]
     return if block_given? and not yield(@raw)
+    info[:list] ||= :rails
 
-    fail "Ticket #{number}: #{info[:title]}"
+    fail "Ticket #{info[:list]}:#{number}: #{info[:title]}"
   end
 
   # read and pre-process $input.html (only done once, and cached)
@@ -99,6 +79,9 @@ class Gorp::TestCase < Test::Unit::TestCase
     input.force_encoding('utf-8') if input.respond_to? :force_encoding
     head, body, tail = input.split /<body>\s+|\s+<\/body>/m
 
+    # ruby 1.8.8 reverses the order
+    body.gsub! /<a (id="[-.\w]+") (class="\w+")>/,'<a \2 \1>'
+
     # split into sections
     @@sections = body.split(/<a class="toc" id="section-(.*?)">/)
     @@sections[-1], env = @@sections.last.split(/<a class="toc" id="env">/)
@@ -164,18 +147,13 @@ class Gorp::TestCase < Test::Unit::TestCase
 
   %w(cmd post rake ruby).each do |method|
     define_method(method) do |*args, &block|
-      begin
-        $y = Builder::XmlMarkup.new(:indent => 2)
-        $x = Gorp::BuilderTee.new($x, $y)
-        @@base.send method, *args
-
-        if block
-          @raw = $y.target!
-          @selected = HTML::Document.new(@raw).root.children
-          block.call
-        end
-      ensure
-        $x = $x.instance_eval { @one }
+      before = $x.target.length
+      @@base.send method, *args
+  
+      if block
+        @raw = $x.target![before..-1]
+        @selected = HTML::Document.new(@raw).root.children
+        block.call
       end
     end
   end
@@ -208,7 +186,10 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       sections[:contents][/<a href="#section-#{name}"()>/,1] = 
         ' style="color:red; font-weight:bold"'
 
-      tickets = 'https://rails.lighthouseapp.com/projects/8994/tickets/'
+      tickets = {
+        'rails' => 'https://rails.lighthouseapp.com/projects/8994/tickets/',
+        'ruby'  => 'http://redmine.ruby-lang.org/issues/show/'
+      }
 
       # provide details in the section itself
       x = Builder::XmlMarkup.new(:indent => 2)
@@ -217,10 +198,10 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
           "\n\nTraceback:\n  " + fault.location.join("\n  "),
           :class=>'traceback'
       else
-        if fault.message =~ /RuntimeError: Ticket (\d+): (.*)/ 
+        if fault.message =~ /RuntimeError: Ticket (\w+):(\d+): (.*)/ 
           x.p :class => 'traceback' do
-            x.a "Ticket #{$1}", :href => tickets+$1
-            x.text! ': ' + $2
+            x.a "Ticket #{$2}", :href => tickets[$1]+$2
+            x.text! ': ' + $3
           end
         else
           x.pre fault.message, :class=>'traceback'
@@ -251,7 +232,8 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
 
   def html_summary elapsed
     # terminate server
-    at_exit { Gorp::Commands.stop_server }
+    Gorp::Commands.stop_server
+    $cleanup.call if $cleanup
 
     open(File.join($WORK, "#{$output}.html"),'w') do |output|
       sections = @@sections
@@ -300,8 +282,12 @@ end
 
 # Produce output for standalone scripts
 at_exit do
-  next if !caller or caller.empty? or $output
-  source = File.basename(caller.first.split(/:/).first)
+  next if $output
+  if caller and !caller.empty?
+    source = File.basename(caller.first.split(':').first)
+  else
+    source = File.basename($0).split('.').first
+  end
   name = source.sub(Regexp.new(Regexp.escape(File.extname(source))+'$'), '')
   $output = name
 
@@ -309,16 +295,39 @@ at_exit do
   ObjectSpace.each_object(Class) do |c|
     next unless c.superclass == Gorp::TestCase
     suite << c.suite
+    def c.herald instance, name
+      instance.head nil, name
+    end
   end
 
   def suite.sections
     style = open(File.join(File.dirname(__FILE__), 'output.css')) {|fh| fh.read}
-    head = "<head><title>#{$output}</title><style>\n#{style}</style></head>"
-    {:head=>"<html>\n#{head}\n  ", :tail=>"\n</html>"}
+    head = "<html>\n<head>\n<title>#{$output}</title>\n<style></style>\n</head>"
+    $cleanup = Proc.new do
+      Dir['public/stylesheets/*.css'].each do |css|
+        File.open(css) {|file| style+= file.read}
+      end
+      head[/(<style><\/style>)/,1] = "<style>\n#{style}</style>"
+    end
+    {:head=>head, :tail=>"\n</html>"}
   end 
 
   require 'gorp/xml'
   require 'gorp/edit'
   require 'gorp/net'
+
+  class HTMLRunner
+    def output(something, *args)
+     if something.respond_to?(:passed?)
+       Gorp::Commands.stop_server
+       at_exit {puts "\n#{something}"}
+     end
+    end
+    def output_single(something, *args)
+    end
+  end
+
   HTMLRunner.run(suite)
+
+  Gorp.log :WRITE, Gorp.path($output+'.html')
 end

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 21
-    TINY  = 2
+    MINOR = 22
+    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.21.2
+  version: 0.22.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -05:00
+date: 2010-01-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency