tryouts 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6e297c2fe5c80dfc2f056d0df5e2742c72ee14e26566283746410d8d3eed5b
-  data.tar.gz: de4ff46738db509b6a511e57a8cd4713510c9a38bec5d4fa7f61383585f0e554
+  metadata.gz: 17dda7b61be5923b407bd6e00c98c0ef3731897b3dd7afca88d00ed2bf240e5d
+  data.tar.gz: 846fa9f79683f8ce9cd1e486653abfb6da44883e937fcd9edbeaece2c0ef0e4c
 SHA512:
-  metadata.gz: dd90be3bd46856d40055cf36e7cf41820b2692c06f117645daf1614ce8910dc4e7f28ada9731e1cf00674208f1c99f6fccd1f03b4b304ea03f29628fe51700ea
-  data.tar.gz: d8214885cbc47e502c65f4a46383774ee881869aa88164ac475f559914110a2905448db7b8a4afb461d491e70d3f57be56be09924083619a4127dccc504ae63d
+  metadata.gz: 9deedfac36285115ca643ddfa818ef5db33a1daf93906fadba8b49689390e0a020324f2fed638454ebee0b30e3600d48d2258b8213bc14cbcd25c0660d132a51
+  data.tar.gz: 87d94a10b8500d2eb543f6c4c84be10f236a485bf4b94c79f12c8fc05ad6e2de6536087c43cd35ce5395ec8d38781006d67dafcd876c03d42cdca69f49cbf5d1

data/README.md

@@ -1,4 +1,4 @@
-# Tryouts v2.3.1 (2024-06-18)
+# Tryouts v2.4 (2024-07-20)
 
 **Ruby tests that read like documentation.**
 

data/VERSION.yml

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

data/lib/tryouts/testbatch.rb

@@ -22,14 +22,23 @@ class Tryouts
       setup
       ret = self.select do |tc|
         before_test.call(tc) unless before_test.nil?
-        ret = !tc.run
-        after_test.call(tc)
+        begin
+          ret = !tc.run  # returns true if test failed
+        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($/), $/
+        end
+        after_test.call(tc) # runs the tallying code
         ret # select failed tests
       end
+
       @failed = ret.size
       @run = true
       clean
       !failed?
+
     rescue StandardError => e
       @failed = 1
       $stderr.puts e.message, e.backtrace.join($/), $/

data/lib/tryouts/testcase.rb

@@ -2,11 +2,12 @@
 
 class Tryouts
   class TestCase
-    attr_reader :desc, :test, :exps, :path, :outlines, :test_result
+    attr_reader :desc, :test, :exps, :path, :testrunner_output, :test_result, :console_output
 
     def initialize(d, t, e)
       @desc, @test, @exps, @path = d, t, e
-      @outlines = []
+      @testrunner_output = []
+      @console_output = StringIO.new
     end
 
     def inspect
@@ -20,22 +21,27 @@ class Tryouts
     def run
       Tryouts.debug format('%s:%d', @test.path, @test.first)
       Tryouts.debug inspect, $/
-      $stdout = StringIO.new
+
+      $stdout = @console_output
       expectations = exps.collect do |exp, _idx|
         exp =~ /\A\#?\s*=>\s*(.+)\Z/
         ::Regexp.last_match(1) # this will be nil if the expectation is commented out
       end
 
+      Tryouts.info 'Capturing STDOUT for tryout'
+      Tryouts.info 'vvvvvvvvvvvvvvvvvvv'
       # Evaluate test block only if there are valid expectations
       unless expectations.compact.empty?  # TODO: fast-fail if no expectations
         test_value = Tryouts.eval @test.to_s, @test.path, @test.first
         @has_run = true
       end
-      $stdout = STDOUT # restore stdout
+      Tryouts.info '^^^^^^^^^^^^^^^^^^^'
 
+      Tryouts.info "Capturing STDOUT for expectations"
+      Tryouts.info 'vvvvvvvvvvvvvvvvvvv'
       expectations.each_with_index do |exp, idx|
         if exp.nil?
-          @outlines << '     [skipped]'
+          @testrunner_output << '     [skipped]'
           @test_result = 0
         else
           # Evaluate expectation
@@ -44,17 +50,22 @@ class Tryouts
 
           test_passed = test_value.eql?(exp_value)
           @test_result = test_passed ? 1 : -1
-          @outlines << test_value.inspect
+          @testrunner_output << test_value.inspect
         end
       end
+      Tryouts.info '^^^^^^^^^^^^^^^^^^^'
+      $stdout = STDOUT # restore stdout
+
       Tryouts.debug # extra newline
       failed?
 
-    rescue StandardException => e
+
+    rescue StandardError => e
       Tryouts.debug "[testcaste.run] #{e.message}", e.backtrace.join($/), $/
-      $stdout = STDOUT # restore stdout
       # Continue raising the exception
       raise e
+    ensure
+      $stdout = STDOUT # restore stdout
     end
 
     def run?

data/lib/tryouts.rb

@@ -44,7 +44,7 @@ class Tryouts
         parse path
       end
 
-      all = 0
+      tryouts_incr = 0
       skipped_tests = 0
       failed_tests = 0
       skipped_batches = 0
@@ -78,12 +78,13 @@ class Tryouts
         end
 
         batch.run(before_handler) do |tc|
-          all += 1
+          tryouts_incr += 1
           failed_tests += 1 if tc.failed?
           skipped_tests += 1 if tc.skipped?
-          codelines = tc.outlines.join($/)
+          codelines = tc.testrunner_output.join($/)
           first_exp_line = tc.exps.first
-          result_adjective = tc.failed? ? 'FAILED' : 'PASSED'
+
+          Tryouts.debug Console.color(:white, "tryouts_incr is now %d" % tryouts_incr)
 
           first_exp_line = tc.exps.first
           location = format('%s:%d', tc.exps.path, first_exp_line)
@@ -98,10 +99,11 @@ class Tryouts
           end
           vmsg
 
-          # Output buffered testcase_io to stdout
-          # and reset it for the next test case.
+          # Output the buffered testcase_io to stdout
+          # and then reset it for the next test case.
           unless Tryouts.fails && !tc.failed?
             $stdout.puts testcase_io.string unless Tryouts.quiet
+            $stdout.puts tc.console_output.string if Tryouts.noisy
           end
 
           # Reset the testcase IO buffer
@@ -112,19 +114,29 @@ class Tryouts
       # Create a line of separation before the result summary
       msg $INPUT_RECORD_SEPARATOR  # newline
 
-      if all
-        suffix = "tests passed (#{skipped_tests} skipped)" if skipped_tests > 0
-        actual_test_size = all - skipped_tests
+      if tryouts_incr
+        suffix = "tryouts passed"
+        if skipped_tests > 0
+          suffix = "#{suffix} (#{skipped_tests} skipped)"
+        end
+
+        actual_test_size = tryouts_incr - skipped_tests
         if actual_test_size > 0
-          msg cformat(all - failed_tests - skipped_tests, all - skipped_tests, suffix)
+          success_count = tryouts_incr - failed_tests - skipped_tests
+          total_count = tryouts_incr - skipped_tests
+          msg cformat(success_count, total_count, suffix)
         end
       end
 
-      actual_batch_size = (batches.size - skipped_batches)
-      if batches.size > 1 && actual_batch_size > 0
+      # In what circumstance is this ever true?
+      #
+      adjusted_batch_size = (batches.size - skipped_batches)
+      if batches.size > 1 && adjusted_batch_size > 0
         suffix = 'batches passed'
         suffix << " (#{skipped_batches} skipped)" if skipped_batches > 0
-        msg cformat(batches.size - skipped_batches - failed_batches, batches.size - skipped_batches, suffix)
+        success_count = adjusted_batch_size - failed_batches
+        total_count = adjusted_batch_size
+        msg cformat(success_count, total_count, suffix)
       end
 
       # Print out the buffered result summary
@@ -133,8 +145,8 @@ class Tryouts
       failed_tests  # returns the number of failed tests (0 if all passed)
     end
 
-    def cformat(*args)
-      Console.bright '%d of %d %s' % args
+    def cformat(lval, rval, suffix = nil)
+      Console.bright '%d of %d %s' % [lval, rval, suffix]
     end
 
     def run(path)
@@ -210,6 +222,7 @@ class Tryouts
 
       batch
     end
+
     def print(str)
       return if Tryouts.quiet
 
@@ -225,6 +238,12 @@ class Tryouts
       testcase_io.puts(*msgs) unless Tryouts.quiet
     end
 
+    def info *msgs
+      msgs.each do |line|
+        $stdout.puts line
+      end
+    end
+
     def err *msgs
       msgs.each do |line|
         $stderr.puts Console.color :red, line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tryouts
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Delano Mandelbaum
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sysinfo
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: Ruby tests that read like documentation.