benchmark_driver 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8346d596ab14db8378d9575ecd00a9efae898170b890c4627cb603d60290c19c
-  data.tar.gz: 21879bf897e059878da0bae0ef0c68dd622fe6086d948d33e18822c36582597d
+  metadata.gz: 8b1b310f52a83e0661be59e3835573a69b7e84a7aebb7f4f13e0f190ce2545c8
+  data.tar.gz: 3597a61936cedb14e59cf172e76cf3d5f91616ec0dd6470a54c4e51c32e7008c
 SHA512:
-  metadata.gz: 2d612ff00aceaea804a3b0ebaa39c7c6dd5bcd219d26e1e9c855049069e65271c1aa4dfd897502326713cd1e447054ddb39ba47061a0f604402c6b0c039b8107
-  data.tar.gz: 1be94a52f4d63a438bbec19e9c787b2b7c202367102b516784ad7a7d30afc33a3457ad7b3a434012fb739a2be6f95b9289417607d613defe741d4847f6a85a3b
+  metadata.gz: b96308b5c25cae8dead511787fba95c1b049b5900e15670ccd8f84ec1b7b4584a23d2dd555c49a58c8ac32b59d4bc9715d6ffcdc964ee15761877d0986eb4ead
+  data.tar.gz: 9a33f86af59d36209715847a39cfc6777d1d4f078203f0dfa702b330e12201b747f3a275b9d6d032d2e2322013a83bd9230fa91c12303fb97e77b67c459029a1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.10.8
+
+- In `command_stdout`, `$RBENV_VERSION` is no longer passed to --rbenv option because it has no effect for rbenv
+- Instead, now dirname of executable path is prefixed to $PATH in `command_stdout`
+
 # v0.10.7
 
 - Pass `$RBENV_VERSION` for `command_stdout` runner with --rbenv option

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::RbenvExecutable.new(
+        executables << BenchmarkDriver::Config::Executable.new(
           name: name,
           command: [BenchmarkDriver::Rbenv.ruby_path(version), *args],
         )

data/lib/benchmark_driver/config.rb

@@ -36,17 +36,4 @@ 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,6 +1,5 @@
 require 'benchmark_driver/struct'
 require 'benchmark_driver/metrics'
-require 'benchmark_driver/rbenv'
 require 'tempfile'
 require 'shellwords'
 require 'open3'
@@ -62,7 +61,7 @@ class BenchmarkDriver::Runner::CommandStdout
           @config.executables.each do |exec|
             best_value = with_repeat(metrics_type) do
               stdout = with_chdir(job.working_directory) do
-                with_rbenv_version(exec) { execute(*exec.command, *job.command) }
+                with_ruby_prefix(exec) { execute(*exec.command, *job.command) }
               end
               StdoutToMetrics.new(
                 stdout: stdout,
@@ -84,18 +83,12 @@ 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
+  def with_ruby_prefix(executable, &block)
+    env = ENV.to_h.dup
+    ENV['PATH'] = "#{File.dirname(executable.command.first)}:#{ENV['PATH']}"
+    block.call
+  ensure
+    ENV.replace(env)
   end
 
   def with_chdir(working_directory, &block)

data/lib/benchmark_driver/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fully-featured accurate benchmark driver for Ruby