gorp 0.14.0 → 0.15.0

data/Rakefile

@@ -21,11 +21,13 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
   p.dependencies   = %w(
     builder
     erubis
+    i18n
     rack
     rack-mount
     rack-test
     rake
     sqlite3-ruby
+    test-unit
     tzinfo
   )
 end

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.14.0"
+  s.version = "0.15.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-23}
+  s.date = %q{2009-12-25}
   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
@@ -32,30 +32,36 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       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<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-mount>, [">= 0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<test-unit>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
     else
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<erubis>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-mount>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
     end
   else
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<erubis>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-mount>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
   end
 end

data/lib/gorp.rb

@@ -8,10 +8,12 @@ require 'open3'
 require 'net/http'
 require 'builder'
 require 'stringio'
-require 'gorp/env'
 require 'time'
 require 'cgi'
 
+require 'gorp/env'
+require 'gorp/edit'
+
 require 'rbconfig'
 $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
 
@@ -48,19 +50,6 @@ RUNFILE = File.join($WORK, 'status.run')
 open(RUNFILE,'w') {|running| running.puts(Process.pid)}
 at_exit { FileUtils.rm_f RUNFILE }
 
-class String
-  def unindent(n)
-    gsub Regexp.new("^#{' '*n}"), ''
-  end
-  def indent(n)
-    gsub /^/, ' '*n
-  end
-end
-
-def read name
-  open(File.join($DATA, name)) {|file| file.read}
-end
-
 def overview message
   $x.p message.gsub(/(^|\n)\s+/, ' ').strip, :class=>'overview'
 end
@@ -203,61 +192,6 @@ def irb file
   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
-    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
-
 # pluggable XML parser support
 begin
   raise LoadError if ARGV.include? 'rexml'

data/lib/gorp/env.rb

@@ -15,5 +15,5 @@ if (work=ARGV.find {|arg| arg =~ /--work=(.*)/})
   ARGV.delete(work)
   $WORK = File.join($BASE,$1)
 else
-  $WORK = File.join($BASE,'work')
+  $WORK = File.join($BASE, ENV['GORP_WORK'] || 'work')
 end

data/lib/gorp/test.rb

@@ -88,8 +88,9 @@ class Book::TestCase < ActiveSupport::TestCase
     @raw =~ /<pre\sclass="stdin">edit\s([\w\/.]+)<\/pre>\s+
              <pre\sclass="traceback">\s+
              \#&lt;IndexError:\sregexp\snot\smatched&gt;\s+
+             (.*gorp\/lib\/gorp\/edit.rb.*\n\s+)*
              ([\w\/.]+:\d+)/x
-    fail "edit #{$1} failed at #{$2}" if $1
+    fail "Edit #{$1} failed at #{$3}" if $1
   end
 
   attr_reader :raw

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 14
+    MINOR = 15
     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.14.0
+  version: 0.15.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2009-12-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  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
@@ -82,6 +92,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   type: :runtime