benchmark_driver 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a333f4b3eda58e21fb18b0ee0bbe2e8e6c215b60759c5951aa345a98f3c76eac
-  data.tar.gz: 5faaec82e758406b42f3305ddf5f188c8ff3bc14a26df54e0935fb2a7aabb653
+  metadata.gz: 8346d596ab14db8378d9575ecd00a9efae898170b890c4627cb603d60290c19c
+  data.tar.gz: 21879bf897e059878da0bae0ef0c68dd622fe6086d948d33e18822c36582597d
 SHA512:
-  metadata.gz: dc1904907ed3ad571494030a894935cb4f9c3742b266af6977326ee566381026d45e819ddbd3a89ee0b6231b47070ff831f9592f56d72cd576162a202acbfe47
-  data.tar.gz: dbcc9e041a6f50599fbe7582a21b37f5dd6bd81612936b17c455a4548166ae36d2b16b18b717bcc974fbb354686e6c7dc74fe5a5822116a52eb8cf12a8f58e10
+  metadata.gz: 2d612ff00aceaea804a3b0ebaa39c7c6dd5bcd219d26e1e9c855049069e65271c1aa4dfd897502326713cd1e447054ddb39ba47061a0f604402c6b0c039b8107
+  data.tar.gz: 1be94a52f4d63a438bbec19e9c787b2b7c202367102b516784ad7a7d30afc33a3457ad7b3a434012fb739a2be6f95b9289417607d613defe741d4847f6a85a3b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.10.7
+
+- Pass `$RBENV_VERSION` for `command_stdout` runner with --rbenv option
+
 # v0.10.6
 
 - Fix TypeError on Ruby <= 2.3

data/exe/benchmark-driver

@@ -35,7 +35,7 @@ config = BenchmarkDriver::Config.new.tap do |c|
         name, spec = full_spec.split('::', 2)
         spec ||= name # if `::` is not given, regard whole string as spec
         version, *args = spec.split(',')
-        executables << BenchmarkDriver::Config::Executable.new(
+        executables << BenchmarkDriver::Config::RbenvExecutable.new(
           name: name,
           command: [BenchmarkDriver::Rbenv.ruby_path(version), *args],
         )

data/lib/benchmark_driver/config.rb

@@ -36,4 +36,17 @@ module BenchmarkDriver
   Config.defaults[:executables] = [
     BenchmarkDriver::Config::Executable.new(name: RUBY_VERSION, command: [RbConfig.ruby]),
   ]
+
+  class Config::RbenvExecutable < Config::Executable
+    def freeze
+      rbenv_version # avoid `can't modify frozen xxx`
+      super
+    end
+
+    def rbenv_version
+      return @rbenv_version if defined?(@rbenv_version)
+      match = command.first.match(%r[/(?<version>[^/]+)/bin/ruby\z])
+      @rbenv_version = match && match[:version]
+    end
+  end
 end

data/lib/benchmark_driver/runner/command_stdout.rb

@@ -1,5 +1,6 @@
 require 'benchmark_driver/struct'
 require 'benchmark_driver/metrics'
+require 'benchmark_driver/rbenv'
 require 'tempfile'
 require 'shellwords'
 require 'open3'
@@ -61,7 +62,7 @@ class BenchmarkDriver::Runner::CommandStdout
           @config.executables.each do |exec|
             best_value = with_repeat(metrics_type) do
               stdout = with_chdir(job.working_directory) do
-                execute(*exec.command, *job.command)
+                with_rbenv_version(exec) { execute(*exec.command, *job.command) }
               end
               StdoutToMetrics.new(
                 stdout: stdout,
@@ -83,6 +84,20 @@ class BenchmarkDriver::Runner::CommandStdout
 
   private
 
+  def with_rbenv_version(executable, &block)
+    if executable.is_a?(BenchmarkDriver::Config::RbenvExecutable) && executable.rbenv_version
+      begin
+        env = ENV.to_h.dup
+        ENV['RBENV_VERSION'] = executable.rbenv_version
+        block.call
+      ensure
+        ENV.replace(env)
+      end
+    else
+      block.call
+    end
+  end
+
   def with_chdir(working_directory, &block)
     if working_directory
       Dir.chdir(working_directory) { block.call }

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.10.6'
+  VERSION = '0.10.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler