rgot 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f276d8ac23961aa00103a1217c57b1ef513b7d1
-  data.tar.gz: f742e18e1815dde34451f3566a303dc2239b9433
+  metadata.gz: 0bd2d7a31146606c28b7b373c1f05632088ba374
+  data.tar.gz: 14a9e7bf677e9eb24ea70d3710a48f6383d8b7ad
 SHA512:
-  metadata.gz: 7be4569af2fdd700a3df4ed304a7e53d00d23d73d40153b555eb05b132640d2cea8990b89a2db5a73d0d91cea67b6f149de405f14e277f8f39bc02919df44f84
-  data.tar.gz: a89b569ed19bac5b3a26d650fa6262f84daf7a0a65d1ce304d3943fbee7bef1abeada4a24023f317d53f8c11bf8a9590957387c473eef7ef37e67c42c032c09e
+  metadata.gz: b912a04b6c18f16b8660d2eefb0a50a0444fd1fd60c7d68292d2fdab77f4bf6de63874f86d05346749bbf5c397a195b5247da17089a71c0558dd2b22ce9dde1b
+  data.tar.gz: cc789d6941cb34fc8b0fc1acb1c5844d3a157c69811b5c08e83c04126cdfd38e563fb8f7a1ebaee0c495aa72c1d4f2dc91b815e4ec695c18a84b07caa130ea39

data/README.md

@@ -1,4 +1,4 @@
-rgot
+Rgot
 ===
 
 [![Build Status](https://travis-ci.org/ksss/rgot.svg)](https://travis-ci.org/ksss/rgot)
@@ -7,7 +7,7 @@ Ruby + Golang Testing = Rgot
 
 Rgot is a testing package convert from golang testing.
 
-### usage
+### Usage
 
 test/sample.rb
 ```ruby
@@ -20,8 +20,6 @@ end
 
 test/pass_test.rb
 ```ruby
-require_relative './sample'
-
 module SampleTest
   class TypeSum < Struct.new(:left, :right, :expect)
   end
@@ -40,7 +38,7 @@ module SampleTest
         t.error("expect Fixnum got #{sum.class}")
       end
       unless sum == ts.expect
-        t.error("expect 5 got #{sum}")
+        t.error("expect #{ts.expect} got #{sum}")
       end
     end
   end
@@ -48,7 +46,7 @@ end
 ```
 
 ```
-$ rgot -v test/pass_test.rb
+$ rgot -v --require ./test/sample test/pass_test.rb
 === RUN test_pass
 --- PASS: test_pass (0.00003s)
 PASS
@@ -168,9 +166,11 @@ end
 $ rgot -h
 Usage: rgot [options]
     -v, --verbose                    log all tests
-    -b, --bench [regexp]             benchmark
+        --bench [regexp]             benchmark
         --benchtime [sec]            benchmark running time
         --timeout [sec]              set timeout sec to testing
+        --require [path]             load some code before running
+        --load-path [path]           Specify $LOAD_PATH directory
 ```
 
 ## Basic
@@ -208,7 +208,7 @@ Show all log and more detail infomation of testing.
 ## Benchmark
 
 ```
-$ rgot target_file_test.rb -b .
+$ rgot target_file_test.rb --bench .
 ```
 
 Run testing with benchmark.
@@ -243,7 +243,7 @@ end
 
 Main method should be set 'test_main' only.
 
-variable `m` is a instance of `Rgot::M` class means Main.
+Variable `m` is a instance of `Rgot::M` class means Main.
 
 `Rgot::M#run` start all testing methods.
 
@@ -315,6 +315,22 @@ For Benchmark class.
 
 Can use log methods same as `Rgot::T` class
 
+## Rgot::B#n
+
+Automatic number calculated by running time.
+
+Recommend to this idiom.
+
+```ruby
+def benchmark_someone(b)
+  i = 0
+  while i < b.n
+    someone()
+    i += 1
+  end
+end
+```
+
 ## Rgot::B#reset_timer
 
 Reset benchmark timer

data/bin/rgot

@@ -2,12 +2,14 @@
 require 'optparse'
 require 'rgot'
 
-opts = {}
+opts = {
+  require_paths: []
+}
 parser = OptionParser.new do |o|
   o.on '-v', '--verbose', "log all tests" do |arg|
     opts[:verbose] = arg
   end
-  o.on '-b', '--bench [regexp]', "benchmark" do |arg|
+  o.on '--bench [regexp]', "benchmark" do |arg|
     unless arg
       raise Rgot::OptionError, "missing argument for flag --bench"
     end
@@ -19,71 +21,94 @@ parser = OptionParser.new do |o|
   o.on '--timeout [sec]', "set timeout sec to testing" do |arg|
     opts[:timeout] = arg
   end
+  o.on '--require [path]', "load some code before running" do |arg|
+    opts[:require_paths] << arg
+  end
+  o.on '--load-path [path]', "Specify $LOAD_PATH directory" do |arg|
+    $LOAD_PATH.unshift(arg)
+  end
 end
 parser.parse!(ARGV)
+opts[:require_paths].each do |path|
+  require path
+end
 
-target = ARGV[0]
-
-if target
-  if File.file?(target)
-    require File.expand_path(target)
-  elsif File.directory?(target)
-    Dir.glob("./#{target}/**/*_test.rb") do |i|
-      require i
+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
-    puts target
-  end
-else
-  Dir.glob("./**/*_test.rb") do |i|
-    require i
+    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
+# if 1 != modules.length
+#   puts "can not load module. found #{modules.join(', ')}"
+#   exit 1
+# end
 
-tests = []
-benchmarks = []
-examples = []
-main = nil
-c = modules.first
+code = 0
+modules.each do |test_module|
+  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
 
-test_module = Object.const_get(c)
-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(/\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
 
-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"
 
-m = Rgot::M.new(tests: tests, benchmarks: benchmarks, examples: examples, opts: opts)
-duration = Rgot.now
-at_exit {
-  if !$!
-    puts sprintf("ok\t%.3fs", Rgot.now - duration)
+      if $!.kind_of?(SystemExit) && $!.success?
+        puts sprintf(template, "ok", test_module, Rgot.now - duration)
+      else
+        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
+  }
+  _, status = Process.waitpid2(pid)
+  unless status.success?
+    code = 1
   end
-}
-if main
-  main.module.extend main.module
-  main.module.instance_method(main.name).bind(main.module).call(m)
-else
-  exit m.run
 end
+
+exit code

data/lib/rgot/m.rb

@@ -13,18 +13,18 @@ module Rgot
     def run
       test_ok = false
       example_ok = false
+
       Timeout.timeout(@opts[:timeout].to_f) {
         test_ok = run_tests
         example_ok = run_examples
       }
       if !test_ok || !example_ok
         puts "FAIL"
-        1
-      else
-        puts "PASS"
-        0
+        return 1
       end
+      puts "PASS" if @opts[:verbose]
       run_benchmarks
+      0
     end
 
     private
@@ -87,8 +87,6 @@ module Rgot
       ok
     end
 
-    private
-
     def capture
       orig_out, orig_err = $stdout, $stderr
       out, err = StringIO.new, StringIO.new

data/lib/rgot/version.rb

@@ -1,3 +1,3 @@
 module Rgot
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler