gorp 0.18.2 → 0.18.3

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.18.2"
+  s.version = "0.18.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = %q{2010-01-01}
+  s.date = %q{2010-01-02}
   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

data/lib/gorp/edit.rb

@@ -54,7 +54,7 @@ module Gorp
         base.extend Gorp::StringEditingFunctions
         yield base if block_given?
         base.highlight if options.include? :highlight
-        base.mark(options.last[:mark]) if options.last.respond_to? :key
+        base.mark(options.last[:mark]) if options.last.respond_to? :keys
         base
       end
     end
@@ -72,6 +72,10 @@ module Gorp
       end
     end
 
+    def dup
+      super.extend(Gorp::StringEditingFunctions)
+    end
+
     def clear_highlights
       self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
     end

data/lib/gorp/rails.rb

@@ -30,11 +30,14 @@ else
 end
 
 if $?.success?
-  # place a link in the $WORK directory
-  FileUtils.rm_f File.join($WORK, 'rails')
+  # setup vendored environment
+  FileUtils.mkdir_p File.join($WORK, 'vendor', 'gems')
+  FileUtils.rm_f File.join($WORK, 'vendor', 'rails')
   unless $rails =~ /^rails( |$)/
-    FileUtils.ln_s $rails, File.join($WORK, 'rails')
+    FileUtils.ln_s $rails, File.join($WORK, 'vendor', 'rails')
   end
+  FileUtils.cp File.join(File.dirname(__FILE__), 'rails.env'),
+    File.join($WORK, 'vendor', 'gems', 'environment.rb')
 else
   puts "Install rails or specify path to git clone of rails as the " + 
     "first argument."

data/lib/gorp/test.rb

@@ -1,14 +1,32 @@
 require 'test/unit'
 require 'builder'
 require 'gorp/env'
+require 'gorp/edit'
 require 'gorp/rails'
 require 'gorp/commands'
 
-$:.unshift "#{$WORK}/rails/activesupport/lib"
-  require 'active_support'
-  require 'active_support/version'
-  require 'active_support/test_case'
-$:.shift
+if File.exist? "#{$WORK}/vendor/gems/environment.rb"
+  require "#{$WORK}/vendor/gems/environment.rb"
+end
+
+require 'active_support'
+require 'active_support/version'
+require 'active_support/test_case'
+
+# just enough infrastructure to get 'assert_select' to work
+require 'action_controller'
+begin
+  # Rails (2.3.3 ish)
+  require 'action_controller/assertions/selector_assertions'
+  include ActionController::Assertions::SelectorAssertions
+rescue LoadError
+  # Rails (3.0 ish)
+  require 'action_dispatch/testing/assertions'
+require 'action_dispatch/testing/assertions/selector'
+  include ActionDispatch::Assertions::SelectorAssertions
+end
+require 'action_controller/vendor/html-scanner/html/tokenizer'
+require 'action_controller/vendor/html-scanner/html/document'
 
 module Gorp
   class BuilderTee < BlankSlate
@@ -25,21 +43,6 @@ module Gorp
 end
 
 class Gorp::TestCase < ActiveSupport::TestCase
-  # just enough infrastructure to get 'assert_select' to work
-  $:.unshift "#{$WORK}/rails/actionpack/lib"
-  require 'action_controller'
-  begin
-    # Rails (2.3.3 ish)
-    require 'action_controller/assertions/selector_assertions'
-    include ActionController::Assertions::SelectorAssertions
-  rescue LoadError
-    # Rails (3.0 ish)
-    require 'action_dispatch/testing/assertions'
-  require 'action_dispatch/testing/assertions/selector'
-    include ActionDispatch::Assertions::SelectorAssertions
-  end
-  require 'action_controller/vendor/html-scanner/html/tokenizer'
-  require 'action_controller/vendor/html-scanner/html/document'
 
   # micro DSL allowing the definition of optional tests
   def self.section number, title, &tests
@@ -139,7 +142,7 @@ class Gorp::TestCase < ActiveSupport::TestCase
   @@base = Object.new.extend(Gorp::Commands)
   include Gorp::Commands
 
-  %w(cmd rake).each do |method|
+  %w(cmd get post rake ruby).each do |method|
     define_method(method) do |*args, &block|
       begin
         $y = Builder::XmlMarkup.new(:indent => 2)

data/lib/version.rb

@@ -2,7 +2,7 @@ module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 18
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -05:00
+date: 2010-01-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency