rgot 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edabddcdf99d28070fbe94f391d49d7c034cb1b6d467629c76fc671f7d27956b
-  data.tar.gz: 642606670788ef496178d91b9450f6c08bb97e8e4f9e14442e0868ddf0c2acbd
+  metadata.gz: 368b98f9969eee4d2608df53e668eaaed9f06320ecd5b26096ff05c0f81dc16e
+  data.tar.gz: b045a87ffcb3f18338ce0286e2f22b71921b5bab011e4049c203164b9ab7a077
 SHA512:
-  metadata.gz: eb8824c1730be5395ffb22b3c075239b612a987db000367c804201394305b080834bb246c7c198da556e26090ae7a8424830b6253f7c10fd0183662ff6d490d0
-  data.tar.gz: 4064bdb31930c1cc0a072ab6c7113f93f66ce8cd3bafd4208824c36a5c591685a0e82f7e09758ff32a4d342eefee64efeb92910e8b45c75a48175571f84e03f7
+  metadata.gz: 7a3d443886aa26702be0720d8bdf8abf38dd938e3707d595ac1bf21b1edd0f3cb52f64f29e4ca11996357d8671bfaaa4edc94500560510b67c393244202a2db3
+  data.tar.gz: 13d8fcdf048c4c82da186f96dc7bfef3eb78a35fb5df04a2f6f17badda63100587df8cd175dc0618d823d613526b9e60aeec8e18cc09075c8bf3c8c218d58841

data/.github/workflows/main.yml

@@ -14,13 +14,12 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.6.10'
-          - '2.7.6'
-          - '3.0.4'
-          - '3.1.2'
+          - '2.7.7'
+          - '3.0.5'
+          - '3.1.3'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -1,3 +1,2 @@
-Gemfile.lock
 pkg
 tmp

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    rgot (1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (13.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  rake
+  rgot!
+
+BUNDLED WITH
+   2.3.26

data/README.md

@@ -341,7 +341,7 @@ And this is default virtual main code.
 ```ruby
 module TestSomeCode
   def test_main(m)
-    exit m.run
+    m.run
   end
 end
 ```
@@ -362,7 +362,7 @@ module TestSomeCode
     the_before_running_some_code
     code = m.run
     the_after_running_some_code
-    exit code
+    code
   end
 end
 ```

data/Rakefile

@@ -5,6 +5,8 @@ task :test do |t|
   targets = [
     "test/rgot_common_test.rb",
     "test/rgot_test.rb",
+    "test/rgot_benchmark_test.rb",
+    "test/rgot_example_test.rb",
   ]
   ruby "bin/rgot -v #{targets.join(' ')}"
 end

data/bin/rgot

@@ -1,4 +1,4 @@
 #! /usr/bin/env ruby
 require 'rgot/cli'
 
-Rgot::Cli.new(ARGV).run
+exit Rgot::Cli.new(ARGV).run

data/lib/rgot/b.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rgot
   class B < Common
     Options = Struct.new(

data/lib/rgot/benchmark_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rgot
   class BenchmarkResult
     def initialize(n:, t:)

data/lib/rgot/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 
 require_relative '../rgot'
@@ -11,7 +13,7 @@ module Rgot
     def run
       opts = Rgot::M::Options.new
       parse_option(opts)
-      process_start(opts)
+      main_process(opts)
     end
 
     private
@@ -74,81 +76,82 @@ module Rgot
       end
     end
 
-    def process_start(opts)
+    def main_process(opts)
       code = 0
-      testing_files.map do |testing_file|
-        begin
-          pid = fork do
-            require testing_file
-
-            modules = Object.constants.select { |c|
-              next if c == :FileTest
-              /.*Test\z/ =~ c
-            }.map { |c|
-              Object.const_get(c)
-            }
-
-            modules.each do |test_module|
-              tests = []
-              benchmarks = []
-              examples = []
-              main = nil
-              methods = test_module.instance_methods
-              methods.grep(/\Atest_/).each do |m|
-                if m == :test_main && main.nil?
-                  main = Rgot::InternalTest.new(test_module, m)
-                else
-                  tests << Rgot::InternalTest.new(test_module, m)
-                end
-              end
-
-              methods.grep(/\Abenchmark_/).each do |m|
-                benchmarks << Rgot::InternalBenchmark.new(test_module, m)
-              end
-
-              methods.grep(/\Aexample_?/).each do |m|
-                examples << Rgot::InternalExample.new(test_module, m)
-              end
-
-              duration = Rgot.now
-              at_exit do
-                template = "%s\t%s\t%.3fs"
-
-                case $!
-                when SystemExit
-                  if $!.success?
-                    # exit 0
-                    puts sprintf(template, "ok  ", test_module, Rgot.now - duration)
-                  else
-                    # exit 1
-                    puts "exit status #{$!.status}"
-                    puts sprintf(template, "FAIL", test_module, Rgot.now - duration)
-                  end
-                when NilClass
-                  # not raise, not exit
-                else
-                  # any exception
-                  puts sprintf(template, "FAIL", test_module, Rgot.now - duration)
-                end
-              end
-              m = Rgot::M.new(tests: tests, benchmarks: benchmarks, examples: examples, opts: opts)
-              if main
-                main.module.extend main.module
-                main.module.instance_method(main.name).bind(main.module).call(m)
-              else
-                exit m.run
-              end
-            end
-          end
-        ensure
-          _, status = Process.waitpid2(pid)
-          unless status.success?
-            code = 1
-          end
+
+      testing_files.each do |testing_file|
+        result = child_process(opts, testing_file)
+        unless result == 0
+          code = 1
         end
       end
 
-      exit code
+      code
+    end
+
+    def child_process(opts, testing_file)
+      node = RubyVM::AbstractSyntaxTree.parse_file(testing_file).children[2]
+      test_module_name = find_toplevel_name(node)
+
+      load testing_file
+
+      test_module = Object.const_get(test_module_name)
+      tests = []
+      benchmarks = []
+      examples = []
+      main = nil
+      methods = test_module.public_instance_methods
+      methods.grep(/\Atest_/).each do |m|
+        if m == :test_main && main.nil?
+          main = Rgot::InternalTest.new(test_module, m)
+        else
+          tests << Rgot::InternalTest.new(test_module, m)
+        end
+      end
+
+      methods.grep(/\Abenchmark_/).each do |m|
+        benchmarks << Rgot::InternalBenchmark.new(test_module, m)
+      end
+
+      methods.grep(/\Aexample_?/).each do |m|
+        examples << Rgot::InternalExample.new(test_module, m)
+      end
+
+      m = Rgot::M.new(test_module: test_module, tests: tests, benchmarks: benchmarks, examples: examples, opts: opts)
+      if main
+        main.module.extend main.module
+        main.module.instance_method(:test_main).bind(main.module).call(m)
+      else
+        m.run
+      end
+    end
+
+    private
+
+    def find_toplevel_name(node)
+      case node.type
+      when :MODULE
+        find_toplevel_name(node.children.first)
+      when :CONST, :COLON3
+        node.children.first
+      when :COLON2
+        case node.children
+        in [nil, sym]
+          # module Foo
+          sym
+        in [namespace, sym]
+          # module Foo::Bar
+          find_toplevel_name(namespace)
+        end
+      when :BLOCK
+        module_node = node.children.find { |c| c.type == :MODULE }
+        unless module_node
+          raise "no module found"
+        end
+        find_toplevel_name(module_node)
+      else
+        raise node.type.to_s
+      end
     end
   end
 end

data/lib/rgot/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'pathname'
 
@@ -6,7 +8,7 @@ module Rgot
     attr_accessor :output
 
     def initialize
-      @output = ""
+      @output = "".dup
       @failed = false
       @skipped = false
       @finished = false
@@ -100,7 +102,8 @@ module Rgot
       path = c.sub(/:.*/, '')
       line = c.match(/:(\d+?):/)[1]
       relative_path = Pathname.new(path).relative_path_from(Pathname.new(Dir.pwd)).to_s
-      "\t#{relative_path}:#{line}: #{str}\n"
+      # Every line is indented at least 4 spaces.
+      "    #{relative_path}:#{line}: #{str}\n"
     end
 
     def internal_log(msg)

data/lib/rgot/example_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ripper'
 
 module Rgot
@@ -8,7 +10,7 @@ module Rgot
       @examples = []
       @in_def = false
       @has_output = false
-      @output = ""
+      @output = "".dup
     end
 
     def on_def(method, args, body)

data/lib/rgot/m.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'etc'
 require 'timeout'
@@ -12,43 +14,74 @@ module Rgot
       :thread,
     ); end
 
-    def initialize(tests:, benchmarks:, examples:, opts: Options.new)
-      cpu = opts.cpu || (Etc.respond_to?(:nprocessors) ? Etc.nprocessors : '1').to_s
-      @cpu_list = cpu.split(',').map { |i|
-        j = i.to_i
-        raise Rgot::OptionError, "invalid value #{i.inspect} for --cpu" unless 0 < j
-        j
-      }
-      @thread_list = (opts.thread || "1").split(',').map { |i|
-        j = i.to_i
-        raise Rgot::OptionError, "invalid value #{i.inspect} for --thread" unless 0 < j
-        j
-      }
+    def initialize(tests:, benchmarks:, examples:, test_module: nil, opts: Options.new)
+      unless test_module
+        raise "Require `test_module` keyword" if Gem::Version.new("2.0") <= Gem::Version.new(Rgot::VERSION)
+        warn "`Rgot::M#initialize` will require the `test_module` keyword in the next major version."
+      end
+
       @tests = tests
       @benchmarks = benchmarks
       @examples = examples
+      @test_module = test_module
       @opts = opts
+      @cpu_list = nil
+      @thread_list = nil
     end
 
     def run
+      duration = Rgot.now
       test_ok = false
       example_ok = false
 
+      if @tests.empty? && @benchmarks.empty? && @examples.empty?
+        warn "rgot: warning: no tests to run"
+      end
+
+      begin
+        parse_option
+      rescue Rgot::OptionError
+        puts sprintf("%s\t%s\t%.3fs", "FAIL", @test_module, Rgot.now - duration)
+        raise
+      end
+
       Timeout.timeout(@opts.timeout.to_f) do
         test_ok = run_tests
         example_ok = run_examples
       end
+
       if !test_ok || !example_ok
         puts "FAIL"
-        return 1
+        puts "exit status 1"
+        puts sprintf("%s\t%s\t%.3fs", "FAIL", @test_module, Rgot.now - duration)
+
+        1
+      else
+        puts "PASS"
+        run_benchmarks
+        puts sprintf("%s\t%s\t%.3fs", "ok  ", @test_module, Rgot.now - duration)
+
+        0
       end
-      puts "PASS"
-      run_benchmarks
-      0
     end
 
     private
 
+    def parse_option
+      cpu = @opts.cpu || (Etc.respond_to?(:nprocessors) ? Etc.nprocessors : '1').to_s
+      @cpu_list = cpu.split(',').map { |i|
+        j = i.to_i
+        raise Rgot::OptionError, "invalid value #{i.inspect} for --cpu" unless 0 < j
+        j
+      }
+
+      @thread_list = (@opts.thread || "1").split(',').map { |i|
+        j = i.to_i
+        raise Rgot::OptionError, "invalid value #{i.inspect} for --thread" unless 0 < j
+        j
+      }
+    end
+
     def run_tests
       ok = true
       @tests.each do |test|
@@ -57,7 +90,6 @@ module Rgot
           puts "=== RUN   #{test.name}"
         end
         t.run
-        t.report
         if t.failed?
           ok = false
         end

data/lib/rgot/pb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rgot
   class PB
     attr_accessor :bn

data/lib/rgot/t.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rgot
   class T < Common
     def initialize(test_module, name)
@@ -10,6 +12,7 @@ module Rgot
     def run
       catch(:skip) { call }
       finish!
+      report
     rescue => e
       fail!
       report
@@ -17,15 +20,16 @@ module Rgot
     end
 
     def report
+      puts @output if Rgot.verbose? && !@output.empty?
       duration = Rgot.now - @start
-      template = "--- %s: %s (%.2fs)\n%s"
+      template = "--- \e[%sm%s\e[m: %s (%.2fs)\n"
       if failed?
-        printf template, "FAIL", @name, duration, @output
+        printf template, [41, 1].join(';'), "FAIL", @name, duration
       elsif Rgot.verbose?
         if skipped?
-          printf template, "SKIP", @name, duration, @output
+          printf template, [44, 1].join(';'), "SKIP", @name, duration
         else
-          printf template, "PASS", @name, duration, @output
+          printf template, [42, 1].join(';'), "PASS", @name, duration
         end
       end
     end

data/lib/rgot/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rgot
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/rgot.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Rgot
-  require 'rgot/version'
-  require 'rgot/common'
-  require 'rgot/m'
-  require 'rgot/t'
-  require 'rgot/b'
-  require 'rgot/pb'
-  require 'rgot/benchmark_result'
-  require 'rgot/example_parser'
+  autoload :VERSION, 'rgot/version'
+  autoload :Common, 'rgot/common'
+  autoload :M, 'rgot/m'
+  autoload :T, 'rgot/t'
+  autoload :B, 'rgot/b'
+  autoload :PB, 'rgot/pb'
+  autoload :BenchmarkResult, 'rgot/benchmark_result'
+  autoload :ExampleParser, 'rgot/example_parser'
 
   OptionError = Class.new(StandardError)
   InternalTest = Struct.new(:module, :name)

data/rgot.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ksss/rgot"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|go)/}) }
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgot
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,6 +49,7 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby + Golang Testing = Rgot