tryouts 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17dda7b61be5923b407bd6e00c98c0ef3731897b3dd7afca88d00ed2bf240e5d
-  data.tar.gz: 846fa9f79683f8ce9cd1e486653abfb6da44883e937fcd9edbeaece2c0ef0e4c
+  metadata.gz: 975acb3a790344e059de10c8eafae0a58de04e407f89a42af031d7a76c082ca2
+  data.tar.gz: a9d77fe3c5f15d2080999b93b7b42c3d16a465fbe31397338f806cd6d67bb253
 SHA512:
-  metadata.gz: 9deedfac36285115ca643ddfa818ef5db33a1daf93906fadba8b49689390e0a020324f2fed638454ebee0b30e3600d48d2258b8213bc14cbcd25c0660d132a51
-  data.tar.gz: 87d94a10b8500d2eb543f6c4c84be10f236a485bf4b94c79f12c8fc05ad6e2de6536087c43cd35ce5395ec8d38781006d67dafcd876c03d42cdca69f49cbf5d1
+  metadata.gz: 4c70927fb871e78c28d44a1b996844e76b84eb944d57c9943f5603b5227f6f18d38bcdc836fa504b4e4b1220683c5d1b9c02a7af5636f884e393697927d8fc68
+  data.tar.gz: 7ccb05deaf71afdb6ff239e312c6bba8c7ef371a8fe746b15a47cf84cc81652502a62bff704ea8d33e345fa9350bcaec90d3055860c71973f9e2d8ffe618412d

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :MAJOR: 2
 :MINOR: 4
-:PATCH: 0
+:PATCH: 1

data/lib/tryouts/testbatch.rb

@@ -9,50 +9,53 @@ class Tryouts
     end
     attr_reader :path, :failed, :lines
 
-    def initialize(p, l)
-      @path = p
-      @lines = l
+    def initialize(path, lines)
+      @path = path
+      @lines = lines
       @container = Container.new.metaclass
       @run = false
+      #super
     end
 
     def run(before_test, &after_test)
       return if empty?
+      testcase_score = nil
 
       setup
-      ret = self.select do |tc|
+      failed_tests = self.select do |tc|
         before_test.call(tc) unless before_test.nil?
         begin
-          ret = !tc.run  # returns true if test failed
+          testcase_score = tc.run  # returns -1 for failed, 0 for skipped, 1 for passed
         rescue StandardError => e
-          ret = true
-          $stderr.puts Console.color(:red, "Error in test: #{tc.inspect}")
-          $stderr.puts Console.color(:red, e.message)
-          $stderr.puts e.backtrace.join($/), $/
+          testcase_score = -1
+          warn Console.color(:red, "Error in test: #{tc.inspect}")
+          warn Console.color(:red, e.message)
+          warn e.backtrace.join($/), $/
         end
         after_test.call(tc) # runs the tallying code
-        ret # select failed tests
+        testcase_score.negative? # select failed tests
       end
 
-      @failed = ret.size
+      warn Console.color(:red, "Failed tests: #{failed_tests.size}") if Tryouts.debug?
+      @failed = failed_tests.size
       @run = true
       clean
       !failed?
 
     rescue StandardError => e
-      @failed = 1
-      $stderr.puts e.message, e.backtrace.join($/), $/
+      @failed = 1 # so that failed? returns true
+      warn e.message, e.backtrace.join($/), $/
     end
 
     def failed?
-      !@failed.nil? && @failed > 0
+      !@failed.nil? && @failed.positive?
     end
 
     def setup
       return if empty?
 
       start = first.desc.nil? ? first.test.first : first.desc.first - 1
-      Tryouts.eval lines[0..start - 1].join, path, 0 if start > 0
+      Tryouts.eval lines[0..start - 1].join, path, 0 if start.positive?
     end
 
     def clean

data/lib/tryouts/testcase.rb

@@ -59,13 +59,14 @@ class Tryouts
       Tryouts.debug # extra newline
       failed?
 
-
+      @test_result
     rescue StandardError => e
       Tryouts.debug "[testcaste.run] #{e.message}", e.backtrace.join($/), $/
       # Continue raising the exception
       raise e
     ensure
       $stdout = STDOUT # restore stdout
+      @test_result
     end
 
     def run?

data/lib/tryouts.rb

@@ -109,8 +109,14 @@ class Tryouts
           # Reset the testcase IO buffer
           testcase_io.truncate(0)
         end
+
+        failed_tests += batch.failed
+        if Tryouts.debug?
+          msg "Batch failed_tests: #{batch.failed} (#{batch.failed?}) #{failed_tests}"
+        end
       end
 
+
       # Create a line of separation before the result summary
       msg $INPUT_RECORD_SEPARATOR  # newline
 
@@ -125,6 +131,9 @@ class Tryouts
           success_count = tryouts_incr - failed_tests - skipped_tests
           total_count = tryouts_incr - skipped_tests
           msg cformat(success_count, total_count, suffix)
+          if Tryouts.debug?
+            msg "tryouts_incr: %d; failed: %d; skipped: %d" % [tryouts_incr, failed_tests, skipped_tests]
+          end
         end
       end
 
@@ -256,6 +265,7 @@ class Tryouts
 
     def eval(str, path, line)
       Kernel.eval str, @container.send(:binding), path, line
+
     rescue SyntaxError, LoadError => e
       Tryouts.err Console.color(:red, e.message),
                   Console.color(:red, e.backtrace.first)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tryouts
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Delano Mandelbaum