benchmark_driver 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1dd8df7fee30ffcc5a49d82cdd276ba4809d11f
-  data.tar.gz: d415b2d50e9bcb381e82b4ff72c8b73ea7f43e02
+  metadata.gz: c0ee94f8c79245195b7f99fd9df77f485fe65be5
+  data.tar.gz: 3796376a848335e72ddd3154526d0ced4cc3cc8c
 SHA512:
-  metadata.gz: 579465023608edfc4d585be52b0155d9e764e72ddad56b45e451838e073740148ee44a2ea7f93916ae9562dd435fdac63ad4b7cabe776d1690b30ac4fa82ac32
-  data.tar.gz: 0427471a8a5c01dfbe4f543bbc959de2f599e05e4bf39943b886ef8ef64e3adf9d81a4746b309d4262ab62d86b57affb6f51b121de3278b48e506b2856699e79
+  metadata.gz: 630d4342c798cf476c2e603a07d9fa0047e2437892a3da2a56dd2f5f834cf906814c822d9165f895e514b221eb5ef6426fc605cce8bf88f27d34802b9fa3281a
+  data.tar.gz: 332d676db6aba74c977ba79aea71f722af25ad9c66b3b31ee6f44df266964a1ec398f746a560defa2ade94ce2bc3bfd939c80bd086dac576ac73ba1f62774748

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+# v0.4.4
+
+- Add `--bundler` option to run benchmark with fixed gems
+
 # v0.4.3
 
-- Add `--filter` to run only specified benchmarks
+- Add `--filter` option to run only specified benchmarks
 
 # v0.4.2
 

data/exe/benchmark-driver

@@ -13,7 +13,7 @@ args = OptionParser.new do |o|
     options[:execs] ||= []
     e.split(';').each do |name_path|
       name, path = name_path.split('::', 2)
-      options[:execs] << Benchmark::Driver::Configuration::Executable.new(name, path || name)
+      options[:execs] << Benchmark::Driver::Configuration::Executable.new(name, [path || name])
     end
   end
   o.on('--rbenv [VERSIONS]', 'Ruby executables in rbenv (2.3.5;2.4.2;...)') do |r|
@@ -21,7 +21,7 @@ args = OptionParser.new do |o|
     r.split(';').each do |version|
       path = `RBENV_VERSION='#{version}' rbenv which ruby`.rstrip
       abort "Failed to execute 'rbenv which ruby'" unless $?.success?
-      options[:execs] << Benchmark::Driver::Configuration::Executable.new(version, path)
+      options[:execs] << Benchmark::Driver::Configuration::Executable.new(version, [path])
     end
   end
   o.on('-c', '--compare', 'Compare results (currently only supported in ips output)') do |v|
@@ -38,6 +38,9 @@ args = OptionParser.new do |o|
     abort '--filter can be used only once' if options.key?(:filter)
     options[:filter] = v
   end
+  o.on('--bundler', 'Use gems specified in Gemfile (append -rbundler/setup)') do |v|
+    options[:bundler] = v
+  end
   o.on('--dir', 'Override __dir__ from "/tmp" to actual directory of YAML') do |v|
     options[:dir] = v
   end
@@ -57,8 +60,17 @@ args.each do |path|
     raise
   end
 
+  # Proceed execs first for --bundler
+  if options.key?(:execs)
+    config.runner_options.executables = options.delete(:execs)
+  end
+
   options.each do |key, value|
     case key
+    when :bundler
+      config.runner_options.executables.each do |executable|
+        executable.command << '-rbundler/setup'
+      end
     when :compare
       config.output_options.compare = value
     when :dir
@@ -66,8 +78,6 @@ args.each do |path|
       config.jobs.each do |job|
         job.prelude = "__dir__ = #{dir.dump}.freeze; #{job.prelude}"
       end
-    when :execs
-      config.runner_options.executables = value
     when :filter
       filter = Regexp.compile(value)
       config.jobs.select! do |job|

data/lib/benchmark/driver/configuration.rb

@@ -21,10 +21,10 @@ class Benchmark::Driver::Configuration < Struct.new(:jobs, :runner_options, :out
   end
 
   # @param [String] name
-  # @param [String] path
-  Executable = Struct.new(:name, :path)
+  # @param [Array<String>] command
+  Executable = Struct.new(:name, :command)
 
-  DEFAULT_EXECUTABLES = [Executable.new(RUBY_VERSION, RbConfig.ruby)]
+  DEFAULT_EXECUTABLES = [Executable.new(RUBY_VERSION, [RbConfig.ruby])]
 
   # @param [Symbol] type - Type of runner
   # @param [Array<Benchmark::Driver::Configuration::Executable>] executables

data/lib/benchmark/driver/version.rb

@@ -1,5 +1,5 @@
 module Benchmark
   module Driver
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

data/lib/benchmark/runner/exec.rb

@@ -67,7 +67,7 @@ class Benchmark::Runner::Exec
     fields = @output.class::REQUIRED_FIELDS
     if fields == [:real]
       Benchmark::Driver::RepeatableRunner.new(job).run(
-        runner: build_runner(executable.path),
+        runner: build_runner(executable.command),
         repeat_count: @options.repeat_count,
       ).tap do |result|
         if result.real < 0
@@ -79,7 +79,7 @@ class Benchmark::Runner::Exec
 
       script = BenchmarkScript.new(job.prelude, job.script).full_script(job.loop_count)
       with_file(script) do |script_path|
-        out = Bundler.with_clean_env { IO.popen(['/usr/bin/time', executable.path, script_path], err: [:child, :out], &:read) }
+        out = Bundler.with_clean_env { IO.popen(['/usr/bin/time', *executable.command, script_path], err: [:child, :out], &:read) }
         match_data = /^(?<user>\d+.\d+)user\s+(?<system>\d+.\d+)system\s+(?<elapsed1>\d+):(?<elapsed2>\d+.\d+)elapsed.+\([^\s]+\s+(?<maxresident>\d+)maxresident\)k$/.match(out)
         raise "Unexpected format given from /usr/bin/time:\n#{out}" unless match_data[:maxresident]
 
@@ -133,11 +133,11 @@ class Benchmark::Runner::Exec
 
   # @param [String] path - Path to Ruby executable
   # @return [Proc] - Lambda to run benchmark
-  def build_runner(path = RbConfig.ruby)
+  def build_runner(command = [RbConfig.ruby])
     lambda do |job, times|
       benchmark = BenchmarkScript.new(job.prelude, job.script)
-      measure_seconds(path, benchmark.full_script(times)) -
-        measure_seconds(path, benchmark.overhead_script(times))
+      measure_seconds(command, benchmark.full_script(times)) -
+        measure_seconds(command, benchmark.overhead_script(times))
     end
   end
 
@@ -149,9 +149,9 @@ class Benchmark::Runner::Exec
     end
   end
 
-  def measure_seconds(ruby, script)
+  def measure_seconds(command, script)
     with_file(script) do |path|
-      cmd = [ruby, path].shelljoin
+      cmd = [*command, path].shelljoin
 
       Bundler.with_clean_env do
         before = Benchmark::Driver::Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Takashi Kokubun