rgot 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7571a770fb9c1047be1ec5e1e46f00111aa66948
-  data.tar.gz: 893e306ae56bf1c564fe174071d77f53035f2f3d
+  metadata.gz: fad880c302f5d362eda08135ab27437e1888969d
+  data.tar.gz: fbed3fac0716f0957c4a88864c0444e261f2ad74
 SHA512:
-  metadata.gz: a66f756df701873ad1acdae4202d89586946c86251e9b28ddb64fe7baaa4fac2ec782a938f657d0215830420bbe1c8166b04ccdf6bbc3a389916ebcadc3d76d2
-  data.tar.gz: 74f482d803f640563393a3395984a9e4b6f11ebc18f269dd1047839dab2d05b8f5164fff5d59f22c794872b1f5bc502bd5c432e7e06f16722374c0ccbcda61c2
+  metadata.gz: 60c14ab525a73c15392801891161bde4f45c21544037fc273c657b75ab96bab751efa0c8fc166a51fcfaf069b8b5ce0c452f84d8b8aaffc272a95c939634e8b6
+  data.tar.gz: 441094eb65219d7b2105bce7b7df8945abb14186025eb71f7af2e953269735f8df98e740cfe76c86ae8ef78fc7c3e10d238a3b76ba724cadd6777cba30bde84f

data/bin/rgot

@@ -9,7 +9,7 @@ parser = OptionParser.new do |o|
     Rgot.class_eval{ @chatty = arg }
   end
   o.on '--version', "show Rgot version" do |arg|
-    puts "Rgot v#{Rgot::VERSION}"
+    puts "rgot #{Rgot::VERSION} (ruby #{RUBY_VERSION})"
     exit 0
   end
   o.on '--bench [regexp]', "benchmark" do |arg|
@@ -42,8 +42,12 @@ require_paths.each do |path|
   require path
 end
 
-ARGV.each do |target|
-  if target
+if ARGV.empty?
+  Dir.glob("./**/*_test.rb") do |i|
+    require i
+  end
+else
+  ARGV.each do |target|
     if File.file?(target)
       require File.expand_path(target)
     elsif File.directory?(target)
@@ -53,10 +57,6 @@ ARGV.each do |target|
     else
       puts target
     end
-  else
-    Dir.glob("./**/*_test.rb") do |i|
-      require i
-    end
   end
 end
 
@@ -80,7 +80,7 @@ modules.each do |test_module|
       benchmarks = []
       examples = []
       main = nil
-      methods = test_module.instance_methods.sort
+      methods = test_module.instance_methods
       methods.grep(/\Atest_/).each do |m|
         if m == :test_main && main.nil?
           main = Rgot::InternalTest.new(test_module, m)
@@ -105,9 +105,10 @@ modules.each do |test_module|
         when SystemExit
           if $!.success?
             # exit 0
-            puts sprintf(template, "ok", test_module, Rgot.now - duration)
+            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

data/lib/rgot/b.rb

@@ -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
+          self.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/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
@@ -45,7 +46,7 @@ module Rgot
         puts "FAIL"
         return 1
       end
-      puts "PASS" if Rgot.verbose?
+      puts "PASS"
       run_benchmarks
       0
     end
@@ -57,7 +58,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,8 +106,10 @@ 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
@@ -116,12 +119,17 @@ module Rgot
         r = ExampleParser.new(File.read(file))
         r.parse
         e = r.examples.find{|e| e.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/t.rb

@@ -20,7 +20,7 @@ module Rgot
 
     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 +34,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 = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby + Golang Testing = Rgot