gorp 0.18.0 → 0.18.1

data/README

@@ -16,21 +16,25 @@ Execution instructions:
   This is a library which, among other things, will interpret ARGV.  Here's
   an example based on http://github.com/rubys/awdwr:
 
-  ruby makedepot.rb [VERSION] [restore] [RANGE]... [save]
+  ruby makedepot.rb [VERSION] [bundle] [restore] [RANGE]... [save]
 
-    "restore" - restore from snapshot before resuming execution
-
-    "VERSION" specifies the Rails version to test.  Examples:
+    "VERSION" - specifies the Rails version to test.  Examples:
       edge
       _2.2.2_
       ~/git
 
-    "RANGE" specifies a set of sections to execute.  Examples:
+    "bundle"  - bundle this version of rails with each Rails app generated.
+      - if libraries are listed in the RUBYLIB environment variable, they
+        will be added as directories to the Gemfile before making the bundle
+
+    "restore" - restore from snapshot before resuming execution
+
+    "RANGE"   - specifies a set of sections to execute.  Examples:
       6.2..6.5
       7.1-9.5
       16
 
-    "save" - save snapshot after execution completes
+    "save"    - save snapshot after execution completes
 
 Tests against the output produced (e.g., makedepot.html) can also be run
 separately:

data/gorp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.18.0"
+  s.version = "0.18.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]

data/lib/gorp.rb

@@ -3,9 +3,6 @@
 #
 # You have been warned.
 
-require 'fileutils'
-require 'builder'
-
 require 'gorp/env'
 require 'gorp/commands'
 require 'gorp/edit'
@@ -13,45 +10,3 @@ require 'gorp/output'
 require 'gorp/net'
 require 'gorp/rails'
 require 'gorp/xml'
-
-require 'rbconfig'
-$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|
-    section = [section] unless section.respond_to? :include?
-    $omit << Range.new(secsplit(section.first), secsplit(section.last))
-  end
-end
-
-# Micro DSL for declaring an ordered set of book sections
-$sections = []
-def section number, title, &steps
-  number = (sprintf "%f", number).sub(/0+$/,'') if number.kind_of? Float
-  $sections << [number, title, steps]
-end
-
-$x = Builder::XmlMarkup.new(:indent => 2)
-$toc = Builder::XmlMarkup.new(:indent => 2)
-$todos = Builder::XmlMarkup.new(:indent => 2)
-$issue = 0
-$style = Builder::XmlMarkup.new(:indent => 2)
-$omit  = []
-
-FileUtils.mkdir_p $WORK
-RUNFILE = File.join($WORK, 'status.run')
-open(RUNFILE,'w') {|running| running.puts(Process.pid)}
-at_exit { FileUtils.rm_f RUNFILE }
-
-def secsplit section
-  section.to_s.split('.').map {|n| n.to_i}
-end
-
-def secinclude ranges, section
-  # was (in Ruby 1.8): range.include?(secsplit(section))
-  ranges.any? do |range| 
-    ss = secsplit(section)
-    (range.first <=> ss) <= 0 and (range.last <=> ss) >= 0
-  end
-end

data/lib/gorp/commands.rb

@@ -1,9 +1,44 @@
 require 'fileutils'
+require 'builder'
 require 'open3'
 require 'time'
 
 module Gorp
   module Commands
+    # indicate that a given step should be omitted
+    $omit  = []
+    def omit *sections
+      sections.each do |section|
+        section = [section] unless section.respond_to? :include?
+        $omit << Range.new(secsplit(section.first), secsplit(section.last))
+      end
+    end
+
+    # Micro DSL for declaring an ordered set of book sections
+    $sections = []
+    def section number, title, &steps
+      number = (sprintf "%f", number).sub(/0+$/,'') if number.kind_of? Float
+      $sections << [number, title, steps]
+    end
+
+    $x = Builder::XmlMarkup.new(:indent => 2)
+    $toc = Builder::XmlMarkup.new(:indent => 2)
+    $todos = Builder::XmlMarkup.new(:indent => 2)
+    $issue = 0
+    $style = Builder::XmlMarkup.new(:indent => 2)
+
+    def secsplit section
+      section.to_s.split('.').map {|n| n.to_i}
+    end
+
+    def secinclude ranges, section
+      # was (in Ruby 1.8): range.include?(secsplit(section))
+      ranges.any? do |range| 
+        ss = secsplit(section)
+        (range.first <=> ss) <= 0 and (range.last <=> ss) >= 0
+      end
+    end
+
     def overview message
       $x.p message.gsub(/(^|\n)\s+/, ' ').strip, :class=>'overview'
     end
@@ -68,9 +103,7 @@ module Gorp
     end
 
     def cmd args, hilight=[]
-      x = $x
       log :cmd, args
-      $x = Builder::XmlMarkup.new(:indent => 2) if block_given?
       $x.pre args, :class=>'stdin'
       if args == 'rake db:migrate'
 	Dir.chdir 'db/migrate' do
@@ -84,14 +117,6 @@ module Gorp
       end
       args += ' -C' if args == 'ls -p'
       popen3 args, hilight
-      if block_given?
-	p $x.target!
-	@raw = $x.target!
-	@selected = HTML::Document.new(@raw).root.children
-	yield
-      end
-    ensure
-      $x = x
     end
 
     def popen3 args, hilight=[]

data/lib/gorp/env.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 # determine port
 if ARGV.find {|arg| arg =~ /--port=(\d+)/}
   $PORT=$1.to_i
@@ -17,3 +19,8 @@ if (work=ARGV.find {|arg| arg =~ /--work=(.*)/})
 else
   $WORK = File.join($BASE, ENV['GORP_WORK'] || 'work')
 end
+
+require 'rbconfig'
+$ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
+
+FileUtils.mkdir_p $WORK

data/lib/gorp/output.rb

@@ -3,6 +3,9 @@ require 'time'
 
 at_exit do
   next unless $output
+  RUNFILE = File.join($WORK, 'status.run')
+  open(RUNFILE,'w') {|running| running.puts(Process.pid)}
+  at_exit { FileUtils.rm_f RUNFILE }
 
   $x.declare! :DOCTYPE, :html
   $x.html :xmlns => 'http://www.w3.org/1999/xhtml' do
@@ -10,7 +13,7 @@ at_exit do
       $x.title $title
       $x.meta 'http-equiv'=>'text/html; charset=UTF-8'
       $x.style :type => "text/css" do
-        $x.text! <<-'EOF'.unindent(2)
+        $x.text! <<-'EOF'.gsub(/^  /, '')
           body {background-color: #F5F5DC}
           #banner {margin-top: 0}
           pre {font-weight: bold; margin: 0; padding: 0}

data/lib/gorp/rails.rb

@@ -41,6 +41,8 @@ else
   Process.exit!
 end
 
+$bundle = ARGV.include? 'bundle'
+
 module Gorp
   # determine which version of rails is running
   def self.which_rails rails
@@ -63,7 +65,7 @@ module Gorp
       # determine how to invoke rails
       rails = Gorp.which_rails $rails
 
-      opt = (ARGV.include?('bundle') ? ' --dev' : '')
+      opt = ($bundle ? ' --dev' : '')
       $x.pre "#{rails} #{name}#{opt}", :class=>'stdin'
       popen3 "#{rails} #{name}#{opt}"
 
@@ -83,7 +85,7 @@ module Gorp
 
       if $rails != 'rails' and File.directory?($rails)
         if File.exist? 'Gemfile'
-          if ARGV.include? 'bundle'
+          if $bundle
             if ENV['RUBYLIB']
               gem=open('Gemfile') {|file| file.read}
 
@@ -106,7 +108,7 @@ module Gorp
             cmd 'gem bundle'
           else
             system 'mkdir -p vendor/gems'
-            system "ln -s #{$rails} vendor/rails"
+            cmd "ln -s #{$rails} vendor/rails"
             system "cp #{__FILE__.sub(/\.rb$/,'.env')} " +
               "vendor/gems/environment.rb"
           end

data/lib/gorp/test.rb

@@ -1,6 +1,8 @@
 require 'test/unit'
 require 'builder'
 require 'gorp/env'
+require 'gorp/rails'
+require 'gorp/commands'
 
 $:.unshift "#{$WORK}/rails/activesupport/lib"
   require 'active_support'
@@ -9,6 +11,17 @@ $:.unshift "#{$WORK}/rails/activesupport/lib"
 $:.shift
 
 module Gorp
+  class BuilderTee < BlankSlate
+    def initialize(one, two)
+      @one = one
+      @two = two
+    end
+
+    def method_missing sym, *args, &block
+      @one.method_missing sym, *args, &block
+      @two.method_missing sym, *args, &block
+    end
+  end
 end
 
 class Gorp::TestCase < ActiveSupport::TestCase
@@ -87,9 +100,9 @@ class Gorp::TestCase < ActiveSupport::TestCase
     # report version
     body =~ /rails .*?-v<\/pre>\s+.*?>(.*)<\/pre>/
     @@version = $1
-    @@version += ' (git)' if body =~ /ln -s.*vendor.rails/
-    @@version += ' (edge)' if body =~ /rails:freeze:edge/
-    @@version += ' (bundle)' if body =~ /gem bundle/
+    @@version += ' (git)'    if body =~ /"stdin">ln -s.*vendor.rails</
+    @@version += ' (edge)'   if body =~ /"stdin">rails:freeze:edge</
+    @@version += ' (bundle)' if body =~ /"stdin">gem bundle</
     STDERR.puts @@version
   end
 
@@ -121,6 +134,27 @@ class Gorp::TestCase < ActiveSupport::TestCase
 
   def self.sections
     @@sections
+  end 
+
+  @@base = Object.new.extend(Gorp::Commands)
+  include Gorp::Commands
+
+  %w(cmd rake).each do |method|
+    define_method(method) do |*args, &block|
+      begin
+        $y = Builder::XmlMarkup.new(:indent => 2)
+        $x = Gorp::BuilderTee.new($x, $y)
+        @@base.send method, *args
+
+        if block
+          @raw = $x.target!
+          @selected = HTML::Document.new(@raw).root.children
+          block.call
+        end
+      ensure
+        $x = $x.instance_eval { @one }
+      end
+    end
   end
 end
 

data/lib/version.rb

@@ -2,7 +2,7 @@ module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 18
-    TINY  = 0
+    TINY  = 1
 
     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.0
+  version: 0.18.1
 platform: ruby
 authors: 
 - Sam Ruby