gorp 0.17.0 → 0.18.0

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.17.0"
+  s.version = "0.18.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-31}
+  s.date = %q{2010-01-01}
   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/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/rails.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/net.rb", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/version.rb"]
+  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.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.rb

@@ -4,15 +4,15 @@
 # You have been warned.
 
 require 'fileutils'
-require 'open3'
 require 'builder'
-require 'time'
 
 require 'gorp/env'
+require 'gorp/commands'
 require 'gorp/edit'
 require 'gorp/output'
 require 'gorp/net'
 require 'gorp/rails'
+require 'gorp/xml'
 
 require 'rbconfig'
 $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
@@ -44,245 +44,6 @@ RUNFILE = File.join($WORK, 'status.run')
 open(RUNFILE,'w') {|running| running.puts(Process.pid)}
 at_exit { FileUtils.rm_f RUNFILE }
 
-def overview message
-  $x.p message.gsub(/(^|\n)\s+/, ' ').strip, :class=>'overview'
-end
-
-def desc message
-  $x.p message, :class=>'desc'
-end
-
-def log type, message
-  type = type.to_s.ljust(5).upcase
-  STDOUT.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S] #{type} #{message}")
-end
-
-def head number, title
-  $section = "#{number} #{title}"
-  log '====>', $section
-
-  $x.a(:class => 'toc', :id => "section-#{number}") {$x.h2 $section}
-  $toc.li {$toc.a $section, :href => "#section-#{number}"}
-end
-
-def issue text, options={}
-  log :issue, text
-
-  $issue+=1
-  $x.p :class => 'issue', :id => "issue-#{$issue}" do
-    $x.text! text
-    if options[:ticket]
-      $x.text! ' ('
-      $x.a "ticket #{options[:ticket]}", :href=>
-        'https://rails.lighthouseapp.com/projects/8994/tickets/' + 
-        options[:ticket].to_s
-      $x.text! ')'
-    end
-  end
-  $todos.li do
-    section = $section.split(' ').first
-    $todos.a "Section #{section}:", :href => "#section-#{$section}"
-    $todos.a "#{text}", :href => "#issue-#{$issue}"
-  end
-end
-
-def db statement, hilight=[]
-  log :db, statement
-  $x.pre "sqlite3> #{statement}", :class=>'stdin'
-  cmd = "sqlite3 --line db/development.sqlite3 #{statement.inspect}"
-  popen3 cmd, hilight
-end
-
-def ruby args
-  cmd "ruby #{args}"
-end
-
-def console script
-  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=[]
-  log :cmd, args
-  $x.pre args, :class=>'stdin'
-  if args == 'rake db:migrate'
-    Dir.chdir 'db/migrate' do
-      date = '20100301000000'
-      Dir['[0-9]*'].sort_by {|file| file=~/201003/?file:'x'+file}.each do |file|
-        file =~ /^([0-9]*)_(.*)$/
-        FileUtils.mv file, "#{date}_#{$2}" unless $1 == date.next!
-        $x.pre "mv #{file} #{date}_#{$2}"  unless $1 == date
-      end
-    end
-  end
-  args += ' -C' if args == 'ls -p'
-  popen3 args, hilight
-end
-
-def popen3 args, hilight=[]
-  Open3.popen3(args) do |pin, pout, perr|
-    terr = Thread.new do
-      $x.pre perr.readline.chomp, :class=>'stderr' until perr.eof?
-    end
-    pin.close
-    until pout.eof?
-      line = pout.readline
-      if hilight.any? {|pattern| line.include? pattern}
-        outclass='hilight'
-      elsif line =~ /\x1b\[\d/
-        line.gsub! /\x1b\[1m\x1b\[3\dm(.*?)\x1b\[0m/, '\1'
-        outclass = 'logger'
-      else
-        outclass='stdout'
-      end
-
-      if line.strip.size == 0
-        $x.pre ' ', :class=>outclass
-      else
-        $x.pre line.chomp, :class=>outclass
-      end
-    end
-    terr.join
-  end
-end
-
-def irb file
-  $x.pre "irb #{file}", :class=>'stdin'
-  log :irb, file
-  cmd = "irb -f -rubygems -r ./config/boot --prompt-mode simple #{$CODE}/#{file}"
-  Open3.popen3(cmd) do |pin, pout, perr|
-    terr = Thread.new do
-      until perr.eof?
-        line = perr.readline.chomp
-        line.gsub! /\x1b\[4(;\d+)*m(.*?)\x1b\[0m/, '\2'
-        line.gsub! /\x1b\[0(;\d+)*m(.*?)\x1b\[0m/, '\2'
-        line.gsub! /\x1b\[0(;\d+)*m/, ''
-        $x.pre line, :class=>'stderr'
-      end
-    end
-    pin.close
-    prompt = nil
-    until pout.eof?
-      line = pout.readline
-      if line =~ /^([?>]>)\s*#\s*(START|END):/
-        prompt = $1
-      elsif line =~ /^([?>]>)\s+$/
-        $x.pre ' ', :class=>'irb'
-        prompt ||= $1
-      elsif line =~ /^([?>]>)(.*)\n/
-        prompt ||= $1
-        $x.pre prompt + $2, :class=>'irb'
-	prompt = nil
-      elsif line =~ /^\w+(::\w+)*: /
-        $x.pre line.chomp, :class=>'stderr'
-      elsif line =~ /^\s+from [\/.:].*:\d+:in `\w.*'\s*$/
-        $x.pre line.chomp, :class=>'stderr'
-      else
-        $x.pre line.chomp, :class=>'stdout'
-      end
-    end
-    terr.join
-  end
-end
-
-# pluggable XML parser support
-begin
-  raise LoadError if ARGV.include? 'rexml'
-  require 'nokogiri'
-  def xhtmlparse(text)
-    Nokogiri::HTML(text)
-  end
-  Comment=Nokogiri::XML::Comment
-rescue LoadError
-  require 'rexml/document'
-
-  HTML_VOIDS = %w(area base br col command embed hr img input keygen link meta
-                  param source)
-
-  def xhtmlparse(text)
-    begin
-      require 'htmlentities'
-      text.gsub! '&', '&'
-      text.gsub! '<', '<'
-      text.gsub! '>', '>'
-      text.gsub! ''', '''
-      text.gsub! '"', '"'
-      text.force_encoding('utf-8') if text.respond_to? :force_encoding
-      text = HTMLEntities.new.decode(text)
-    rescue LoadError
-    end
-    doc = REXML::Document.new(text)
-    doc.get_elements('//*[not(* or text())]').each do |e|
-      e.text='' unless HTML_VOIDS.include? e.name
-    end
-    doc
-  end
-
-  class REXML::Element
-    def has_attribute? name
-      self.attributes.has_key? name
-    end
-
-    def at xpath
-      self.elements[xpath]
-    end
-
-    def search xpath
-      self.elements.to_a(xpath)
-    end
-
-    def content=(string)
-      self.text=string
-    end
-
-    def [](index)
-      if index.instance_of? String
-        self.attributes[index]
-      else
-        super(index)
-      end
-    end
-
-    def []=(index, value)
-      if index.instance_of? String
-        self.attributes[index] = value
-      else
-        super(index, value)
-      end
-    end
-  end
-
-  module REXML::Node
-    def before(node)
-      self.parent.insert_before(self, node)
-    end
-
-    def add_previous_sibling(node)
-      self.parent.insert_before(self, node)
-    end
-
-    def to_xml
-      self.to_s
-    end
-  end
-
-  # monkey patch for Ruby 1.8.6
-  doc = REXML::Document.new '<doc xmlns="ns"><item name="foo"/></doc>'
-  if not doc.root.elements["item[@name='foo']"]
-    class REXML::Element
-      def attribute( name, namespace=nil )
-        prefix = nil
-        prefix = namespaces.index(namespace) if namespace
-        prefix = nil if prefix == 'xmlns'
-        attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
-      end
-    end
-  end
-
-  Comment = REXML::Comment
-end
-
 def secsplit section
   section.to_s.split('.').map {|n| n.to_i}
 end

data/lib/gorp/commands.rb

@@ -0,0 +1,164 @@
+require 'fileutils'
+require 'open3'
+require 'time'
+
+module Gorp
+  module Commands
+    def overview message
+      $x.p message.gsub(/(^|\n)\s+/, ' ').strip, :class=>'overview'
+    end
+
+    def desc message
+      $x.p message, :class=>'desc'
+    end
+
+    def log type, message
+      type = type.to_s.ljust(5).upcase
+      STDOUT.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S] #{type} #{message}")
+    end
+
+    def head number, title
+      $section = "#{number} #{title}"
+      log '====>', $section
+
+      $x.a(:class => 'toc', :id => "section-#{number}") {$x.h2 $section}
+      $toc.li {$toc.a $section, :href => "#section-#{number}"}
+    end
+
+    def issue text, options={}
+      log :issue, text
+
+      $issue+=1
+      $x.p :class => 'issue', :id => "issue-#{$issue}" do
+	$x.text! text
+	if options[:ticket]
+	  $x.text! ' ('
+	  $x.a "ticket #{options[:ticket]}", :href=>
+	    'https://rails.lighthouseapp.com/projects/8994/tickets/' + 
+	    options[:ticket].to_s
+	  $x.text! ')'
+	end
+      end
+      $todos.li do
+	section = $section.split(' ').first
+	$todos.a "Section #{section}:", :href => "#section-#{$section}"
+	$todos.a "#{text}", :href => "#issue-#{$issue}"
+      end
+    end
+
+    def db statement, hilight=[]
+      log :db, statement
+      $x.pre "sqlite3> #{statement}", :class=>'stdin'
+      cmd = "sqlite3 --line db/development.sqlite3 #{statement.inspect}"
+      popen3 cmd, hilight
+    end
+
+    def ruby args
+      cmd "ruby #{args}"
+    end
+
+    def rake args
+      cmd "rake #{args}"
+    end
+
+    def console script
+      open('tmp/irbrc','w') {|fh| fh.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=[]
+      x = $x
+      log :cmd, args
+      $x = Builder::XmlMarkup.new(:indent => 2) if block_given?
+      $x.pre args, :class=>'stdin'
+      if args == 'rake db:migrate'
+	Dir.chdir 'db/migrate' do
+	  date = '20100301000000'
+	  Dir['[0-9]*'].sort_by {|fn| fn=~/201003/ ? fn : 'x'+fn}.each do |file|
+	    file =~ /^([0-9]*)_(.*)$/
+	    FileUtils.mv file, "#{date}_#{$2}" unless $1 == date.next!
+	    $x.pre "mv #{file} #{date}_#{$2}"  unless $1 == date
+	  end
+	end
+      end
+      args += ' -C' if args == 'ls -p'
+      popen3 args, hilight
+      if block_given?
+	p $x.target!
+	@raw = $x.target!
+	@selected = HTML::Document.new(@raw).root.children
+	yield
+      end
+    ensure
+      $x = x
+    end
+
+    def popen3 args, hilight=[]
+      Open3.popen3(args) do |pin, pout, perr|
+	terr = Thread.new do
+	  $x.pre perr.readline.chomp, :class=>'stderr' until perr.eof?
+	end
+	pin.close
+	until pout.eof?
+	  line = pout.readline
+	  if hilight.any? {|pattern| line.include? pattern}
+	    outclass='hilight'
+	  elsif line =~ /\x1b\[\d/
+	    line.gsub! /\x1b\[1m\x1b\[3\dm(.*?)\x1b\[0m/, '\1'
+	    outclass = 'logger'
+	  else
+	    outclass='stdout'
+	  end
+
+	  if line.strip.size == 0
+	    $x.pre ' ', :class=>outclass
+	  else
+	    $x.pre line.chomp, :class=>outclass
+	  end
+	end
+	terr.join
+      end
+    end
+
+    def irb file
+      $x.pre "irb #{file}", :class=>'stdin'
+      log :irb, file
+      cmd = "irb -f -rubygems -r ./config/boot --prompt-mode simple " + 
+        "#{$CODE}/#{file}"
+      Open3.popen3(cmd) do |pin, pout, perr|
+	terr = Thread.new do
+	  until perr.eof?
+	    line = perr.readline.chomp
+	    line.gsub! /\x1b\[4(;\d+)*m(.*?)\x1b\[0m/, '\2'
+	    line.gsub! /\x1b\[0(;\d+)*m(.*?)\x1b\[0m/, '\2'
+	    line.gsub! /\x1b\[0(;\d+)*m/, ''
+	    $x.pre line, :class=>'stderr'
+	  end
+	end
+	pin.close
+	prompt = nil
+	until pout.eof?
+	  line = pout.readline
+	  if line =~ /^([?>]>)\s*#\s*(START|END):/
+	    prompt = $1
+	  elsif line =~ /^([?>]>)\s+$/
+	    $x.pre ' ', :class=>'irb'
+	    prompt ||= $1
+	  elsif line =~ /^([?>]>)(.*)\n/
+	    prompt ||= $1
+	    $x.pre prompt + $2, :class=>'irb'
+	    prompt = nil
+	  elsif line =~ /^\w+(::\w+)*: /
+	    $x.pre line.chomp, :class=>'stderr'
+	  elsif line =~ /^\s+from [\/.:].*:\d+:in `\w.*'\s*$/
+	    $x.pre line.chomp, :class=>'stderr'
+	  else
+	    $x.pre line.chomp, :class=>'stdout'
+	  end
+	end
+	terr.join
+      end
+    end
+  end
+end

data/lib/gorp/output.rb

@@ -0,0 +1,163 @@
+require 'fileutils'
+require 'time'
+
+at_exit do
+  next unless $output
+
+  $x.declare! :DOCTYPE, :html
+  $x.html :xmlns => 'http://www.w3.org/1999/xhtml' do
+    $x.header do
+      $x.title $title
+      $x.meta 'http-equiv'=>'text/html; charset=UTF-8'
+      $x.style :type => "text/css" do
+        $x.text! <<-'EOF'.unindent(2)
+          body {background-color: #F5F5DC}
+          #banner {margin-top: 0}
+          pre {font-weight: bold; margin: 0; padding: 0}
+          pre.stdin {color: #800080; margin-top: 1em; padding: 0}
+          pre.irb {color: #800080; padding: 0}
+          pre.stdout {color: #000; padding: 0}
+          pre.logger {color: #088; padding: 0}
+          pre.hilight {color: #000; background-color: #FF0; padding: 0}
+          pre.stderr {color: #F00; padding: 0}
+          div.body {border-style: solid; border-color: #800080; padding: 0.5em}
+          .issue, .traceback {background:#FDD; border: 4px solid #F00; 
+                      font-weight: bold; margin-top: 1em; padding: 0.5em}
+          div.body, .issue, .traceback {
+            -webkit-border-radius: 0.7em; -moz-border-radius: 0.7em;}
+          ul.toc {list-style: none}
+          ul a {text-decoration: none}
+          ul a:hover {text-decoration: underline; color: #000;
+                      background-color: #F5F5DC}
+          a.toc h2 {background-color: #981A21; color:#FFF; padding: 6px}
+          ul a:visited {color: #000}
+          h2 {clear: both}
+          p.desc {font-style: italic}
+          p.overview {border-width: 2px; border-color: #000;
+            border-style: solid; border-radius: 4em;
+            background-color: #CCF; margin: 1.5em 1.5em; padding: 1em 2em; 
+            -webkit-border-radius: 4em; -moz-border-radius: 4em;}
+        EOF
+      end
+    end
+  
+    $x.body do
+      $x.h1 $title, :id=>'banner'
+      $x.h2 'Table of Contents'
+      $x.ul :class => 'toc'
+  
+      # determine which range(s) of steps are to be executed
+      ranges = ARGV.grep(/^ \d+(.\d+)? ( (-|\.\.) \d+(.\d+)? )? /x).map do |arg|
+        bounds = arg.split(/-|\.\./)
+        Range.new(secsplit(bounds.first), secsplit(bounds.last))
+      end
+  
+      # optionally save a snapshot
+      if ARGV.include? 'restore'
+        log :snap, 'restore'
+        Dir.chdir $BASE
+        FileUtils.rm_rf $WORK
+        FileUtils.cp_r "snapshot", $WORK, :preserve => true
+        Dir.chdir $WORK
+        if $autorestart and File.directory? $autorestart
+          Dir.chdir $autorestart
+          restart_server
+        end
+      end
+  
+      # run steps
+      e = nil
+      begin
+        $sections.each do |section, title, steps|
+	  omit = secinclude($omit, section)
+	  omit ||= (!ranges.empty? and !secinclude(ranges, section))
+
+	  if omit
+            $x.a(:class => 'omit', :id => "section-#{section}") do
+              $x.comment! title
+            end
+          else
+	    head section, title
+	    steps.call
+          end
+        end
+      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
+      ensure
+        if e.class != SystemExit
+	  $cleanup.call if $cleanup
+  
+          # terminate server
+	  Process.kill "INT", $server if $server
+	  Process.wait($server) if $server
+  
+          # optionally save a snapshot
+          if ARGV.include? 'save'
+            log :snap, 'save'
+            Dir.chdir $BASE
+            FileUtils.rm_rf "snapshot"
+            FileUtils.cp_r $WORK, "snapshot", :preserve => true
+          end
+        end
+      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
+
+      $x.a(:class => 'toc', :id => 'todos') {$x.h2 'Todos'}
+      $x.ul :class => 'todos'
+    end
+  end
+  
+  # output results as HTML, after inserting style and toc information
+  $x.target![/<style.*?>()/,1] = "\n#{$style.target!.strip.gsub(/^/,' '*6)}\n"
+  $x.target!.sub! /<ul class="toc"\/>/,
+    "<ul class=\"toc\">\n#{$toc.target!.gsub(/^/,' '*6)}    </ul>"
+  $x.target!.sub! /<ul class="todos"\/>/,
+    "<ul class=\"todos\">\n#{$todos.target!.gsub(/^/,' '*6)}    </ul>"
+  $x.target!.gsub! '<strong/>', '<strong></strong>'
+  $x.target!.gsub! /(<textarea[^>]+)\/>/, '\1></textarea>'
+  log :WRITE, "#{$output}.html"
+  open("#{$WORK}/#{$output}.html",'w') { |file| file.write $x.target! }
+  
+  # run tests
+  if $checker
+    log :CHECK, "#{$output}.html"
+    Dir.chdir $BASE
+    STDOUT.puts
+    if $checker.respond_to? :call
+      $checker.call
+    elsif $checker =~ /^[-\w]+$/
+      require File.join($BASE,$checker)
+    else
+      require $checker
+    end
+  end
+end

data/lib/gorp/rails.env

@@ -0,0 +1,37 @@
+# The following is code that was a part of Rails 2.3.*, but was removed in 3.0:
+#
+# http://github.com/rails/rails/blob/2-3-stable/railties/lib/initializer.rb#L217
+#
+# What it does is ensure that requires of things like 'active_script' are
+# satisfied by the vendored rails, and not by whatever gems you have
+# installed.
+
+vendor = File.expand_path(File.dirname(File.dirname(__FILE__)))
+vendor_rails = File.join(vendor, 'rails')
+
+if File.exist? vendor_rails
+  require 'rubygems'
+
+  Dir.chdir(vendor_rails) do
+    rails_version = open('railties/lib/rails/version.rb') do |file|
+      eval(file.read.gsub(/\s*(module|end).*\n/, '').downcase)
+    end
+
+    Dir[File.join('*', 'lib')].each do |lib|
+      stub = lib.split(File::Separator).first
+      stub.sub 'railties', 'rails'
+
+      next if Gem.loaded_specs.key?(stub)
+
+      spec = Gem::Specification.new do |s|
+        s.name = stub
+        s.version = rails_version
+        s.loaded_from = File.join(vendor_rails, lib)
+      end
+
+      $LOAD_PATH.unshift spec.loaded_from
+      Gem.loaded_specs[stub] = spec
+      Gem.source_index.add_spec spec
+    end
+  end
+end

data/lib/gorp/rails.rb

@@ -22,118 +22,161 @@ else
   $rails = 'rails'
 end
 
-# determine which version of rails is running
-def 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 =~ /^#!/
+# verify version of rails
+if $rails =~ /^rails( |$)/
+  `#{$rails} -v 2>/dev/null`
+else
+  `ruby #{$rails}/railties/bin/rails -v 2>/dev/null`
+end
+
+if $?.success?
+  # place a link in the $WORK directory
+  FileUtils.rm_f File.join($WORK, 'rails')
+  unless $rails =~ /^rails( |$)/
+    FileUtils.ln_s $rails, File.join($WORK, 'rails')
   end
-  rails
+else
+  puts "Install rails or specify path to git clone of rails as the " + 
+    "first argument."
+  Process.exit!
 end
 
-# run rails as a command
-def rails name, app=nil
-  Dir.chdir($WORK)
-  FileUtils.rm_rf name
-  log :rails, name
-
-  # determine how to invoke rails
-  rails = which_rails $rails
-
-  opt = (ARGV.include?('bundle') ? ' --dev' : '')
-  $x.pre "#{rails} #{name}#{opt}", :class=>'stdin'
-  popen3 "#{rails} #{name}#{opt}"
-
-  # canonicalize the reference to Ruby
-  Dir["#{name}/script/**/*"].each do |script|
-    next if File.directory? script
-    code = open(script) {|file| file.read}
-    code.sub! /^#!.*/, '#!/usr/bin/env ruby'
-    open(script,'w') {|file| file.write code}
+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
 
-  cmd "mkdir #{name}" unless File.exist?(name)
-  Dir.chdir(name)
-  FileUtils.rm_rf 'public/.htaccess'
+  module Commands
+    # run rails as a command
+    def rails name, app=nil
+      Dir.chdir($WORK)
+      FileUtils.rm_rf name
+      log :rails, name
 
-  cmd 'rake rails:freeze:edge' if ARGV.include? 'edge'
+      # determine how to invoke rails
+      rails = Gorp.which_rails $rails
 
-  if $rails != 'rails' and File.directory?($rails)
-    if File.exist? 'Gemfile'
-      if ARGV.include? 'bundle'
-        cmd 'gem bundle'
-      else
-        system 'mkdir -p vendor/gems'
-        system "ln -s #{$rails} vendor/rails"
-        system "cp #{__FILE__.sub(/\.rb$/,'.env')} vendor/gems/environment.rb"
+      opt = (ARGV.include?('bundle') ? ' --dev' : '')
+      $x.pre "#{rails} #{name}#{opt}", :class=>'stdin'
+      popen3 "#{rails} #{name}#{opt}"
+
+      # canonicalize the reference to Ruby
+      Dir["#{name}/script/**/*"].each do |script|
+        next if File.directory? script
+        code = open(script) {|file| file.read}
+        code.sub! /^#!.*/, '#!/usr/bin/env ruby'
+        open(script,'w') {|file| file.write code}
       end
-    else
-      system 'mkdir -p vendor'
-      system "ln -s #{$rails} vendor/rails"
-    end
-  end
-end
 
-# start/restart a rails server in a separate process
-def restart_server
-  log :server, 'restart'
-  if $server
-    $x.h3 'Restart the server.'
-    Process.kill "INT", $server
-    Process.wait($server)
-  else
-    $x.h3 'Start the server.'
-  end
+      cmd "mkdir #{name}" unless File.exist?(name)
+      Dir.chdir(name)
+      FileUtils.rm_rf 'public/.htaccess'
+
+      cmd 'rake rails:freeze:edge' if ARGV.include? 'edge'
+
+      if $rails != 'rails' and File.directory?($rails)
+        if File.exist? 'Gemfile'
+          if ARGV.include? 'bundle'
+            if ENV['RUBYLIB']
+              gem=open('Gemfile') {|file| file.read}
 
-  $server = fork
-  if $server
-    # wait for server to start
-    60.times do
-      sleep 0.5
-      begin
-        status = Net::HTTP.get_response('localhost','/',$PORT).code
-        break if %(200 404).include? status
-      rescue Errno::ECONNREFUSED
+              gem.sub! /gem "rails", :path => "(.*)"/ do
+                rails = "directory \"#{$1}\", :glob => '{*/,}*.gemspec'\n"
+
+                version = open("#{$1}/railties/lib/rails/version.rb") do |file|
+                  eval(file.read.gsub(/\s*(module|end).*\n/, '').downcase)
+                end
+
+                ENV['RUBYLIB'].split(File::PATH_SEPARATOR).each do |lib|
+                  rails << "directory #{lib.sub(/\/lib$/,'').inspect}\n"
+                end
+                rails + "gem \"rails\", #{version.inspect}"
+              end
+
+              open('Gemfile','w') {|file| file.write gem}
+            end
+
+            cmd 'gem bundle'
+          else
+            system 'mkdir -p vendor/gems'
+            system "ln -s #{$rails} vendor/rails"
+            system "cp #{__FILE__.sub(/\.rb$/,'.env')} " +
+              "vendor/gems/environment.rb"
+          end
+        else
+          system 'mkdir -p vendor'
+          system "ln -s #{$rails} vendor/rails"
+        end
       end
     end
-  else
-    #
-    # For unknown reason, when run as CGI, the below produces:
-    #   undefined method `chomp' for nil:NilClass (NoMethodError)
-    #   from rails/actionpack/lib/action_dispatch/middleware/static.rb:13
-    #     path   = env['PATH_INFO'].chomp('/')
-    #
-    unless ENV['GATEWAY_INTERFACE'].to_s =~ /CGI/
-      STDOUT.reopen '/dev/null', 'a'
-      exec "#{$ruby} script/server --port #{$PORT}"
-    end
 
-    # alternatives to the above, with backtrace
-    begin
-      if File.exist?('config.ru')
-        require 'rack'
-        server = Rack::Builder.new {eval(open('config.ru') {|file| file.read})}
-        Rack::Handler::WEBrick.run(server, :Port => $PORT)
+    # start/restart a rails server in a separate process
+    def restart_server
+      log :server, 'restart'
+      if $server
+	$x.h3 'Restart the server.'
+	Process.kill "INT", $server
+	Process.wait($server)
       else
-        ARGV.clear.unshift('--port', $PORT.to_s)
+	$x.h3 'Start the server.'
+      end
 
-        # start server, redirecting stdout to a string
-        $stdout = StringIO.open('','w')
-        require './config/boot'
-        if Rails::VERSION::MAJOR == 2
-          require 'commands/server'
-        else
-          require 'rails/commands/server'
-          Rails::Server.start
-        end
+      $server = fork
+      if $server
+	# wait for server to start
+	60.times do
+	  sleep 0.5
+	  begin
+	    status = Net::HTTP.get_response('localhost','/',$PORT).code
+	    break if %(200 404).include? status
+	  rescue Errno::ECONNREFUSED
+	  end
+	end
+      else
+	#
+	# For unknown reason, when run as CGI, the below produces:
+	#   undefined method `chomp' for nil:NilClass (NoMethodError)
+	#   from rails/actionpack/lib/action_dispatch/middleware/static.rb:13
+	#     path   = env['PATH_INFO'].chomp('/')
+	#
+	unless ENV['GATEWAY_INTERFACE'].to_s =~ /CGI/
+	  STDOUT.reopen '/dev/null', 'a'
+	  exec "#{$ruby} script/server --port #{$PORT}"
+	end
+
+	# alternatives to the above, with backtrace
+	begin
+	  if File.exist?('config.ru')
+	    require 'rack'
+	    server = Rack::Builder.new {eval(open('config.ru') {|fh| fh.read})}
+	    Rack::Handler::WEBrick.run(server, :Port => $PORT)
+	  else
+	    ARGV.clear.unshift('--port', $PORT.to_s)
+
+	    # start server, redirecting stdout to a string
+	    $stdout = StringIO.open('','w')
+	    require './config/boot'
+	    if Rails::VERSION::MAJOR == 2
+	      require 'commands/server'
+	    else
+	      require 'rails/commands/server'
+	      Rails::Server.start
+	    end
+	  end
+	rescue 
+	  STDERR.puts $!
+	  $!.backtrace.each {|method| STDERR.puts "\tfrom " + method}
+	ensure
+	  Process.exit!
+	end
       end
-    rescue 
-      STDERR.puts $!
-      $!.backtrace.each {|method| STDERR.puts "\tfrom " + method}
-    ensure
-      Process.exit!
     end
   end
 end

data/lib/gorp/test.rb

@@ -2,18 +2,18 @@ require 'test/unit'
 require 'builder'
 require 'gorp/env'
 
-$:.unshift "#{$WORK}/depot/vendor/rails/activesupport/lib"
+$:.unshift "#{$WORK}/rails/activesupport/lib"
   require 'active_support'
   require 'active_support/version'
   require 'active_support/test_case'
 $:.shift
 
-module Book
+module Gorp
 end
 
-class Book::TestCase < ActiveSupport::TestCase
+class Gorp::TestCase < ActiveSupport::TestCase
   # just enough infrastructure to get 'assert_select' to work
-  $:.unshift "#{$WORK}/depot/vendor/rails/actionpack/lib"
+  $:.unshift "#{$WORK}/rails/actionpack/lib"
   require 'action_controller'
   begin
     # Rails (2.3.3 ish)

data/lib/gorp/xml.rb

@@ -0,0 +1,96 @@
+# pluggable XML parser support
+begin
+  raise LoadError if ARGV.include? 'rexml'
+  require 'nokogiri'
+  def xhtmlparse(text)
+    Nokogiri::HTML(text)
+  end
+  Comment=Nokogiri::XML::Comment
+rescue LoadError
+  require 'rexml/document'
+
+  HTML_VOIDS = %w(area base br col command embed hr img input keygen link meta
+                  param source)
+
+  def xhtmlparse(text)
+    begin
+      require 'htmlentities'
+      text.gsub! '&', '&'
+      text.gsub! '<', '<'
+      text.gsub! '>', '>'
+      text.gsub! ''', '''
+      text.gsub! '"', '"'
+      text.force_encoding('utf-8') if text.respond_to? :force_encoding
+      text = HTMLEntities.new.decode(text)
+    rescue LoadError
+    end
+    doc = REXML::Document.new(text)
+    doc.get_elements('//*[not(* or text())]').each do |e|
+      e.text='' unless HTML_VOIDS.include? e.name
+    end
+    doc
+  end
+
+  class REXML::Element
+    def has_attribute? name
+      self.attributes.has_key? name
+    end
+
+    def at xpath
+      self.elements[xpath]
+    end
+
+    def search xpath
+      self.elements.to_a(xpath)
+    end
+
+    def content=(string)
+      self.text=string
+    end
+
+    def [](index)
+      if index.instance_of? String
+        self.attributes[index]
+      else
+        super(index)
+      end
+    end
+
+    def []=(index, value)
+      if index.instance_of? String
+        self.attributes[index] = value
+      else
+        super(index, value)
+      end
+    end
+  end
+
+  module REXML::Node
+    def before(node)
+      self.parent.insert_before(self, node)
+    end
+
+    def add_previous_sibling(node)
+      self.parent.insert_before(self, node)
+    end
+
+    def to_xml
+      self.to_s
+    end
+  end
+
+  # monkey patch for Ruby 1.8.6
+  doc = REXML::Document.new '<doc xmlns="ns"><item name="foo"/></doc>'
+  if not doc.root.elements["item[@name='foo']"]
+    class REXML::Element
+      def attribute( name, namespace=nil )
+        prefix = nil
+        prefix = namespaces.index(namespace) if namespace
+        prefix = nil if prefix == 'xmlns'
+        attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
+      end
+    end
+  end
+
+  Comment = REXML::Comment
+end

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 17
+    MINOR = 18
     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.17.0
+  version: 0.18.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 -05:00
+date: 2010-01-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,11 +131,15 @@ extensions: []
 extra_rdoc_files: 
 - README
 - lib/gorp.rb
+- lib/gorp/commands.rb
 - lib/gorp/edit.rb
 - lib/gorp/env.rb
 - lib/gorp/net.rb
+- lib/gorp/output.rb
+- lib/gorp/rails.env
 - lib/gorp/rails.rb
 - lib/gorp/test.rb
+- lib/gorp/xml.rb
 - lib/version.rb
 files: 
 - Manifest
@@ -143,11 +147,15 @@ files:
 - Rakefile
 - gorp.gemspec
 - lib/gorp.rb
+- lib/gorp/commands.rb
 - lib/gorp/edit.rb
 - lib/gorp/env.rb
 - lib/gorp/net.rb
+- lib/gorp/output.rb
+- lib/gorp/rails.env
 - lib/gorp/rails.rb
 - lib/gorp/test.rb
+- lib/gorp/xml.rb
 - lib/version.rb
 has_rdoc: true
 homepage: http://github.com/rubys/gorp