test_bench-bootstrap 0.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978ac1932ff9bd26c3df5224a36601e8c0904a86373cb0afce012719c304061a
-  data.tar.gz: 6f2d19a75d8ba1e3b24682768df85a29472a69d10312eb678739ba06df403d51
+  metadata.gz: 04226ba70367c28b48c2c29d0691ffd31949b08017a342fb8f32c6e841a2d44c
+  data.tar.gz: 40d1d80234fa5b2fefb05e26335aa4ce85483e2995696fa319e563db32e1d4f3
 SHA512:
-  metadata.gz: e80f1d090729ae650faac76d433e9d8aa7e7812a8da986593944b1797fbdaf97dd62def14b1326ed1aff098d0113a67991d6a49d48afc232c051a813e88f01d9
-  data.tar.gz: d571f23a5dbed980a37788c157d2673b7c7abe697f2c64a7ff9597e772f48a8dd4c9a47d89221c49f03120dd6cea0b7b3fb67a6d9a246e1456b17172292f6b00
+  metadata.gz: c0fb1e8d99ad10a5085610837ae9ef987ded7d517692cd1d6ab854e5a6ff2c7f502ee39f5d6965fc7f036550bf07a8d0968d3836ee89ad2abab5b34ef2a9c892
+  data.tar.gz: 737d057fe58581cd3aa7f6b23872df01e26594f75eec2b306b9b47220c390a93d43019f4e1c30eceeb021e5be03780624c640f27bd65ec60ebdb84a68c6420f8

data/lib/test_bench/bootstrap.rb

@@ -1,15 +1,13 @@
 module TestBench
   module Bootstrap
-    def self.activate(receiver=nil)
-      receiver ||= TOPLEVEL_BINDING.receiver
-
-      receiver.extend(Fixture)
+    def self.activate
+      Object.include(Fixture)
     end
 
     module Fixture
       def assert(value)
         unless value
-          raise AssertionFailure.build(caller_locations.first)
+          raise AssertionFailure.build(caller.first)
         end
       end
 
@@ -27,24 +25,24 @@ module TestBench
           end
         end
 
-        raise AssertionFailure.build(caller_locations.first)
+        raise AssertionFailure.build(caller.first)
       end
 
       def refute(value)
         if value
-          raise AssertionFailure.build(caller_locations.first)
+          raise AssertionFailure.build(caller.first)
         end
       end
 
-      def refute_raises(error_class, &block)
+      def refute_raises(error_class=nil, &block)
         block.()
 
-      rescue error_class => error
+      rescue (error_class || StandardError) => error
         unless error.instance_of?(error_class)
           raise error
         end
 
-        raise AssertionFailure.build(caller_locations.first)
+        raise AssertionFailure.build(caller.first)
       end
 
       def context(prose=nil, &block)
@@ -70,6 +68,10 @@ module TestBench
         end
       end
 
+      def _context(prose=nil, &block)
+        context(prose)
+      end
+
       def test(prose=nil, &block)
         if block.nil?
           Output.write(prose || 'Test', sgr_code: 0x33)
@@ -90,81 +92,109 @@ module TestBench
         end
       end
 
+      def _test(prose=nil, &block)
+        test(prose)
+      end
+
       def comment(text)
         Output.write(text)
       end
 
+      def fixture(cls, *args, **kwargs, &block)
+        fixture = TestBench::Fixture.(cls, *args, **kwargs, &block)
+
+        passed = !fixture.test_session.failed?
+
+        assert(passed)
+      end
+
       def self.print_error(error)
         omit_backtrace_pattern = ENV['TEST_BENCH_OMIT_BACKTRACE_PATTERN']
-        omit_backtrace_pattern ||= %r{lib/test_bench/bootstrap\.rb}
+        omit_backtrace_pattern ||= %r{test_bench/bootstrap\.rb}
 
         omitting = false
 
-        error_message = error.full_message(highlight: true, order: :bottom)
+        Output.write("\e[1mTraceback\e[22m (most recent call last):", sgr_code: 0x31)
+
+        rjust_length = error.backtrace.length.to_s.length
+
+        error.backtrace[1..-1].reverse_each.with_index do |line, index|
+          line = line.dup
 
-        error_message.each_line.with_index do |line, index|
           line.chomp!
 
-          if line.start_with?("\t") && omit_backtrace_pattern.match?(line)
+          if omit_backtrace_pattern.match?(line)
             if omitting
               next
             else
               omitting = true
 
-              indentation = line.index("from ")
-
-              line.slice!(indentation..-1)
-              line.gsub!(%r{[[:digit:]]}, '?')
-              line.concat("*omitted*")
+              header = index.to_s.gsub(/./, '?').rjust(rjust_length, ' ')
 
-              Output.write(line, sgr_codes: [0x2, 0x3, 0x31])
+              Output.write("#{header}: *omitted*", sgr_codes: [0x2, 0x3, 0x31], tab_indent: true)
             end
           else
             omitting = false
 
-            Output.write(line, sgr_code: 0x31)
+            header = index.to_s.rjust(rjust_length, ' ')
+
+            Output.write("#{header}: #{line}", sgr_code: 0x31, tab_indent: true)
+          end
+        end
+
+        if error.message.empty?
+          if error.instance_of?(RuntimeError)
+            Output.write("#{error.backtrace[0]}: \e[1;4munhandled exception\e[24;22m", sgr_code: 0x31)
+            return
           end
+
+          error.message = error.class
         end
+
+        Output.write("#{error.backtrace[0]} \e[1m#{error} (\e[4m#{error.class}\e[24m)\e[22m", sgr_code: 0x31)
       end
     end
 
     module Output
       extend self
 
-      def write(text, device: nil, sgr_code: nil, sgr_codes: nil)
-        indent(text, device: device, sgr_code: sgr_code, sgr_codes: sgr_codes)
+      def write(text, device: nil, sgr_code: nil, sgr_codes: nil, tab_indent: nil)
+        indent(text, device: device, sgr_code: sgr_code, sgr_codes: sgr_codes, tab_indent: tab_indent)
       end
 
-      def indent(text, device: nil, sgr_code: nil, sgr_codes: nil, &block)
+      def indent(text, device: nil, sgr_code: nil, sgr_codes: nil, tab_indent: nil, &block)
         device ||= $stdout
 
         unless text.nil?
           sgr_codes = Array(sgr_codes)
+
           unless sgr_code.nil?
             sgr_codes << sgr_code
           end
 
+          sgr_codes.compact!
+
           unless sgr_codes.empty?
             sgr_codes.map! do |sgr_code|
               sgr_code.to_s(16)
             end
 
-            text = "\e[#{sgr_codes * ';'}m#{text}\e[0m"
+            text = "\e[#{sgr_codes.join(';')}m#{text}\e[0m"
           end
 
-          text = "#{'  ' * indentation}#{text}"
+          text = "#{"\t" if tab_indent}#{'  ' * indentation}#{text}"
 
           device.puts(text)
         end
 
         return if block.nil?
 
-        self.indentation += 1
+        self.indentation += 1 unless text.nil?
 
         begin
           block.()
         ensure
-          self.indentation -= 1
+          self.indentation -= 1 unless text.nil?
         end
       end
 
@@ -176,10 +206,10 @@ module TestBench
 
     class AssertionFailure < RuntimeError
       def self.build(caller_location=nil)
-        caller_location ||= caller_locations.first
+        caller_location ||= caller(0)
 
         instance = new
-        instance.set_backtrace([caller_location.to_s])
+        instance.set_backtrace([caller_location])
         instance
       end
 
@@ -190,7 +220,7 @@ module TestBench
 
     class Failure < SystemExit
       def self.build
-        new(false)
+        new(1, "TestBench::Bootstrap is aborting")
       end
     end
 
@@ -202,7 +232,9 @@ module TestBench
         exclude_file_pattern ||= %r{automated_init\.rb}
 
         if argv.empty?
-          file_patterns = ['test/automated/**/*.rb']
+          tests_dir = ENV['TEST_BENCH_TESTS_DIR'] || 'test/automated'
+
+          file_patterns = [File.join(tests_dir, '**', '*.rb')]
         else
           file_patterns = argv
         end
@@ -212,7 +244,7 @@ module TestBench
             file_pattern = File.join(file_pattern, '**/*.rb')
           end
 
-          files = Dir[file_pattern].reject do |file|
+          files = Dir.glob(file_pattern).reject do |file|
             File.basename(file).match?(exclude_file_pattern)
           end
 
@@ -229,6 +261,4 @@ module TestBench
       end
     end
   end
-
-  Bootstrap.activate
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: test_bench-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Nathan Ladd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: nathanladd+github@gmail.com
 executables: []
 extensions: []
@@ -21,7 +21,7 @@ homepage: https://github.com/test-bench/test-bench-bootstrap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -36,8 +36,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A minimal test framework for testing TestBench
 test_files: []