gorp 0.22.1 → 0.22.2

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.22.1"
+  s.version = "0.22.2"
 
   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-09}
+  s.date = %q{2010-01-17}
   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/rails.env

@@ -35,3 +35,7 @@ if File.exist? vendor_rails
     end
   end
 end
+
+module Gem
+  @loaded_stacks = Hash.new { |h,k| h[k] = [] }
+end

data/lib/gorp/rails.rb

@@ -141,7 +141,7 @@ module Gorp
               open('Gemfile','w') {|file| file.write gem}
             end
 
-            cmd 'gem bundle'
+            cmd 'gem bundle --only default'
           else
             system 'mkdir -p vendor/gems'
             cmd "ln -s #{$rails} vendor/rails"
@@ -167,11 +167,17 @@ module Gorp
     end
 
     # stop a server if it is currently running
-    def self.stop_server
-      return unless $server
-      Process.kill "INT", $server
-      Process.wait($server)
-      $server = nil
+    def self.stop_server(restart=false)
+      if !restart and $cleanup
+        $cleanup.call
+        $cleanup = nil
+      end
+
+      if $server
+        Process.kill "INT", $server
+        Process.wait($server)
+        $server = nil
+      end
     end
 
     # start/restart a rails server in a separate process
@@ -179,7 +185,7 @@ module Gorp
       if $server
         log :server, 'restart'
 	$x.h3 'Restart the server.'
-        Gorp::Commands.stop_server
+        Gorp::Commands.stop_server(true)
       else
         log :CMD, 'ruby script/server'
 	$x.h3 'Start the server.'

data/lib/gorp/test.rb

@@ -177,6 +177,33 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
   end
 
   def html_fault fault
+    if $standalone
+      puts fault
+      x = $x
+    else
+      x = Builder::XmlMarkup.new(:indent => 2)
+    end
+
+    tickets = {
+      'rails' => 'https://rails.lighthouseapp.com/projects/8994/tickets/',
+      'ruby'  => 'http://redmine.ruby-lang.org/issues/show/'
+    }
+
+    if fault.respond_to? :location
+      x.pre fault.message.sub(".\n<false> is not true",'') +
+        "\n\nTraceback:\n  " + fault.location.join("\n  "),
+        :class=>'traceback'
+    else
+      if fault.message =~ /RuntimeError: Ticket (\w+):(\d+): (.*)/ 
+        x.p :class => 'traceback' do
+          x.a "Ticket #{$2}", :href => tickets[$1]+$2
+          x.text! ': ' + $3
+        end
+      else
+        x.pre fault.message, :class=>'traceback'
+      end
+    end
+
     if fault.test_name =~ /^test_([\d.]+)_.*\(\w+\)$/
       name = $1
       sections = @@sections
@@ -186,27 +213,7 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       sections[:contents][/<a href="#section-#{name}"()>/,1] = 
         ' style="color:red; font-weight:bold"'
 
-      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)
-      if fault.respond_to? :location
-        x.pre fault.message.sub(".\n<false> is not true",'') +
-          "\n\nTraceback:\n  " + fault.location.join("\n  "),
-          :class=>'traceback'
-      else
-        if fault.message =~ /RuntimeError: Ticket (\w+):(\d+): (.*)/ 
-          x.p :class => 'traceback' do
-            x.a "Ticket #{$2}", :href => tickets[$1]+$2
-            x.text! ': ' + $3
-          end
-        else
-          x.pre fault.message, :class=>'traceback'
-        end
-      end
       sections[name][/<\/a>()/,1] = x.target!
 
       # add to the todos
@@ -233,7 +240,6 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
   def html_summary elapsed
     # terminate server
     Gorp::Commands.stop_server
-    $cleanup.call if $cleanup
 
     open(File.join($WORK, "#{$output}.html"),'w') do |output|
       sections = @@sections
@@ -283,11 +289,14 @@ end
 # Produce output for standalone scripts
 at_exit do
   next if $output
+  $standalone = true
+
   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
 

data/lib/version.rb

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