rgot 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d8f9ab92c4012ef3961c16b85282ff90a56e10
-  data.tar.gz: bd531b85de9472e12bd858619b9438915ab8fcdb
+  metadata.gz: b420828d0e0801d5f766faa6ef3c57c67ae81a6b
+  data.tar.gz: 49271b8268fc5eb3b61da0350a2ac12adb5b91c3
 SHA512:
-  metadata.gz: 745a54c2504ef26f67a1bbcdbc54ee87d42eeab98edefefb56f8b477833a34f078aa7aff5c2ab732464bd782d1f18b0b61fd7f2b8f383a5eb4c60c59a7b45cfa
-  data.tar.gz: bd09b0e3dc34cb369144ef7154eb8032c38b75b3a75b8ebd22bbd1269df1e4760c728ef3139f220ed84898a57b1d264740143c8109c85e68727f729039d93fc7
+  metadata.gz: 384ccc588fe79b31c639d8e4aaa6ada76ba283ab9082ddc113b84362277142616dcb54fba6c4250827bafc3443f90de7a1284b2ebda61e6bab1573b8f5ef39ea
+  data.tar.gz: 39490b59b9baf6c883b6beafce640ddd5301aa34ee2f0e3f199db0daead6932463c74c3408576638fc63ee5275f083d49b6b73f9bb05fdbb15e690c01e86a27d

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 2.1.6
   - 2.2.2
 notifications:

data/Rakefile

@@ -3,7 +3,7 @@ require "bundler/gem_tasks"
 desc "test to rgot"
 task :test do |t|
   target = "test/rgot_test.rb"
-  ruby "bin/rgot #{target}"
+  ruby "bin/rgot -v #{target}"
 end
 
 task :default => [:test]

data/bin/rgot

@@ -4,8 +4,17 @@ require 'rgot'
 
 opts = {}
 parser = OptionParser.new do |o|
-  o.on '-v', '--verbose', "log all tests" do
-    opts[:verbose] = true
+  o.on '-v', '--verbose', "log all tests" do |arg|
+    opts[:verbose] = arg
+  end
+  o.on '-b', '--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
 end
 parser.parse!(ARGV)
@@ -20,7 +29,7 @@ if target
       require i
     end
   else
-    puts USAGE
+    puts target
   end
 else
   Dir.glob("./**/*_test.rb") do |i|
@@ -38,20 +47,26 @@ if 1 != modules.length
   exit 1
 end
 
-cases = []
+tests = []
+benchmarks = []
 main = nil
 c = modules.first
 
 test_module = Object.const_get(c)
-test_module.instance_methods.grep(/\Atest_.*/).sort.each do |m|
+methods = test_module.instance_methods
+methods.grep(/\Atest_.*/).sort.each do |m|
   if m == :test_main && main.nil?
-    main = Rgot::InternalTestType.new(test_module, m)
+    main = Rgot::InternalTest.new(test_module, m)
   else
-    cases << Rgot::InternalTestType.new(test_module, m)
+    tests << Rgot::InternalTest.new(test_module, m)
   end
 end
 
-m = Rgot::M.new(cases, opts)
+methods.grep(/\Abenchmark_.*/).sort.each do |m|
+  benchmarks << Rgot::InternalBenchmark.new(test_module, m)
+end
+
+m = Rgot::M.new(tests: tests, benchmarks: benchmarks, opts: opts)
 duration = Rgot.now
 at_exit {
   puts sprintf("ok\t%.3fs", Rgot.now - duration)

data/lib/rgot.rb

@@ -1,15 +1,28 @@
 module Rgot
   autoload :VERSION, 'rgot/version'
   autoload :Common, 'rgot/common'
-  autoload :T, 'rgot/t'
   autoload :M, 'rgot/m'
+  autoload :T, 'rgot/t'
+  autoload :B, 'rgot/b'
+
+  class OptionError < StandardError
+  end
+
+  class InternalTest < Struct.new(:module, :name)
+  end
 
-  class InternalTestType < Struct.new(:module, :name)
+  class InternalBenchmark < Struct.new(:module, :name)
   end
 
   class << self
-    def now
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    if "2.0.0" < RUBY_VERSION
+      def now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+    else
+      def now
+        Time.now
+      end
     end
   end
 end

data/lib/rgot/b.rb

@@ -0,0 +1,78 @@
+module Rgot
+  class B < Common
+    attr_accessor :n
+    def initialize(benchmark_module, name, opts)
+      super()
+      @n = 1
+      @module = benchmark_module
+      @name = name
+      @opts = opts
+      @benchtime = @opts.fetch(:benchtime, 1).to_f
+      @timer_on = false
+      @start = Rgot.now
+      @duration = 0
+      @module.extend @module
+    end
+
+    def start_timer
+      if !@timer_on
+        @start = Rgot.now
+        @timer_on = true
+      end
+    end
+
+    def stop_timer
+      if @timer_on
+        @duration += Rgot.now - @start
+        @timer_on = false
+      end
+    end
+
+    def reset_timer
+      if @timer_on
+        @start = Rgot.now
+      end
+      @duration = 0
+    end
+
+    def run
+      n = 1
+      a = Rgot.now
+      run_n(n)
+      while !failed? && @duration < @benchtime && @n < 1e9
+        if @duration < (@benchtime / 100.0)
+          n *= 100
+        elsif @duration < (@benchtime / 10.0)
+          n *= 10
+        elsif @duration < (@benchtime / 5.0)
+          n *= 5
+        elsif @duration < (@benchtime / 2.0)
+          n *= 2
+        else
+          n *= 1.2
+        end
+        run_n(n)
+      end
+    end
+
+    def report
+      printf("%s\t%d\t%.3f ns/op\n", @name, @n, @duration / @n * 1_000_000_000)
+    end
+
+    private
+
+    def run_n(n)
+      GC.start
+      i = 0
+      @n = n
+      reset_timer
+      start_timer
+      call
+      stop_timer
+    end
+
+    def call
+      @module.instance_method(@name).bind(@module).call(self)
+    end
+  end
+end

data/lib/rgot/m.rb

@@ -1,13 +1,16 @@
 module Rgot
   class M
-    def initialize(cases, opts)
-      @cases = cases
+    # Ruby-2.0.0 wants default value of keyword_argument
+    def initialize(tests: [], benchmarks: [], opts: {})
+      @tests = tests
+      @benchmarks = benchmarks
       @opts = opts
     end
 
     def run
       test_ok = run_tests
-      if !test_ok
+      benchmark_ok = run_benchmarks
+      if !test_ok || !benchmark_ok
         puts "FAIL"
         1
       else
@@ -20,8 +23,8 @@ module Rgot
 
     def run_tests
       ok = true
-      @cases.each do |test|
-        t = Rgot::T.new(test.module, test.name.to_sym, @opts)
+      @tests.each do |test|
+        t = T.new(test.module, test.name.to_sym, @opts)
         if @opts[:verbose]
           puts "=== RUN #{test.name}\n"
         end
@@ -33,5 +36,21 @@ module Rgot
       end
       ok
     end
+
+    def run_benchmarks
+      ok = true
+      return ok unless @opts[:bench]
+      @benchmarks.each do |bench|
+        next unless /#{@opts[:bench]}/ =~ bench.name
+
+        b = B.new(bench.module, bench.name.to_sym, @opts)
+        b.run
+        b.report
+        if b.failed?
+          ok = false
+        end
+      end
+      ok
+    end
   end
 end

data/lib/rgot/t.rb

@@ -5,12 +5,12 @@ module Rgot
       @module = test_module
       @name = name
       @opts = opts
+      @module.extend @module
     end
 
     def run
       begin
-        @module.extend @module
-        @module.instance_method(@name).bind(@module).call(self)
+        call
         finished!
       rescue => e
         fail!
@@ -32,5 +32,9 @@ module Rgot
         end
       end
     end
+
+    def call
+      @module.instance_method(@name).bind(@module).call(self)
+    end
   end
 end

data/lib/rgot/version.rb

@@ -1,3 +1,3 @@
 module Rgot
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rgot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: rgot is golang like testing module in ruby
@@ -46,14 +46,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/rgot
 - lib/rgot.rb
+- lib/rgot/b.rb
 - lib/rgot/common.rb
 - lib/rgot/m.rb
 - lib/rgot/t.rb
@@ -69,17 +70,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: The Ruby GOlang like Testing module