gorp 0.23.0 → 0.24.0

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.23.0"
+  s.version = "0.24.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-02-25}
+  s.date = %q{2010-04-28}
   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
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{gorp}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rails scenario testing support library}
 
   if s.respond_to? :specification_version then

data/lib/gorp/commands.rb

@@ -120,6 +120,12 @@ module Gorp
         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'
+      elsif RUBY_PLATFORM =~ /w32/
+        open('tmp/irbin','w') {|fh| fh.write(script.gsub('\n',"\r\n")+"\r\n")}
+        save, ENV['IRBRC']=ENV['IRBRC'], 'tmp/irbin'
+        cmd "cmd /c ruby #{console_cmd} < tmp/irbin"
+        ENV['IRBRC']=save
+        FileUtils.rm_rf 'tmp/irbin'
       else
         cmd "echo #{script.inspect} | IRBRC=tmp/irbrc ruby #{console_cmd}"
       end
@@ -152,6 +158,7 @@ module Gorp
 
       if RUBY_PLATFORM =~ /w32/
         args.gsub! '/', '\\' unless args =~ /http:/
+	args.sub! /^cmd \\c/, 'cmd /c'
 	args.sub! /^cp -v/, 'xcopy /i /f /y'
 	args.sub! /^ls -p/, 'dir/w'
 	args.sub! /^ls/, 'dir'

data/lib/gorp/edit.rb

@@ -92,7 +92,8 @@ module Gorp
       self.sub!(re) do |lines|
         lines.extend Gorp::StringEditingFunctions
         lines.instance_exec(lines, &block) if block_given?
-        lines.mark(options.last[:mark]) if options.last.respond_to? :[]
+        lines.mark(options.last[:mark]) if options.last.respond_to? :[]=
+        lines.highlight if options.last == :highlight
         lines
       end
     end
@@ -113,6 +114,9 @@ module Gorp
       if option == :highlight
         replacement.extend Gorp::StringEditingFunctions
         replacement.highlight if option == :highlight
+      elsif option.respond_to? :keys
+        replacement.extend Gorp::StringEditingFunctions
+        replacement.mark(option[:mark]) 
       end
 
       if replacement =~ /\\[1-9]/
@@ -158,7 +162,7 @@ def edit filename, tag=nil, &block
     tag = nil
 
   ensure
-    log :edit, filename
+    log :edit, filename.gsub('/',FILE_SEPARATOR)
 
     include = tag.nil?
     highlight = false

data/lib/gorp/net.rb

@@ -75,8 +75,8 @@ def snap response, form=nil
   $x.div '', :style => "clear: both"
 end
 
-def get path
-  post path, nil
+def get path, options={}
+  post path, nil, options
 end
 
 def post path, form, options={}
@@ -90,7 +90,7 @@ def post path, form, options={}
   end
 
   Net::HTTP.start(host, port) do |http|
-    accept = 'text/html'
+    accept = options[:accept] || 'text/html'
     accept = 'application/atom+xml' if path =~ /\.atom$/
     accept = 'application/json' if path =~ /\.json$/
     accept = 'application/xml' if path =~ /\.xml$/
@@ -176,4 +176,6 @@ def post path, form, options={}
       $COOKIE=response.response['set-cookie'] if response.response['set-cookie']
     end
   end
+rescue Timeout::Error
+  Gorp::Commands.stop_server(false, 9)
 end

data/lib/gorp/rails.rb

@@ -3,6 +3,21 @@ require 'builder'
 require 'stringio'
 require 'time'
 
+module Gorp
+  # determine which version of rails is running
+  def self.which_rails rails
+    railties = File.join(rails, 'railties', 'bin', 'rails')
+    rails = railties if File.exists?(railties)
+    bin = File.join(rails, 'bin', 'rails')
+    rails = bin if File.exists?(bin)
+    if File.exists?(rails)
+      firstline = open(rails) {|file| file.readlines.first}
+      rails = 'ruby ' + rails unless firstline =~ /^#!/
+    end
+    rails
+  end
+end
+
 # verify that port is available for testing
 if (Net::HTTP.get_response('localhost','/',$PORT).code == '200' rescue false)
   STDERR.puts "local server already running on port #{$PORT}"
@@ -46,7 +61,7 @@ end
 if $rails =~ /^rails( |$)/
   `#{$rails} -v 2>#{DEV_NULL}`
 else
-  `ruby #{$rails}/railties/bin/rails -v 2>#{DEV_NULL}`
+  `#{Gorp.which_rails($rails)} -v 2>#{DEV_NULL}`
 end
 
 if $?.success?
@@ -77,17 +92,6 @@ $bundle = true  if ARGV.include?('--bundle')
 $bundle = false if ARGV.include?('--vendor')
 
 module Gorp
-  # determine which version of rails is running
-  def self.which_rails rails
-    railties = File.join(rails, 'railties', 'bin', 'rails')
-    rails = railties if File.exists?(railties)
-    if File.exists?(rails)
-      firstline = open(rails) {|file| file.readlines.first}
-      rails = 'ruby ' + rails unless firstline =~ /^#!/
-    end
-    rails
-  end
-
   module Commands
     # run rails as a command
     def rails name, app=nil
@@ -150,7 +154,7 @@ module Gorp
     end
 
     # stop a server if it is currently running
-    def self.stop_server(restart=false)
+    def self.stop_server(restart=false, signal="INT")
       if !restart and $cleanup
         $cleanup.call
         $cleanup = nil
@@ -159,12 +163,21 @@ module Gorp
       if $server
         if $server.respond_to?(:process_id)
           # Windows
-          Process.kill 1, $server.process_id
+          signal = 1 if signal == "INT"
+          Process.kill signal, $server.process_id
           Process.waitpid($server.process_id) rescue nil
         else
           # UNIX
-          Process.kill "INT", $server
-          Process.wait($server)
+          require 'timeout'
+          Process.kill signal, $server
+          begin
+             Timeout::timeout(15) do
+               Process.wait $server
+             end
+          rescue Timeout::Error
+            Process.kill 9, $server
+            Process.wait $server
+          end
         end
       end
     ensure
@@ -192,8 +205,14 @@ module Gorp
         $server = fork
       else
         require 'win32/process'
-        $server = Process.create(:app_name => rails_server)
-        # :startup_info => {:stdout => File.open('NUL','w+')}
+        begin
+          save = STDOUT.dup
+          STDOUT.reopen(File.open('NUL','w+'))
+          $server = Process.create(:app_name => rails_server, :inherit => true)
+          # :startup_info => {:stdout => File.open('server.log','w+')})
+        ensure
+          STDOUT.reopen save
+        end
       end
 
       if $server

data/lib/gorp/test.rb

@@ -102,14 +102,6 @@ class Gorp::TestCase < Test::Unit::TestCase
       next unless key =~ /^\d/
       @@sections[key] = "<a class=\"toc\" id=\"section-#{key}\">#{value}"
     end
-
-    # report version
-    body =~ /rails .*?-v<\/pre>\s+.*?>(.*)<\/pre>/
-    @@version = $1
-    @@version += ' (git)'    if body =~ /"stdin">ln -s.*vendor.rails</
-    @@version += ' (edge)'   if body =~ /"stdin">rails:freeze:edge</
-    @@version += ' (bundle)' if body =~ /"stdin">gem bundle</
-    STDERR.puts @@version
   end
 
   def self.output filename
@@ -192,8 +184,11 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
     }
 
     if fault.respond_to? :location
+      location = fault.location
+      location.shift while location.first.to_s. =~ /testing.assertions.selector/
+      location.pop   while location.last.to_s.  =~ /gorp.lib.gorp.test/
       x.pre fault.message.sub(".\n<false> is not true",'') +
-        "\n\nTraceback:\n  " + fault.location.join("\n  "),
+        "\n\nTraceback:\n  " + location.join("\n  "),
         :class=>'traceback'
     else
       if fault.message =~ /RuntimeError: Ticket (\w+):(\d+): (.*)/ 

data/lib/version.rb

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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.23.0
+  prerelease: false
+  segments: 
+  - 0
+  - 24
+  - 0
+  version: 0.24.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,119 +14,141 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -05:00
+date: 2010-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: erubis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: i18n
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-mount
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id011
 description: "    Enables the creation of scenarios that involve creating a rails project,\n    starting and stoppping of servers, generating projects, editing files,\n    issuing http requests, running of commands, etc.  Output is captured as\n    a single HTML file that can be viewed locally or uploaded.\n\n    Additionally, there is support for verification, in the form of defining\n    assertions based on selections (typically CSS) against the generated HTML.\n"
 email: rubys@intertwingly.net
 executables: []
@@ -177,18 +204,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: gorp
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails scenario testing support library