ZenTest 4.3.3 → 4.4.0

data/History.txt

@@ -1,3 +1,19 @@
+=== 4.4.0 / 2010-09-01
+
+* 1 major enhancement:
+
+  * Removed git building. I'm dropping direct support for rubinius.
+
+* 3 minor enhancements:
+
+  * Added multiruby  mri:list:x.y.z command so you can see what's available.
+  * Enabled installing specific patch versions of ruby.
+  * multiruby rubygems:update now forces a build to be less confusing.
+
+* 1 bug fix:
+
+  * Removed redundant test_to_normal, now in zentest_mappings
+
 === 4.3.3 / 2010-06-17
 
 * 2 minor enhancements:

data/bin/multiruby_setup

@@ -30,6 +30,7 @@ ARGV.each do |spec|
     Multiruby.merge_rubygems
   when "rubygems:update", "update:rubygems" then
     Multiruby.update_rubygems
+    ARGV << "build"
   when "update" then
     Multiruby.update
   when "tags" then
@@ -57,6 +58,12 @@ ARGV.each do |spec|
     ARGV << "build"
   when /mri:svn:tag:(.*)/ then
     ARGV << "mri:svn:tag:#{$1}:#{$1}" << "build"
+  when /mri:list:(.*)/ then
+    v   = $1
+    ver = v[/\d+\.\d+/]
+    url = "#{Multiruby::RUBY_URL}/#{ver}/"
+
+    puts Multiruby.matching_versions(url, v).join("\n")
   when /mri:tar:(.*)/ then
     Multiruby.fetch_tar $1
     ARGV << "build"

data/lib/autotest.rb

@@ -144,6 +144,8 @@ class Autotest
                 :unit_diff,
                 :wants_to_quit)
 
+  alias tainted? tainted
+
   ##
   # Initialize the instance and then load the user's .autotest file, if any.
 
@@ -196,14 +198,14 @@ class Autotest
     loop do # ^c handler
       begin
         get_to_green
-        if self.tainted then
+        if tainted? then
           rerun_all_tests
         else
           hook :all_good
         end
         wait_for_changes
       rescue Interrupt
-        break if self.wants_to_quit
+        break if wants_to_quit
         reset
       end
     end
@@ -371,7 +373,7 @@ class Autotest
   # if any file is newer than the previously recorded most recent
   # file.
 
-  def find_files_to_test(files=find_files)
+  def find_files_to_test files = find_files
     updated = files.select { |filename, mtime| self.last_mtime < mtime }
 
     p updated if $v unless updated.empty? || self.last_mtime.to_i == 0

data/lib/multiruby.rb

@@ -123,7 +123,7 @@ module Multiruby
   def self.clean
     self.each_scm_build_dir do |style|
       case style
-      when :svn, :git then
+      when :svn then
         if File.exist? "Rakefile" then
           run "rake clean"
         elsif File.exist? "Makefile" then
@@ -140,9 +140,8 @@ module Multiruby
       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
+          if File.exist?(".svn") then
+            yield :svn
           else
             yield :none
           end
@@ -151,23 +150,31 @@ module Multiruby
     end
   end
 
-  def self.extract_latest_version url, matching=nil
+  def self.matching_versions url, matching=nil
     file = URI.parse(url).read
-    versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
-      s =~ /-rc\d/
-    }.sort_by { |s|
-      s.split(/\D+/).map { |i| i.to_i }
-    }.flatten
+
+    map = {
+      "preview" => "beta",
+      "rc"      => "beta2",
+      "p"       => "release",
+      "tar"     => "aargh",
+      "gz"      => "aargh",
+    }
+
+    versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.sort_by { |s|
+      s.scan(/\d+|[a-z]+/).map { |a| Integer(a) rescue map[a] || a }
+    }
 
     versions = versions.grep(/#{Regexp.escape(matching)}/) if matching
-    versions.last
+
+    versions
   end
 
   def self.fetch_tar v
     in_versions_dir do
       warn "  Determining latest version for #{v}"
       ver = v[/\d+\.\d+/]
-      base = extract_latest_version("#{RUBY_URL}/#{ver}/", v)
+      base = matching_versions("#{RUBY_URL}/#{ver}/", v).last
       abort "Could not determine release for #{v}" unless base
       url = File.join RUBY_URL, ver, base
       unless File.file? base then
@@ -181,13 +188,6 @@ module Multiruby
     end
   end
 
-  def self.git_clone url, dir
-    Multiruby.in_versions_dir do
-      Multiruby.run "git clone #{url} #{dir}" unless File.directory? dir
-      FileUtils.ln_sf "../versions/#{dir}", "../build/#{dir}"
-    end
-  end
-
   def self.gnu_utils_build inst_dir
     run "autoconf" unless test ?f, "configure"
     run "./configure --enable-shared --prefix #{inst_dir}", "log.configure" unless
@@ -201,31 +201,31 @@ module Multiruby
   end
 
   def self.in_build_dir
-    Dir.chdir File.join(self.root_dir, "build") do
+    in_root_dir "build" do
       yield
     end
   end
 
   def self.in_install_dir
-    Dir.chdir File.join(self.root_dir, "install") do
+    in_root_dir "install" do
       yield
     end
   end
 
-  def self.in_root_dir
-    Dir.chdir self.root_dir do
+  def self.in_root_dir subdir = ""
+    Dir.chdir File.join(self.root_dir, subdir) do
       yield
     end
   end
 
   def self.in_tmp_dir
-    Dir.chdir File.join(self.root_dir, "tmp") do
+    in_root_dir "tmp" do
       yield
     end
   end
 
   def self.in_versions_dir
-    Dir.chdir File.join(self.root_dir, "versions") do
+    in_root_dir "versions" do
       yield
     end
   end
@@ -370,13 +370,6 @@ module Multiruby
         else
           warn "  update in this svn dir not supported yet: #{dir}"
         end
-      when :git then
-        case dir
-        when /rubinius/ then
-          run "rake git:update build" # minor cheat by building here
-        else
-          warn "  update in this git dir not supported yet: #{dir}"
-        end
       else
         warn "  update in non-svn dir not supported yet: #{dir}"
       end

data/lib/zentest.rb

@@ -53,7 +53,7 @@ end
 
 class ZenTest
 
-  VERSION = '4.3.3'
+  VERSION = '4.4.0'
 
   include ZenTestMapping
 
@@ -419,20 +419,6 @@ class ZenTest
     end # @klasses[klassname]
   end
 
-  def test_to_normal(_name, klassname=nil)
-    super do |name|
-      if defined? @inherited_methods then
-        known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
-        known_methods_re = known_methods.map {|s| Regexp.escape(s) }.join("|")
-
-        name = name.sub(/^(#{known_methods_re})(_.*)?$/) { $1 } unless
-          known_methods_re.empty?
-
-        name
-      end
-    end
-  end
-
   # create a given method at a given
   # indentation. Returns an array containing
   # the lines of the method.

data/test/test_autotest.rb

@@ -116,7 +116,10 @@ class TestAutotest < MiniTest::Unit::TestCase
 
     @a.find_order = @files.keys.sort
 
-    input = [['test_fail1', @test_class], ['test_fail2', @test_class], ['test_error1', @test_class], ['test_error2', @test_class]]
+    input = [['test_fail1',  @test_class],
+             ['test_fail2',  @test_class],
+             ['test_error1', @test_class],
+             ['test_error2', @test_class]]
     result = @a.consolidate_failures input
     expected = { @test => %w( test_fail1 test_fail2 test_error1 test_error2 ) }
     assert_equal expected, result
@@ -139,10 +142,10 @@ class TestAutotest < MiniTest::Unit::TestCase
 
   def test_consolidate_failures_nested_classes
     @files.clear
-    @files['lib/outer.rb'] = Time.at(5)
+    @files['lib/outer.rb']       = Time.at(5)
     @files['lib/outer/inner.rb'] = Time.at(5)
-    @files[@inner_test] = Time.at(5)
-    @files[@outer_test] = Time.at(5)
+    @files[@inner_test]          = Time.at(5)
+    @files[@outer_test]          = Time.at(5)
 
     @a.find_order = @files.keys.sort
 
@@ -368,8 +371,12 @@ test_error2(#{@test_class}):
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
     }
 
-    expected = [ "#{RUBY} -I.:lib:test -rubygems -e \"%w[test/unit #{@test}].each { |f| require f }\" | unit_diff -u",
-                 "#{RUBY} -I.:lib:test -rubygems test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
+    pre = "#{RUBY} -I.:lib:test -rubygems"
+    req = ".each { |f| require f }\""
+    post = "| unit_diff -u"
+
+    expected = [ "#{pre} -e \"%w[test/unit #{@test}]#{req} #{post}",
+                 "#{pre} test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" #{post}" ].join("; ")
 
     result = @a.make_test_cmd f
     assert_equal expected, result
@@ -433,8 +440,8 @@ test_error2(#{@test_class}):
 
     assert @a.find_files_to_test(files)
     assert_equal expected, @a.files_to_test
-    assert_equal t, @a.last_mtime
-    assert_equal "", @a.output.string
+    assert_equal t,        @a.last_mtime
+    assert_equal "",       @a.output.string
   end
 
   def util_mappings

metadata

@@ -1,30 +1,54 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
+  hash: 47
   prerelease: false
   segments: 
   - 4
-  - 3
-  - 3
-  version: 4.3.3
+  - 4
+  - 0
+  version: 4.4.0
 platform: ruby
 authors: 
 - Ryan Davis
 - Eric Hodel
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2010-06-17 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -36,28 +60,32 @@ dependencies:
   name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
-        - 6
+        - 7
         - 0
-        version: 1.6.0
+        version: 1.7.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 1
+        version: 2.6.1
   type: :development
   version_requirements: *id003
 description: |-
@@ -144,23 +172,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: zentest
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby"

metadata.gz.sig

@@ -0,0 +1 @@
+�ж/�Hl5�<����ņsm�8C�����8��9��S�ᷴ�{V���o۳�da�p--������i�#[���55����g�ggԏ�VD��8B������.�3]	���3�����}�E����Bb�4��F�����g!�T���R��x(�Z�y��~��׶�c�C0LЯ-�Eu>ck�p����ϐ\��/�D�<��yï��zJ���5�.$,6��`�� �c]���F��;ﳎ��H�&<w���