benchmark_driver 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa17cc07885ff406870c16844aa57b9230f81a1be2104627af5e21131ba9fb9
-  data.tar.gz: 6b3d0dfcc8fe50785811a98eb1d62093a90463150aff7eb7d1773c07a9c72391
+  metadata.gz: '0286746ad8c7c0b6c5c5eaaa9e224c9a1e62785c55a5285053c9150eb2297f8a'
+  data.tar.gz: 9cb1292f11551d0ad1de357532d8ae5b1b6b97ad666395c53e1ebc787221e536
 SHA512:
-  metadata.gz: dc65698d4628c758ec49a32769d9f4e86c1b3d2721777227e7bca285c32b75687e7ec05d93351c4df37ed789e1d96fb0e717fe56440b972e34f03ce04341ca9b
-  data.tar.gz: 139315d91d21b9f86a276a3257eec66bdff8f317dd358619d99a6fcdcafabbe9e1fb9a9837b4607f97dbcc2df911b0d11ac128d228c10c644d7336cecbf396e8
+  metadata.gz: 9bb68b47e082eff267c213968ef34684a032bbb93152cb592307114e787480a21237307be72a0b22f553b3a0102547abc662cf00fac0e797c92cc6078aecc34a
+  data.tar.gz: a22277c75ef96e21c9dafda77a7d7fbe8ac279dfe7c48cf9c55bb02cd7c74597edc397cac7db24902ab05225f795ec10a0b01618e6fb401f4480a7b8ced3b0d6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.16.3
+
+- Unset `GEM_PATH` and `GEM_HOME` in child processes to avoid warnings when using chruby
+
+# v0.16.2
+
+- Add --chruby option to use a Ruby managed by chruby
+
 # v0.16.1
 
 - Add --output-humanize option to --output=simple

data/exe/benchmark-driver

@@ -48,6 +48,11 @@ config = BenchmarkDriver::Config.new.tap do |c|
         executables << BenchmarkDriver::Rbenv.parse_spec(version)
       end
     end if system("which rbenv > #{File::NULL} 2>&1")
+    o.on('--chruby VERSIONS', String, 'Ruby executables in chruby (x.x.x arg1;y.y.y arg2;...)') do |r|
+      r.split(';').each do |version|
+        executables << BenchmarkDriver::Chruby.parse_spec(version)
+      end
+    end if Dir.exist?('/opt/rubies') || Dir.exist?("#{ENV['HOME']}/.rubies")
     o.on('--rvm VERSIONS', String, 'Ruby executables in rvm (x.x.x arg1;y.y.y arg2;...)') do |r|
       r.split(';').each do |version|
         executables << BenchmarkDriver::Rvm.parse_spec(version)

data/lib/benchmark_driver/chruby.rb

@@ -0,0 +1,27 @@
+require 'shellwords'
+
+module BenchmarkDriver
+  module Chruby
+    # @param [String] version
+    def self.ruby_path(version)
+      prefix = (Dir.glob('/opt/rubies/*') + Dir.glob("#{ENV['HOME']}/.rubies/*")).find do |dir|
+        File.basename(dir) == version
+      end
+      unless prefix
+        abort "Failed to find '#{version}' in /opt/rubies or ~/.rubies"
+      end
+      "#{prefix}/bin/ruby"
+    end
+
+    # @param [String] full_spec - "2.5.0", "2.5.0 --jit", "JIT::2.5.0 --jit", etc.
+    def self.parse_spec(full_spec)
+      name, spec = full_spec.split('::', 2)
+      spec ||= name # if `::` is not given, use the whole string as spec
+      version, *args = spec.shellsplit
+      BenchmarkDriver::Config::Executable.new(
+        name: name,
+        command: [BenchmarkDriver::Chruby.ruby_path(version), *args],
+      )
+    end
+  end
+end

data/lib/benchmark_driver/runner.rb

@@ -98,6 +98,16 @@ module BenchmarkDriver
     end
 
     def with_clean_env(&block)
+      # chruby sets GEM_HOME and GEM_PATH in your shell. We have to unset it in the child
+      # process to avoid installing gems to the version that is running benchmark-driver.
+      env = nil
+      ['GEM_HOME', 'GEM_PATH'].each do |var|
+        if ENV.key?(var)
+          env ||= ENV.to_h
+          ENV.delete(var)
+        end
+      end
+
       unless defined?(Gem::Version)
         # default-gem Bundler can be loaded and broken with --disable-gems
         return block.call
@@ -115,6 +125,10 @@ module BenchmarkDriver
       end
     rescue LoadError
       block.call
+    ensure
+      if env
+        ENV.replace(env)
+      end
     end
   end
 end

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.16.1'
+  VERSION = '0.16.3'
 end

data/lib/benchmark_driver.rb

@@ -3,6 +3,7 @@ require 'benchmark_driver/config'
 require 'benchmark_driver/job_parser'
 require 'benchmark_driver/output'
 require 'benchmark_driver/rbenv'
+require 'benchmark_driver/chruby'
 require 'benchmark_driver/rvm'
 require 'benchmark_driver/repeater'
 require 'benchmark_driver/ridkuse'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - images/optcarrot.png
 - lib/benchmark_driver.rb
 - lib/benchmark_driver/bulk_output.rb
+- lib/benchmark_driver/chruby.rb
 - lib/benchmark_driver/config.rb
 - lib/benchmark_driver/default_job.rb
 - lib/benchmark_driver/default_job_parser.rb
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Fully-featured accurate benchmark driver for Ruby