gorp 0.16.6 → 0.17.0

data/Rakefile

@@ -22,6 +22,7 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
     builder
     erubis
     i18n
+    mail
     rack
     rack-mount
     rack-test

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.16.6"
+  s.version = "0.17.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-27}
+  s.date = %q{2009-12-31}
   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
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<mail>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-mount>, [">= 0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<mail>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-mount>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<mail>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-mount>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/lib/gorp.rb

@@ -10,6 +10,7 @@ require 'time'
 
 require 'gorp/env'
 require 'gorp/edit'
+require 'gorp/output'
 require 'gorp/net'
 require 'gorp/rails'
 
@@ -293,160 +294,3 @@ def secinclude ranges, section
     (range.first <=> ss) <= 0 and (range.last <=> ss) >= 0
   end
 end
-
-at_exit do
-  $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 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 =~ /^[-\w]+$/
-      require File.join($BASE,$checker)
-    else
-      require $checker
-    end
-  end
-end

data/lib/gorp/edit.rb

@@ -48,6 +48,8 @@ module Gorp
         from = Regexp.new('.*' + Regexp.escape(from) + '.*')
       end
 
+      raise IndexError.new('regexp not matched') unless match(from)
+
       sub!(from) do |base|
         base.extend Gorp::StringEditingFunctions
         yield base if block_given?
@@ -58,9 +60,13 @@ module Gorp
     end
 
     def dcl(name, *options)
-      self.sub!(/(\s*)(class|def|test)\s+"?#{name}"?.*?\n\1end\n/mo) do |lines|
+      re = Regexp.new '\n(\s*)(class|def|test)\s+"?' + name +
+        '"?.*?\n\1end\n', Regexp::MULTILINE
+      raise IndexError.new('regexp not matched') unless match(re)
+
+      self.sub!(re) do |lines|
         lines.extend Gorp::StringEditingFunctions
-        yield lines
+        yield lines if block_given?
         lines.mark(options.last[:mark]) if options.last.respond_to? :[]
         lines
       end
@@ -68,14 +74,25 @@ module Gorp
 
     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/, ''
+      self.gsub! /^\s*(#|<!--)\s*(START|END)(_HIGHLIGHT|:\w+)(\s*-->)?\n/, ''
     end
 
-    def msub pattern, replacement
+    def msub pattern, replacement, option=nil
+      if option == :highlight
+        replacement.extend Gorp::StringEditingFunctions
+        replacement.highlight if option == :highlight
+      end
+
+      if replacement =~ /\\[1-9]/
+        replacement.gsub! /\\([1-9])/, '#{$\1}'
+        replacement = replacement.inspect.gsub('\#','#')
+        match(pattern)
+        replacement = eval(replacement)
+      end
+
       self[pattern, 1] = replacement
     end
 

data/lib/gorp/net.rb

@@ -90,7 +90,12 @@ def post path, form, options={}
   end
 
   Net::HTTP.start(host, port) do |http|
-    get = Net::HTTP::Get.new(path)
+    accept = 'text/html'
+    accept = 'application/atom+xml' if path =~ /\.atom$/
+    accept = 'application/json' if path =~ /\.json$/
+    accept = 'application/xml' if path =~ /\.xml$/
+
+    get = Net::HTTP::Get.new(path, 'Accept' => accept)
     get['Cookie'] = $COOKIE if $COOKIE
     response = http.request(get)
     snap response, form unless options[:snapget] == false
@@ -117,6 +122,15 @@ def post path, form, options={}
         end
       end
 
+      # find matching submit button
+      xform ||= xforms.find do |element|
+        form.all? do |name, value| 
+          element.search('.//input[@type="submit"]').any? do |input|
+            input.attribute('value').to_s==form['submit']
+          end
+        end
+      end
+
       # match based on action itself
       xform ||= xforms.find do |element|
         form.all? do |name, value| 

data/lib/gorp/rails.rb

@@ -42,8 +42,9 @@ def rails name, app=nil
   # determine how to invoke rails
   rails = which_rails $rails
 
-  $x.pre "#{rails} #{name}", :class=>'stdin'
-  popen3 "#{rails} #{name}"
+  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|
@@ -60,8 +61,18 @@ def rails name, app=nil
   cmd 'rake rails:freeze:edge' if ARGV.include? 'edge'
 
   if $rails != 'rails' and File.directory?($rails)
-    cmd "mkdir vendor" unless File.exist?('vendor')
-    cmd "ln -s #{$rails} vendor/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"
+      end
+    else
+      system 'mkdir -p vendor'
+      system "ln -s #{$rails} vendor/rails"
+    end
   end
 end
 

data/lib/gorp/test.rb

@@ -89,6 +89,7 @@ class Book::TestCase < ActiveSupport::TestCase
     @@version = $1
     @@version += ' (git)' if body =~ /ln -s.*vendor.rails/
     @@version += ' (edge)' if body =~ /rails:freeze:edge/
+    @@version += ' (bundle)' if body =~ /gem bundle/
     STDERR.puts @@version
   end
 
@@ -215,5 +216,7 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
     open(File.join($WORK, 'status'), 'w') do |status|
       status.puts @result.to_s
     end
+
+    at_exit { raise SystemExit.new(1) } unless @result.passed?
   end
 end

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
-    TINY  = 6
+    MINOR = 17
+    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.16.6
+  version: 0.17.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 -05:00
+date: 2009-12-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mail
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rack
   type: :runtime