oktest 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 829638b6c9703b023e61adfdef426e7ddb206f2ba93775143b8ae39c86b0f381
-  data.tar.gz: f4d70f1272398f74b0abaad9bd0ea027ca557a8860c44d6f11f056a60d89fc4c
+  metadata.gz: 65c65e47a706541792e7ba1e9705dc03af1c2fe46c87141472659fb811463e76
+  data.tar.gz: c405d466c9b63eb3897754716d220f884af655cceba5cc7c644e742caf22b465
 SHA512:
-  metadata.gz: 5669eea2d32e6d0ecdfdd263a50e9a740fd6e2da081bbc0e35d433796d242507341bccc53c2c6ca7cd5a26d0b55a7c8222da5fb15eca27945a1207222c4ee32d
-  data.tar.gz: 8cdce5238153c774972ac26bf6b389786b920a41c8d4d2069df03d17e80ebdd299be83a63d44f7840088482b3e05e35019fdf0804a57c1273e93cde14a9a547e
+  metadata.gz: 496909751ed5b3035d07091c0dc362af3586e85e144177603f15035e178fa5f1d9e31c70bd1da7c60059efd8c3275c781e5876af45ac144f4d56fccf444fea20
+  data.tar.gz: e7d440c6dcdbccefe33e99be638dc0f70aae187ee49f0fc091ea631f55e93da822b22804bfa57d570bf9190440c248783564724fa7998df4b0e9b0a6eb0f7ed3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2021 kuwata-lab.com all rights reserved
+Copyright (c) 2011-2024 kuwata-lab.com all rights reserved
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -95,8 +95,8 @@ Oktest.rb requires Ruby 2.0 or later.
     * <a href="#testing-rack-application">Testing Rack Application</a>
     * <a href="#environment-variale-oktest_rb">Environment Variale <code>$OKTEST_RB</code></a>
     * <a href="#traverser-class">Traverser Class</a>
-    * <a href="#benchmarks">Benchmarks</a>
     * <a href="#--faster-option"><code>--faster</code> Option</a>
+    * <a href="#benchmarks">Benchmarks</a>
   * <a href="#change-log">Change Log</a>
   * <a href="#license-and-copyright">License and Copyright</a>
 
@@ -817,10 +817,15 @@ ok {pr}.raise?(NoMethodError) {|exc|
   ok {exc.class}   == NoMethodError
   ok {exc.message} == "undefined method `len' for \"abc\":String"
 }
+## or (Oktest.rb >= 1.3)
+exc = ok {pr}.raise?(NoMethodError)
+ok {exc.class}   == NoMethodError
+ok {exc.message} == "undefined method `len' for \"abc\":String"
 
 ## assert that procedure does NOT raise any exception
-ok {pr}.NOT.raise?   # no exception class nor error message
-not_ok {pr}.raise?   # same as above
+ok {pr}.raise_nothing? # (>= Oktest 1.3)
+ok {pr}.NOT.raise?     # no exception class nor error message
+not_ok {pr}.raise?     # same as above
 
 ## assert that procedure throws symbol.
 pr2 = proc do
@@ -829,8 +834,8 @@ end
 ok {pr2}.throw?(:quit)  # pass if :quit thrown, fail if other or nothing thrown
 ```
 
-If procedure contains `raise "errmsg"` instead of `raise ErrorClass, "errmsg"`,
-you can omit exception class such as `ok {pr}.raise?("errmsg")`.
+If a procedure contains `raise "errmsg"` instead of `raise ErrorClass, "errmsg"`,
+you can omit exception class like `ok {pr}.raise?("errmsg")`.
 
 <!--
 test/example14b_test.rb:
@@ -939,7 +944,7 @@ require 'oktest'
 
 Oktest::AssertionObject.class_eval do
   def readable?     # custom assertion: file readable?
-    _done()
+    __done()
     result = File.readable?(@actual)
     __assert(result == @bool) {
       "File.readable?($<actual>) == #{@bool}: failed.\n" +
@@ -1010,15 +1015,15 @@ end
 Result:
 
 ```terminal
-$ oktest -s plain test/example21_test.rb
+$ oktest -s quiet test/example21a_test.rb
 *** before_all() ***
 === before() ===
 ---- example spec #1 ----
 === after() ===
-.=== before() ===
+=== before() ===
 ---- example spec #2 ----
 === after() ===
-.*** after_all() ***
+*** after_all() ***
 
 ## total:2 (pass:2, fail:0, error:0, skip:0, todo:0) in 0.000s
 ```
@@ -1729,7 +1734,7 @@ END
 If you want to change embed mark, specify 4th argument, like this:
 
 ```ruby
-partial_regexp <<-'END', '\A', '\z', '%%(.*?)%%'    # !!!!!
+partial_regexp <<-'END', '\A', '\z', '%% %%'    # !!!!!
 * [config.date]   %% \d\d\d\d-\d\d-\d\d %%
 * [config.secret] %% [0-9a-f]+ %%
 END
@@ -2160,6 +2165,24 @@ $ ruby test/example54_test.rb
 ```
 
 
+### `--faster` Option
+
+~~If you are working in very larget project and you want to run test scripts as fast as possible, try `--faster` option of `oktest` command.~~
+
+```terminal
+$ oktest -s quiet --faster test/        ## only for very large project
+```
+
+~~Or set `Oktest::Config.ok_location = false` in your test script.~~
+
+```ruby
+require 'oktest'
+Oktest::Config.ok_location = false      ## only for very large project
+```
+
+`--faster` option is still available but no longer recommended, because performance of `ok{}` is improved significantly since Oktest.rb 1.2.0.
+
+
 ### Benchmarks
 
 Oktest.rb gem file contains benchmark script.
@@ -2180,42 +2203,52 @@ ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x86_64-darwin18]
 $ rake benchmark:all
 ```
 
+Summary of example result:
+
+```
+Oktest:              6.815 real     6.511 user     0.257 sys
+Oktest (--faster):   6.401 real     6.123 user     0.240 sys
+RSpec:              32.062 real    27.778 user     4.383 sys
+MiniTest:            9.140 real     8.657 user     0.705 sys
+Test::Unit:         19.580 real    19.020 user     0.885 sys
+```
+
 Example result:
 
 ```
-==================== {{*oktest*}} ====================
+==================== oktest ====================
 oktest -sq run_all.rb
 
 ## total:100000 (pass:100000, fail:0, error:0, skip:0, todo:0) in 2.36s
 
-        {{*6.815 real*}}        6.511 user        0.257 sys
+        6.815 real        6.511 user        0.257 sys
 
-==================== {{*oktest:faster*}} ====================
+==================== oktest:faster ====================
 oktest -sq --faster run_all.rb
 
 ## total:100000 (pass:100000, fail:0, error:0, skip:0, todo:0) in 2.01s
 
-        {{*6.401 real*}}        6.123 user        0.240 sys
+        6.401 real        6.123 user        0.240 sys
 
-==================== {{*rspec*}} ====================
+==================== rspec ====================
 rspec run_all.rb | tail -4
 
 Finished in 15.27 seconds (files took 16.08 seconds to load)
 100000 examples, 0 failures
 
 
-        {{*32.062 real*}}        27.778 user        4.383 sys
+        32.062 real        27.778 user        4.383 sys
 
-==================== {{*minitest*}} ====================
+==================== minitest ====================
 ruby run_all.rb | tail -4
 
 Finished in 5.281425s, 18934.2838 runs/s, 37868.5677 assertions/s.
 
 100000 runs, 200000 assertions, 0 failures, 0 errors, 0 skips
 
-        {{*9.140 real*}}        8.657 user        0.705 sys
+        9.140 real        8.657 user        0.705 sys
 
-==================== {{*testunit*}} ====================
+==================== testunit ====================
 ruby run_all.rb | tail -5
 -------------------------------------------------------------------------------
 100000 tests, 200000 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
@@ -2223,34 +2256,7 @@ ruby run_all.rb | tail -5
 -------------------------------------------------------------------------------
 7775.59 tests/s, 15551.18 assertions/s
 
-        {{*19.580 real*}}        19.020 user        0.885 sys
-```
-
-Summary:
-
-```
-Oktest:              6.815 real     6.511 user     0.257 sys
-Oktest (--fast):     6.401 real     6.123 user     0.240 sys
-RSpec:              32.062 real    27.778 user     4.383 sys
-MiniTest:            9.140 real     8.657 user     0.705 sys
-Test::Unit:         19.580 real    19.020 user     0.885 sys
-```
-
-
-### `--faster` Option
-
-If you are working in very larget project and you want to run test scripts
-as fast as possible, try `--faster` option of `oktest` command.
-
-```terminal
-$ oktest -s quiet --faster test/        ## only for very large project
-```
-
-Or set `Oktest::Config.ok_location = false` in your test script.
-
-```ruby
-require 'oktest'
-Oktest::Config.ok_location = false      ## only for very large project
+        19.580 real        19.020 user        0.885 sys
 ```
 
 
@@ -2264,4 +2270,4 @@ See [CHANGES.md](https://github.com/kwatch/oktest/blob/ruby/ruby/CHANGES.md).
 ## License and Copyright
 
 * $License: MIT License $
-* $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+* $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $

data/Rakefile.rb

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
 PROJECT   = "oktest"
 RELEASE   = ENV['RELEASE'] || "0.0.0"
-COPYRIGHT = "copyright(c) 2011-2021 kuwata-lab.com all rights reserved"
+COPYRIGHT = "copyright(c) 2011-2024 kuwata-lab.com all rights reserved"
 LICENSE   = "MIT License"
 
-$ruby_versions ||= %w[2.4 2.5 2.6 2.7 3.0]
+$ruby_versions ||= %w[2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3]
 
 desc "show release guide"
 task :guide do

data/lib/oktest.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -12,7 +12,7 @@ require 'set'
 module Oktest
 
 
-  VERSION = '$Release: 1.2.0 $'.split()[1]
+  VERSION = '$Release: 1.3.0 $'.split()[1]
 
 
   class OktestError < StandardError
@@ -236,14 +236,29 @@ module Oktest
       self
     end
 
-    def method_missing(method_name, *args)
+    if RUBY_VERSION >= "2.7"
+      def method_missing(method_name, *args, **kwargs, &b)
+        #; [!ttow6] raises NoMethodError when not a boolean method.
+        return super unless method_name.to_s =~ /\?\z/
+        #; [!gd3vg] supports keyword arguments on Ruby >= 2.7.
+        __method_missing(method_name, args, kwargs) {
+          @actual.__send__(method_name, *args, **kwargs, &b)
+        }
+      end
+    else
+      def method_missing(method_name, *args, &b)
+        return super unless method_name.to_s =~ /\?\z/
+        __method_missing(method_name, args, nil) {
+          @actual.__send__(method_name, *args, &b)
+        }
+      end
+    end
+
+    def __method_missing(method_name, args, kwargs)
       __done()
       #; [!yjnxb] enables to handle boolean methods.
-      #; [!ttow6] raises NoMethodError when not a boolean method.
-      method_name.to_s =~ /\?\z/  or
-        super
       begin
-        ret = @actual.__send__(method_name, *args)
+        ret = yield
       rescue NoMethodError, TypeError => exc
         #; [!f0ekh] skip top of backtrace when NoMethodError raised.
         while !exc.backtrace.empty? && exc.backtrace[0].start_with?(__FILE__)
@@ -254,10 +269,11 @@ module Oktest
       #; [!cun59] fails when boolean method failed returned false.
       #; [!4objh] is available with NOT.
       if ret == true || ret == false
+        #; [!5y9iu] reports args and kwargs in error message.
+        s = __inspect_args_and_kwargs(args, kwargs)
         __assert(@bool == ret) {
-          args = args.empty? ? '' : "(#{args.collect {|x| x.inspect }.join(', ')})"
           eq = @bool ? '' : ' == false'
-          "$<actual>.#{method_name}#{args}#{eq}: failed.\n"\
+          "$<actual>.#{method_name}#{s}#{eq}: failed.\n"\
           "    $<actual>:   #{@actual.inspect}"
         }
       #; [!sljta] raises TypeError when boolean method returned non-boolean value.
@@ -267,6 +283,17 @@ module Oktest
       #; [!7bbrv] returns self when passed.
       self
     end
+    private :__method_missing
+
+    def __inspect_args_and_kwargs(args, kwargs)
+      kwargs ||= {}
+      arr = [
+        (args.empty?   ? nil : args.collect {|x| x.inspect}),
+        (kwargs.empty? ? nil : kwargs.collect {|k, v| "#{k}: #{v.inspect}" }),
+      ].compact.flatten
+      return arr.empty? ? "" : "(#{arr.join(', ')})"
+    end
+    private :__inspect_args_and_kwargs
 
     def raise!(errcls=nil, errmsg=nil, &b)
       #; [!8k6ee] compares error class by '.is_a?' instead of '=='.
@@ -349,8 +376,8 @@ module Oktest
       #; [!vnc6b] sets exception object into '#exc' attribute.
       (class << proc_obj; self; end).class_eval { attr_accessor :exc }
       proc_obj.exc = exc
-      #; [!y1b28] returns self when passed.
-      self
+      #; [!y1b28] returns exception object.
+      return exc
     end
 
     def throw?(expected)
@@ -1077,7 +1104,7 @@ END
     end
 
     attr_reader :target
-    attr_accessor :_prefix
+    attr_writer :_prefix
 
     def _prefix
       @_prefix || '*'
@@ -1229,7 +1256,7 @@ END
       raise SkipException, reason if condition
     end
 
-    def fixture(name, *args)
+    def fixture(name, *args, **kwargs)
       #; [!zgfg9] finds fixture block in current or parent node.
       node = self.class.__node
       while node && (tuple = node.get_fixture_block(name)) == nil
@@ -1244,7 +1271,7 @@ END
       #; [!m4ava] calls fixture block and returns result of it.
       #; [!l2mcx] accepts block arguments.
       block, _, _ = tuple
-      return block.call(*args)
+      return block.call(*args, **kwargs)
     end
 
     def TODO()
@@ -1913,6 +1940,12 @@ END
       puts "## #{scope.filename}"
     end
 
+    def exit_scope(scope)
+      #; [!ibdu7] reports errors even when no topics.
+      super
+      print_exceptions()
+    end
+
     def enter_topic(topic, depth)
       super
       puts "#{'  ' * (depth - 1)}#{topic._prefix} #{Color.topic(topic.target)}"
@@ -2304,7 +2337,7 @@ END
     @os_windows      = RUBY_PLATFORM =~ /mswin|mingw/i
     @auto_run        = true
     @ok_location     = true     # false will make 'ok()' faster
-    @color_available = ! @os_windows || ENV['COLORTERM'] =~ /color|24bit/i
+    @color_available = ! @os_windows || ENV['WT_SESSION'] || ENV['COLORTERM'] =~ /color|24bit/i
     @color_enabled   = @color_available && $stdout.tty?
     @diff_command    = @os_windows ? "diff.exe -u" : "diff -u"
 

data/oktest.gemspec

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
+### $Release: 1.3.0 $
 ### $License: MIT License $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ###
 
 require 'rubygems'
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.name        = "oktest"
   s.author      = "kwatch"
   s.email       = "kwatch@gmail.com"
-  s.version     = "$Release: 1.2.0 $".split()[1]
+  s.version     = "$Release: 1.3.0 $".split()[1]
   s.license     = "MIT"
   s.platform    = Gem::Platform::RUBY
   s.homepage    = "https://github.com/kwatch/oktest/tree/ruby"

data/test/assertion_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -351,7 +351,7 @@ END
     end
   end
 
-describe '#method_missing()' do
+  describe '#method_missing()' do
     it "[!7bbrv] returns self when passed." do
       should_return_self { ok {"file.png"}.end_with?(".png") }
     end
@@ -365,6 +365,27 @@ describe '#method_missing()' do
         ok {"a"}.start_with
       end
     end
+    it "[!gd3vg] supports keyword arguments on Ruby >= 2.7." do
+      #if RUBY_VERSION >= "2.7"
+      if true
+        eval <<-END
+          class Dummy392
+            def foo?(a, b, c: nil, d: nil)
+              return true
+            end
+          end
+        END
+        PASS! { ok {Dummy392.new}.foo?(123, 'abc', c: 45, d: true) }
+        if RUBY_VERSION >= "2.7"
+          errmsg = "unknown keywords: :x, :y"
+        else
+          errmsg = "unknown keywords: x, y"
+        end
+        ERROR!(ArgumentError, errmsg) do
+          ok {Dummy392.new}.foo?(123, 'abc', x: 45, y: true)
+        end
+      end
+    end
     it "[!f0ekh] skip top of backtrace when NoMethodError raised." do
       exc = ERROR!(NoMethodError) do
         ok {[1]}.start_with?(1)
@@ -399,12 +420,45 @@ describe '#method_missing()' do
         ok {s}.sos?
       end
     end
+    it "[!5y9iu] reports args and kwargs in error message." do
+      if RUBY_VERSION >= "2.7"
+        str = '123, "abc", x: "45", y: true'
+      else
+        str = '123, "abc", {:x=>"45", :y=>true}'
+      end
+      errmsg = "$<actual>.bla?(#{str}): failed.\n"\
+               "    $<actual>:   \"Blabla\""
+      FAIL!(errmsg) do
+        s = "Blabla"
+        def s.bla?(*a, **k); return false; end
+        ok {s}.bla?(123, "abc", x: "45", y: true)
+      end
+      #
+      obj = Oktest::AssertionObject.new(nil, true, nil)
+      expected = '(123, "abc", c: "45", d: true)'
+      actual = obj.instance_eval {
+        __inspect_args_and_kwargs([123, "abc"], c: "45", d: true)
+      }
+      assert_eq actual, expected
+    end
   end
 
   describe '#raise?' do
-    it "[!y1b28] returns self when passed." do
+    it "[!y1b28] returns exception object." do
       pr = proc { "SOS".sos }
-      should_return_self { ok {pr}.raise?(NoMethodError, "undefined method `sos' for \"SOS\":String")  }
+      if RUBY_VERSION >= "3.3"
+        expected = "undefined method `sos' for an instance of String"
+      elsif RUBY_VERSION =~ /^3\.1\./
+        expected = "undefined method `sos' for \"SOS\":String\n"\
+                   "\n"\
+                   "      pr = proc { \"SOS\".sos }\n"\
+                   "                       ^^^^"
+      else
+        expected = "undefined method `sos' for \"SOS\":String"
+      end
+      ret = ok {pr}.raise?(NoMethodError, expected)
+      assert_eq ret.class, NoMethodError
+      assert_eq ret.message, expected
     end
     it "[!2rnni] 1st argument can be error message string or rexp." do
       pr = proc { raise "something wrong" }
@@ -440,14 +494,36 @@ describe '#method_missing()' do
       end
       it "[!4n3ed] reraises if exception is not matched to specified error class." do
         pr = proc { "SOS".sos }
-        errmsg = "undefined method `sos' for \"SOS\":String"
+        if RUBY_VERSION >= "3.3"
+          errmsg = "undefined method `sos' for an instance of String"
+        elsif RUBY_VERSION =~ /^3\.1\./
+          errmsg = "undefined method `sos' for \"SOS\":String\n"\
+                   "\n"\
+                   "        pr = proc { \"SOS\".sos }\n"\
+                   "                         ^^^^"
+        else
+          errmsg = "undefined method `sos' for \"SOS\":String"
+        end
         ERROR!(NoMethodError, errmsg) { ok {pr}.raise?(ArgumentError) }
       end
       it "[!tpxlv] accepts string or regexp as error message." do
+        if RUBY_VERSION >= "3.1"
+          expected = "undefined method `sos' for \"SOS\":String\n"\
+                     "\n"\
+                     "        pr = proc { \"SOS\".sos }\n"\
+                     "                         ^^^^"
+        else
+          expected = "undefined method `sos' for \"SOS\":String"
+        end
         pr = proc { "SOS".sos }
-        PASS! { ok {pr}.raise?(NoMethodError, "undefined method `sos' for \"SOS\":String") }
+        PASS! { ok {pr}.raise?(NoMethodError, ) }
         pr = proc { "SOS".sos }
-        PASS! { ok {pr}.raise?(NoMethodError, /^undefined method `sos' for "SOS":String$/) }
+        if RUBY_VERSION >= "3.3"
+          expected = /^undefined method `sos' for an instance of String$/
+        else
+          expected = /^undefined method `sos' for "SOS":String$/
+        end
+        PASS! { ok {pr}.raise?(NoMethodError, expected) }
       end
       it "[!4c6x3] not check exception class when nil specified as errcls." do
         pr = proc { foobar() }
@@ -483,7 +559,16 @@ describe '#method_missing()' do
       end
       it "[!61vtv] assertion fails when specified exception raised." do
         pr = proc { "SOS".foobar }
-        errmsg = "NoMethodError should not be raised but got #<NoMethodError: undefined method `foobar' for \"SOS\":String>."
+        if RUBY_VERSION >= "3.3"
+          errmsg = "NoMethodError should not be raised but got #<NoMethodError: undefined method `foobar' for an instance of String>."
+        elsif RUBY_VERSION =~ /^3\.1\./
+          errmsg = "NoMethodError should not be raised but got #<NoMethodError: undefined method `foobar' for \"SOS\":String\n"\
+                   "\n"\
+                   "        pr = proc { \"SOS\".foobar }\n"\
+                   "                         ^^^^^^^>."
+        else
+          errmsg = "NoMethodError should not be raised but got #<NoMethodError: undefined method `foobar' for \"SOS\":String>."
+        end
         FAIL!(errmsg) { ok {pr}.NOT.raise?(NoMethodError) }
       end
       it "[!smprc] compares error class with '==' operator, not '.is_a?'." do
@@ -516,7 +601,17 @@ describe '#method_missing()' do
       PASS! { ok {pr}.raise?(NoMethodError) }
       assert pr.respond_to?(:exc)
       assert pr.exc.is_a?(NoMethodError)
-      assert_eq pr.exc.message, "undefined method `foobar' for \"SOS\":String"
+      if RUBY_VERSION >= "3.3"
+        errmsg = "undefined method `foobar' for an instance of String"
+      elsif RUBY_VERSION =~ /^3\.1\./
+        errmsg = "undefined method `foobar' for \"SOS\":String\n"\
+                 "\n"\
+                 "      pr = proc { \"SOS\".foobar }\n"\
+                 "                       ^^^^^^^"
+      else
+        errmsg = "undefined method `foobar' for \"SOS\":String"
+      end
+      assert_eq pr.exc.message, errmsg
       #
       pr = proc { nil }
       assert !pr.respond_to?(:exc)

data/test/filter_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/fixture_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/generator_test.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/helper_test.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -129,17 +129,17 @@ class SpecHelper_TC < TC
     it "[!l2mcx] accepts block arguments." do
       val = nil
       Oktest.scope() do
-        fixture :foo do |x, y|
-          {x: x, y: y}
+        fixture :foo do |x, y, z: 0|
+          {x: x, y: y, z: z}
         end
         topic 'Example' do
           spec 'sample' do
-            val = fixture(:foo, 10, 20)
+            val = fixture(:foo, 10, 20, z: 30)
           end
         end
       end
       capture { Oktest.run() }
-      assert_eq val, {x: 10, y: 20}
+      assert_eq val, {x: 10, y: 20, z: 30}
     end
     it "[!wxcsp] raises error when fixture not found." do
       exc = nil

data/test/initialize.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/mainapp_test.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -257,7 +257,7 @@ END
     end
 
     it "[!qqizl] '--version' option prints version number." do
-      expected = '$Release: 1.2.0 $'.split()[1] + "\n"
+      expected = '$Release: 1.3.0 $'.split()[1] + "\n"
       #
       ret, sout, serr = run("--version")
       assert_eq ret, 0

data/test/matcher_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/misc_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/node_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/reporter_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -527,6 +527,37 @@ class VerboseReporter_TC < Reporter_TC
     assert_eq serr, ""
   end
 
+  it "[!ibdu7] reports errors even when no topics." do
+    input = <<'END'
+require 'oktest'
+Oktest.scope do
+  spec "example" do
+    ok {1-1} == 2
+  end
+end
+END
+    File.write(@filename, input)
+    #
+    expected = <<'END'
+## _test.tmp
+- [<R>Fail</R>] example
+----------------------------------------------------------------------
+[<R>Fail</R>] <b>example</b>
+    _test.tmp:4:in `block (2 levels) in <top (required)>'
+        ok {1-1} == 2
+%%%
+<R>$<actual> == $<expected>: failed.</R>
+    $<actual>:   0
+    $<expected>: 2
+----------------------------------------------------------------------
+## total:1 (pass:0, <R>fail:1</R>, error:0, skip:0, todo:0) in 0.000s
+END
+    #
+    sout, serr = run("-sv", @filename)
+    assert_eq edit_actual(sout), edit_expected(expected)
+    assert_eq serr, ""
+  end
+
 end
 
 

data/test/runner_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -118,7 +118,24 @@ topic: "Parent"
     $<actual>:   2
     $<expected>: 1>
     spec: "spec#3"
+END
+      if RUBY_VERSION >= "3.3"
+        expected += <<'END'
+    /spec: status=:ERROR, error=#<NoMethodError: undefined method `null?' for an instance of String>
+END
+      elsif RUBY_VERSION =~ /^3\.1\./
+        expected += <<'END'
+    /spec: status=:ERROR, error=#<NoMethodError: undefined method `null?' for "":String
+
+            spec("spec#3") { "".null? }                   # error
+                               ^^^^^^>
+END
+      else
+        expected += <<'END'
     /spec: status=:ERROR, error=#<NoMethodError: undefined method `null?' for "":String>
+END
+      end
+      expected += <<'END'
     spec: "spec#4"
     /spec: status=:SKIP, error=#<Oktest::SkipException: REASON>
     spec: "spec#5"
@@ -285,7 +302,24 @@ topic: "topic#A"
   /spec: status=:PASS
   spec: "spec#2"
   - at_end A2
+END
+      if RUBY_VERSION >= "3.3"
+        expected += <<'END'
+  /spec: status=:ERROR, error=#<NoMethodError: undefined method `null?' for an instance of String>
+END
+      elsif RUBY_VERSION =~ /^3\.1\./
+        expected += <<'END'
+  /spec: status=:ERROR, error=#<NoMethodError: undefined method `null?' for "":String
+
+            spec("spec#2") { at_end { puts "  - at_end A2" }; "".null? }   # raises NoMethodError
+                                                                ^^^^^^>
+END
+      else
+        expected += <<'END'
   /spec: status=:ERROR, error=#<NoMethodError: undefined method `null?' for "":String>
+END
+      end
+      expected += <<'END'
 /topic
 /file
 END

data/test/tc.rb

@@ -34,9 +34,9 @@ class TC
       obj.instance_eval(&b)
     rescue => exc
       if exc.is_a?(AssertionFailed)
-        COUNTS[:fail]  += 1; puts "FAILED!" unless ENV['TC_QUIET']
+        COUNTS[:fail]  += 1; puts "\e[31mFAILED!\e[0m" unless ENV['TC_QUIET']
       else
-        COUNTS[:error] += 1; puts "ERROR!"  unless ENV['TC_QUIET']
+        COUNTS[:error] += 1; puts "\e[31mERROR!\e[0m"  unless ENV['TC_QUIET']
       end
       puts "  #{exc.class.name}: #{exc.message}"
       exc.backtrace.each do |bt|

data/test/util_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/utilhelper_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/visitor_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.2.0 $
-### $Copyright: copyright(c) 2011-2021 kuwata-lab.com all rights reserved $
+### $Release: 1.3.0 $
+### $Copyright: copyright(c) 2011-2024 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oktest
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - kwatch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: new style testing library