rgot 0.1.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7571a770fb9c1047be1ec5e1e46f00111aa66948
-  data.tar.gz: 893e306ae56bf1c564fe174071d77f53035f2f3d
+SHA256:
+  metadata.gz: edabddcdf99d28070fbe94f391d49d7c034cb1b6d467629c76fc671f7d27956b
+  data.tar.gz: 642606670788ef496178d91b9450f6c08bb97e8e4f9e14442e0868ddf0c2acbd
 SHA512:
-  metadata.gz: a66f756df701873ad1acdae4202d89586946c86251e9b28ddb64fe7baaa4fac2ec782a938f657d0215830420bbe1c8166b04ccdf6bbc3a389916ebcadc3d76d2
-  data.tar.gz: 74f482d803f640563393a3395984a9e4b6f11ebc18f269dd1047839dab2d05b8f5164fff5d59f22c794872b1f5bc502bd5c432e7e06f16722374c0ccbcda61c2
+  metadata.gz: eb8824c1730be5395ffb22b3c075239b612a987db000367c804201394305b080834bb246c7c198da556e26090ae7a8424830b6253f7c10fd0183662ff6d490d0
+  data.tar.gz: 4064bdb31930c1cc0a072ab6c7113f93f66ce8cd3bafd4208824c36a5c591685a0e82f7e09758ff32a4d342eefee64efeb92910e8b45c75a48175571f84e03f7

data/.github/workflows/main.yml

@@ -0,0 +1,30 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '2.6.10'
+          - '2.7.6'
+          - '3.0.4'
+          - '3.1.2'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run the default task
+      run: bundle exec rake

data/README.md

@@ -1,7 +1,7 @@
 Rgot
 ===
 
-[![Build Status](https://travis-ci.org/ksss/rgot.svg)](https://travis-ci.org/ksss/rgot)
+[![Ruby](https://github.com/ksss/rgot/actions/workflows/main.yml/badge.svg)](https://github.com/ksss/rgot/actions/workflows/main.yml)
 
 Ruby + Golang Testing = Rgot
 
@@ -36,8 +36,8 @@ module SampleTest
     s = Sample.new
     DATA.each do |ts|
       sum = s.sum(ts.left, ts.right)
-      unless sum.kind_of?(Fixnum)
-        t.error("expect Fixnum got #{sum.class}")
+      unless sum.kind_of?(Integer)
+        t.error("expect Integer got #{sum.class}")
       end
       unless sum == ts.expect
         t.error("expect #{ts.expect} got #{sum}")
@@ -131,6 +131,36 @@ end
 
 So, you can notice that the sample code is wrong.
 
+# Table Driven Tests
+
+```rb
+FLAGTESTS = [
+  ["%a", "[%a]"],
+  ["%-a", "[%-a]"],
+  ["%+a", "[%+a]"],
+  ["%#a", "[%#a]"],
+  ["% a", "[% a]"],
+  ["%0a", "[%0a]"],
+  ["%1.2a", "[%1.2a]"],
+  ["%-1.2a", "[%-1.2a]"],
+  ["%+1.2a", "[%+1.2a]"],
+  ["%-+1.2a", "[%+-1.2a]"],
+  ["%-+1.2abc", "[%+-1.2a]bc"],
+  ["%-1.2abc", "[%-1.2a]bc"],
+]
+
+def test_flag_parser(t)
+  FLAGTESTS.each do |input, output|
+    s = Flag.print(input)
+    unless s == output
+      t.errorf("Flag.print(%p) => %p, want %p", input, s, output)
+    end
+  end
+end
+```
+
+see https://github.com/golang/go/wiki/TableDrivenTests
+
 # Naming convention
 
 ## Filename

data/Rakefile

@@ -2,8 +2,11 @@ require "bundler/gem_tasks"
 
 desc "test to rgot"
 task :test do |t|
-  target = "test/{rgot_common,rgot}_test.rb"
-  ruby "bin/rgot -v #{target}"
+  targets = [
+    "test/rgot_common_test.rb",
+    "test/rgot_test.rb",
+  ]
+  ruby "bin/rgot -v #{targets.join(' ')}"
 end
 
 task :default => [:test]

data/bin/rgot

@@ -1,136 +1,4 @@
 #! /usr/bin/env ruby
-require 'optparse'
-require 'rgot'
+require 'rgot/cli'
 
-opts = Rgot::M::Options.new
-require_paths = []
-parser = OptionParser.new do |o|
-  o.on '-v', '--verbose', "log all tests" do |arg|
-    Rgot.class_eval{ @chatty = arg }
-  end
-  o.on '--version', "show Rgot version" do |arg|
-    puts "Rgot v#{Rgot::VERSION}"
-    exit 0
-  end
-  o.on '--bench [regexp]', "benchmark" do |arg|
-    unless arg
-      raise Rgot::OptionError, "missing argument for flag --bench"
-    end
-    opts.bench = arg
-  end
-  o.on '--benchtime [sec]', "benchmark running time" do |arg|
-    opts.benchtime = arg
-  end
-  o.on '--timeout [sec]', "set timeout sec to testing" do |arg|
-    opts.timeout = arg
-  end
-  o.on '--cpu [count,...]', "set cpu counts of comma split" do |arg|
-    opts.cpu = arg
-  end
-  o.on '--thread [count,...]', "set thread counts of comma split" do |arg|
-    opts.thread = arg
-  end
-  o.on '--require [path]', "load some code before running" do |arg|
-    require_paths << arg
-  end
-  o.on '--load-path [path]', "Specify $LOAD_PATH directory" do |arg|
-    $LOAD_PATH.unshift(arg)
-  end
-end
-parser.parse!(ARGV)
-require_paths.each do |path|
-  require path
-end
-
-ARGV.each do |target|
-  if target
-    if File.file?(target)
-      require File.expand_path(target)
-    elsif File.directory?(target)
-      Dir.glob("./#{target}/**/*_test.rb") do |i|
-        require i
-      end
-    else
-      puts target
-    end
-  else
-    Dir.glob("./**/*_test.rb") do |i|
-      require i
-    end
-  end
-end
-
-modules = Object.constants.select { |c|
-  next if c == :FileTest
-  /.*Test\z/ =~ c
-}.map{ |c|
-  Object.const_get(c)
-}
-
-# if 1 != modules.length
-#   puts "can not load module. found #{modules.join(', ')}"
-#   exit 1
-# end
-
-code = 0
-modules.each do |test_module|
-  begin
-    pid = fork {
-      tests = []
-      benchmarks = []
-      examples = []
-      main = nil
-      methods = test_module.instance_methods.sort
-      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 {
-        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 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
-      }
-      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
-    }
-  ensure
-    _, status = Process.waitpid2(pid)
-    unless status.success?
-      code = 1
-    end
-  end
-end
-
-exit code
+Rgot::Cli.new(ARGV).run

data/lib/rgot/b.rb

@@ -1,13 +1,13 @@
 module Rgot
   class B < Common
-    class Options < Struct.new(
+    Options = Struct.new(
       :procs,
       :threads,
-      :benchtime
-    ); end
+      :benchtime,
+    )
 
     attr_accessor :n
-    def initialize(benchmark_module, name, opts=Options.new)
+    def initialize(benchmark_module, name, opts = Options.new)
       super()
       @n = 1
       @module = benchmark_module
@@ -42,7 +42,7 @@ module Rgot
     def run(&block)
       n = 1
       benchtime = (@opts.benchtime || 1).to_f
-      catch(:skip) {
+      catch(:skip) do
         run_n(n.to_i, block)
         while !failed? && @duration < benchtime && @n < 1e9
           if @duration < (benchtime / 100.0)
@@ -61,7 +61,7 @@ module Rgot
           end
           run_n(@n.to_i, block)
         end
-      }
+      end
 
       BenchmarkResult.new(n: @n, t: @duration)
     end
@@ -73,13 +73,13 @@ module Rgot
       threads = (@opts.threads || 1)
 
       procs.times do
-        fork {
+        fork do
           Array.new(threads) {
             Thread.new {
               yield PB.new(bn: @n)
             }.tap { |t| t.abort_on_exception = true }
           }.each(&:join)
-        }
+        end
       end
       @n *= procs * threads
       Process.waitall
@@ -87,7 +87,7 @@ module Rgot
 
     private
 
-    def run_n(n, block=nil)
+    def run_n(n, block = nil)
       GC.start
       @n = n
       reset_timer
@@ -95,7 +95,13 @@ module Rgot
       if block
         block.call(self)
       else
-        @module.instance_method(@name).bind(@module).call(self)
+        bench_method = @module.instance_method(@name).bind(@module)
+        if bench_method.arity == 0
+          path, line = bench_method.source_location
+          skip "#{path}:#{line} `#{bench_method.name}' is not running. It's a benchmark method name, But not have argument"
+        else
+          bench_method.call(self)
+        end
       end
       stop_timer
     end

data/lib/rgot/benchmark_result.rb

@@ -1,9 +1,6 @@
 module Rgot
   class BenchmarkResult
-    # Ruby-2.0.0 wants default value of keyword_argument
-    def initialize(n: nil, t: nil)
-      raise ArgumentError, "missing keyword: n" unless n
-      raise ArgumentError, "missing keyword: t" unless t
+    def initialize(n:, t:)
       @n = n
       @t = t
     end

data/lib/rgot/cli.rb

@@ -0,0 +1,154 @@
+require 'optparse'
+
+require_relative '../rgot'
+
+module Rgot
+  class Cli
+    def initialize(argv)
+      @argv = argv
+    end
+
+    def run
+      opts = Rgot::M::Options.new
+      parse_option(opts)
+      process_start(opts)
+    end
+
+    private
+
+    def parse_option(opts)
+      require_paths = []
+      parser = OptionParser.new do |o|
+        o.on '-v', '--verbose', "log all tests" do |arg|
+          Rgot.class_eval { @chatty = arg }
+        end
+        o.on '--version', "show Rgot version" do |arg|
+          puts "rgot #{Rgot::VERSION} (ruby #{RUBY_VERSION})"
+          exit 0
+        end
+        o.on '--bench [regexp]', "benchmark" do |arg|
+          unless arg
+            raise Rgot::OptionError, "missing argument for flag --bench"
+          end
+          opts.bench = arg
+        end
+        o.on '--benchtime [sec]', "benchmark running time" do |arg|
+          opts.benchtime = arg
+        end
+        o.on '--timeout [sec]', "set timeout sec to testing" do |arg|
+          opts.timeout = arg
+        end
+        o.on '--cpu [count,...]', "set cpu counts of comma split" do |arg|
+          opts.cpu = arg
+        end
+        o.on '--thread [count,...]', "set thread counts of comma split" do |arg|
+          opts.thread = arg
+        end
+        o.on '--require [path]', "load some code before running" do |arg|
+          require_paths << arg
+        end
+        o.on '--load-path [path]', "Specify $LOAD_PATH directory" do |arg|
+          $LOAD_PATH.unshift(arg)
+        end
+      end
+      parser.parse!(@argv)
+
+      require_paths.each do |path|
+        require path
+      end
+    end
+
+    def testing_files
+      if @argv.empty?
+        Dir.glob("./**/*_test.rb")
+      else
+        @argv.flat_map do |target|
+          if File.file?(target)
+            File.expand_path(target)
+          elsif File.directory?(target)
+            Dir.glob("./#{target}/**/*_test.rb")
+          else
+            warn "#{target} is not file or directory"
+          end
+        end.compact
+      end
+    end
+
+    def process_start(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
+        end
+      end
+
+      exit code
+    end
+  end
+end

data/lib/rgot/common.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'pathname'
 
 module Rgot
   class Common

data/lib/rgot/m.rb

@@ -1,5 +1,6 @@
 require 'stringio'
 require 'etc'
+require 'timeout'
 
 module Rgot
   class M
@@ -11,12 +12,8 @@ module Rgot
       :thread,
     ); end
 
-    # Ruby-2.0.0 wants default value of keyword_argument
-    def initialize(tests: nil, benchmarks: nil, examples: nil, opts: Options.new)
-      raise ArgumentError, "missing keyword: tests" unless tests
-      raise ArgumentError, "missing keyword: benchmarks" unless benchmarks
-      raise ArgumentError, "missing keyword: examples" unless examples
-      cpu = opts.cpu || "#{Etc.respond_to?(:nprocessors) ? Etc.nprocessors : "1"}"
+    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
@@ -37,15 +34,15 @@ module Rgot
       test_ok = false
       example_ok = false
 
-      Timeout.timeout(@opts.timeout.to_f) {
+      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
       end
-      puts "PASS" if Rgot.verbose?
+      puts "PASS"
       run_benchmarks
       0
     end
@@ -57,7 +54,7 @@ module Rgot
       @tests.each do |test|
         t = T.new(test.module, test.name.to_sym)
         if Rgot.verbose?
-          puts "=== RUN #{test.name}"
+          puts "=== RUN   #{test.name}"
         end
         t.run
         t.report
@@ -105,23 +102,30 @@ module Rgot
       ok = true
       @examples.each do |example|
         if Rgot.verbose?
-          puts "=== RUN #{example.name}"
+          puts "=== RUN   #{example.name}"
         end
+
+        start = Rgot.now
         example.module.extend(example.module)
         method = example.module.instance_method(example.name).bind(example.module)
-        out, err = capture do
+        out, _ = capture do
           method.call
         end
         file = method.source_location[0]
         r = ExampleParser.new(File.read(file))
         r.parse
-        e = r.examples.find{|e| e.name == example.name}
+        e = r.examples.find { |re| re.name == example.name }
+
+        duration = Rgot.now - start
         if e && e.output.strip != out.strip
+          printf("--- FAIL: %s (%.2fs)\n", e.name, duration)
           ok = false
           puts "got:"
           puts out.strip
           puts "want:"
           puts e.output.strip
+        elsif Rgot.verbose?
+          printf("--- PASS: %s (%.2fs)\n", e.name, duration)
         end
       end
       ok

data/lib/rgot/pb.rb

@@ -2,9 +2,7 @@ module Rgot
   class PB
     attr_accessor :bn
 
-    # Ruby-2.0.0 wants default value of keyword_argument
-    def initialize(bn: nil)
-      raise ArgumentError, "missing keyword: bn" unless bn
+    def initialize(bn:)
       @bn = bn
     end
 

data/lib/rgot/t.rb

@@ -8,19 +8,17 @@ module Rgot
     end
 
     def run
-      begin
-        catch(:skip) { call }
-        finish!
-      rescue => e
-        fail!
-        report
-        raise e
-      end
+      catch(:skip) { call }
+      finish!
+    rescue => e
+      fail!
+      report
+      raise e
     end
 
     def report
       duration = Rgot.now - @start
-      template = "--- %s: %s (%.5fs)\n%s"
+      template = "--- %s: %s (%.2fs)\n%s"
       if failed?
         printf template, "FAIL", @name, duration, @output
       elsif Rgot.verbose?
@@ -34,7 +32,7 @@ module Rgot
 
     def call
       test_method = @module.instance_method(@name).bind(@module)
-      if test_method.arity != 1
+      if test_method.arity == 0
         path, line = test_method.source_location
         warn "#{path}:#{line} `#{test_method.name}' is not running. It's a testing method name, But not have argument"
       else

data/lib/rgot/version.rb

@@ -1,3 +1,3 @@
 module Rgot
-  VERSION = "0.1.4"
+  VERSION = "1.1.0"
 end

data/lib/rgot.rb

@@ -8,33 +8,18 @@ module Rgot
   require 'rgot/benchmark_result'
   require 'rgot/example_parser'
 
-  class OptionError < StandardError
-  end
-
-  class InternalTest < Struct.new(:module, :name)
-  end
-
-  class InternalBenchmark < Struct.new(:module, :name)
-  end
-
-  class InternalExample < Struct.new(:module, :name)
-  end
-
-  class ExampleOutput < Struct.new(:name, :output)
-  end
+  OptionError = Class.new(StandardError)
+  InternalTest = Struct.new(:module, :name)
+  InternalBenchmark = Struct.new(:module, :name)
+  InternalExample = Struct.new(:module, :name)
+  ExampleOutput = Struct.new(:name, :output)
 
   class << self
-    if "2.0.0" < RUBY_VERSION
-      def now
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end
-    else
-      def now
-        Time.now
-      end
+    def now
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
 
-    def benchmark(opts_hash={}, &block)
+    def benchmark(opts_hash = {}, &block)
       opts = B::Options.new
       opts_hash.each do |k, v|
         opts[k] = v

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.1.0
 platform: ruby
 authors:
 - ksss
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,8 +46,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -56,6 +56,7 @@ files:
 - lib/rgot.rb
 - lib/rgot/b.rb
 - lib/rgot/benchmark_result.rb
+- lib/rgot/cli.rb
 - lib/rgot/common.rb
 - lib/rgot/example_parser.rb
 - lib/rgot/m.rb
@@ -67,7 +68,7 @@ homepage: https://github.com/ksss/rgot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Ruby + Golang Testing = Rgot
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.7
-  - 2.2.3
-notifications:
-  email: false