ZenTest 4.1.4 → 4.2.0

data/History.txt

@@ -1,3 +1,17 @@
+=== 4.2.0 / 2009-12-08
+
+* 3 minor enhancements:
+
+  * Added 'multiruby -1 $version' for easier execution (idea from flori)
+  * Set up and tear down PATH in multiruby (luis)
+  * died hook now gets passed the exception (amikula)
+
+* 3 bug fixes:
+
+  * Deal with windoze getc returning nil (undees)
+  * Fix unit_diff for multiline miniunit results.
+  * Fix warning for 1.8.8+
+
 === 4.1.4 / 2009-08-07
 
 * 2 minor enhancements:

data/bin/multiruby

@@ -3,6 +3,23 @@
 require 'multiruby'
 
 root_dir = Multiruby.root_dir
+
+##
+# multiruby -1 1.8.7 ruby_args...
+
+if ARGV.first == "-1" then
+  ARGV.shift
+  vers = Dir["#{root_dir}/install/#{ARGV.shift}*"]
+
+  abort "ambiguous version: #{vers.map { |p| File.basename p }.inspect}" if
+    vers.size != 1
+
+  bin = "#{vers.first}/bin"
+  ENV['PATH'] += File::PATH_SEPARATOR + bin
+
+  exec "#{bin}/ruby", *ARGV
+end
+
 versions = Multiruby.build_and_install
 versions = ENV['VERSIONS'].split(/:/) if ENV.has_key? 'VERSIONS'
 
@@ -11,6 +28,9 @@ if ENV.has_key? 'EXCLUDED_VERSIONS' then
   versions = versions.delete_if { |v| v =~ excludes }
 end
 
+# safekeep original PATH
+original_path = ENV['PATH']
+
 results = {}
 versions.each do |version|
   ruby = "#{root_dir}/install/#{version}/bin/ruby"
@@ -23,10 +43,17 @@ versions.each do |version|
   cmd.sub!(/#{ENV['HOME']}/, '~')
   puts "CMD     = #{cmd}"
   puts
+
+  # append ruby binary path prior execution
+  ENV['PATH'] += File::PATH_SEPARATOR + "#{dir}/bin"
+
   system ruby, *ARGV
   puts
   puts "RESULT = #{$?}"
   results[version] = $?
+
+  # restore the path to original state
+  ENV['PATH'] = original_path
 end
 
 passed, failed = results.keys.partition { |v| results[v] == 0 }

data/lib/autotest.rb

@@ -162,7 +162,7 @@ class Autotest
     self.order             = :random
     self.output            = $stderr
     self.sleep             = 1
-    self.testlib          = "test/unit"
+    self.testlib           = "test/unit"
     self.find_directories  = ['.']
     self.unit_diff         = "unit_diff -u"
 
@@ -206,8 +206,8 @@ class Autotest
       end
     end
     hook :quit
-  rescue Exception
-    hook :died
+  rescue Exception => err
+    hook :died, err
   end
 
   ##
@@ -242,7 +242,7 @@ class Autotest
     begin
       open("| #{cmd}", "r") do |f|
         until f.eof? do
-          c = f.getc
+          c = f.getc or break
           putc c
           line << c
           if c == ?\n then
@@ -499,7 +499,7 @@ class Autotest
 
     p :test_file_for => [filename, result.first] if result and $DEBUG
 
-    result = result.nil? ? [] : Array(result.last.call(filename, $~))
+    result = result.nil? ? [] : [result.last.call(filename, $~)].flatten
 
     output.puts "No tests matched #{filename}" if
       ($v or $TESTING) and result.empty?

data/lib/unit_diff.rb

@@ -81,7 +81,7 @@ class UnitDiff
         end
         output.puts input.gets # the rest of "Finished in..."
         output.puts
-       next
+        next
       when /^\s*$/, /^\(?\s*\d+\) (Failure|Error):/, /^\d+\)/ then
         print_lines = false
         current = []
@@ -96,6 +96,22 @@ class UnitDiff
     data = data.reject { |o| o == ["\n"] or o.empty? }
     footer = data.pop
 
+    data.map do |result|
+      break if result.find do |line|
+        line =~ / expected( but was|, not)/
+      end
+
+      header = result.find do |line|
+        line =~ /^\(?\s*\d+\) (Failure|Error):/
+      end
+
+      break unless header
+
+      message_index = result.index(header) + 2
+
+      result[message_index..-1] = result[message_index..-1].join
+    end
+
     return data, footer
   end
 

data/lib/zentest.rb

@@ -53,7 +53,7 @@ end
 
 class ZenTest
 
-  VERSION = '4.1.4'
+  VERSION = '4.2.0'
 
   include ZenTestMapping
 

data/test/test_unit_diff.rb

@@ -44,6 +44,27 @@ Expected ['a', 'b', 'c'], not ['a', 'c', 'b'].
     util_unit_diff(header, input, expected, :parse_input)
   end
 
+  def test_input_miniunit_multiline
+    header = "Loaded suite -e\nStarted\nF\nFinished in 0.035332 seconds.\n\n"
+    input = "#{header}  1) Failure:
+test_blah(TestBlah) [./blah.rb:25]:
+Expected ['a',
+ 'b',
+ 'c'], not ['a',
+ 'c',
+ 'b'].
+
+1 tests, 1 assertions, 1 failures, 0 errors
+"
+
+    expected = [[["  1) Failure:\n",
+                  "test_blah(TestBlah) [./blah.rb:25]:\n",
+                  "Expected ['a',\n 'b',\n 'c'], not ['a',\n 'c',\n 'b'].\n"]],
+                ["\n", "1 tests, 1 assertions, 1 failures, 0 errors\n"]]
+
+    util_unit_diff(header, input, expected, :parse_input)
+  end
+
   def test_input_mspec
     header = <<-HEADER
 Started
@@ -169,6 +190,7 @@ backtrace = <<-BACKTRACE
 
     assert_equal expected, @diff.parse_diff(input)
   end
+
   def test_parse_diff1
     input = ["  1) Failure:\n",
              "test_test1(TestBlah) [./blah.rb:25]:\n",

metadata

@@ -1,16 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 4.1.4
+  version: 4.2.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: 2009-08-07 00:00:00 -07:00
+date: 2009-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   ZenTest provides 4 different tools: zentest, unit_diff, autotest, and