rgot 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad880c302f5d362eda08135ab27437e1888969d
-  data.tar.gz: fbed3fac0716f0957c4a88864c0444e261f2ad74
+  metadata.gz: a4246161e01be60d8f75c374c5411521513b4892
+  data.tar.gz: b72b95bb14e0793b70d613abdb61078defb658d5
 SHA512:
-  metadata.gz: 60c14ab525a73c15392801891161bde4f45c21544037fc273c657b75ab96bab751efa0c8fc166a51fcfaf069b8b5ce0c452f84d8b8aaffc272a95c939634e8b6
-  data.tar.gz: 441094eb65219d7b2105bce7b7df8945abb14186025eb71f7af2e953269735f8df98e740cfe76c86ae8ef78fc7c3e10d238a3b76ba724cadd6777cba30bde84f
+  metadata.gz: 865bf93fdc54e99fdb2b17194516f13d694ad84fe2f11372200a4dcc90e3ee895571f2a041700b991749344a4d15b213b91f55172d8c59636afc85b86051d0d4
+  data.tar.gz: c24d7e37e5ac9c1ce61539e27196875b1091e896ca8a512a845e2cb78d56d38407c773a511e317adc2bf9a758a35456adca57a9a18db171107a9ca2ad9b6958f

data/.travis.yml

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

data/bin/rgot

@@ -6,7 +6,7 @@ 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 }
+    Rgot.class_eval { @chatty = arg }
   end
   o.on '--version', "show Rgot version" do |arg|
     puts "rgot #{Rgot::VERSION} (ruby #{RUBY_VERSION})"
@@ -42,17 +42,19 @@ require_paths.each do |path|
   require path
 end
 
+testing_files = []
+
 if ARGV.empty?
   Dir.glob("./**/*_test.rb") do |i|
-    require i
+    testing_files << i
   end
 else
   ARGV.each do |target|
     if File.file?(target)
-      require File.expand_path(target)
+      testing_files << File.expand_path(target)
     elsif File.directory?(target)
       Dir.glob("./#{target}/**/*_test.rb") do |i|
-        require i
+        testing_files << i
       end
     else
       puts target
@@ -60,72 +62,71 @@ else
   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|
+testing_files.each do |testing_file|
   begin
-    pid = fork {
-      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)
+    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
-      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"
+        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)
+          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
-            # exit 1
-            puts "exit status #{$!.status}"
+            # any exception
             puts sprintf(template, "FAIL", test_module, Rgot.now - duration)
           end
-        when NilClass
-          # not raise, not exit
+        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
-          # any exception
-          puts sprintf(template, "FAIL", test_module, Rgot.now - duration)
+          exit m.run
         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
   ensure
     _, status = Process.waitpid2(pid)
     unless status.success?

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

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
@@ -98,7 +98,7 @@ module Rgot
         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"
+          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

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/m.rb

@@ -12,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
@@ -38,10 +34,10 @@ 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
@@ -118,7 +114,7 @@ module Rgot
         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 { |e| e.name == example.name }
 
         duration = Rgot.now - start
         if e && e.output.strip != out.strip

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,14 +8,12 @@ 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

data/lib/rgot/version.rb

@@ -1,3 +1,3 @@
 module Rgot
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgot
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2016-04-13 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.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby + Golang Testing = Rgot