ZenTest 3.9.3 → 3.10.0

data/History.txt

@@ -1,3 +1,20 @@
+=== 3.10.0 / 2008-06-17
+
+* 1 major enhancement:
+
+  * Added multiruby_setup to help manage multiruby installed versions.
+
+* 3 minor enhancements:
+
+  * Added autotest/once plugin to help plugin developers.
+  * Heavily refactored multiruby.
+  * Switched rubinius from shotgun/rubinius to bin/rbx, finally.
+
+* 2 bug fixes:
+
+  * Refactored zentest_mapping test to avoid zentest altogether.
+  * zentest tests bail gracefully for rubinius.
+
 === 3.9.3 / 2008-06-09
 
 * 12 minor enhancements:

data/Manifest.txt

@@ -7,6 +7,7 @@ articles/getting_started_with_autotest.html
 articles/how_to_use_zentest.txt
 bin/autotest
 bin/multiruby
+bin/multiruby_setup
 bin/rails_test_audit
 bin/unit_diff
 bin/zentest
@@ -30,6 +31,7 @@ lib/autotest/kdenotify.rb
 lib/autotest/menu.rb
 lib/autotest/migrate.rb
 lib/autotest/notify.rb
+lib/autotest/once.rb
 lib/autotest/pretty.rb
 lib/autotest/rails.rb
 lib/autotest/rcov.rb
@@ -39,6 +41,7 @@ lib/autotest/shame.rb
 lib/autotest/snarl.rb
 lib/autotest/timestamp.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

data/README.txt

@@ -21,7 +21,8 @@ development. As soon as you save a file, autotest will run the
 corresponding dependent tests.
 
 multiruby runs anything you want on multiple versions of ruby. Great
-for compatibility checking!
+for compatibility checking! Use multiruby_setup to manage your
+installed versions.
 
 Test::Rails helps you build industrial-strength Rails code.
 
@@ -58,6 +59,7 @@ implementation.
 
   autotest
 
+  multiruby_setup mri:svn:current
   multiruby ./TestMyProject.rb
 
   (and other stuff for Test::Rails)

data/bin/multiruby

@@ -1,104 +1,9 @@
 #!/usr/bin/env ruby -w
 
-require 'fileutils'
-
-def run(cmd)
-  puts "Running command: #{cmd}"
-  raise "ERROR: Command failed with exit code #{$?}" unless system cmd
-end
-
-def extract_latest_version url
-  file = URI.parse(url).read
-  versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
-    s =~ /preview/
-  }.sort_by { |s|
-    s.split(/\D+/).map { |i| i.to_i }
-  }.flatten.last
-end
-
-root_dir = File.expand_path(ENV['MULTIRUBY'] ||
-                            File.join(ENV['HOME'], ".multiruby"))
-
-unless test ?d, root_dir then
-  puts "creating #{root_dir}"
-  Dir.mkdir root_dir, 0700
-end
-
-versions = []
-Dir.chdir root_dir do
-  %w(build install versions).each do |dir|
-    unless test ?d, dir then
-      puts "creating #{dir}"
-      Dir.mkdir dir
-      if dir == "versions" then
-        warn "  Downloading initial ruby tarballs to ~/.multiruby/versions:"
-        Dir.chdir dir do
-          require 'open-uri'
-          base_url = "http://ftp.ruby-lang.org/pub/ruby"
-
-          %w(1.8 1.9).each do |v|
-            warn "    Determining latest version for #{v}"
-            base = extract_latest_version("#{base_url}/#{v}/")
-            url = File.join base_url, v, 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
-              end
-            end
-          end
-        end
-        warn "  ...done"
-        warn "  Put other ruby tarballs in ~/.multiruby/versions to use them."
-      end
-    end
-  end
-
-  tarballs = Dir["versions/rubygems*.tgz"]
-  raise "You should delete all but one rubygem tarball" if tarballs.size > 1
-  rubygem_tarball = File.expand_path tarballs.last rescue nil
-
-  Dir.chdir "build" do
-    Dir["../versions/ruby*.tar.gz"].each do |tarball|
-      next if tarball =~ /rubygems/
-      build_dir = File.basename tarball, ".tar.gz"
-      version = build_dir.sub(/^ruby-?/, '')
-      versions << version
-      inst_dir = "#{root_dir}/install/#{version}"
-      unless test ?d, inst_dir then
-        unless test ?d, build_dir then
-          puts "creating #{inst_dir}"
-          Dir.mkdir inst_dir
-          run "tar zxf #{tarball}"
-        end
-        Dir.chdir build_dir do
-          puts "building and installing #{version}"
-          run "autoconf" unless test ?f, "configure"
-          FileUtils.rm_r "ext/readline" if test ?d, "ext/readline"
-          run "./configure --prefix #{inst_dir} &> log.configure" unless test ?f, "Makefile"
-          run "nice make -j4 &> log.build"
-          run "make install &> log.install"
-          build_dir = Dir.pwd
-
-          if rubygem_tarball and version !~ /1[._-]9/ then
-            rubygems = File.basename rubygem_tarball, ".tgz"
-            run "tar zxf #{rubygem_tarball}" unless test ?d, rubygems
-
-            Dir.chdir rubygems do
-              run "../ruby ./setup.rb &> ../log.rubygems"
-            end
-          end
-        end
-      end
-    end
-  end
-
-  # pick up rubinius - allows for simple symlinks to your build dir
-  Dir.chdir('install') do
-    versions.push(*Dir["rubinius*"])
-  end
-end
+require 'multiruby'
 
+root_dir = Multiruby.root_dir
+versions = Multiruby.build_and_install
 versions = ENV['VERSIONS'].split(/:/) if ENV.has_key? 'VERSIONS'
 
 if ENV.has_key? 'EXCLUDED_VERSIONS' then
@@ -109,7 +14,8 @@ end
 results = {}
 versions.each do |version|
   ruby = "#{root_dir}/install/#{version}/bin/ruby"
-  ruby.sub!(/bin.ruby/, 'shotgun/rubinius') if version =~ /rubinius/
+
+  ruby.sub!(/bin.ruby/, 'bin/rbx') if version =~ /rubinius/
 
   puts
   puts "VERSION = #{version}"

data/bin/multiruby_setup

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby -w
+
+require 'multiruby'
+
+ARGV << "help" if ARGV.empty?
+
+ARGV.each do |spec|
+  case spec
+  when "-h", "help" then
+    Multiruby.help
+  when "list" then
+    Multiruby.list
+  when /rm:(.*)/ then
+    Multiruby.rm $1
+  when "clean" then
+    Multiruby.clean
+  when "update" then
+    Multiruby.update
+  when "update:rubygems" then
+    Multiruby.update_rubygems
+  when "mri:svn:current" then
+    ARGV << "mri:svn:releases" << "mri:svn:branches"
+  when "mri:svn:releases" then
+    Multiruby::TAGS.each do |v|
+      ARGV << "mri:svn:#{v}"
+    end
+  when "mri:svn:branches" then
+    Multiruby::BRANCHES.each do |v|
+      ARGV << "mri:svn:#{v}"
+    end
+  when /mri:svn:branch:(.*)/ then
+    ver = $1
+    ver = "branches/ruby_#{ver}" unless ver == "trunk"
+
+    Multiruby.svn_co "#{Multiruby::MRI_SVN}/#{ver}", "mri_#{ver}"
+  when /mri:svn:tag:(.*)/ then
+    ver = $1
+    latest = Multiruby.tags.grep(/#{ver}/).last
+
+    Multiruby.svn_co "#{Multiruby::MRI_SVN}/tags/#{latest}", "mri_rel_#{ver}"
+  when /mri:tar:(.*)/ then
+    v = $1
+    Multiruby.fetch_tar v
+  else
+    warn "unknown spec #{spec}"
+  end
+end
+
+Multiruby.build_and_install

data/lib/autotest/once.rb

@@ -0,0 +1,9 @@
+##
+# this is for autotest plugin developers only...
+
+module Autotest::Once
+  Autotest.add_hook :ran_command do |at|
+    exit 0
+  end
+end
+

data/lib/multiruby.rb

@@ -0,0 +1,303 @@
+require 'fileutils'
+require 'open-uri'
+
+##
+# multiruby_setup is a script to help you manage multiruby.
+#
+# usage: multiruby_setup [-h|cmd|spec...]
+#
+#   cmds:
+#
+#     h, help         - show this help.
+#     list            - print installed versions.
+#     update          - update svn builds.
+#     update:rubygems - update rubygems and nuke install dirs.
+#     rm:$version     - remove a particular version.
+#     clean           - clean scm build dirs and remove non-scm build 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.
+#
+# NOTES:
+#
+# * you can add a symlink to your rubinius build into ~/.multiruby/install
+# * I'll get to adding support for other implementations soon.
+#
+module Multiruby
+  MRI_SVN = "http://svn.ruby-lang.org/repos/ruby"
+  TAGS     = %w(    1_8_6 1_8_7 1_9  ).map { |v| "tag:#{v}" }
+  BRANCHES = %w(1_8 1_8_6 1_8_7 trunk).map { |v| "branch:#{v}" }
+
+  def self.build_and_install
+    root_dir = self.root_dir
+    versions = []
+
+    Dir.chdir root_dir do
+      self.setup_dirs
+
+      rubygems = Dir["versions/rubygems*.tgz"]
+      abort "You should delete all but one rubygem tarball" if rubygems.size > 1
+      rubygem_tarball = File.expand_path rubygems.last rescue nil
+
+      Dir.chdir "build" do
+        Dir["../versions/*"].each do |tarball|
+          next if tarball =~ /rubygems/
+
+          build_dir = File.basename tarball, ".tar.gz"
+          version = build_dir.sub(/^ruby-?/, '')
+          versions << version
+          inst_dir = "#{root_dir}/install/#{version}"
+
+          unless test ?d, inst_dir then
+            unless test ?d, build_dir then
+              puts "creating #{inst_dir}"
+              Dir.mkdir inst_dir
+              run "tar zxf #{tarball}"
+            end
+            Dir.chdir build_dir do
+              puts "building and installing #{version}"
+              run "autoconf" unless test ?f, "configure"
+              FileUtils.rm_r "ext/readline" if test ?d, "ext/readline"
+              run "./configure --prefix #{inst_dir} &> log.configure" unless test ?f, "Makefile"
+              run "nice make -j4 &> log.build"
+              run "make install &> log.install"
+              build_dir = Dir.pwd
+
+              if rubygem_tarball and version !~ /1[._-]9|trunk/ then
+                rubygems = File.basename rubygem_tarball, ".tgz"
+                run "tar zxf #{rubygem_tarball}" unless test ?d, rubygems
+
+                Dir.chdir rubygems do
+                  run "../ruby ./setup.rb --no-rdoc --no-ri &> ../log.rubygems"
+                end
+              end
+            end
+          end
+        end
+      end
+
+      # pick up rubinius - allows for simple symlinks to your build dir
+      self.in_install_dir do
+        versions.push(*Dir["rubinius*"])
+      end
+    end
+
+    versions
+  end
+
+  def self.clean
+    self.each_scm_build_dir do |style|
+      case style
+      when :svn, :git then
+        if File.exist? "Makefile" then
+          system "make clean"
+        elsif File.exist? "Rakefile" then
+          system "rake clean"
+        end
+      else
+        FileUtils.rm_rf Dir.pwd
+      end
+    end
+  end
+
+  def self.each_scm_build_dir
+    Multiruby.in_build_dir do
+      Dir["*"].each do |dir|
+        next unless File.directory? dir
+        Dir.chdir dir do
+          if File.exist?(".svn") || File.exist?(".git") then
+            scm = File.exist?(".svn") ? :svn : :git
+            yield scm
+          else
+            yield :none
+          end
+        end
+      end
+    end
+  end
+
+  def self.extract_latest_version url
+    file = URI.parse(url).read
+    versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
+      s =~ /preview/
+    }.sort_by { |s|
+      s.split(/\D+/).map { |i| i.to_i }
+    }.flatten.last
+  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}"
+      base = extract_latest_version("#{base_url}/#{v}/")
+      url = File.join base_url, v, 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
+        end
+      end
+    end
+  end
+
+  def self.help
+    File.readlines(__FILE__).each do |line|
+      next unless line =~ /^#( |$)/
+      puts line.sub(/^# ?/, '')
+    end
+  end
+
+  def self.in_build_dir
+    Dir.chdir File.join(self.root_dir, "build") do
+      yield
+    end
+  end
+
+  def self.in_install_dir
+    Dir.chdir File.join(self.root_dir, "install") do
+      yield
+    end
+  end
+
+  def self.in_root_dir
+    Dir.chdir self.root_dir do
+      yield
+    end
+  end
+
+  def self.in_tmp_dir
+    Dir.chdir File.join(self.root_dir, "tmp") do
+      yield
+    end
+  end
+
+  def self.in_versions_dir
+    Dir.chdir File.join(self.root_dir, "versions") do
+      yield
+    end
+  end
+
+  def self.list
+    puts "Known versions:"
+    in_install_dir do
+      Dir["*"].sort.each do |d|
+        puts "  #{d}"
+      end
+    end
+  end
+
+  def self.rm name
+    Multiruby.in_root_dir do
+      FileUtils.rm_rf Dir["*/#{name}"]
+      File.unlink "versions/ruby-#{name}.tar.gz"
+    end
+  end
+
+  def self.root_dir
+    root_dir = File.expand_path(ENV['MULTIRUBY'] ||
+                                File.join(ENV['HOME'], ".multiruby"))
+
+    unless test ?d, root_dir then
+      puts "creating #{root_dir}"
+      Dir.mkdir root_dir, 0700
+    end
+
+    root_dir
+  end
+
+  def self.run(cmd)
+    puts "Running command: #{cmd}"
+    raise "ERROR: Command failed with exit code #{$?}" unless system cmd
+  end
+
+  def self.setup_dirs
+    %w(build install versions tmp).each do |dir|
+      unless test ?d, dir then
+        puts "creating #{dir}"
+        Dir.mkdir dir
+        if dir == "versions" then
+          warn "  Downloading initial ruby tarballs to ~/.multiruby/versions:"
+          %w(1.8 1.9).each do |v|
+            self.fetch_tar v
+          end
+          warn "  ...done"
+          warn "  Put other ruby tarballs in ~/.multiruby/versions to use them."
+        end
+      end
+    end
+  end
+
+  def self.svn_co url, dir
+    Multiruby.in_versions_dir do
+      Multiruby.run "svn co #{url} #{dir}" unless File.directory? dir
+      FileUtils.ln_s "../versions/#{dir}", "../build/#{dir}"
+    end
+  end
+
+  def self.tags
+    tags = nil
+    Multiruby.in_tmp_dir do
+      cache = "svn.tag.cache"
+      File.unlink cache if Time.now - File.mtime(cache) > 86400 rescue nil
+
+      File.open cache, "w" do |f|
+        f.write `svn ls #{MRI_SVN}/tags/`
+      end unless File.exist? cache
+
+      tags = File.read(cache).split(/\n/).grep(/^v/).reject {|s| s =~ /preview/}
+    end
+
+    tags = tags.sort_by { |s| s.scan(/\d+/).map { |s| s.to_i } }
+  end
+
+  def self.update
+    # TODO:
+    # update will look at the dir name and act accordingly rel_.* will
+    # figure out latest tag on that name and svn sw to it trunk and
+    # others will just svn update
+
+    self.each_scm_build_dir do |style|
+      case style
+      when :svn then
+        dir = File.basename(Dir.pwd)
+        warn dir
+        case dir
+        when /mri_\d/ then
+          system "svn cleanup" # just in case
+          FileUtils.rm_rf "../install/#{dir}" if `svn up` =~ /^[ADUCG] /
+        when /tag/
+          warn "don't know how to update tags: #{dir}"
+          # url = `svn info`[/^URL: (.*)/, 1]
+        else
+          warn "don't know how to update: #{dir}"
+        end
+      else
+        warn "update in non-svn dir not supported yet: #{dir}"
+      end
+    end
+  end
+
+  def self.update_rubygems
+    url = "http://files.rubyforge.rubyuser.de/rubygems/"
+    html = URI.parse(url).read
+
+    versions = html.scan(/href="rubygems-update-(\d+(?:\.\d+)+).gem/).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
+      end
+    end
+  end
+end

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.9.3'
+  VERSION = '3.10.0'
 
   include ZenTestMapping
 

data/test/test_zentest.rb

@@ -1,5 +1,10 @@
 #!/usr/local/bin/ruby -w
 
+if defined? RUBY_ENGINE then
+  warn "rubinius does not support features required by zentest. Skipping tests"
+  return
+end
+
 require 'test/unit' unless defined? $ZENTEST and $ZENTEST
 
 $TESTING = true

data/test/test_zentest_mapping.rb

@@ -2,16 +2,20 @@ require 'test/unit' unless defined? $ZENTEST and $ZENTEST
 
 $TESTING = true
 
-# I do this so I can still run ZenTest against the tests and itself...
-require 'zentest' unless defined? $ZENTEST
+require 'zentest_mapping' unless defined? $ZENTEST
+
+class Dummy
+  attr_accessor :inherited_methods
+  include ZenTestMapping
+end
 
 class TestZentestMapping < Test::Unit::TestCase
   def setup
-    @tester = ZenTest.new
+    @tester = Dummy.new
   end
 
   def util_simple_setup
-    @tester.klasses = {
+    klasses = {
       "Something" =>
         {
         "method1" => true,
@@ -25,7 +29,7 @@ class TestZentestMapping < Test::Unit::TestCase
         "self.[]" => true,
       },
     }
-    @tester.test_klasses = {
+    test_klasses = {
       "TestSomething" =>
         {
         "test_class_method4" => true,
@@ -35,7 +39,7 @@ class TestZentestMapping < Test::Unit::TestCase
         "test_class_index" => true,
       },
     }
-    @tester.inherited_methods = @tester.test_klasses.merge(@tester.klasses)
+    @tester.inherited_methods = test_klasses.merge(klasses)
     @generated_code = "
 require 'test/unit' unless defined? $ZENTEST and $ZENTEST
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.9.3
+  version: 3.10.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-09 00:00:00 -07:00
+date: 2008-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +22,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.3
     version: 
-description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking!  Test::Rails helps you build industrial-strength Rails code."
+description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.  Test::Rails helps you build industrial-strength Rails code."
 email: 
 - ryand-ruby@zenspider.com
 - drbrain@segment7.net
 executables: 
 - autotest
 - multiruby
+- multiruby_setup
 - rails_test_audit
 - unit_diff
 - zentest
@@ -50,6 +51,7 @@ files:
 - articles/how_to_use_zentest.txt
 - bin/autotest
 - bin/multiruby
+- bin/multiruby_setup
 - bin/rails_test_audit
 - bin/unit_diff
 - bin/zentest
@@ -73,6 +75,7 @@ files:
 - lib/autotest/menu.rb
 - lib/autotest/migrate.rb
 - lib/autotest/notify.rb
+- lib/autotest/once.rb
 - lib/autotest/pretty.rb
 - lib/autotest/rails.rb
 - lib/autotest/rcov.rb
@@ -82,6 +85,7 @@ files:
 - lib/autotest/snarl.rb
 - lib/autotest/timestamp.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