benchmark_driver 0.10.10 → 0.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a58840726187503f4a8cd044cb9f0729d815ac2bc9ca3c12d43088742fff28
-  data.tar.gz: 4abc5a4af8b071124e33fde1fa5cc169d5ce47221c6ee8cd2d74698270632155
+  metadata.gz: 24436275666595b27dd25877162c3beec019cdeff0f299b492e3560290ee2bef
+  data.tar.gz: 91de36833aed9e78e16a5d7f345515e1118941397a82491b7de2c37f4e3f332d
 SHA512:
-  metadata.gz: 4a56f4da14d42fabf113863b7bc7f76f5e2c7135548778479814ed38b65c63d96db1bd6f5119708e708c93b15e18bb77b81488793f31495ac15ee9c4899487c3
-  data.tar.gz: 154c05ec72ff9b3c7a6e5a444fab55d88feba526c5291017911208a3d61d1dd455c494bf23ad3ed03fac88b6fd85b8d8fd9dc49d51d8835a1f73ecb01f987bb6
+  metadata.gz: 4f7f721f8971d4cf605489a0bbc7ceeb50db1932a1f12bd31adc92076eb6134daacbad8e304b5644d8af59ffa8980c965b5c8c148c6e9b15c84c26b81e62341f
+  data.tar.gz: 92d1145452989b637e8042e0e20f3a9771f0ad238fa3226cfaba5b832d4b2c8498598e356b24d085dce07e43bb0d23662a70d311ef38a9df43ba301562acaa92

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.10.11
+
+- Add `:required_ruby_option` parameter in YAML format
+
 # v0.10.10
 
 - Add `BenchmarkDriver::Config::Executable#description` method to return `ruby -v` result for output plugins.

data/lib/benchmark_driver/config.rb

@@ -42,6 +42,11 @@ module BenchmarkDriver
     def description
       @cache[:description] ||= IO.popen([*command, '-v'], &:read).rstrip
     end
+
+    # @return [String] - Return RUBY_VERSION
+    def version
+      @cache[:version] ||= IO.popen([*command, '-e', 'print RUBY_VERSION'], &:read)
+    end
   end
   Config.defaults[:executables] = [
     BenchmarkDriver::Config::Executable.new(name: RUBY_VERSION, command: [RbConfig.ruby]),

data/lib/benchmark_driver/default_job.rb

@@ -7,6 +7,21 @@ module BenchmarkDriver
     :prelude,    # @param [String,nil] prelude (optional)
     :teardown,   # @param [String,nil] after (optional)
     :loop_count, # @param [Integer,nil] loop_count (optional)
+    :required_ruby_version, # @param [String,nil] required_ruby_version (optional)
     defaults: { prelude: '', teardown: '' },
-  )
+  ) do
+    def runnable_execs(executables)
+      if required_ruby_version
+        executables.select do |executable|
+          Gem::Version.new(executable.version) >= Gem::Version.new(required_ruby_version)
+        end.tap do |result|
+          if result.empty?
+            raise "No Ruby executables conforming required_ruby_version (#{required_ruby_version}) are specified"
+          end
+        end
+      else
+        executables
+      end
+    end
+  end
 end

data/lib/benchmark_driver/default_job_parser.rb

@@ -17,12 +17,14 @@ module BenchmarkDriver
     # @param [String,Array<String,Hash{ Symbol => String }>,Hash{ Symbol => String }] benchmark
     # @param [String] teardown
     # @param [Integer] loop_count
+    # @param [String] required_ruby_version
     # @return [Array<BenchmarkDriver::Default::Job>]
-    def parse(prelude: nil, benchmark:, teardown: nil, loop_count: nil)
+    def parse(prelude: nil, benchmark:, teardown: nil, loop_count: nil, required_ruby_version: nil)
       parse_benchmark(benchmark).each do |job|
         job.prelude.prepend("#{prelude}\n") if prelude
         job.teardown.prepend("#{teardown}\n") if teardown
         job.loop_count ||= loop_count
+        job.required_ruby_version ||= required_ruby_version
       end.each(&:freeze)
     end
 
@@ -56,9 +58,9 @@ module BenchmarkDriver
       end
     end
 
-    def parse_job_hash(name: nil, prelude: '', script:, teardown: '', loop_count: nil)
+    def parse_job_hash(name: nil, prelude: '', script:, teardown: '', loop_count: nil, required_ruby_version: nil)
       name ||= script
-      job_class.new(name: name, prelude: prelude, script: script, teardown: teardown, loop_count: loop_count)
+      job_class.new(name: name, prelude: prelude, script: script, teardown: teardown, loop_count: loop_count, required_ruby_version: required_ruby_version)
     end
 
     def job_class

data/lib/benchmark_driver/runner/ips.rb

@@ -32,7 +32,7 @@ class BenchmarkDriver::Runner::Ips
           next job if job.loop_count # skip warmup if loop_count is set
 
           @output.with_job(job) do
-            result = run_warmup(job, exec: @config.executables.first)
+            result = run_warmup(job, exec: job.runnable_execs(@config.executables).first)
             metrics = build_metrics(result)
             @output.report(metrics)
 
@@ -46,7 +46,7 @@ class BenchmarkDriver::Runner::Ips
     @output.with_benchmark do
       jobs.each do |job|
         @output.with_job(job) do
-          @config.executables.each do |exec|
+          job.runnable_execs(@config.executables).each do |exec|
             best_metrics = with_repeat(@config.repeat_count) do
               run_benchmark(job, exec: exec)
             end

data/lib/benchmark_driver/runner/memory.rb

@@ -40,7 +40,7 @@ class BenchmarkDriver::Runner::Memory
     @output.with_benchmark do
       jobs.each do |job|
         @output.with_job(job) do
-          @config.executables.each do |exec|
+          job.runnable_execs(@config.executables).each do |exec|
             best_metrics = with_repeat(@config.repeat_count) do
               run_benchmark(job, exec: exec)
             end

data/lib/benchmark_driver/runner/once.rb

@@ -33,7 +33,7 @@ class BenchmarkDriver::Runner::Once
     @output.with_benchmark do
       jobs.each do |job|
         @output.with_job(job) do
-          @config.executables.each do |exec|
+          job.runnable_execs(@config.executables).each do |exec|
             metrics = run_benchmark(job, exec: exec) # no repeat support
             @output.report(metrics)
           end

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.10.10'
+  VERSION = '0.10.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.10.10
+  version: 0.10.11
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler