gorp 0.28.1 → 0.28.2

data/lib/gorp/edit.rb

@@ -47,8 +47,8 @@ module Gorp
         close = '//#END_HIGHLIGHT'
       elsif self =~ /->$/
         # CoffeeScript
-        start = '//#START_HIGHLIGHT'
-        close = '//#END_HIGHLIGHT'
+        start = '#START_HIGHLIGHT'
+        close = '#END_HIGHLIGHT'
       else
         # Other, most likely Ruby
         start = '#START_HIGHLIGHT'
@@ -121,12 +121,12 @@ module Gorp
 
     def clear_highlights
       self.gsub! /^ *(\/\/#)\s*(START|END)_HIGHLIGHT\n/, ''
-      self.gsub! /^\s*(#|<!--|\/\*)\s*(START|END)_HIGHLIGHT\s*(-->|\*\/)?\n/, ''
+      self.gsub! /^ *(#|<!--|\/\*)\s*(START|END)_HIGHLIGHT\s*?(-->|\*\/)?\n/, ''
     end
 
     def clear_all_marks
       self.gsub! /^ *(\/\/#)\s*(START|END)(_HIGHLIGHT|:\w+)\n/, ''
-      self.gsub! /^\s*(#|<!--|\/\*|\/\/#)\s*(START|END)(_HIGHLIGHT|:\w+)\s*(-->|\*\/)?\n/, ''
+      self.gsub! /^ *(#|<!--|\/\*|\/\/#)\s*(START|END)(_HIGHLIGHT|:\w+)\s*?(-->|\*\/)?\n/, ''
     end
 
     def msub pattern, replacement, option=nil
@@ -161,6 +161,7 @@ module Gorp
 end
 
 def edit filename, tag=nil, &block
+  filename = Dir[filename].first || filename if filename.include? '*'
   $x.pre "edit #{filename.gsub('/',FILE_SEPARATOR)}", :class=>'stdin'
 
   stale = File.mtime(filename) rescue Time.now-2
@@ -171,12 +172,13 @@ def edit filename, tag=nil, &block
     data.extend Gorp::StringEditingFunctions
     data.instance_exec(data, &block) if block_given?
 
-    # ensure that the file timestamp changed
-    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
+    # write the file, ensuring that the file timestamp changed
+    while true
+      open(filename,'w') {|file| file.write data}
+      $lastmod = File.mtime(filename)
+      break if $lastmod > stale and Time.now >= $lastmod
+      sleep 0.1
+    end
 
   rescue Exception => e
     $x.pre :class => 'traceback' do

data/lib/gorp/env.rb

@@ -30,9 +30,16 @@ $CODE = File.join($DATA,'code')
 # work directory
 if (work=ARGV.find {|arg| arg =~ /--work=(.*)/})
   ARGV.delete(work)
-  $WORK = File.join($BASE,$1)
+  work = $1
 else
-  $WORK = File.join($BASE, ENV['GORP_WORK'] || 'work')
+  work = ENV['GORP_WORK'] || 'work'
+end
+
+if File.respond_to? :realpath
+  $WORK = File.realpath(work, $BASE)
+else
+  require 'pathname'
+  $WORK = Pathname.new($BASE).join(work).realpath.to_s
 end
 
 # deduce environment based on provided Gemfile
@@ -51,6 +58,7 @@ if gemfile
   end
 
   Dir.chdir(File.dirname(gemfile)) do
+    exit unless File.exist? 'Gemfile.lock' or system 'bundle install'
     require 'bundler/setup'
   end
 end
@@ -65,28 +73,6 @@ module Gorp
     extend Commands
     $x.pre Time.now.httpdate, :class=>'stdout'
 
-    cmd "echo $PATH"
-    cmd "node -v"
-
-    cmd "#{$ruby} -v"
-    cmd 'gem -v'
-    Dir.chdir(File.join($WORK, $rails_app.to_s)) do
-      if $bundle
-        cmd 'bundle show'
-      else
-        cmd 'gem list'
-        cmd 'echo $RUBYLIB | sed "s/:/\n/g"'
-      end
-    end
-
-    if File.exist? 'Gemfile'
-      rake 'about'
-    elsif File.exist? 'script/rails'
-      cmd 'ruby script/rails application -v'
-    else
-      cmd Gorp.which_rails($rails) + ' -v'
-    end
- 
     if $rails != 'rails'
       Dir.chdir($rails) do
         log :cmd, 'git log -1'
@@ -102,7 +88,95 @@ module Gorp
         end
       end
     end
-  rescue
+
+    if File.exist? 'Gemfile'
+      if File.read("#$rails/RAILS_VERSION") =~ /^[34]/
+        cmd = 'rake about'
+      else
+        cmd = 'rails about'
+      end
+
+      log :cmd, cmd
+      $x.pre cmd, :class=>'stdin'
+      about = `#{cmd}`.sub(/^(Middleware\s+)(.*)/) {
+        term,dfn=$1,$2 
+        term+dfn.gsub(', ', ",\n" + ' ' * term.length)
+      }
+      about.split("\n").each {|line| $x.pre line, :class => :stdout}
+    elsif File.exist? 'script/rails'
+      cmd 'ruby script/rails application -v'
+    else
+      cmd Gorp.which_rails($rails) + ' -v'
+    end
+ 
+    Dir.chdir(File.join($WORK, $rails_app.to_s)) do
+      if $bundle
+        cmd 'bundle show'
+      else
+        cmd 'gem list'
+        cmd 'echo $RUBYLIB | sed "s/:/\n/g"'
+      end
+    end
+
+    cmd 'gem -v'
+    cmd "#{$ruby} -v"
+
+    if not `which rvm`.empty?
+      if ENV['rvm_version']
+        cmd "echo $rvm_version", :as => 'rvm -v' 
+      else
+        cmd "rvm -v | grep '\\S'", :as => 'rvm -v' 
+      end
+    elsif not `which rbenv`.empty?
+      cmd "rbenv --version"
+    end
+
+    if not `which nodejs`.empty?
+      cmd "nodejs -v"
+    elsif not `which node`.empty?
+      cmd "node -v"
+    end
+
+    if not `which mysql`.empty?
+      cmd "mysql --version"
+    end
+
+    log :cmd, 'echo $PATH'
+    $x.pre 'echo $PATH', :class=>'stdin'
+    ENV['PATH'].split(':').each {|path| $x.pre path, :class => :stdout}
+
+    if not `which lsb_release`.empty?
+      cmd "lsb_release -irc"
+    elsif File.exist? '/etc/debian_version'
+      cmd 'cat /etc/debian_version'
+    end
+
+    if not `which sw_vers`.empty?
+      cmd "sw_vers"
+    end
+
+    if not `which uname`.empty?
+      cmd "uname -srm"
+    end
+
+    config = Gorp::Config.get
+    if config and not config.empty?
+      $x.pre 'Gorp.config.get', :class=>'stdin'
+      $x.table do
+        config.sort.each do |name, value|
+          $x.tr do
+            $x.td name
+            $x.td value.inspect
+          end
+        end
+      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
   end
 
   def self.log type, message

data/lib/gorp/net.rb

@@ -1,7 +1,32 @@
 require 'net/http'
 require 'cgi'
+require 'http-cookie'
+
+$COOKIEJAR = HTTP::CookieJar.new
+$CookieDebug = Gorp::Config[:cookie_debug, true]
+
+def update_cookies(uri, response)
+  fields = response.get_fields('Set-Cookie')
+  return unless fields
+  fields.each {|value| $COOKIEJAR.parse(value, uri)}
+
+  if $CookieDebug
+    $x.ul do
+      fields.each do |value|
+        $x.li do
+          $x.b {$x.em '[cookie]'}
+          $x.text! value.to_s
+        end
+      end
+    end
+  end
+end
 
 def snap response, form=nil
+  if response.code >= '400'
+    $x.p "HTTP Response Code: #{response.code}", :class => 'traceback'
+  end
+
   if response.content_type == 'text/plain' or response.content_type =~ /xml/
     $x.div :class => 'body' do
       response.body.split("\n").each do |line| 
@@ -72,8 +97,18 @@ def snap response, form=nil
   attrs[:id] = body['id'] if body['id']
   attrs[:class] += ' ' +body['class'] if body['class']
   $x.div(attrs) do
+    html_voids = %w(area base br col command embed hr img input keygen link
+                    meta param source)
+
     body.children.each do |child|
-      $x << child.to_xml unless child.instance_of?(Comment)
+      next if child.instance_of?(Comment)
+      child.search("//*").each do |element|
+        next if html_voids.include? element.name
+        if element.children.empty? and element.text.empty?
+          element.add_child(Nokogiri::XML::Text.new('', element.document))
+        end
+      end
+      $x << child.to_xml
     end
   end
   $x.div '', :style => "clear: both"
@@ -84,6 +119,7 @@ def get path, options={}
 end
 
 def post path, form, options={}
+  $lastmod ||= Time.now
   log :get, path unless form
   $x.pre "get #{path}", :class=>'stdin' unless options[:snapget] == false
 
@@ -99,12 +135,13 @@ def post path, form, options={}
     accept = 'application/json' if path =~ /\.json$/
     accept = 'application/xml' if path =~ /\.xml$/
 
+    uri = URI.parse("http://#{host}:#{port}/#{path}")
     get = Net::HTTP::Get.new(path, 'Accept' => accept)
     get.basic_auth *options[:auth] if options[:auth]
-    get['Cookie'] = $COOKIE if $COOKIE
+    get['Cookie'] = HTTP::Cookie.cookie_value($COOKIEJAR.cookies(uri))
     response = http.request(get)
     snap response, form unless options[:snapget] == false
-    $COOKIE = response.response['set-cookie'] if response.response['set-cookie']
+    update_cookies uri, response
 
     if form
       body = xhtmlparse(response.body).at('//body') rescue nil
@@ -154,34 +191,56 @@ def post path, form, options={}
 
       $x.ul do
         form.each do |name, value|
-          $x.li "#{name} => #{value}"
+          $x.li "#{name} => #{value}" unless $CookieDebug
         end
 
         xform.search('.//input[@type="hidden"]').each do |element|
-          # $x.li "#{element['name']} => #{element['value']}"
+          if $CookieDebug
+            $x.li "#{element['name']} => #{element['value']}"
+          end
           form[element['name']] ||= element['value']
         end
+
+        if $CookieDebug
+          uri = URI.parse("http://#{host}:#{port}/#{path}")
+          $COOKIEJAR.cookies(uri).each do |cookie|
+            $x.li do
+              $x.b {$x.em '[cookie]'}
+              $x.text! cookie.to_s
+            end
+          end
+        end
       end
 
       log :post, path
+      uri = URI.parse("http://#{host}:#{port}/#{path}")
       post = Net::HTTP::Post.new(path)
-      post.form_data = form
-      post['Cookie'] = $COOKIE
+      post.set_form_data form
+      post['Content-Type'] = 'application/x-www-form-urlencoded'
+      post['Cookie'] = HTTP::Cookie.cookie_value($COOKIEJAR.cookies(uri))
       response=http.request(post)
       snap response
+      update_cookies uri, response
     end
 
     if response.code == '302'
-      $COOKIE=response.response['set-cookie'] if response.response['set-cookie']
       path = response['Location']
+      uri = URI.parse("http://#{host}:#{port}/#{path}")
       $x.pre "get #{path}", :class=>'stdin'
       get = Net::HTTP::Get.new(path, 'Accept' => accept)
-      get['Cookie'] = $COOKIE if $COOKIE
+      get['Cookie'] = HTTP::Cookie.cookie_value($COOKIEJAR.cookies(uri))
       response = http.request(get)
       snap response
-      $COOKIE=response.response['set-cookie'] if response.response['set-cookie']
+      update_cookies uri, response
     end
   end
 rescue Timeout::Error
   Gorp::Commands.stop_server(false, 9)
+ensure 
+  while true
+    open('tmp/lastmod', 'w') {|file| file.write 'data'}
+    break if File.mtime('tmp/lastmod') > $lastmod
+    sleep 0.1
+  end
+  File.unlink('tmp/lastmod')
 end

data/lib/gorp/output.css

@@ -1,7 +1,10 @@
 body {background-color: #F5F5DC}
+body.awdwr a {text-decoration: none}
+body.awdwr ul {padding-left: 1em}
 #banner {margin-top: 0}
 pre {font-weight: bold; margin: 0; padding: 0}
-pre.stdin {color: #800080; margin-top: 1em; padding: 0}
+pre.stdin, pre.stdin a {color: #800080; margin-top: 1em; padding: 0}
+pre.stdin a:hover {background-color: #F5F5DC; text-decoration: underline}
 pre.irb {color: #800080; padding: 0}
 pre.stdout {color: #000; padding: 0}
 pre.logger {color: #088; padding: 0}
@@ -10,17 +13,22 @@ 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;}
+div.body, .issue, .traceback {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.note {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: 1.5em; -moz-border-radius: 4em;}
+  background-color: #CCF; margin: 1.5em 1.5em; padding: 1em 2em;}
+.hidden {display: none}
+.traceback #container {background-color: #FFF}
+.traceback .line {background-color: #FFF}
+.traceback .line.active {background-color: #FCC}
+.traceback .source {background-color: #EEE}
+.traceback pre {background-color: #FFF; display: block; margin: 0.5em 0}
+.traceback pre.line_numbers {background-color: #EEE; text-align: right}
+.traceback h1 {background-color: #F00; color: #FFF; padding: 1em; margin: 0}

data/lib/gorp/output.rb

@@ -9,7 +9,7 @@ at_exit do
 
   $x.declare! :DOCTYPE, :html
   $x.html :xmlns => 'http://www.w3.org/1999/xhtml' do
-    $x.header do
+    $x.head do
       $x.title $title
       $x.meta 'charset'=>'utf-8'
       $x.style :type => "text/css" do
@@ -18,8 +18,8 @@ at_exit do
         end
       end
     end
-  
-    $x.body do
+ 
+    $x.body class: 'awdwr' do
       $x.h1 $title, :id=>'banner'
       $x.h2 'Table of Contents'
       $x.ul :class => 'toc'
@@ -42,34 +42,34 @@ at_exit do
           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))
+          omit = secinclude($omit, section)
+          omit ||= (!ranges.empty? and !secinclude(ranges, section))
 
-	  if omit
+          if omit
             $x.a(:class => 'omit', :id => "section-#{section}") do
               $x.comment! title
             end
           else
-	    head section, title
-	    steps.call
+            section_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"}
+          STDERR.puts e.inspect
+          $x.text! "#{e.inspect}\n"
+          e.backtrace.each {|line| $x.text! "  #{line}\n"}
         end
       ensure
         if e.class != SystemExit
           # terminate server
           Gorp::Commands.stop_server
-  
+ 
           # optionally save a snapshot
           if ARGV.include?('save') or ARGV.include? '--save'
             log :snap, 'save'
@@ -87,7 +87,7 @@ at_exit do
       $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"\/>/,
@@ -102,7 +102,7 @@ at_exit do
   # run tests
   if $checker
     Gorp.log :CHECK, "#{$output}.html"
-    Dir.chdir $BASE
+    Dir.chdir $WORK
     STDOUT.puts
     if $checker.respond_to? :call
       $checker.call