test_bench 1.1.0.0 → 1.2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d18b019b73d853e50b78abd989c8d8969c65eb7c5beedc0f3eeadb415f652aa
-  data.tar.gz: e8a421026be5f2cf1c5f2af81ddd6a763ab0095669bbda97998fee4ca6fafb83
+  metadata.gz: 82b5c7ea30694c73b4fea06fd84b04a91c39ddb2e4c1f3c5d61bf7cbcf19968a
+  data.tar.gz: e3e762b1ed21103f6b63cdc1c9b3c974803e2ae82e60a8f110dcf7b3ba6a5aff
 SHA512:
-  metadata.gz: bc855a5819e98378bae988487b7d8e55c5143ca157f6f116c1411e2bbf087771a6bf992650049d07cb3b1a8a0666ad56ef4ef05686a88536264884700851de77
-  data.tar.gz: 15a6baea7cbbf7f8cfcccaa17c3bb128fe396be9ffb227087335f4edc5a569d95cdbe066359f9af80907f3fa298e8299af8be0d402fb6e08c3c125222fe69a23
+  metadata.gz: be92980ba27d4c0132a96a2d31df200e3c442e0de320ee0b66e482b8793ca0868992a833a58b25fd0d6db384eadf9a2f21fee4d3e4308890736881ad3b08b1ec
+  data.tar.gz: 4687fc714ea34ddb8510359827016a8107b1ca1fd2659ed140237fa9a4abc73a3c2eafa96f5aeeaa4f1f6b4ea6a877d7e17fde63e74ba1db05e83a0e02eec66d

data/lib/test_bench.rb

@@ -1,4 +1,6 @@
-require 'optionparser'
+unless RUBY_ENGINE == 'mruby'
+  require 'optionparser'
+end
 
 require 'test_bench/fixture'
 

data/lib/test_bench/cli.rb

@@ -8,7 +8,7 @@ module TestBench
       read_stdin = $stdin.stat.pipe?
 
       if read_stdin && $stdin.eof?
-        warn "$stdin is a pipe, but no data was written to it; no test files will be run"
+        STDERR.puts "$stdin is a pipe, but no data was written to it; no test files will be run"
       end
 
       Run.(exclude: exclude_file_pattern) do |run|

data/lib/test_bench/cli/parse_arguments.rb

@@ -48,21 +48,21 @@ module TestBench
           parser.on('-h', '--help', "Print this help message and exit successfully") do
             output_device.puts(parser.help)
 
-            exit(true)
+            raise SystemExit.new(0)
           end
 
           parser.on('-V', '--version', "Print version and exit successfully") do
-            output_device.puts <<~TEXT
-            test-bench (#{self.class.program_name}) version #{self.class.version}
-            TEXT
+            output_device.puts <<TEXT
+test-bench (#{self.class.program_name}) version #{self.class.version}
+TEXT
 
-            exit(true)
+            raise SystemExit.new(0)
           end
 
           parser.separator('')
           parser.separator("Configuration Options")
 
-          parser.on('-a', '--[no-]abort-on-error', %{Exit immediately after any test failure or error (Default: #{Session::Defaults.abort_on_error ? 'on' : 'off'})}) do |abort_on_error|
+          parser.on('-a', '--[no-]abort-on-error', %{Exit immediately after any test failure or error (Default: #{TestBench::Defaults.abort_on_error ? 'on' : 'off'})}) do |abort_on_error|
             env['TEST_BENCH_ABORT_ON_ERROR'] = abort_on_error ? 'on' : 'off'
           end
 
@@ -116,7 +116,7 @@ module TestBench
             env['TEST_BENCH_OUTPUT_STYLING'] = styling_text
           end
 
-          parser.on('-p', '--[no-]permit-deactivated-tests', %{Do not fail the test run if there are deactivated tests or contexts, e.g. _test or _context (Default: #{!DeactivationVariants::Defaults.fail_session ? 'on' : 'off'})}) do |permit_deactivated_tests|
+          parser.on('-p', '--[no-]permit-deactivated-tests', %{Do not fail the test run if there are deactivated tests or contexts, e.g. _test or _context (Default: #{!TestBench::Defaults.fail_deactivated_tests ? 'on' : 'off'})}) do |permit_deactivated_tests|
             env['TEST_BENCH_FAIL_DEACTIVATED_TESTS'] = !permit_deactivated_tests ? 'on' : 'off'
           end
 
@@ -128,29 +128,29 @@ module TestBench
             env['TEST_BENCH_VERBOSE'] = verbose ? 'on' : 'off'
           end
 
-          parser.separator(<<~TEXT)
+          parser.separator(<<TEXT)
 
-          Paths to test files (and directories containing test files) can be given after any command line arguments or via STDIN (or both).
-          If no paths are given, a default path (#{Defaults.tests_directory}) is scanned for test files.
+Paths to test files (and directories containing test files) can be given after any command line arguments or via STDIN (or both).
+If no paths are given, a default path (#{Defaults.tests_directory}) is scanned for test files.
 
-          The following environment variables can also control execution:
+The following environment variables can also control execution:
 
-          #{parser.summary_indent}TEST_BENCH_ABORT_ON_ERROR          Same as -a or --abort-on-error
-          #{parser.summary_indent}TEST_BENCH_DETAIL                  Same as -d or --detail
-          #{parser.summary_indent}TEST_BENCH_EXCLUDE_FILE_PATTERN    Same as -x or --exclude-file-pattern
-          #{parser.summary_indent}TEST_BENCH_LOG_LEVEL               Same as -l or --log-level
-          #{parser.summary_indent}TEST_BENCH_OMIT_BACKTRACE_PATTERN  Same as -o or --omit-backtrace-pattern
-          #{parser.summary_indent}TEST_BENCH_OUTPUT_STYLING          Same as -s or --output-styling
-          #{parser.summary_indent}TEST_BENCH_FAIL_DEACTIVATED_TESTS  Opposite of -p or --permit-deactivated-tests
-          #{parser.summary_indent}TEST_BENCH_REVERSE_BACKTRACES      Same as -r or --reverse-backtraces
-          #{parser.summary_indent}TEST_BENCH_VERBOSE                 Same as -v or --reverse-backtraces
+#{parser.summary_indent}TEST_BENCH_ABORT_ON_ERROR          Same as -a or --abort-on-error
+#{parser.summary_indent}TEST_BENCH_DETAIL                  Same as -d or --detail
+#{parser.summary_indent}TEST_BENCH_EXCLUDE_FILE_PATTERN    Same as -x or --exclude-file-pattern
+#{parser.summary_indent}TEST_BENCH_LOG_LEVEL               Same as -l or --log-level
+#{parser.summary_indent}TEST_BENCH_OMIT_BACKTRACE_PATTERN  Same as -o or --omit-backtrace-pattern
+#{parser.summary_indent}TEST_BENCH_OUTPUT_STYLING          Same as -s or --output-styling
+#{parser.summary_indent}TEST_BENCH_FAIL_DEACTIVATED_TESTS  Opposite of -p or --permit-deactivated-tests
+#{parser.summary_indent}TEST_BENCH_REVERSE_BACKTRACES      Same as -r or --reverse-backtraces
+#{parser.summary_indent}TEST_BENCH_VERBOSE                 Same as -v or --reverse-backtraces
 
-          TEXT
+TEXT
         end
       end
 
       def assure_pattern(pattern_text)
-        Regexp.new(pattern_text)
+        Regexp.new(pattern_text.to_s)
       rescue RegexpError
         raise Error, "Invalid regular expression pattern (Pattern: #{pattern_text.inspect})"
       end
@@ -164,7 +164,7 @@ module TestBench
       end
 
       def self.version
-        if defined?(Gem)
+        if Object.const_defined?(:Gem)
           spec = Gem.loaded_specs['test_bench']
         end
 

data/lib/test_bench/controls.rb

@@ -1,4 +1,6 @@
-require 'securerandom'
+unless RUBY_ENGINE == 'mruby'
+  require 'securerandom'
+end
 
 require 'test_bench/fixture/controls'
 

data/lib/test_bench/controls/error.rb

@@ -11,11 +11,11 @@ module TestBench
 
           error = Error.example(message)
 
-          <<~TEXT
-          #{indent}#{error.backtrace[0]}: #{error.message} (#{error.class.name})
-          \t#{indent}from #{error.backtrace[1]}
-          \t#{indent}from #{error.backtrace[2]}
-          TEXT
+          <<TEXT
+#{indent}#{error.backtrace[0]}: #{error.message} (#{error.class.name})
+\t#{indent}from #{error.backtrace[1]}
+\t#{indent}from #{error.backtrace[2]}
+TEXT
         end
 
         module Assertion
@@ -24,9 +24,9 @@ module TestBench
 
             assertion_failure = TestBench::Fixture::AssertionFailure.build(caller_location)
 
-            <<~TEXT
-            #{assertion_failure.backtrace[0]}: #{assertion_failure.message} (#{assertion_failure.class.name})
-            TEXT
+            <<TEXT
+#{assertion_failure.backtrace[0]}: #{assertion_failure.message} (#{assertion_failure.class.name})
+TEXT
           end
         end
       end

data/lib/test_bench/controls/output/newline_character.rb

@@ -3,7 +3,12 @@ module TestBench
     module Output
       module NewlineCharacter
         def self.example
-          StringIO.new.tap(&:puts).string
+          str = String.new
+
+          string_io = StringIO.new(str)
+          string_io.puts('')
+
+          str
         end
       end
     end

data/lib/test_bench/controls/output/summary/error.rb

@@ -5,12 +5,12 @@ module TestBench
         module Error
           module Text
             def self.example
-              <<~TEXT
-                Error Summary:
-                   1: #{file}
-                      #{error.backtrace[0]}: #{error} (#{error.class})
+              <<TEXT
+Error Summary:
+   1: #{file}
+      #{error.backtrace[0]}: #{error} (#{error.class})
 
-              TEXT
+TEXT
             end
 
             def self.file

data/lib/test_bench/controls/output/summary/session.rb

@@ -5,12 +5,12 @@ module TestBench
         module Session
           module Text
             def self.example
-              <<~TEXT
-              Finished running 0 files
-              Ran 0 tests in 0.000s (0.0 tests/second)
-              0 passed, 0 skipped, 0 failed, 0 total errors
+              <<TEXT
+Finished running 0 files
+Ran 0 tests in 0.000s (0.0 tests/second)
+0 passed, 0 skipped, 0 failed, 0 total errors
 
-              TEXT
+TEXT
             end
           end
         end

data/lib/test_bench/controls/time.rb

@@ -12,9 +12,19 @@ module TestBench
         minutes = self.minutes
         seconds = self.seconds + seconds_offset
 
-        tz_offset = self.tz_offset
+        if not RUBY_ENGINE == 'mruby'
+          tz_offset = self.tz_offset
 
-        ::Time.new(year, month, day, hours, minutes, seconds, tz_offset)
+          final_argument = tz_offset
+        else
+          seconds, subseconds = seconds.divmod(1)
+
+          microseconds = subseconds * 1_000_000
+
+          final_argument = microseconds
+        end
+
+        ::Time.new(year, month, day, hours, minutes, seconds, final_argument)
       end
 
       def self.year

data/lib/test_bench/deactivation_variants.rb

@@ -1,21 +1,11 @@
 module TestBench
   module DeactivationVariants
     def _context(title=nil, &block)
-      test_session.fail! if Defaults.fail_session
-
       context(title)
     end
 
     def _test(title=nil, &block)
-      test_session.fail! if Defaults.fail_session
-
       test(title)
     end
-
-    module Defaults
-      def self.fail_session
-        Environment::Boolean.fetch('TEST_BENCH_FAIL_DEACTIVATED_TESTS', true)
-      end
-    end
   end
 end

data/lib/test_bench/fixtures.rb

@@ -1,3 +1,5 @@
-require 'ostruct'
+unless RUBY_ENGINE == 'mruby'
+  require 'ostruct'
+end
 
 require 'test_bench/fixtures/configure_receiver'

data/lib/test_bench/output/buffer.rb

@@ -41,7 +41,9 @@ module TestBench
       end
 
       def new_record(signal, data)
-        record = Record.new(signal, data)
+        record = super
+
+        record.extend(Record)
 
         case signal
         when :enter_context, :start_test, :start_fixture
@@ -87,7 +89,7 @@ module TestBench
         stack.length
       end
 
-      class Record < Fixture::Output::Capture::Record
+      module Record
         attr_accessor :batch_data
 
         def forward(raw_output)

data/lib/test_bench/output/timer/substitute.rb

@@ -8,7 +8,7 @@ module TestBench
 
         class Timer < Timer
           def elapsed_time
-            @elapsed_time ||= 0
+            @elapsed_time ||= 0.0
           end
           attr_writer :elapsed_time
 

data/lib/test_bench/output/writer.rb

@@ -106,7 +106,7 @@ module TestBench
 
       def newline
         sync
-        device.puts
+        device.puts('')
         self.byte_offset += 1
         self
       end

data/lib/test_bench/run.rb

@@ -3,7 +3,7 @@ module TestBench
     Error = Class.new(RuntimeError)
 
     def session
-      @session ||= Session::Substitute.build
+      @session ||= Fixture::Session::Substitute.build
     end
     attr_writer :session
 
@@ -25,7 +25,7 @@ module TestBench
 
       instance.exclude_pattern = exclude unless exclude.nil?
 
-      Session.configure(instance, session: session)
+      Fixture::Session.configure(instance, session: session)
       instance.session.output = output unless output.nil?
 
       instance
@@ -79,7 +79,7 @@ module TestBench
     def directory(path)
       glob_pattern = File.join(path, '**/*.rb')
 
-      Dir[glob_pattern].sort.each do |path|
+      Dir.glob(glob_pattern).sort.each do |path|
         next if exclude_pattern.match?(path)
 
         file(path)

data/lib/test_bench/test_bench.rb

@@ -2,7 +2,9 @@ module TestBench
   def self.session
     @session ||= build_session.tap do |session|
       at_exit do
-        exit 1 if session.failed?
+        exit_code = exit_code(session)
+
+        exit(exit_code) unless exit_code.zero?
       end
     end
   end
@@ -65,7 +67,7 @@ module TestBench
   end
 
   def self.session_error_policy(abort_on_error=nil)
-    abort_on_error = Session::Defaults.abort_on_error if abort_on_error.nil?
+    abort_on_error = Defaults.abort_on_error if abort_on_error.nil?
 
     if abort_on_error
       :abort
@@ -74,11 +76,29 @@ module TestBench
     end
   end
 
+  def self.exit_code(session, fail_deactivated_tests: nil)
+    if fail_deactivated_tests.nil?
+      fail_deactivated_tests = Defaults.fail_deactivated_tests
+    end
+
+    if session.failed?
+      1
+    elsif session.skip?
+      fail_deactivated_tests ? 2 : 0
+    else
+      0
+    end
+  end
+
   Session = Fixture::Session
 
-  module Session::Defaults
+  module Defaults
     def self.abort_on_error
       Environment::Boolean.fetch('TEST_BENCH_ABORT_ON_ERROR', false)
     end
+
+    def self.fail_deactivated_tests
+      Environment::Boolean.fetch('TEST_BENCH_FAIL_DEACTIVATED_TESTS', true)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_bench
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 1.2.0.5
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: script
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench-fixture
@@ -72,8 +72,6 @@ files:
 - lib/test_bench/controls/time.rb
 - lib/test_bench/deactivation_variants.rb
 - lib/test_bench/environment/boolean.rb
-- lib/test_bench/fixture
-- lib/test_bench/fixture.rb
 - lib/test_bench/fixtures.rb
 - lib/test_bench/fixtures/configure_receiver.rb
 - lib/test_bench/output.rb
@@ -113,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Principled Test Framework for Ruby
+summary: Principled Test Framework for Ruby and MRuby
 test_files: []

data/lib/test_bench/fixture

@@ -1 +0,0 @@
-lib/test_bench/home/ntl/Projects/test-bench-fixture/lib/test_bench/fixture

data/lib/test_bench/fixture.rb

@@ -1 +0,0 @@
-lib/test_bench/home/ntl/Projects/test-bench-fixture/lib/test_bench/fixture.rb