gorp 0.20.1 → 0.21.0

data/gorp.gemspec

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

@@ -28,8 +28,10 @@ module Gorp
     $style = Builder::XmlMarkup.new(:indent => 2)
 
     $semaphore = Mutex.new
-    def $x.pre! *args
-      $semaphore.synchronize { $x.pre *args }
+    class Builder::XmlMarkup
+      def pre! *args
+        $semaphore.synchronize { $x.pre *args }
+      end
     end
 
     def secsplit section
@@ -54,7 +56,7 @@ module Gorp
 
     def log type, message
       type = type.to_s.ljust(5).upcase
-      STDOUT.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S] #{type} #{message}")
+      $stdout.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S] #{type} #{message}")
     end
 
     def head number, title

data/lib/gorp/env.rb

@@ -24,3 +24,43 @@ require 'rbconfig'
 $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
 
 FileUtils.mkdir_p $WORK
+
+module Gorp
+  def self.dump_env
+    extend Commands
+    $x.pre Time.now.httpdate, :class=>'stdout'
+
+    cmd "#{$ruby} -v"
+    cmd 'gem -v'
+    Dir.chdir(File.join($WORK, $rails_app.to_s)) do
+      system 'pwd'
+      system 'ls vendor/gems/ruby/*/cache'
+      caches = Dir['vendor/gems/ruby/*/cache']
+      if caches.empty?
+        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 $rails != 'rails'
+      Dir.chdir($rails) do
+        log :cmd, 'git log -1'
+        $x.pre 'git log -1', :class=>'stdin'
+        `git log -1`.strip.split(/\n/).each do |line|
+          line.sub! /commit (\w{40})/,
+            'commit <a href="http://github.com/rails/rails/commit/\1">\1</a>'
+          if $1
+            $x.pre(:class=>'stdout') {$x << line.chomp}
+          else
+            $x.pre line.chomp, :class=>'stdout'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gorp/output.rb

@@ -84,30 +84,7 @@ at_exit do
       end
 
       $x.a(:class => 'toc', :id => 'env') {$x.h2 'Environment'}
-      $x.pre Time.now.httpdate, :class=>'stdout'
-
-      cmd "#{$ruby} -v"
-      cmd 'gem -v'
-      cmd 'gem list'
-      cmd 'echo $RUBYLIB | sed "s/:/\n/g"'
-
-      cmd Gorp.which_rails($rails) + ' -v'
-  
-      if $rails != 'rails'
-        Dir.chdir($rails) do
-          log :cmd, 'git log -1'
-          $x.pre 'git log -1', :class=>'stdin'
-          `git log -1`.strip.split(/\n/).each do |line|
-            line.sub! /commit (\w{40})/,
-              'commit <a href="http://github.com/rails/rails/commit/\1">\1</a>'
-            if $1
-              $x.pre(:class=>'stdout') {$x << line.chomp}
-            else
-              $x.pre line.chomp, :class=>'stdout'
-            end
-          end
-        end
-      end
+      Gorp.dump_env
 
       $x.a(:class => 'toc', :id => 'todos') {$x.h2 'Todos'}
       $x.ul :class => 'todos'

data/lib/gorp/rails.rb

@@ -153,6 +153,8 @@ module Gorp
           system "ln -s #{$rails} vendor/rails"
         end
       end
+
+      $rails_app = name
     end
 
     # start/restart a rails server in a separate process

data/lib/gorp/test.rb

@@ -265,6 +265,13 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       if env
         output.write('<a class="toc" id="env">')
         output.write(env)
+      else
+        $x = Builder::XmlMarkup.new(:indent => 2)
+        $x.a(:class => 'toc', :id => 'env') {$x.h2 'Environment'}
+        $stdout = StringIO.open('','w')
+        Gorp.dump_env
+        $stdout = STDOUT
+        output.write($x.target!)
       end
 
       if todos

data/lib/version.rb

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