gorp 0.7.2 → 0.8.0

data/Manifest

@@ -1,7 +1,8 @@
 README
 Rakefile
-Manifest
 gorp.gemspec
-lib/version.rb
 lib/gorp.rb
+lib/gorp/env.rb
 lib/gorp/test.rb
+lib/version.rb
+Manifest

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-11-24}
   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
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
     assertions based on selections (typically CSS) against the generated HTML.
 }
   s.email = %q{rubys@intertwingly.net}
-  s.extra_rdoc_files = ["README", "lib/version.rb", "lib/gorp.rb", "lib/gorp/test.rb"]
-  s.files = ["README", "Rakefile", "Manifest", "gorp.gemspec", "lib/version.rb", "lib/gorp.rb", "lib/gorp/test.rb"]
+  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
+  s.files = ["README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb", "Manifest"]
   s.homepage = %q{http://github.com/rubys/gorp}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/gorp.rb

@@ -8,6 +8,7 @@ require 'open3'
 require 'net/http'
 require 'builder'
 require 'stringio'
+require 'gorp/env'
 
 require 'rbconfig'
 $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
@@ -20,15 +21,11 @@ def section number, title, &steps
 end
 
 # verify that port is available for testing
-if (Net::HTTP.get_response('localhost','/',3000).code == '200' rescue false)
-  STDERR.puts 'local server already running on port 3000'
+if (Net::HTTP.get_response('localhost','/',$PORT).code == '200' rescue false)
+  STDERR.puts "local server already running on port #{$PORT}"
   exit
 end
 
-$BASE=File.expand_path(File.dirname(caller.last.split(':').first)) unless $BASE
-$WORK = File.join($BASE,'work')
-$DATA = File.join($BASE,'data')
-$CODE = File.join($DATA,'code')
 $x = Builder::XmlMarkup.new(:indent => 2)
 $toc = Builder::XmlMarkup.new(:indent => 2)
 $todos = Builder::XmlMarkup.new(:indent => 2)
@@ -101,7 +98,9 @@ def ruby args
 end
 
 def console script
-  cmd "echo #{script.inspect} | ruby script/console '--irb=irb -f'"
+  open('tmp/irbrc','w') {|file| file.write('IRB.conf[:PROMPT_MODE]=:SIMPLE')}
+  cmd "echo #{script.inspect} | IRBRC=tmp/irbrc ruby script/console"
+  FileUtils.rm_rf 'tmp/irbrc'
 end
 
 def cmd args, hilight=[]
@@ -376,7 +375,7 @@ def snap response, form={}
     name = xpath[/@(\w+)/,1]
     body.search("//#{xpath}").each do |element|
       next if element[name] =~ /^http:\/\//
-      element[name] = URI.join('http://localhost:3000/', element[name]).to_s
+      element[name] = URI.join("http://localhost:#{$PORT}/", element[name]).to_s
     end
   end
 
@@ -414,7 +413,7 @@ def post path, form
   if path.include? ':'
     host, port, path = URI.parse(path).select(:host, :port, :path)
   else
-    host, port = '127.0.0.1', 3000
+    host, port = '127.0.0.1', $PORT
   end
 
   Net::HTTP.start(host, port) do |http|
@@ -529,7 +528,7 @@ def restart_server
     60.times do
       sleep 0.5
       begin
-        status = Net::HTTP.get_response('localhost','/',3000).code
+        status = Net::HTTP.get_response('localhost','/',$PORT).code
         break if %(200 404).include? status
       rescue Errno::ECONNREFUSED
       end
@@ -539,7 +538,7 @@ def restart_server
       if File.exist?('config.ru')
         require 'rack'
         server = Rack::Builder.new {eval open('config.ru').read}
-        Rack::Handler::WEBrick.run(server, :Port => 3000)
+        Rack::Handler::WEBrick.run(server, :Port => $PORT)
       else
         # start server, redirecting stdout to a string
         $stdout = StringIO.open('','w')
@@ -616,8 +615,8 @@ at_exit do
       if ARGV.include? 'restore'
         log :snap, 'restore'
         Dir.chdir $BASE
-        FileUtils.rm_rf "work"
-        FileUtils.cp_r "snapshot", "work", :preserve => true
+        FileUtils.rm_rf $WORK
+        FileUtils.cp_r "snapshot", $WORK, :preserve => true
         Dir.chdir $WORK
         if $autorestart and File.directory? $autorestart
           Dir.chdir $autorestart
@@ -657,7 +656,7 @@ at_exit do
             log :snap, 'save'
             Dir.chdir $BASE
             FileUtils.rm_rf "snapshot"
-            FileUtils.cp_r "work", "snapshot", :preserve => true
+            FileUtils.cp_r $WORK, "snapshot", :preserve => true
           end
         end
       end
@@ -683,7 +682,7 @@ at_exit do
     "<ul class=\"todos\">\n#{$todos.target!.gsub(/^/,' '*6)}    </ul>"
   $x.target!.gsub! '<strong/>', '<strong></strong>'
   log :WRITE, "#{$output}.html"
-  open("#{$BASE}/#{$output}.html",'w') do |file| 
+  open("#{$WORK}/#{$output}.html",'w') do |file| 
     file.write <<-EOF.unindent(6)
       <!DOCTYPE html
       PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

data/lib/gorp/env.rb

@@ -0,0 +1,19 @@
+# determine port
+if ARGV.find {|arg| arg =~ /--port=(\d+)/}
+  $PORT=$1.to_i
+else
+  $PORT=3000
+end
+
+# base directories
+$BASE=File.expand_path(File.dirname(caller.last.split(':').first)) unless $BASE
+$DATA = File.join($BASE,'data')
+$CODE = File.join($DATA,'code')
+
+# work directory
+if (work=ARGV.find {|arg| arg =~ /--work=(.*)/})
+  ARGV.delete(work)
+  $WORK = File.join($BASE,$1)
+else
+  $WORK = File.join($BASE,'work')
+end

data/lib/gorp/test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'builder'
+require 'gorp/env'
 
 begin
   # installed Rails (2.3.3 ish)
@@ -49,7 +50,7 @@ class Book::TestCase < ActiveSupport::TestCase
   # read and pre-process $input.html (only done once, and cached)
   def self.input filename
     # read $input output; remove front matter and footer
-    input = open("#{filename}.html").read
+    input = open(File.join($WORK, "#{filename}.html")).read
     head, body, tail = input.split /<body>\s+|\s+<\/body>/m
 
     # split into sections
@@ -152,14 +153,17 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       x.li do
         x.a "Section #{name}", :href => "#section-#{name}"
         x.tt fault.message.sub(".\n<false> is not true",'').
-          sub(/ but was\n.*/, '.')
+          sub(/ but was\n.*/, '.').
+          sub(/"((?:\\"|[^"])+)"/) {
+            '"' + ($1.length>80 ? $1[0..72]+'...' : $1) + '"'
+          }
       end
       sections[:todos][/() *<\/ul>/,1] = x.target!.gsub(/^/,'      ')
     end
   end
 
   def html_summary elapsed
-    open("#{$output}.html",'w') do |output|
+    open(File.join($WORK, "#{$output}.html"),'w') do |output|
       sections = @@sections
       output.write(sections.delete(:head))
       output.write("<body>\n    ")

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
-    TINY  = 2
+    MINOR = 8
+    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.7.2
+  version: 0.8.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2009-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,17 +90,19 @@ extensions: []
 
 extra_rdoc_files: 
 - README
-- lib/version.rb
 - lib/gorp.rb
+- lib/gorp/env.rb
 - lib/gorp/test.rb
+- lib/version.rb
 files: 
 - README
 - Rakefile
-- Manifest
 - gorp.gemspec
-- lib/version.rb
 - lib/gorp.rb
+- lib/gorp/env.rb
 - lib/gorp/test.rb
+- lib/version.rb
+- Manifest
 has_rdoc: true
 homepage: http://github.com/rubys/gorp
 licenses: []