ZenTest 3.11.1 → 4.0.0

data/.autotest

@@ -0,0 +1,17 @@
+# -*- ruby -*-
+
+require 'autotest/restart'
+
+Autotest.add_hook :initialize do |at|
+  at.order = :random
+  at.add_exception 'coverage'
+  at.add_exception 'coverage.info'
+
+  at.libs << ':../../minitest/dev/lib'
+  at.testlib = "minitest/autorun"
+end
+
+Autotest.add_hook :all_good do |at|
+  system "rake rcov_info"
+end if ENV['RCOV']
+

data/History.txt

@@ -1,5 +1,38 @@
+=== 4.0.0 / 2009-03-02
+
+* 2 minor enhancements:
+
+  * Deleted autotest/screen - releasing as a separate gem soon.
+  * Deleted test-rails and rails_test_audit.
+
+* 8 minor enhancements:
+
+  * Added "tags" command to multiruby_setup.
+  * Added "the_usual" as a recipe for multiruby_setup. Motivated by Dr. Nic.
+  * Added :died hook to Autotest (yoshuki).
+  * Added focus.rb, helping you ignore extra tests while you focus on something.
+  * Added multigem command line tool!
+  * Cleaned up multiruby to make it easier to tweak.
+  * Parameterized testlib so you can override test/unit in autotest. Thanks JB!
+  * Switched tests and rakefile to minitest. 20% faster!
+
+* 7 bug fixes:
+
+  * Fix Autotest::Screen to distinguish between errors and failures. (khalsah)
+  * Fixed some hook commands from overriding others.
+  * Hopefully fixed growl support on 10.5.x?
+  * Supposedly adding -w to growlnotify will fix autotest/growl.
+  * Updated missing entries in Autotest::ALL_HOOKS.
+  * Updated rubygems download location. (carletti)
+    * Still not automated :(
+  * ruby 1.9.1 fixes.
+
 === 3.11.1 / 2009-01-20
 
+* 1 minor enhancement:
+
+  * Parameterized test_lib so you can override test/unit. Thanks JB!
+
 * 1 bug fix:
 
   * Fixed growl autotest plugin hooks to not return true, preempting other plugins.

data/Manifest.txt

@@ -1,3 +1,4 @@
+.autotest
 History.txt
 Manifest.txt
 README.txt
@@ -6,9 +7,9 @@ articles/Article.css
 articles/getting_started_with_autotest.html
 articles/how_to_use_zentest.txt
 bin/autotest
+bin/multigem
 bin/multiruby
 bin/multiruby_setup
-bin/rails_test_audit
 bin/unit_diff
 bin/zentest
 example.txt
@@ -37,33 +38,17 @@ lib/autotest/rails.rb
 lib/autotest/rcov.rb
 lib/autotest/redgreen.rb
 lib/autotest/restart.rb
-lib/autotest/screen.rb
 lib/autotest/shame.rb
 lib/autotest/snarl.rb
 lib/autotest/timestamp.rb
+lib/focus.rb
 lib/functional_test_matrix.rb
 lib/multiruby.rb
-lib/test/rails.rb
-lib/test/rails/controller_test_case.rb
-lib/test/rails/functional_test_case.rb
-lib/test/rails/helper_test_case.rb
-lib/test/rails/ivar_proxy.rb
-lib/test/rails/pp_html_document.rb
-lib/test/rails/rake_tasks.rb
-lib/test/rails/render_tree.rb
-lib/test/rails/test_case.rb
-lib/test/rails/view_test_case.rb
-lib/test/zentest_assertions.rb
 lib/unit_diff.rb
 lib/zentest.rb
 lib/zentest_mapping.rb
 test/test_autotest.rb
-test/test_help.rb
-test/test_rails_autotest.rb
-test/test_rails_controller_test_case.rb
-test/test_rails_helper_test_case.rb
-test/test_rails_view_test_case.rb
+test/test_focus.rb
 test/test_unit_diff.rb
 test/test_zentest.rb
-test/test_zentest_assertions.rb
 test/test_zentest_mapping.rb

data/Rakefile

@@ -4,11 +4,16 @@ $: << 'lib'
 
 require 'rubygems'
 require 'hoe'
+
+Hoe.add_include_dirs("../../minitest/dev/lib")
+
 require './lib/zentest.rb'
 
 Hoe.new("ZenTest", ZenTest::VERSION) do |zentest|
   zentest.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
   zentest.developer('Eric Hodel', 'drbrain@segment7.net')
+
+  zentest.testlib = :minitest
 end
 
 task :autotest do

data/bin/multigem

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby -w
+
+exec "multiruby", "-S", "gem", *ARGV
+

data/bin/multiruby_setup

@@ -9,60 +9,63 @@ Multiruby.setup_dirs(false)
 
 ARGV.each do |spec|
   case spec
-  when "-h", "help" then
+  when "-h", "--help", "help" then
     Multiruby.help
     exit 0
+  when "the_usual" then # TODO: update #help
+    ARGV.push(*Multiruby::TAGS.map { |v| "mri:tar:#{v.gsub(/_/, '.')}" })
+    ARGV << "build" << "update:rubygems"
+    system "multigem install --no-ri --no-rdoc rake minitest ZenTest"
+  when "build" then
+    Multiruby.build_and_install
+  when "clean" then
+    Multiruby.clean
   when "list" then
     Multiruby.list
-    exit 0
-  when "build" then
-    # do nothing
   when /rm:(.*)/ then
     Multiruby.rm $1
-  when "clean" then
-    Multiruby.clean
-    exit 0
-  when "update" then
-    Multiruby.update
-  when "update:rubygems" then
-    Multiruby.update_rubygems
   when "rubygems:merge" then
     Multiruby.merge_rubygems
+  when "rubygems:update", "update:rubygems" then
+    Multiruby.update_rubygems
+  when "update" then
+    Multiruby.update
+  when "tags" then
+    p Multiruby.tags
   when "mri:svn:current" then
-    ARGV << "mri:svn:releases" << "mri:svn:branches"
+    ARGV << "mri:svn:releases" << "mri:svn:branches" << "build"
   when "mri:svn:releases" then
     Multiruby::TAGS.each do |v|
       latest = Multiruby.mri_latest_tag v
       abort "Can't find tag #{v}" unless latest
       ARGV << "mri:svn:tag:#{latest}:mri_rel_#{v}"
     end
+    ARGV << "build"
+  when /mri:svn:branch:(.*)/ then
+    ver = "branches/ruby_#{$1}" unless ver == "trunk"
+    Multiruby.svn_co "#{Multiruby::MRI_SVN}/#{$1}", "mri_#{$1}"
+    ARGV << "build"
   when "mri:svn:branches" then
     Multiruby::BRANCHES.each do |v|
       ARGV << "mri:svn:branch:#{v}"
     end
-  when /mri:svn:branch:(.*)/ then
-    dir = ver = $1
-    ver = "branches/ruby_#{ver}" unless ver == "trunk"
-
-    Multiruby.svn_co "#{Multiruby::MRI_SVN}/#{ver}", "mri_#{dir}"
+    ARGV << "build"
   when /mri:svn:tag:(.*):(.*)/ then
-    ver, dir = $1, $2
-
-    Multiruby.svn_co "#{Multiruby::MRI_SVN}/tags/#{ver}", dir
+    Multiruby.svn_co "#{Multiruby::MRI_SVN}/tags/#{$1}", $2
+    ARGV << "build"
   when /mri:svn:tag:(.*)/ then
-    ver = $1
-
-    ARGV << "mri:svn:tag:#{ver}:#{ver}"
+    ARGV << "mri:svn:tag:#{$1}:#{$1}" << "build"
   when /mri:tar:(.*)/ then
-    v = $1
-    Multiruby.fetch_tar v
-  when /rbx:ln:(.*)/ then
-    Multiruby.rbx_ln $1
+    Multiruby.fetch_tar $1
+    ARGV << "build"
   when /rbx:git:current/ then
     Multiruby.git_clone "#{Multiruby::RBX_GIT}/code", "rubinius"
+    ARGV << "build"
+  when /rbx:ln:(.*)/ then
+    Multiruby.rbx_ln $1
+    ARGV << "build"
   else
     warn "unknown spec #{spec}"
   end
 end
 
-Multiruby.build_and_install

data/lib/autotest.rb

@@ -28,8 +28,7 @@ $TESTING = false unless defined? $TESTING
 #
 #   Autotest.add_hook hook_name { |autotest| ... }
 #
-# The available hooks are: initialize, run, run_command, ran_command,
-#   red, green, updated, all_good, reset, interrupt, and quit.
+# The available hooks are listed in +ALL_HOOKS+.
 #
 # See example_dot_autotest.rb for more details.
 #
@@ -62,8 +61,8 @@ class Autotest
 
   T0 = Time.at 0
 
-  ALL_HOOKS = [ :all_good, :initialize, :interrupt, :quit, :ran_command,
-                :reset, :run_command, :waiting ]
+  ALL_HOOKS = [ :all_good, :died, :green, :initialize, :interrupt, :quit,
+                :ran_command, :red, :reset, :run_command, :updated, :waiting ]
 
   HOOKS = Hash.new { |h,k| h[k] = [] }
   unless defined? WINDOZE then
@@ -154,6 +153,7 @@ class Autotest
                 :results,
                 :sleep,
                 :tainted,
+                :testlib,
                 :find_directories,
                 :unit_diff,
                 :wants_to_quit)
@@ -168,18 +168,19 @@ class Autotest
     @test_mappings = []
 
     self.completed_re = /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/
-    self.extra_class_map = {}
-    self.extra_files = []
+    self.extra_class_map   = {}
+    self.extra_files       = []
     self.failed_results_re = /^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/
-    self.files_to_test = new_hash_of_arrays
-    self.find_order = []
-    self.known_files = nil
-    self.libs = %w[. lib test].join(File::PATH_SEPARATOR)
-    self.order = :random
-    self.output = $stderr
-    self.sleep = 1
-    self.find_directories = ['.']
-    self.unit_diff = "unit_diff -u"
+    self.files_to_test     = new_hash_of_arrays
+    self.find_order        = []
+    self.known_files       = nil
+    self.libs              = %w[. lib test].join(File::PATH_SEPARATOR)
+    self.order             = :random
+    self.output            = $stderr
+    self.sleep             = 1
+    self.testlib          = "test/unit"
+    self.find_directories  = ['.']
+    self.unit_diff         = "unit_diff -u"
 
     self.add_mapping(/^lib\/.*\.rb$/) do |filename, _|
       possible = File.basename(filename).gsub '_', '_?'
@@ -221,6 +222,8 @@ class Autotest
       end
     end
     hook :quit
+  rescue Exception
+    hook :died
   end
 
   ##
@@ -429,8 +432,9 @@ class Autotest
     full, partial = reorder(files_to_test).partition { |k,v| v.empty? }
 
     unless full.empty? then
-      classes = full.map {|k,v| k}.flatten.uniq.join(' ')
-      cmds << "#{ruby} -I#{libs} -rtest/unit -e \"%w[#{classes}].each { |f| require f }\" | #{unit_diff}"
+      classes = full.map {|k,v| k}.flatten.uniq
+      classes.unshift testlib
+      cmds << "#{ruby} -I#{libs} -rubygems -e \"%w[#{classes.join(' ')}].each { |f| require f }\" | #{unit_diff}"
     end
 
     partial.each do |klass, methods|

data/lib/autotest/emacs.rb

@@ -11,6 +11,7 @@ module Autotest::Emacs
 
   def self.emacs_autotest status
     `#{@@client_cmd} \"(autotest-update '#{status})\"`
+    nil
   end
 
   Autotest.add_hook :run_command do  |at|

data/lib/autotest/growl.rb

@@ -6,7 +6,7 @@ module Autotest::Growl
     msg += " at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"
     # TODO: parameterize default image
     img ||= "/Applications/Mail.app/Contents/Resources/Caution.tiff"
-    cmd = "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title}"
+    cmd = "growlnotify -w -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title}"
     system cmd
     nil
   end

data/lib/focus.rb

@@ -0,0 +1,9 @@
+class Module
+  def focus *wanteds
+    wanteds.map! { |m| m.to_s }
+    unwanteds = public_instance_methods(false).grep(/test_/) - wanteds
+    unwanteds.each do |unwanted|
+      remove_method unwanted
+    end
+  end
+end

data/lib/multiruby.rb

@@ -8,37 +8,53 @@ require 'open-uri'
 #
 #   cmds:
 #
-#     h, help         - show this help.
-#     list            - print installed versions.
-#     update          - update svn builds.
-#     update:rubygems - update rubygems and nuke install dirs.
-#     rubygems:merge  - symlink all rubygem dirs to one dir.
-#     rm:$version     - remove a particular version.
-#     clean           - clean scm build dirs and remove non-scm build dirs.
+#     -h, --help, help = show this help.
+#     build            = build and install everything. used internally.
+#     clean            = clean scm build dirs and remove non-scm build dirs.
+#     list             = print installed versions.
+#     rm:$version      = remove a particular version.
+#     rubygems:merge   = symlink all rubygem dirs to one dir.
+#     tags             = list all tags from svn.
+#     update           = update svn builds.
+#     update:rubygems  = update rubygems and nuke install dirs.
 #
 #   specs:
 #
-#     mri:svn:current        - alias for mri:svn:releases and mri:svn:branches.
-#     mri:svn:releases       - alias for supported releases of mri ruby.
-#     mri:svn:branches       - alias for active branches of mri ruby.
-#     mri:svn:branch:$branch - install a specific $branch of mri from svn.
-#     mri:svn:tag:$tag       - install a specific $tag of mri from svn.
-#     mri:tar:$version       - install a specific $version of mri from tarball.
-#     rbx:ln:$dir            - symlink your rbx $dir
-#     rbx:git:current        - install rbx from git
+#     the_usual              = alias for latest versions from tar + rubygems
+#     mri:svn:current        = alias for mri:svn:releases and mri:svn:branches.
+#     mri:svn:releases       = alias for supported releases of mri ruby.
+#     mri:svn:branches       = alias for active branches of mri ruby.
+#     mri:svn:branch:$branch = install a specific $branch of mri from svn.
+#     mri:svn:tag:$tag       = install a specific $tag of mri from svn.
+#     mri:tar:$version       = install a specific $version of mri from tarball.
+#     rbx:ln:$dir            = symlink your rbx $dir
+#     rbx:git:current        = install rbx from git
+#
+#   environment variables:
+#
+#     GEM_URL  = url for rubygems tarballs
+#     MRI_SVN  = url for MRI SVN
+#     RBX_GIT  = url for rubinius git
+#     RUBY_URL = url for MRI tarballs
+#     VERSIONS = what versions to install
 #
 # NOTES:
 #
 # * you can add a symlink to your rubinius build into ~/.multiruby/install
-# * I'll get to adding support for other implementations soon.
+# * I need patches/maintainers for other implementations.
 #
 module Multiruby
-  MRI_SVN  = "http://svn.ruby-lang.org/repos/ruby"
-  RBX_GIT  = "git://git.rubini.us"
+  def self.env name, fallback; ENV[name] || fallback; end # :nodoc:
 
-  TAGS     = %w(    1_8_6 1_8_7 1_9  )
+  TAGS     = %w(    1_8_6 1_8_7 1_9_1)
   BRANCHES = %w(1_8 1_8_6 1_8_7 trunk)
 
+  VERSIONS = env('VERSIONS', TAGS.join(":")).split(/:/)
+  MRI_SVN  = env 'MRI_SVN',  'http://svn.ruby-lang.org/repos/ruby'
+  RBX_GIT  = env 'RBX_GIT',  'git://git.rubini.us'
+  RUBY_URL = env 'RUBY_URL', 'http://ftp.ruby-lang.org/pub/ruby'
+  GEM_URL  = env 'GEM_URL',  'http://files.rubyforge.vm.bytemark.co.uk/rubygems'
+
   HELP = []
 
   File.readlines(__FILE__).each do |line|
@@ -138,7 +154,7 @@ module Multiruby
   def self.extract_latest_version url, matching=nil
     file = URI.parse(url).read
     versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
-      s =~ /preview/
+      s =~ /preview|-rc\d/
     }.sort_by { |s|
       s.split(/\D+/).map { |i| i.to_i }
     }.flatten
@@ -147,19 +163,18 @@ module Multiruby
   end
 
   def self.fetch_tar v
-    require 'open-uri'
-    base_url = "http://ftp.ruby-lang.org/pub/ruby"
-
     in_versions_dir do
-      warn "    Determining latest version for #{v}"
+      warn "  Determining latest version for #{v}"
       ver = v[/\d+\.\d+/]
-      base = extract_latest_version("#{base_url}/#{ver}/", v)
+      base = extract_latest_version("#{RUBY_URL}/#{ver}/", v)
       abort "Could not determine release for #{v}" unless base
-      url = File.join base_url, ver, base
-      warn "    Fetching #{base} via HTTP... this might take a while."
-      open(url) do |f|
-        File.open base, 'w' do |out|
-          out.write f.read
+      url = File.join RUBY_URL, ver, base
+      unless File.file? base then
+        warn "    Fetching #{base} via HTTP... this might take a while."
+        open(url) do |f|
+          File.open base, 'w' do |out|
+            out.write f.read
+          end
         end
       end
     end
@@ -179,11 +194,6 @@ module Multiruby
     run "make install &> log.install"
   end
 
-  def self.rake_build inst_dir
-    run "rake &> log.build"
-    FileUtils.ln_sf "../build/#{File.basename Dir.pwd}", inst_dir
-  end
-
   def self.help
     puts HELP.join
   end
@@ -246,6 +256,11 @@ module Multiruby
     Multiruby.tags.grep(/#{v}/).last
   end
 
+  def self.rake_build inst_dir
+    run "rake &> log.build"
+    FileUtils.ln_sf "../build/#{File.basename Dir.pwd}", inst_dir
+  end
+
   def self.rbx_ln dir
     dir = File.expand_path dir
     Multiruby.in_versions_dir do
@@ -274,19 +289,19 @@ module Multiruby
     root_dir
   end
 
-  def self.run(cmd)
+  def self.run cmd
     puts "Running command: #{cmd}"
     raise "ERROR: Command failed with exit code #{$?}" unless system cmd
   end
 
-  def self.setup_dirs(download = true)
+  def self.setup_dirs download = true
     %w(build install versions tmp).each do |dir|
       unless test ?d, dir then
         puts "creating #{dir}"
         Dir.mkdir dir
         if dir == "versions" && download then
           warn "  Downloading initial ruby tarballs to ~/.multiruby/versions:"
-          %w(1.8 1.9).each do |v|
+          VERSIONS.each do |v|
             self.fetch_tar v
           end
           warn "  ...done"
@@ -380,17 +395,20 @@ module Multiruby
   end
 
   def self.update_rubygems
-    url = "http://files.rubyforge.rubyuser.de/rubygems/"
-    html = URI.parse(url).read
+    warn "  Determining latest version for rubygems"
+    html = URI.parse(GEM_URL).read
 
-    versions = html.scan(/href="rubygems-update-(\d+(?:\.\d+)+).gem/).flatten
+    versions = html.scan(/href="rubygems-update-(\d+(?:\.\d+)+).gem/i).flatten
     latest = versions.sort_by { |s| s.scan(/\d+/).map { |s| s.to_i } }.last
 
     Multiruby.in_versions_dir do
-      File.unlink(*Dir["rubygems*"])
       file = "rubygems-#{latest}.tgz"
-      File.open file, 'w' do |f|
-        f.write URI.parse(url+file).read
+      unless File.file? file then
+        warn "    Fetching rubygems-#{latest}.tgz via HTTP."
+        File.unlink(*Dir["rubygems*"])
+        File.open file, 'w' do |f|
+          f.write URI.parse(GEM_URL+"/"+file).read
+        end
       end
     end