gorp 0.9.0 → 0.10.0

data/Manifest

@@ -1,8 +0,0 @@
-Manifest
-README
-Rakefile
-gorp.gemspec
-lib/gorp.rb
-lib/gorp/env.rb
-lib/gorp/test.rb
-lib/version.rb

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.9.0"
+  s.version = "0.10.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-02}
+  s.date = %q{2009-12-03}
   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.rb

@@ -16,12 +16,9 @@ $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
 # indicate that a given step should be omitted
 def omit *sections
   sections.each do |section|
-    STDERR.puts section.inspect
     section = [section] unless section.respond_to? :include?
-    STDERR.puts section.inspect
     $omit << Range.new(secsplit(section.first), secsplit(section.last))
   end
-  STDERR.puts $omit.inspect
 end
 
 # Micro DSL for declaring an ordered set of book sections
@@ -629,7 +626,6 @@ at_exit do
         bounds = arg.split(/-|\.\./)
         Range.new(secsplit(bounds.first), secsplit(bounds.last))
       end
-      ARGV.push 'partial' unless ranges.empty? and $omit.empty?
   
       # optionally save a snapshot
       if ARGV.include? 'restore'
@@ -648,10 +644,17 @@ at_exit do
       e = nil
       begin
         $sections.each do |section, title, steps|
-	  next if !ranges.empty? and !secinclude(ranges, section)
-	  next if secinclude($omit, section)
-	  head section, title
-	  steps.call
+	  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

data/lib/gorp/test.rb

@@ -2,20 +2,11 @@ require 'test/unit'
 require 'builder'
 require 'gorp/env'
 
-begin
-  # installed Rails (2.3.3 ish)
+$:.unshift "#{$WORK}/depot/vendor/rails/activesupport/lib"
   require 'active_support'
-  $:.unshift "#{$WORK}/depot/vendor/rails/activesupport/lib"
   require 'active_support/version'
-  $:.shift
-rescue LoadError
-  # testing Rails (3.0 ish)
-  $:.unshift "#{$WORK}/depot/vendor/rails/activesupport/lib"
-  require 'active_support'
-  require 'active_support/version'
-end
-
-require 'active_support/test_case'
+  require 'active_support/test_case'
+$:.shift
 
 module Book
 end
@@ -42,7 +33,7 @@ class Book::TestCase < ActiveSupport::TestCase
   # micro DSL allowing the definition of optional tests
   def self.section number, title, &tests
     number = (sprintf "%f", number).sub(/0+$/,'') if number.kind_of? Float
-    return if ARGV.include? 'partial' and !@@sections.has_key? number.to_s
+    return if @@omit.include? number.to_s
     test "#{number} #{title}" do
       instance_eval {select number}
       instance_eval &tests
@@ -61,6 +52,9 @@ class Book::TestCase < ActiveSupport::TestCase
     @@sections[-1], env = @@sections.last.split(/<a class="toc" id="env">/)
     env, todos = env.split(/<a class="toc" id="todos">/)
 
+    # split into sections
+    @@omit = body.split(/<a class="omit" id="section-(.*?)">/)
+
     # convert to a Hash
     @@sections = Hash[*@@sections.unshift(:contents)]
     @@sections[:head] = head

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 9
+    MINOR = 10
     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.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2009-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency