tryouts 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b560848d9f29bcfe84ae8984317c4c9d87eaff34f9ebd91141ad7bfc0af1ca8
-  data.tar.gz: 87c833052a1267da1f0e8a6786565baf0cd880280ca676951aaeddde7aa0601a
+  metadata.gz: ca346c47683b393c8c60c586ab053a73c09b7d5f3e19ce184b35453135ae6594
+  data.tar.gz: 2ba211232994981e53393167cce8e09fc29bbc988d14b9ac3178321cbf158aaf
 SHA512:
-  metadata.gz: 72a738d41925f4e24ffc233d4e1e5f3dc96f7eaa9ee72eca9ab181da10ec3a283dd5b85b14b91c436acb777a005cb3529a1958c97fdc5f30c13f642de3466551
-  data.tar.gz: 0102df1a296fa62e04e05fd97c0e21ea83e4e2e718885cde380047c784c8ef0304e64182fee7ae45aa2c8ccac585fe7df6f21f527a2cb11a7e88d33d912028eb
+  metadata.gz: 12f4d97b1f2049f1f6df4d0badca42d2a585360f12678e678cfbbcb85e0768cc2365eb7eb09a744713df15e2d51d3df9690fde78d160ff73947d2d9bdf986aa9
+  data.tar.gz: d919d1923c471aaa240f66dd0f03760bf7f5f9e53f71c35f8ace03d84935648dc21dafd5c8dceb68468a1b7e31ed6a47ad554471758d6e345146e15a661eca4f

data/lib/tryouts/cli/formatters/verbose.rb

@@ -134,7 +134,7 @@ class Tryouts
         end
 
         test_case = result_packet.test_case
-        location = "#{Console.pretty_path(test_case.path)}:#{test_case.line_range.first + 1}"
+        location = "#{Console.pretty_path(test_case.path)}:#{test_case.first_expectation_line + 1}"
         puts
         puts indent_text("#{status_line} @ #{location}", 2)
 

data/lib/tryouts/expectation_evaluators/intentional_failure.rb

@@ -2,7 +2,7 @@
 
 require_relative 'base'
 require_relative 'regular'
-require_relative '../testcase'
+require_relative '../test_case'
 
 class Tryouts
   module ExpectationEvaluators

data/lib/tryouts/prism_parser.rb

@@ -1,7 +1,7 @@
 # Modern Ruby 3.4+ solution for the teardown bug
 
 require 'prism'
-require_relative 'testcase'
+require_relative 'test_case'
 
 class Tryouts
   # Fixed PrismParser with pattern matching for robust token filtering
@@ -16,8 +16,10 @@ class Tryouts
     def parse
       return handle_syntax_errors if @prism_result.failure?
 
-      tokens      = tokenize_content
-      test_blocks = group_into_test_blocks(tokens)
+      tokens           = tokenize_content
+      test_boundaries  = find_test_case_boundaries(tokens)
+      tokens           = classify_potential_descriptions_with_boundaries(tokens, test_boundaries)
+      test_blocks      = group_into_test_blocks(tokens)
       process_test_blocks(test_blocks)
     end
 
@@ -66,8 +68,106 @@ class Tryouts
         tokens << token
       end
 
-      # Post-process to convert potential_descriptions to descriptions or comments
-      classify_potential_descriptions(tokens)
+      # Return tokens with potential_descriptions - they'll be classified later with test boundaries
+      tokens
+    end
+
+    # Find actual test case boundaries by looking for ## descriptions or # TEST: patterns
+    # followed by code and expectations
+    def find_test_case_boundaries(tokens)
+      boundaries = []
+
+      tokens.each_with_index do |token, index|
+        # Look for explicit test descriptions (## or # TEST:)
+        if token[:type] == :description
+          # Find the end of this test case by looking for the last expectation
+          # before the next description or end of file
+          start_line = token[:line]
+          end_line = find_test_case_end(tokens, index)
+
+          boundaries << { start: start_line, end: end_line } if end_line
+        end
+      end
+
+      boundaries
+    end
+
+    # Find where a test case ends by looking for the last expectation
+    # before the next test description or end of tokens
+    def find_test_case_end(tokens, start_index)
+      last_expectation_line = nil
+
+      # Look forward from the description for expectations
+      (start_index + 1).upto(tokens.length - 1) do |i|
+        token = tokens[i]
+
+        # Stop if we hit another test description
+        break if token[:type] == :description
+
+        # Track the last expectation we see
+        if is_expectation_type?(token[:type])
+          last_expectation_line = token[:line]
+        end
+      end
+
+      last_expectation_line
+    end
+
+    # Convert potential_descriptions to descriptions or comments using test case boundaries
+    def classify_potential_descriptions_with_boundaries(tokens, test_boundaries)
+      tokens.map.with_index do |token, index|
+        if token[:type] == :potential_description
+          # Check if this comment falls within any test case boundary
+          line_num = token[:line]
+          within_test_case = test_boundaries.any? { |boundary|
+            line_num >= boundary[:start] && line_num <= boundary[:end]
+          }
+
+          if within_test_case
+            # This comment is within a test case, treat as regular comment
+            token.merge(type: :comment)
+          else
+            # For comments outside test boundaries, be more conservative
+            # Only treat as description if it immediately precedes a test pattern AND
+            # looks like a test description
+            content = token[:content].strip
+
+            # Check if this looks like a test description based on content
+            looks_like_test_description = content.match?(/test|example|demonstrate|show|should|when|given/i) &&
+                                        content.length > 10
+
+            # Check if there's code immediately before this (suggesting it's mid-test)
+            prev_token = index > 0 ? tokens[index - 1] : nil
+            has_code_before = prev_token && prev_token[:type] == :code
+
+            if has_code_before || !looks_like_test_description
+              # Treat as regular comment
+              token.merge(type: :comment)
+            else
+              # Look ahead for IMMEDIATE test pattern (stricter than before)
+              following_tokens = tokens[(index + 1)..]
+
+              # Skip blanks and comments to find meaningful content
+              meaningful_following = following_tokens.reject { |t| [:blank, :comment].include?(t[:type]) }
+
+              # Look for test pattern within next 5 tokens (more restrictive)
+              test_window = meaningful_following.first(5)
+              has_code = test_window.any? { |t| t[:type] == :code }
+              has_expectation = test_window.any? { |t| is_expectation_type?(t[:type]) }
+
+              # Only promote to description if BOTH code and expectation are found nearby
+              # AND it looks like a test description
+              if has_code && has_expectation && looks_like_test_description
+                token.merge(type: :description)
+              else
+                token.merge(type: :comment)
+              end
+            end
+          end
+        else
+          token
+        end
+      end
     end
 
     # Convert potential_descriptions to descriptions or comments based on context
@@ -360,6 +460,9 @@ class Tryouts
         # Extract source lines from the original source during parsing
         source_lines = @lines[start_line..end_line]
 
+        # Find the first expectation line for better error reporting
+        first_expectation_line = exp_tokens.empty? ? start_line : exp_tokens.first[:line]
+
         TestCase.new(
           description: desc,
           code: extract_code_content(code_tokens),
@@ -387,6 +490,7 @@ class Tryouts
           line_range: start_line..end_line,
           path: @source_path,
           source_lines: source_lines,
+          first_expectation_line: first_expectation_line,
         )
       else
         raise "Invalid test block structure: #{block}"

data/lib/tryouts/{testbatch.rb → test_batch.rb}

@@ -38,10 +38,13 @@ class Tryouts
       @test_case_count = 0
       @setup_failed    = false
 
+      # Setup container for fresh context mode - preserves @instance_variables from setup
+      @setup_container = nil
+
       # Circuit breaker for batch-level failure protection
-      @consecutive_failures = 0
+      @consecutive_failures     = 0
       @max_consecutive_failures = options[:max_consecutive_failures] || 10
-      @circuit_breaker_active = false
+      @circuit_breaker_active   = false
 
       # Expose context objects for testing - different strategies for each mode
       @shared_context = if options[:shared_context]
@@ -68,7 +71,19 @@ class Tryouts
 
         # Stop execution if setup failed
         if @setup_failed
-          @output_manager&.error("Stopping batch execution due to setup failure")
+          @output_manager&.error('Stopping batch execution due to setup failure')
+          @status = :failed
+          finalize_results([])
+          return false
+        end
+      else
+        # Fresh context mode: execute setup once to establish shared @instance_variables
+        @output_manager&.info('Running setup for fresh context...', 2)
+        execute_fresh_context_setup
+
+        # Stop execution if setup failed
+        if @setup_failed
+          @output_manager&.error('Stopping batch execution due to setup failure')
           @status = :failed
           finalize_results([])
           return false
@@ -94,10 +109,10 @@ class Tryouts
         update_circuit_breaker(result)
 
         result
-      rescue StandardError => e
-        @output_manager&.test_end(test_case, idx, @test_case_count, status: :failed, error: e)
+      rescue StandardError => ex
+        @output_manager&.test_end(test_case, idx, @test_case_count, status: :failed, error: ex)
         # Create error result packet to maintain consistent data flow
-        error_result = build_error_result(test_case, e)
+        error_result = build_error_result(test_case, ex)
         process_test_result(error_result)
 
         # Update circuit breaker for exception cases
@@ -174,7 +189,7 @@ class Tryouts
           error: result.error,
           captured_output: captured_output,
           elapsed_time: result.elapsed_time,
-          metadata: result.metadata
+          metadata: result.metadata,
         )
       end
 
@@ -188,7 +203,7 @@ class Tryouts
       execute_test_case_with_container(test_case, @container)
     end
 
-    # Fresh context execution - setup runs per test, isolated state
+    # Fresh context execution - tests run in isolated state but inherit setup @instance_variables
     def execute_with_fresh_context(test_case)
       fresh_container = if @shared_context.is_a?(FreshContextFactory)
                           @shared_context.create_container
@@ -196,10 +211,12 @@ class Tryouts
                           Object.new  # Fallback for backwards compatibility
                         end
 
-      # Execute setup in fresh context if present
-      setup = @testrun.setup
-      if setup && !setup.code.empty?
-        fresh_container.instance_eval(setup.code, setup.path, 1)
+      # Copy @instance_variables from setup container to fresh container
+      if @setup_container
+        @setup_container.instance_variables.each do |var|
+          value = @setup_container.instance_variable_get(var)
+          fresh_container.instance_variable_set(var, value)
+        end
       end
 
       execute_test_case_with_container(test_case, fresh_container)
@@ -225,7 +242,7 @@ class Tryouts
         # Check if we need output capture for any expectations
         needs_output_capture = test_case.expectations.any?(&:output?)
 
-        result_value, execution_time_ns, stdout_content, stderr_content, expectations_result =
+        result_value, _, _, _, expectations_result =
           execute_with_timeout(test_timeout, test_case) do
             if needs_output_capture
               # Execute with output capture using Fiber-local isolation
@@ -239,9 +256,9 @@ class Tryouts
             else
               # Regular execution with timing capture only
               execution_start_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
-              result_value = container.instance_eval(code, path, range.first + 1)
-              execution_end_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
-              execution_time_ns = execution_end_ns - execution_start_ns
+              result_value       = container.instance_eval(code, path, range.first + 1)
+              execution_end_ns   = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+              execution_time_ns  = execution_end_ns - execution_start_ns
 
               expectations_result = evaluate_expectations(test_case, result_value, container, execution_time_ns)
               [result_value, execution_time_ns, nil, nil, expectations_result]
@@ -276,9 +293,9 @@ class Tryouts
 
           # Execute with timing capture
           execution_start_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
-          result_value = container.instance_eval(code, path, range.first + 1)
-          execution_end_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
-          execution_time_ns = execution_end_ns - execution_start_ns
+          result_value       = container.instance_eval(code, path, range.first + 1)
+          execution_end_ns   = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+          execution_time_ns  = execution_end_ns - execution_start_ns
 
           [result_value, execution_time_ns]
         end.resume.tap do |result_value, execution_time_ns|
@@ -317,7 +334,7 @@ class Tryouts
       {
         passed: evaluation_results.all? { |r| r[:passed] },
         actual_results: evaluation_results.map { |r| r[:actual] },
-        expected_results: evaluation_results.map { |r| r[:expected] }
+        expected_results: evaluation_results.map { |r| r[:expected] },
       }
     end
 
@@ -328,14 +345,14 @@ class Tryouts
           test_case,
           result_value,
           expectations_result[:actual_results],
-          expectations_result[:expected_results]
+          expectations_result[:expected_results],
         )
       else
         TestCaseResultPacket.from_failure(
           test_case,
           result_value,
           expectations_result[:actual_results],
-          expectations_result[:expected_results]
+          expectations_result[:expected_results],
         )
       end
     end
@@ -375,7 +392,7 @@ class Tryouts
         @output_manager&.setup_output(captured_output) if captured_output && !captured_output.empty?
       end
     rescue StandardError => ex
-      @setup_failed = true
+      @setup_failed                 = true
       @global_tally[:total_errors] += 1 if @global_tally
 
       # Classify error and handle appropriately
@@ -394,6 +411,43 @@ class Tryouts
       raise "Global setup failed (#{ex.class}): #{ex.message}"
     end
 
+    # Setup execution for fresh context mode - creates @setup_container with @instance_variables
+    def execute_fresh_context_setup
+      setup = @testrun.setup
+
+      if setup && !setup.code.empty? && !@options[:shared_context]
+        @output_manager&.setup_start(setup.line_range)
+
+        # Create setup container to hold @instance_variables
+        @setup_container = Object.new
+
+        # Capture setup output instead of letting it print directly
+        captured_output = capture_output do
+          @setup_container.instance_eval(setup.code, setup.path, setup.line_range.first + 1)
+        end
+
+        @output_manager&.setup_output(captured_output) if captured_output && !captured_output.empty?
+      end
+    rescue StandardError => ex
+      @setup_failed                 = true
+      @global_tally[:total_errors] += 1 if @global_tally
+
+      # Classify error and handle appropriately
+      error_type = Tryouts.classify_error(ex)
+
+      Tryouts.debug "Setup failed with #{error_type} error: (#{ex.class}): #{ex.message}"
+      Tryouts.trace ex.backtrace
+
+      # For non-catastrophic errors, we still stop batch execution
+      unless Tryouts.batch_stopping_error?(ex)
+        @output_manager&.error("Fresh context setup failed: #{ex.message}")
+        return
+      end
+
+      # For catastrophic errors, still raise to stop execution
+      raise "Fresh context setup failed (#{ex.class}): #{ex.message}"
+    end
+
     # Global teardown execution
     def execute_global_teardown
       teardown = @testrun.teardown
@@ -420,11 +474,11 @@ class Tryouts
       @output_manager&.error("Teardown failed: #{ex.message}")
 
       # Teardown failures are generally non-fatal - log and continue
-      unless Tryouts.batch_stopping_error?(ex)
-        @output_manager&.error("Continuing despite teardown failure")
-      else
+      if Tryouts.batch_stopping_error?(ex)
         # Only catastrophic errors should potentially affect batch completion
-        @output_manager&.error("Teardown failure may affect subsequent operations")
+        @output_manager&.error('Teardown failure may affect subsequent operations')
+      else
+        @output_manager&.error('Continuing despite teardown failure')
       end
     end
 
@@ -477,11 +531,9 @@ class Tryouts
     end
 
     # Timeout protection for individual test execution
-    def execute_with_timeout(timeout_seconds, test_case)
-      Timeout.timeout(timeout_seconds) do
-        yield
-      end
-    rescue Timeout::Error => e
+    def execute_with_timeout(timeout_seconds, test_case, &)
+      Timeout.timeout(timeout_seconds, &)
+    rescue Timeout::Error
       Tryouts.debug "Test timeout after #{timeout_seconds}s: #{test_case.description}"
       raise StandardError.new("Test execution timeout (#{timeout_seconds}s)")
     end
@@ -496,7 +548,7 @@ class Tryouts
         end
       else
         # Reset on success
-        @consecutive_failures = 0
+        @consecutive_failures   = 0
         @circuit_breaker_active = false
       end
     end

data/lib/tryouts/{testcase.rb → test_case.rb}

@@ -3,7 +3,7 @@
 # Modern data structures using Ruby 3.2+ Data classes
 class Tryouts
   # Core data structures
-  TestCase = Data.define(:description, :code, :expectations, :line_range, :path, :source_lines) do
+  TestCase = Data.define(:description, :code, :expectations, :line_range, :path, :source_lines, :first_expectation_line) do
     def empty?
       code.empty?
     end

data/lib/tryouts/test_executor.rb

@@ -1,6 +1,6 @@
 # lib/tryouts/test_executor.rb
 
-require_relative 'testbatch'
+require_relative 'test_batch'
 
 class Tryouts
   class TestExecutor

data/lib/tryouts/test_runner.rb

@@ -1,7 +1,7 @@
 # lib/tryouts/test_runner.rb
 
 require_relative 'prism_parser'
-require_relative 'testbatch'
+require_relative 'test_batch'
 require_relative 'translators/rspec_translator'
 require_relative 'translators/minitest_translator'
 require_relative 'file_processor'

data/lib/tryouts/translators/minitest_translator.rb

@@ -2,6 +2,44 @@
 
 class Tryouts
   module Translators
+    # Translates Tryouts test files to Minitest format
+    #
+    # IMPORTANT: Context Mode Differences
+    # ==================================
+    #
+    # Tryouts supports two context modes that behave differently than Minitest:
+    #
+    # 1. Tryouts Shared Context (default):
+    #    - Setup runs once, all tests share the same context object
+    #    - Tests can modify variables/state and affect subsequent tests
+    #    - Behaves like a Ruby script executing top-to-bottom
+    #    - Designed for documentation-style tests where examples build on each other
+    #
+    # 2. Tryouts Fresh Context (--no-shared-context):
+    #    - Setup @instance_variables are copied to each test's fresh context
+    #    - Tests are isolated but inherit setup state
+    #    - Similar to Minitest's setup method but with setup state inheritance
+    #
+    # Minitest Translation Behavior:
+    # ==============================
+    # - Uses setup method which runs before each test (Minitest standard)
+    # - Each test method gets fresh context (Minitest standard)
+    # - Tests that rely on shared state between test cases WILL FAIL
+    # - This is intentional and reveals inappropriate test dependencies
+    #
+    # Example that works in Tryouts shared mode but fails in Minitest:
+    #   ## TEST 1
+    #   @counter = 1
+    #   @counter
+    #   #=> 1
+    #
+    #   ## TEST 2
+    #   @counter += 1  # Will be reset to 1 by setup, then fail
+    #   @counter
+    #   #=> 2
+    #
+    # Recommendation: Write tryouts tests that work in fresh context mode
+    # if you plan to use Minitest translation.
     class MinitestTranslator
       def initialize
         require 'minitest/test'

data/lib/tryouts/translators/rspec_translator.rb

@@ -2,6 +2,44 @@
 
 class Tryouts
   module Translators
+    # Translates Tryouts test files to RSpec format
+    #
+    # IMPORTANT: Context Mode Differences
+    # ==================================
+    #
+    # Tryouts supports two context modes that behave differently than RSpec:
+    #
+    # 1. Tryouts Shared Context (default):
+    #    - Setup runs once, all tests share the same context object
+    #    - Tests can modify variables/state and affect subsequent tests
+    #    - Behaves like a Ruby script executing top-to-bottom
+    #    - Designed for documentation-style tests where examples build on each other
+    #
+    # 2. Tryouts Fresh Context (--no-shared-context):
+    #    - Setup @instance_variables are copied to each test's fresh context
+    #    - Tests are isolated but inherit setup state
+    #    - Similar to RSpec's before(:each) but with setup state inheritance
+    #
+    # RSpec Translation Behavior:
+    # ===========================
+    # - Uses before(:all) for setup code (closest equivalent to shared context)
+    # - Each 'it' block gets fresh context (RSpec standard)
+    # - Tests that rely on shared state between test cases WILL FAIL
+    # - This is intentional and reveals inappropriate test dependencies
+    #
+    # Example that works in Tryouts shared mode but fails in RSpec:
+    #   ## TEST 1
+    #   @counter = 1
+    #   @counter
+    #   #=> 1
+    #
+    #   ## TEST 2
+    #   @counter += 1  # Will be nil in RSpec, causing failure
+    #   @counter
+    #   #=> 2
+    #
+    # Recommendation: Write tryouts tests that work in fresh context mode
+    # if you plan to use RSpec translation.
     class RSpecTranslator
       def initialize
         require 'rspec/core'

data/lib/tryouts/version.rb

@@ -1,5 +1,5 @@
 # lib/tryouts/version.rb
 
 class Tryouts
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/lib/tryouts.rb

@@ -8,7 +8,7 @@ require 'timeout'
 TRYOUTS_LIB_HOME = __dir__ unless defined?(TRYOUTS_LIB_HOME)
 
 require_relative 'tryouts/console'
-require_relative 'tryouts/testbatch'
+require_relative 'tryouts/test_batch'
 require_relative 'tryouts/version'
 require_relative 'tryouts/prism_parser'
 require_relative 'tryouts/cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tryouts
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Delano Mandelbaum
@@ -98,10 +98,10 @@ files:
 - lib/tryouts/expectation_evaluators/true.rb
 - lib/tryouts/file_processor.rb
 - lib/tryouts/prism_parser.rb
+- lib/tryouts/test_batch.rb
+- lib/tryouts/test_case.rb
 - lib/tryouts/test_executor.rb
 - lib/tryouts/test_runner.rb
-- lib/tryouts/testbatch.rb
-- lib/tryouts/testcase.rb
 - lib/tryouts/translators/minitest_translator.rb
 - lib/tryouts/translators/rspec_translator.rb
 - lib/tryouts/version.rb