comp_tree 1.0.1 → 1.1.0

data/CHANGES.rdoc

@@ -1,5 +1,13 @@
 
-= CompTree ChangeLog
+= comp_tree Changes
+
+== Version 1.1.0
+
+* lazily spawn threads as needed -- no longer pre-allocates possibly
+  unused threads
+
+* no longer required to specify the number of threads (pass 0 to the
+  second argument of +compute+).
 
 == Version 1.0.1
 

data/MANIFEST

@@ -2,17 +2,16 @@ CHANGES.rdoc
 MANIFEST
 README.rdoc
 Rakefile
-devel/jumpstart.rb
-install.rb
+devel/levitate.rb
 lib/comp_tree.rb
 lib/comp_tree/algorithm.rb
-lib/comp_tree/comp_tree.rb
 lib/comp_tree/driver.rb
 lib/comp_tree/error.rb
 lib/comp_tree/node.rb
 lib/comp_tree/queue/queue.rb
 lib/comp_tree/queue/queue_18.rb
 lib/comp_tree/queue/queue_19.rb
+lib/comp_tree/version.rb
 test/basic_test.rb
 test/circular_test.rb
 test/comp_tree_test_base.rb

data/README.rdoc

@@ -31,7 +31,7 @@ A simple framework for automatic parallelism.
       2
     }
     
-    # Compute the area using four parallel threads.
+    # Compute the area using up to four parallel threads.
     puts driver.compute(:area, 4)
     # => 63
 
@@ -44,15 +44,26 @@ A simple framework for automatic parallelism.
 
   % gem install comp_tree
 
-Or for the (non-gem) .tgz package,
-
-  % ruby install.rb [--uninstall]
+Or from inside an unpacked .tgz download, <code>rake install</code> /
+<code>rake uninstall</code>.
 
 == Description
 
 CompTree is a parallel computation tree structure based upon concepts
 from pure functional programming.
 
+CompTree has been tested on MRI versions 1.8.6, 1.8.7, 1.9.1, 1.9.2,
+and jruby versions 1.4, 1.5, 1.6.
+
+== Links
+
+* Home: http://quix.github.com/comp_tree
+* Feature Requests, Bug Reports: http://github.com/quix/comp_tree/issues
+* Manual Download: http://github.com/quix/comp_tree/archives/master
+* Repository: http://github.com/quix/comp_tree
+
+== Background
+
 The user should have a basic understanding of functional programming
 (see for example http://en.wikipedia.org/wiki/Functional_programming)
 and the meaning of <em>side effects</em>.
@@ -88,20 +99,13 @@ Note however it is OK affect a state as long as <em>no other function
 depends on that state</em>.  This is the principle under which
 CompTree parallelizes Rake tasks (http://drake.rubyforge.org).
 
-== Links
-
-* Documentation: http://comptree.rubyforge.org
-* Download: http://rubyforge.org/frs/?group_id=6917
-* Rubyforge home: http://rubyforge.org/projects/comptree
-* Repository: http://github.com/quix/comp_tree
-
 == Author
 
 * James M. Lawrence <quixoticsycophant@gmail.com>
 
 == License
   
-  Copyright (c) 2008, 2009 James M. Lawrence.  All rights reserved.
+  Copyright (c) 2008-2011 James M. Lawrence.  All rights reserved.
   
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation files

data/Rakefile

@@ -1,10 +1,11 @@
 $LOAD_PATH.unshift 'devel'
 
-require 'jumpstart'
+require 'levitate'
 
-Jumpstart.new "comp_tree" do |s|
-  s.developer "James M. Lawrence", "quixoticsycophant@gmail.com"
-  s.rubyforge_user = "quix"
+Levitate.new "comp_tree" do |s|
+  s.developers << ["James M. Lawrence", "quixoticsycophant@gmail.com"]
+  s.rubyforge_info = ["quix", "comptree"]
+  s.github_user = "quix"
   s.rdoc_files = %w[
     lib/comp_tree/comp_tree.rb
     lib/comp_tree/driver.rb

data/devel/{jumpstart.rb → levitate.rb}

@@ -1,11 +1,11 @@
 
-class Jumpstart
-  class SimpleInstaller
+class Levitate
+  class Installer
     def initialize
       require 'fileutils'
       require 'rbconfig'
       require 'find'
-      dest_root = Config::CONFIG["sitelibdir"]
+      dest_root = RbConfig::CONFIG["sitelibdir"]
       sources = []
       Find.find("./lib") { |source|
         if install_file?(source)
@@ -146,13 +146,13 @@ class Jumpstart
       require 'rbconfig'
 
       name = File.join(
-        Config::CONFIG["bindir"],
-        Config::CONFIG["RUBY_INSTALL_NAME"]
+        RbConfig::CONFIG["bindir"],
+        RbConfig::CONFIG["RUBY_INSTALL_NAME"]
       )
 
-      if Config::CONFIG["host"] =~ %r!(mswin|cygwin|mingw)! and
+      if RbConfig::CONFIG["host"] =~ %r!(mswin|cygwin|mingw)! and
           File.basename(name) !~ %r!\.(exe|com|bat|cmd)\Z!i
-        name + Config::CONFIG["EXEEXT"]
+        name + RbConfig::CONFIG["EXEEXT"]
       else
         name
       end
@@ -219,17 +219,6 @@ class Jumpstart
       }
       contents
     end
-
-    def replace_file(file)
-      old_contents = File.read(file)
-      new_contents = yield(old_contents)
-      if old_contents != new_contents
-        File.open(file, "wb") { |output|
-          output.print(new_contents)
-        }
-      end
-      new_contents
-    end
   end
 
   module InstanceEvalWithArgs
@@ -260,20 +249,18 @@ class Jumpstart
   include AttrLazy
   include Util
 
-  def initialize(project_name)
+  def initialize(gem_name)
     $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-    $LOAD_PATH.unshift File.dirname(__FILE__)
 
-    require 'rake/gempackagetask'
-    require 'rake/clean'
+    require 'rubygems/package_task'
 
-    @project_name = project_name
+    @gem_name = gem_name
 
     yield self
 
     self.class.instance_methods(false).select { |t|
       t.to_s =~ %r!\Adefine_!
-    }.each { |method_name|
+    }.sort.each { |method_name|
       send(method_name)
     }
   end
@@ -282,35 +269,32 @@ class Jumpstart
     alias_method :attribute, :attr_lazy_accessor
   end
 
-  attribute :name do
-    @project_name
-  end
+  attr_reader :gem_name
 
   attribute :version_constant_name do
     "VERSION"
   end
 
+  attribute :camel_name do
+    to_camel_case(gem_name)
+  end
+
   attribute :version do
-    require name
-    mod_name = to_camel_case(name)
-    begin
-      mod = Kernel.const_get(mod_name)
-      if mod.constants.include?(version_constant_name)
-        mod.const_get(version_constant_name)
+    catch :bail do
+      if File.file?(version_file = "./lib/#{gem_name}/version.rb")
+        require version_file
+      elsif File.file?("./lib/#{gem_name}.rb")
+        require gem_name
       else
-        raise
+        throw :bail
       end
-    rescue
-      "0.0.0"
-    end
-  end
-  
-  attribute :rubyforge_name do
-    name.gsub('_', '')
-  end
-
-  attribute :rubyforge_user do
-    email.first[%r!^.*(?=@)!]
+      mod = Kernel.const_get(camel_name)
+      constants = mod.constants.map { |t| t.to_sym }
+      unless constants.include?(version_constant_name.to_sym)
+        throw :bail
+      end
+      mod.const_get(version_constant_name)
+    end or "0.0.0"
   end
   
   attribute :readme_file do
@@ -322,7 +306,7 @@ class Jumpstart
   end
   
   attribute :doc_dir do
-    "documentation"
+    "doc"
   end
   
   attribute :spec_files do
@@ -333,7 +317,7 @@ class Jumpstart
     (Dir["./test/test_*.rb"] + Dir["./test/*_test.rb"]).uniq
   end
   
-  attribute :rcov_dir do
+  attribute :cov_dir do
     "coverage"
   end
   
@@ -351,7 +335,7 @@ class Jumpstart
 
   [:gem, :tgz].each { |ext|
     attribute ext do
-      "pkg/#{name}-#{version}.#{ext}"
+      "pkg/#{gem_name}-#{version}.#{ext}"
     end
   }
 
@@ -379,90 +363,86 @@ class Jumpstart
   end
 
   attribute :files do
-    if File.exist?(manifest_file)
+    if File.file? manifest_file
       File.read(manifest_file).split("\n")
-    else
-      `git ls-files`.split("\n") + [manifest_file] + generated_files
-    end
+    elsif source_control?
+      IO.popen("git ls-files") { |pipe| pipe.read.split "\n" }
+    end.to_a + [manifest_file] + generated_files
+  end
+
+  def files_in_require_paths
+    require_paths.inject([]) { |acc, dir|
+      acc + Dir.glob("#{dir}/**/*.rb")
+    }
   end
 
   attribute :rdoc_files do
-    Dir["lib/**/*.rb"]
+    files_in_require_paths
   end
     
-  attribute :extra_rdoc_files do
-    if File.exist?(readme_file)
-      [readme_file]
-    else
-      []
-    end
+  attribute :rdoc_title do
+    "#{gem_name}: #{summary}"
+  end
+
+  attribute :require_paths do
+    ["lib"]
   end
 
   attribute :rdoc_options do
-    if File.exist?(readme_file)
+    if File.file?(readme_file)
       ["--main", readme_file]
     else
       []
     end + [
-     "--title", "#{name}: #{summary}",
-    ] + (files - rdoc_files).inject(Array.new) { |acc, file|
+     "--title", rdoc_title,
+    ] + (files_in_require_paths - rdoc_files).inject(Array.new) {
+      |acc, file|
       acc + ["--exclude", file]
     }
   end
 
+  attribute :extra_rdoc_files do
+    result = []
+    [readme_file, history_file].each { |file|
+      result << file if File.file?(file)
+    }
+    result
+  end
+
   attribute :browser do
     require 'rbconfig'
-    if Config::CONFIG["host"] =~ %r!darwin!
-      app = %w[Firefox Safari].map { |t|
-        "/Applications/#{t}.app"
-      }.select { |t|
-        File.exist? t
-      }.first
-      if app
-        ["open", app]
-      else
-        raise "need to set `browser'"
-      end
+    if RbConfig::CONFIG["host"] =~ %r!darwin!
+      "open"
     else
       "firefox"
     end
   end
 
   attribute :gemspec do
-    Gem::Specification.new { |g|
-      g.has_rdoc = true
+    Gem::Specification.new do |g|
       %w[
-        name
         authors
         email
         summary
         version
         description
         files
-        extra_rdoc_files
         rdoc_options
-      ].each { |param|
-        value = send(param) and (
-          g.send("#{param}=", value)
-        )
-      }
-
-      if rubyforge_name
-        g.rubyforge_project = rubyforge_name
-      end
-
-      if url
-        g.homepage = url
+        extra_rdoc_files
+        require_paths
+      ].each do |param|
+        t = send(param) and g.send("#{param}=", t)
       end
-
-      extra_deps.each { |dep|
+      g.name = gem_name
+      g.has_rdoc = true
+      g.homepage = url if url
+      dependencies.each { |dep|
         g.add_dependency(*dep)
       }
-
-      extra_dev_deps.each { |dep|
+      development_dependencies.each { |dep|
         g.add_development_dependency(*dep)
       }
-    }
+    end
   end
 
   attribute :readme_contents do
@@ -470,10 +450,9 @@ class Jumpstart
   end
   
   attribute :sections do
-    require 'enumerator'
     begin
       data = readme_contents.split(%r!^==\s*(.*?)\s*$!)
-      pairs = data[1..-1].enum_slice(2).map { |section, contents|
+      pairs = data[1..-1].each_slice(2).map { |section, contents|
         [section.downcase, contents.strip]
       }
       Hash[*pairs.flatten]
@@ -513,58 +492,60 @@ class Jumpstart
   }
 
   attribute :url do
-    begin
-      readme_contents.match(%r!^\*.*?(http://\S+)!)[1]
-    rescue
-      "http://#{rubyforge_name}.rubyforge.org"
-    end
+    "http://#{github_user}.github.com/#{gem_name}"
   end
 
-  attribute :extra_deps do
-    []
+  attribute :github_user do
+    raise "github_user not set"
   end
 
-  attribute :extra_dev_deps do
-    []
+  attribute :rubyforge_info do
+    nil
   end
 
   attribute :authors do
-    Array.new
+    developers.map { |d| d[0] }
   end
 
   attribute :email do
-    Array.new
+    developers.map { |d| d[1] }
   end
 
-  def developer(name, email)
-    authors << name
-    self.email << email
+  attribute :dependencies do
+    []
   end
 
-  def dependency(name, version)
-    extra_deps << [name, version]
+  attribute :development_dependencies do
+    []
+  end
+
+  attribute :developers do
+    []
   end
 
   def define_clean
-    task :clean do
+    require 'rake/clean'
+    task :clean do 
       Rake::Task[:clobber].invoke
     end
   end
 
   def define_package
-    task manifest_file do
-      create_manifest
+    if source_control?
+      task manifest_file do
+        create_manifest
+      end
+      CLEAN.add manifest_file
+      task :package => :clean
+      Gem::PackageTask.new(gemspec).define
     end
-    CLEAN.include manifest_file
-    task :package => :clean
-    Rake::GemPackageTask.new(gemspec) { |t|
-      t.need_tar = true
-    }
   end
 
   def define_spec
     unless spec_files.empty?
-      require 'spec/rake/spectask'
+      Ruby.no_warnings {
+        require 'spec/rake/spectask'
+      }
       
       desc "run specs"
       Spec::Rake::SpecTask.new('spec') do |t|
@@ -585,9 +566,11 @@ class Jumpstart
         t.spec_opts = ["-fh:#{spec_output}"]
       end
       
+      suppress_task_warnings :spec, :full_spec, :text_spec
+
       desc "run full_spec then open browser"
       task :show_spec => :full_spec do
-        open_browser(spec_output, rcov_dir + "/index.html")
+        open_browser(spec_output, cov_dir + "/index.html")
       end
 
       desc "run specs individually"
@@ -598,7 +581,7 @@ class Jumpstart
       task :prerelease => [:spec, :spec_deps]
       task :default => :spec
 
-      CLEAN.include spec_output_dir
+      CLEAN.add spec_output_dir
     end
   end
 
@@ -606,23 +589,44 @@ class Jumpstart
     unless test_files.empty?
       desc "run tests"
       task :test do
-        test_files.each { |file|
-          require file
-        }
+        test_files.each { |file| require file }
+
+        # if we use at_exit hook instead, it won't run before :release
+        MiniTest::Unit.new.run ARGV
       end
       
-      desc "run tests with rcov"
-      task :full_test do
-        verbose(false) {
-          sh("rcov", "-o", rcov_dir, "--text-report",
-            *(test_files + rcov_options)
-          )
-        }
+      desc "run tests with coverage"
+      if ruby_18?
+        task :full_test do
+          verbose(false) {
+            sh("rcov", "-o", cov_dir, "--text-report",
+               *(test_files + rcov_options)
+            )
+          }
+        end
+      else
+        task :full_test do
+          rm_rf cov_dir
+          require 'simplecov'
+          SimpleCov.start do
+            add_filter "test/"
+            add_filter "devel/"
+          end
+          Rake::Task[:test].invoke
+        end
       end
       
       desc "run full_test then open browser"
       task :show_test => :full_test do
-        open_browser(rcov_dir + "/index.html")
+        show = lambda { open_browser(cov_dir + "/index.html") }
+        if ruby_18?
+          show.call
+        else
+          SimpleCov.at_exit do
+            SimpleCov.result.format!
+            show.call
+          end
+        end
       end
       
       desc "run tests individually"
@@ -633,13 +637,14 @@ class Jumpstart
       task :prerelease => [:test, :test_deps]
       task :default => :test
       
-      CLEAN.include rcov_dir
+      CLEAN.add cov_dir
     end
   end
 
   def define_doc
     desc "run rdoc"
     task :doc => :clean_doc do
+      Kernel.send :gem, 'rdoc' rescue nil
       require 'rdoc/rdoc'
       args = (
         gemspec.rdoc_options +
@@ -665,108 +670,48 @@ class Jumpstart
   end
 
   def define_publish
-    desc "upload docs"
-    task :publish => [:clean_doc, :doc] do
-      require 'rake/contrib/sshpublisher'
-      Rake::SshDirPublisher.new(
-        "#{rubyforge_user}@rubyforge.org",
-        "/var/www/gforge-projects/#{rubyforge_name}",
-        doc_dir
-      ).upload
+    if source_control?
+      desc "publish docs"
+      task :publish => [:clean, :check_directory, :doc] do
+        if rubyforge_info
+          user, project = rubyforge_info
+          Dir.chdir(doc_dir) do
+            sh "scp", "-r",
+               ".",
+               "#{user}@rubyforge.org:/var/www/gforge-projects/#{project}"
+          end
+        end
+        git "branch", "-D", "gh-pages"
+        git "checkout", "--orphan", "gh-pages"
+        FileUtils.rm ".git/index"
+        git "clean", "-fdx", "-e", "doc"
+        Dir["doc/*"].each { |path|
+          FileUtils.mv path, "."
+        }
+        FileUtils.rmdir "doc"
+        git "add", "."
+        git "commit", "-m", "generated by rdoc"
+        git "push", "-f", "origin", "gh-pages"
+      end
     end
   end
 
   def define_install
     desc "direct install (no gem)"
     task :install do
-      SimpleInstaller.new.run([])
+      Installer.new.run([])
     end
 
     desc "direct uninstall (no gem)"
     task :uninstall do
-      SimpleInstaller.new.run(["--uninstall"])
+      Installer.new.run(["--uninstall"])
     end
   end
   
-  def define_debug
-    runner = Class.new do
-      def comment_src_dst(on)
-        on ? ["", "#"] : ["#", ""]
-      end
-      
-      def comment_regions(on, contents, start)
-        src, dst = comment_src_dst(on)
-        contents.gsub(%r!^(\s+)#{src}#{start}.*?^\1#{src}(\}|end)!m) { |chunk|
-          indent = $1
-          chunk.gsub(%r!^#{indent}#{src}!, "#{indent}#{dst}")
-        }
-      end
-      
-      def comment_lines(on, contents, start)
-        src, dst = comment_src_dst(on)
-        contents.gsub(%r!^(\s*)#{src}#{start}!) { 
-          $1 + dst + start
-        }
-      end
-
-      def debug_info(enable)
-        require 'find'
-        Find.find("lib", "test") { |path|
-          if path =~ %r!\.rb\Z!
-            replace_file(path) { |contents|
-              result = comment_regions(!enable, contents, "debug")
-              comment_lines(!enable, result, "trace")
-            }
-          end
-        }
-      end
-    end
-    
-    desc "enable debug and trace calls"
-    task :debug_on do
-      runner.new.debug_info(true)
-    end
-    
-    desc "disable debug and trace calls"
-    task :debug_off do
-      runner.new.debug_info(false)
-    end
-  end
-
-  def define_columns
-    desc "check for columns > 80"
-    task :check_columns do
-      Dir["**/*.rb"].each { |file|
-        File.read(file).scan(%r!^.{81}!) { |match|
-          unless match =~ %r!http://!
-            raise "#{file} greater than 80 columns: #{match}"
-          end
-        }
-      }
-    end
-    task :prerelease => :check_columns
-  end
-
-  def define_comments
-    task :comments do
-      file = "comments.txt"
-      write_file(file) {
-        result = Array.new
-        (["Rakefile"] + Dir["**/*.{rb,rake}"]).each { |f|
-          File.read(f).scan(%r!\#[^\{].*$!) { |match|
-            result << match
-          }
-        }
-        result.join("\n")
-      }
-      CLEAN.include file
-    end
-  end
-
   def define_check_directory
     task :check_directory do
       unless `git status` =~ %r!nothing to commit \(working directory clean\)!
-        raise "Directory not clean"
+        raise "directory not clean"
       end
     end
   end
@@ -774,9 +719,9 @@ class Jumpstart
   def define_ping
     task :ping do
       require 'rbconfig'
-      %w[github.com rubyforge.org].each { |server|
+      %w[github.com].each { |server|
         cmd = "ping " + (
-          if Config::CONFIG["host"] =~ %r!darwin!
+          if RbConfig::CONFIG["host"] =~ %r!darwin!
             "-c2 #{server}"
           else
             "#{server} 2 2"
@@ -789,24 +734,45 @@ class Jumpstart
     end
   end
 
-  def define_update_jumpstart
-    url = ENV["RUBY_JUMPSTART"] || "git://github.com/quix/jumpstart.git"
-    task :update_jumpstart do
-      git "clone", url
-      rm_rf "devel/jumpstart"
-      Dir["jumpstart/**/*.rb"].each { |source|
-        dest = source.sub(%r!\Ajumpstart/!, "devel/")
-        dest_dir = File.dirname(dest)
-        mkdir_p(dest_dir) unless File.directory?(dest_dir)
-        cp source, dest
-      }
-      rm_r "jumpstart"
-      git "commit", "devel", "-m", "update jumpstart"
+  def define_update_levitate
+    url = ENV["LEVITATE"] ||
+      "https://github.com/quix/levitate/raw/master/levitate.rb"
+    task :update_levitate do
+      if system "curl", "-s", "-o", __FILE__, url
+        if `git diff #{__FILE__}` == ""
+          puts "Already up-to-date."
+        else
+          git "commit", __FILE__, "-m", "updated levitate"
+          puts "Updated levitate."
+        end
+      else
+        raise "levitate download failed"
+      end
     end
   end
 
+  def define_changes
+    task :changes do
+      header = "\n\n== Version ____\n\n"
+
+      bullets = `git log --format=%s #{last_release}..HEAD`.lines.map { |line|
+        "* #{line}"
+      }.join.chomp
+
+      write_file(history_file) do
+        File.read(history_file).sub(/(?<=#{gem_name} Changes)/) {
+          header + bullets
+        }
+      end
+    end
+  end
+
+  def last_release
+    `git tag`.lines.select { |t| t.index(gem_name) == 0 }.last.chomp
+  end
+
   def git(*args)
-    sh("git", *args)
+    sh "git", *args
   end
 
   def create_manifest
@@ -815,38 +781,16 @@ class Jumpstart
     }
   end
 
-  def rubyforge(mode, file, *options)
-    command = ["rubyforge", mode] + options + [
-      rubyforge_name,
-      rubyforge_name,
-      version.to_s,
-      file,
-    ]
-    sh(*command)
-  end
-
   def define_release
     task :prerelease => [:clean, :check_directory, :ping, history_file]
 
     task :finish_release do
-      gem_md5, tgz_md5 = [gem, tgz].map { |file|
-        md5 = "#{file}.md5"
-        sh("md5sum #{file} > #{md5}")
-        md5
-      }
-
-      rubyforge(
-        "add_release", gem, "--release_changes", history_file, "--preformatted"
-      )
-      [gem_md5, tgz, tgz_md5].each { |file|
-        rubyforge("add_file", file)
-      }
-
-      git("tag", "#{name}-" + version.to_s)
-      git(*%w(push --tags origin master))
+      git "tag", "#{gem_name}-" + version.to_s
+      git "push", "--tags", "origin", "master"
+      sh "gem", "push", gem
     end
 
-    task :release => [:prerelease, :package, :publish, :finish_release]
+    task :release => [:prerelease, :package, :finish_release]
   end
 
   def define_debug_gem
@@ -859,6 +803,26 @@ class Jumpstart
     sh(*([browser].flatten + files))
   end
 
+  def suppress_task_warnings(*task_names)
+    task_names.each { |task_name|
+      Rake::Task[task_name].actions.map! { |action|
+        lambda { |*args|
+          Ruby.no_warnings {
+            action.call(*args)
+          }
+        }
+      }
+    }
+  end
+
+  def ruby_18?
+    RUBY_VERSION =~ %r!\A1\.8!
+  end
+
+  def source_control?
+    File.directory? ".git"
+  end
+
   class << self
     include Util
     include InstanceEvalWithArgs
@@ -883,12 +847,11 @@ class Jumpstart
       lib = File.expand_path(File.dirname(__FILE__) + "/../lib")
       header = %{
         $LOAD_PATH.unshift "#{lib}"
-        require 'rubygems'
         begin
       }
       footer = %{
-        rescue Exception => __jumpstart_exception
-          puts "raises \#{__jumpstart_exception.class}"
+        rescue Exception => __levitate_exception
+          puts "raises \#{__levitate_exception.class}"
         end
       }
       final_code = header + code + footer
@@ -931,15 +894,15 @@ class Jumpstart
     end
 
     def doc_to_spec(file, *sections, &block)
-      jump = self
+      levitate = self
       describe file do
         sections.each { |section|
           describe "section `#{section}'" do
             it "should run as claimed" do
               if block
-                jump.run_doc_section(file, section, self, &block)
+                levitate.run_doc_section(file, section, self, &block)
               else
-                jump.run_doc_section(file, section, self) {
+                levitate.run_doc_section(file, section, self) {
                   |expected, actual, index|
                   actual.should == expected
                 }
@@ -951,14 +914,14 @@ class Jumpstart
     end
 
     def doc_to_test(file, *sections, &block)
-      jump = self
-      klass = Class.new Test::Unit::TestCase do
+      levitate = self
+      klass = Class.new MiniTest::Unit::TestCase do
         sections.each { |section|
           define_method "test_#{file}_#{section}" do
             if block
-              jump.run_doc_section(file, section, self, &block)
+              levitate.run_doc_section(file, section, self, &block)
             else
-              jump.run_doc_section(file, section, self) {
+              levitate.run_doc_section(file, section, self) {
                 |expected, actual, index|
                 assert_equal expected, actual
               }