gorp 0.15.0 → 0.16.0

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.15.0"
+  s.version = "0.16.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-12-25}
+  s.date = %q{2009-12-26}
   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/gorp.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
+  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
   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/edit.rb

@@ -0,0 +1,127 @@
+class String
+  def unindent(n)
+    gsub Regexp.new("^#{' '*n}"), ''
+  end
+  def indent(n)
+    gsub /^/, ' '*n
+  end
+end
+
+module Gorp_string_editing_functions
+  def highlight
+    if self =~ /\n\z/
+      self[/(.*)/m,1] = "#START_HIGHLIGHT\n#{self}#END_HIGHLIGHT\n"
+    else
+      self[/(.*)/m,1] = "#START_HIGHLIGHT\n#{self}\n#END_HIGHLIGHT"
+    end
+  end
+
+  def mark name
+    return unless name
+    self[/(.*)/m,1] = "#START:#{name}\n#{self}#END:#{name}\n"
+  end
+
+  def edit(from, *options)
+    STDERR.puts options.inspect
+    STDERR.puts options.last.inspect
+    STDERR.puts options.last.respond_to? :[]
+    if from.instance_of? String
+      from = Regexp.new('.*' + Regexp.escape(from) + '.*')
+    end
+
+    sub!(from) do |base|
+      base.extend Gorp_string_editing_functions
+      yield base if block_given?
+      base.highlight if options.include? :highlight
+      base.mark(options.last[:mark]) if options.last.respond_to? :key
+      base
+    end
+  end
+
+  def dcl(name, *options)
+    self.sub!(/(\s*)(class|def|test)\s+"?#{name}"?.*?\n\1end\n/mo) do |lines|
+      lines.extend Gorp_string_editing_functions
+      yield lines
+      lines.mark(options.last[:mark]) if options.last.respond_to? :[]
+      lines
+    end
+  end
+
+  def clear_highlights
+    self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
+    self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
+  end
+
+  def clear_all_marks
+    self.gsub! /^ *#\s?(START|END)(_HIGHLIGHT|:\w+)\n/, ''
+  end
+
+  def msub pattern, replacement
+    self[pattern, 1] = replacement
+  end
+
+  def all=replacement
+    self[/(.*)/m,1]=replacement
+  end
+end
+
+def edit filename, tag=nil
+  $x.pre "edit #{filename}", :class=>'stdin'
+
+  stale = File.mtime(filename) rescue Time.now-2
+  data = open(filename) {|file| file.read} rescue ''
+  before = data.split("\n")
+
+  begin
+    data.extend Gorp_string_editing_functions
+    yield data
+
+    now = Time.now
+    usec = now.usec/1000000.0
+    sleep 1-usec if now-usec <= stale
+    open(filename,'w') {|file| file.write data}
+    File.utime(stale+2, stale+2, filename) if File.mtime(filename) <= stale
+
+  rescue Exception => e
+    $x.pre :class => 'traceback' do
+      STDERR.puts e.inspect
+      $x.text! "#{e.inspect}\n"
+      e.backtrace.each {|line| $x.text! "  #{line}\n"}
+    end
+    tag = nil
+
+  ensure
+    log :edit, filename
+
+    include = tag.nil?
+    hilight = false
+    data.split("\n").each do |line|
+      if line =~ /START:(\w+)/
+        include = true if $1 == tag
+      elsif line =~ /END:(\w+)/
+        include = false if $1 == tag
+      elsif line =~ /START_HIGHLIGHT/
+        hilight = true
+      elsif line =~ /END_HIGHLIGHT/
+        hilight = false
+      elsif include
+        if hilight or ! before.include?(line)
+          outclass='hilight'
+        else
+          outclass='stdout'
+        end
+
+        if line.empty?
+          $x.pre ' ', :class=>outclass
+        else
+          $x.pre line, :class=>outclass
+        end
+      end
+    end
+  end
+end
+
+def read name
+  open(File.join($DATA, name)) {|file| file.read}
+end
+

data/lib/gorp/test.rb

@@ -38,6 +38,13 @@ class Book::TestCase < ActiveSupport::TestCase
     end
   end
 
+  def ticket number, info
+    return if info[:match] and not @raw =~ info[:match]
+    return if block_given? and not yield(@raw)
+
+    fail "Ticket #{number}: #{info[:title]}"
+  end
+
   # read and pre-process $input.html (only done once, and cached)
   def self.input filename
     # read $input output; remove front matter and footer
@@ -139,6 +146,8 @@ 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/'
+
       # provide details in the section itself
       x = Builder::XmlMarkup.new(:indent => 2)
       if fault.respond_to? :location
@@ -146,7 +155,14 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
           "\n\nTraceback:\n  " + fault.location.join("\n  "),
           :class=>'traceback'
       else
-        x.pre fault.message, :class=>'traceback'
+        if fault.message =~ /RuntimeError: Ticket (\d+): (.*)/ 
+          x.p :class => 'traceback' do
+            x.a "Ticket #{$1}", :href => tickets+$1
+            x.text! ': ' + $2
+          end
+        else
+          x.pre fault.message, :class=>'traceback'
+        end
       end
       sections[name][/<\/a>()/,1] = x.target!
 
@@ -154,11 +170,18 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       x = Builder::XmlMarkup.new(:indent => 2)
       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(/"((?:\\"|[^"])+)"/) {
-            '"' + ($1.length>80 ? $1[0..72]+'...' : $1) + '"'
-          }
+        if fault.message =~ /RuntimeError: Ticket (\d+): (.*)/ 
+          x.text! '['
+          x.a "Ticket #{$1}", :href => tickets+$1
+          x.text! ']: ' + $2
+        else
+          x.text! ': '
+          x.tt fault.message.sub(".\n<false> is not true",'').
+            sub(/ but was\n.*/, '.').
+            sub(/"((?:\\"|[^"])+)"/) {
+              '"' + ($1.length>80 ? $1[0..72]+'...' : $1) + '"'
+            }
+        end
       end
       sections[:todos][/() *<\/ul>/,1] = x.target!.gsub(/^/,'      ')
     end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 -05:00
+date: 2009-12-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 - lib/gorp.rb
+- lib/gorp/edit.rb
 - lib/gorp/env.rb
 - lib/gorp/test.rb
 - lib/version.rb
@@ -130,6 +131,7 @@ files:
 - Rakefile
 - gorp.gemspec
 - lib/gorp.rb
+- lib/gorp/edit.rb
 - lib/gorp/env.rb
 - lib/gorp/test.rb
 - lib/version.rb