gorp 0.26.2 → 0.27.0

data/Manifest

@@ -1,7 +1,6 @@
 Manifest
 README
 Rakefile
-gorp.gemspec
 lib/gorp.rb
 lib/gorp/commands.rb
 lib/gorp/edit.rb

data/Rakefile

@@ -21,15 +21,9 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
   p.dependencies   = %w(
     builder
     bundler
-    erubis
     i18n
     rack
-    rack-mount
-    rack-test
     rake
-    thor
-    sqlite3-ruby
-    tzinfo
   )
   # Does not include mail -- as it depends on active_support
   # test-unit -- incompatible with i18n one hash required (testrunner.rb:116)

data/gorp.gemspec

@@ -1,70 +1,44 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{gorp}
-  s.version = "0.26.2"
+  s.name = "gorp"
+  s.version = "0.27.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = %q{2010-12-08}
-  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
-    a single HTML file that can be viewed locally or uploaded.
-
-    Additionally, there is support for verification, in the form of defining
-    assertions based on selections (typically CSS) against the generated HTML.
-}
-  s.email = %q{rubys@intertwingly.net}
+  s.date = "2011-10-21"
+  s.description = "    Enables the creation of scenarios that involve creating a rails project,\n    starting and stoppping of servers, generating projects, editing files,\n    issuing http requests, running of commands, etc.  Output is captured as\n    a single HTML file that can be viewed locally or uploaded.\n\n    Additionally, there is support for verification, in the form of defining\n    assertions based on selections (typically CSS) against the generated HTML.\n"
+  s.email = "rubys@intertwingly.net"
   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.css", "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.css", "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.files = ["Manifest", "README", "Rakefile", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.css", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb", "gorp.gemspec"]
+  s.homepage = "http://github.com/rubys/gorp"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{gorp}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Rails scenario testing support library}
+  s.rubyforge_project = "gorp"
+  s.rubygems_version = "1.8.11"
+  s.summary = "Rails scenario testing support library"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<bundler>, [">= 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<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
     else
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 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<thor>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
     end
   else
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 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<thor>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
   end
 end

data/lib/gorp/commands.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'builder'
 require 'time'
+require 'thread'
 
 module Gorp
   module Commands
@@ -175,8 +176,9 @@ module Gorp
 
       if args == 'rake db:migrate'
 	Dir.chdir 'db/migrate' do
-	  date = '20110211000000'
-	  Dir['[0-9]*'].sort_by {|fn| fn=~/201102/ ? fn : 'x'+fn}.each do |file|
+	  date = '20110711000000'
+          mask = Regexp.new("^#{date[0..-4]}")
+	  Dir['[0-9]*'].sort_by {|fn| fn=~mask ? 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

data/lib/gorp/edit.rb

@@ -34,9 +34,23 @@ module Gorp
   module StringEditingFunctions
     def highlight
       if self =~ /^\s*<[%!\w].*>/
+        # HTML, possibly XML
         start = '<!-- START_HIGHLIGHT -->'
         close = '<!-- END_HIGHLIGHT -->'
+      elsif self =~ /^\s*[.#]\w+[, ].*\{$/
+        # CSS
+        start = '/* START_HIGHLIGHT */'
+        close = '/* END_HIGHLIGHT */'
+      elsif self =~ /;\s*\}?$/
+        # JavaScript
+        start = '//#START_HIGHLIGHT'
+        close = '//#END_HIGHLIGHT'
+      elsif self =~ /->$/
+        # CoffeeScript
+        start = '//#START_HIGHLIGHT'
+        close = '//#END_HIGHLIGHT'
       else
+        # Other, most likely Ruby
         start = '#START_HIGHLIGHT'
         close = '#END_HIGHLIGHT'
       end
@@ -54,6 +68,9 @@ module Gorp
       if self =~ /^\s*<[%!\w].*>/
         start = "<!-- START:#{name} -->"
         close = "<!-- END:#{name} -->"
+      elsif self =~ /;\s*\}?$/
+        start = "//#START:#{name}"
+        close = "//#END:#{name}"
       else
         start = "#START:#{name}"
         close = "#END:#{name}"
@@ -103,11 +120,13 @@ module Gorp
     end
 
     def clear_highlights
-      self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
+      self.gsub! /^ *(\/\/#)\s*(START|END)_HIGHLIGHT\n/, ''
+      self.gsub! /^\s*(#|<!--|\/\*)\s*(START|END)_HIGHLIGHT\s*(-->|\*\/)?\n/, ''
     end
 
     def clear_all_marks
-      self.gsub! /^\s*(#|<!--)\s*(START|END)(_HIGHLIGHT|:\w+)(\s*-->)?\n/, ''
+      self.gsub! /^ *(\/\/#)\s*(START|END)(_HIGHLIGHT|:\w+)\n/, ''
+      self.gsub! /^\s*(#|<!--|\/\*|\/\/#)\s*(START|END)(_HIGHLIGHT|:\w+)\s*(-->|\*\/)?\n/, ''
     end
 
     def msub pattern, replacement, option=nil
@@ -117,6 +136,8 @@ module Gorp
       elsif option.respond_to? :keys
         replacement.extend Gorp::StringEditingFunctions
         replacement.mark(option[:mark]) 
+      elsif option == :optional
+        return unless match(pattern)
       end
 
       if replacement =~ /\\[1-9]/

data/lib/gorp/env.rb

@@ -20,7 +20,11 @@ end
 
 # base directories
 $BASE=File.expand_path(File.dirname(caller.last.split(':').first)) unless $BASE
+if $EDITION
+$DATA = File.join($BASE,$EDITION,'data')
+else
 $DATA = File.join($BASE,'data')
+end
 $CODE = File.join($DATA,'code')
 
 # work directory
@@ -32,29 +36,27 @@ else
 end
 
 # deduce environment based on provided Gemfile
-unless ENV['GORP_RAILS']
-  gemfile = "#{$BASE}/Gemfile" if File.exist? "#{$BASE}/Gemfile"
-  gemfile = "#{$WORK}/Gemfile" if File.exist? "#{$WORK}/Gemfile"
-  if gemfile
-    libs = ENV['RUBYLIB'].to_s.split(File::PATH_SEPARATOR)
-    open(gemfile) do |file|
-      pattern = /^gem\s+['"](\w+)['"],\s*:path\s*=>\s*['"](.*?)['"]/
-      file.read.scan(pattern).each do |name,path|
-        if name == 'rails'
-          ENV['GORP_RAILS'] ||= path
-        else
-          $: << "#{path}/lib"
-          libs << "#{path}/lib"
-        end
+gemfile = "#{$BASE}/Gemfile" if File.exist? "#{$BASE}/Gemfile"
+gemfile = "#{$WORK}/Gemfile" if File.exist? "#{$WORK}/Gemfile"
+if gemfile
+  open(gemfile) do |file|
+    pattern = /^gem\s+['"](\w+)['"],\s*:path\s*=>\s*['"](.*?)['"]/
+    file.read.scan(pattern).each do |name,path|
+      if name == 'rails'
+        ENV['GORP_RAILS'] ||= path
+      else
+        $: << "#{path}/lib"
       end
     end
-    ENV['RUBYLIB'] = libs.join(File::PATH_SEPARATOR)
-    ENV.delete 'BUNDLE_GEMFILE'
+  end
+
+  Dir.chdir(File.dirname(gemfile)) do
+    require 'bundler/setup'
   end
 end
 
-require 'rbconfig'
-$ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
+config = RbConfig::CONFIG
+$ruby = File.join(config["bindir"], config["RUBY_INSTALL_NAME"])
 
 FileUtils.mkdir_p $WORK
 
@@ -63,6 +65,9 @@ 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

data/lib/gorp/net.rb

@@ -70,6 +70,7 @@ def snap response, form=nil
   attrs = {:class => 'body', :title => title}
   attrs[:class] = 'traceback' if response.code == '500'
   attrs[:id] = body['id'] if body['id']
+  attrs[:class] += ' ' +body['class'] if body['class']
   $x.div(attrs) do
     body.children.each do |child|
       $x << child.to_xml unless child.instance_of?(Comment)

data/lib/gorp/rails.rb

@@ -103,14 +103,18 @@ module Gorp
       # determine how to invoke rails
       rails = Gorp.which_rails($rails)
       rails += ' new' if `#{rails} -v` !~ /Rails 2/ 
-      if `ruby -v` =~ /1\.8/
+      opt = ''
+      if File.exist? 'Gemfile'
+        rails = "bundle exec " + rails
+        opt += ' --skip-bundle'
+        opt += ' --dev' if File.read('Gemfile') =~ /gem ['"]rails['"], :path/
+      elsif `ruby -v` =~ /1\.8/
         rails.sub! /^/, 'ruby ' unless rails =~ /^ruby /
         rails.sub! 'ruby ', 'ruby -rubygems '
       end
 
-      opt = (ARGV.include?('--dev') ? ' --dev' : '')
       $x.pre "#{rails.gsub('/',FILE_SEPARATOR)} #{name}#{opt}", :class=>'stdin'
-      popen3 "#{rails} #{name}#{opt}"
+      popen3 "#{rails} #{name}#{opt.sub(' --dev','')}"
 
       # canonicalize the reference to Ruby
       Dir["#{name}/script/**/*"].each do |script|
@@ -135,8 +139,17 @@ module Gorp
             name = path.split(File::SEPARATOR).last
             next if name == 'gorp'
             if File.exist?(File.join(path, "/#{name}.gemspec"))
-              gemfile[/gem 'rails',.*\n()/,1] = 
-                "gem #{name.inspect}, :path => #{path.inspect}\n"
+              if gemfile =~ /^\s*gem ['"]#{name}['"],\s*:git/
+                gemfile[/^\s*gem ['"]#{name}['"],\s*(:git\s*=>\s*).*/,1] = 
+                  ":path => #{path.inspect} # "
+              elsif gemfile =~ /^\s*gem ['"]#{name}['"],/
+                gemfile[/^\s*gem ['"]#{name}['"],\s*()/,1] = 
+                  ":path => #{path.inspect} # "
+	      else
+                gemfile.sub!(/(^\s*gem ['"]#{name}['"])/) {|line| '# ' + line}
+                gemfile[/gem 'rails',.*\n()/,1] = 
+                  "gem #{name.inspect}, :path => #{path.inspect}\n"
+              end
             end
           end
           gemfile[/^()source/, 1] = '# '
@@ -228,6 +241,7 @@ module Gorp
       end
 
       if $server
+        sleep 3
 	# wait for server to start
 	60.times do
 	  sleep 0.5

data/lib/gorp/test.rb

@@ -1,17 +1,15 @@
 gem 'test-unit'
 require 'test/unit'
-require 'builder'
 require 'gorp/env'
 require 'gorp/rails'
 require 'gorp/commands'
+require 'builder'
 
 class Gorp::TestCase < Test::Unit::TestCase
   def self.suite
     # Deferred loading of Rails infrastructure
     if File.exist? "#{$WORK}/.bundle/environment.rb"
       require "#{$WORK}/.bundle/environment.rb"
-    elsif File.exist? "#{$WORK}/Gemfile"
-      Dir.chdir($WORK) { require 'bundler/setup' }
     end
 
     require 'active_support'
@@ -140,7 +138,7 @@ class Gorp::TestCase < Test::Unit::TestCase
   @@base = Object.new.extend(Gorp::Commands)
   include Gorp::Commands
 
-  %w(cmd get post rake ruby console).each do |method|
+  %w(cmd get post rake ruby console db).each do |method|
     define_method(method) do |*args, &block|
       before = $x.target.length
       @@base.send method, *args

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 26
-    TINY  = 2
+    MINOR = 27
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -2,12 +2,12 @@
 name: gorp
 version: !ruby/object:Gem::Version 
   hash: 115
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 26
-  - 2
-  version: 0.26.2
+  - 27
+  - 0
+  version: 0.27.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -05:00
-default_executable: 
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -47,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: i18n
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,7 +74,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,90 +87,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-mount
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id011
 description: "    Enables the creation of scenarios that involve creating a rails project,\n    starting and stoppping of servers, generating projects, editing files,\n    issuing http requests, running of commands, etc.  Output is captured as\n    a single HTML file that can be viewed locally or uploaded.\n\n    Additionally, there is support for verification, in the form of defining\n    assertions based on selections (typically CSS) against the generated HTML.\n"
 email: rubys@intertwingly.net
 executables: []
@@ -196,7 +111,6 @@ files:
 - Manifest
 - README
 - Rakefile
-- gorp.gemspec
 - lib/gorp.rb
 - lib/gorp/commands.rb
 - lib/gorp/edit.rb
@@ -209,7 +123,7 @@ files:
 - lib/gorp/test.rb
 - lib/gorp/xml.rb
 - lib/version.rb
-has_rdoc: true
+- gorp.gemspec
 homepage: http://github.com/rubys/gorp
 licenses: []
 
@@ -245,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gorp
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Rails scenario testing support library