benchmark_driver 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b03531aa95431a3b14d347576fdda952edec874a81ddef8ad215da14c715bb
-  data.tar.gz: d0c84c6bcca84b668df6c75c4e4a7f61bb95026b9a94564da838783944991cee
+  metadata.gz: bd29e2900712c65a6309f5cfdf39bb57b2d2943527486393afadd001b63c10a2
+  data.tar.gz: 8c098e876e70d1fdde41cb6ece94109b53a96ca93ec0ad2a5e87013ce23b983c
 SHA512:
-  metadata.gz: 4cc3d7e20180d63c75110d0495fbe2828d4aec30fd3ade04da6825dfc452ffdb8250f36b65800d406a5895c932296b87a3d30fd2356c3f5e2f068aa6602eea16
-  data.tar.gz: 30e118e3b54685fe0c4baea6e3b703653600d6aa2a1bb60b31fa6e64d6e83d0feb1b363b0935007e60765ba6a85dc9718437e1b8545888774d00cf0951768d95
+  metadata.gz: 34d30bd25d67c10e916294acd72bbdb53d8a0d54ed4b9596780a7d89710f0d32f097702a60cafee3a1844912563b75b871a3b6496a1a1698b1454b62b9a32c4b
+  data.tar.gz: fa768309b8da1382630a4954bac333bd716d38913dcb3f390e2eeff4f942d6cfba619f010ea9522344bc8be4227191dd3ddf3901eed1d529fc7cce52b4d4014d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.15.3
+
+- Add `--ridkuse` to select Ruby by `ridk use` if `ridk` command is available
+
 # v0.15.2
 
 - `recorded` runner propagates `all_values` to output

data/exe/benchmark-driver

@@ -47,7 +47,12 @@ config = BenchmarkDriver::Config.new.tap do |c|
       r.split(';').each do |version|
         executables << BenchmarkDriver::Rbenv.parse_spec(version)
       end
-    end if system('which rbenv > /dev/null')
+    end if system("which rbenv > #{File::NULL}")
+    o.on('--ridkuse VERSIONS', String, 'Ruby executables in ridk use (x.x.x arg1;y.y.y arg2;...) for RubyInstaller2 on Windows') do |r|
+      r.split(';').each do |version|
+        executables << BenchmarkDriver::RidkUse.parse_spec(version)
+      end
+    end if system("ridk version > #{File::NULL} 2>&1")
     o.on('--repeat-count NUM', Integer, 'Try benchmark NUM times and use the fastest result or the worst memory usage') do |v|
       c.repeat_count = v
     end
@@ -68,7 +73,7 @@ config = BenchmarkDriver::Config.new.tap do |c|
     end
     o.on('--timeout SECONDS', Float, 'Timeout ruby command execution with timeout(1)') do |v|
       timeout = v
-    end if (os = RbConfig::CONFIG['host_os']) && os.match(/linux/) && system('which timeout > /dev/null') # depending on coreutils for now...
+    end if (os = RbConfig::CONFIG['host_os']) && os.match(/linux/) && system("which timeout > #{File::NULL}") # depending on coreutils for now...
     o.on('-v', '--verbose', 'Verbose mode. Multiple -v options increase visilibity (max: 2)') do |v|
       c.verbose += 1
     end

data/lib/benchmark_driver.rb

@@ -4,6 +4,7 @@ require 'benchmark_driver/job_parser'
 require 'benchmark_driver/output'
 require 'benchmark_driver/rbenv'
 require 'benchmark_driver/repeater'
+require 'benchmark_driver/ridkuse'
 require 'benchmark_driver/ruby_interface'
 require 'benchmark_driver/runner'
 require 'benchmark_driver/version'

data/lib/benchmark_driver/ridkuse.rb

@@ -0,0 +1,57 @@
+require 'open3'
+require 'shellwords'
+
+module BenchmarkDriver
+  module RidkUse
+    # Execute "ridk use list" command to get a list of Ruby versions.
+    # 
+    # * "ridk use list" is a sub-command of ridk. It returns a list of installed ruby ​​versions.
+    # * "ridk" is a helper command tool of RubyInstaller2 for Windows, that to manage the runtime environment of RubyInstaller-2.4 and up.
+    #
+    # refer to:
+    # {The ridk tool · oneclick/rubyinstaller2 Wiki}[https://github.com/oneclick/rubyinstaller2/wiki/The-ridk-tool]
+    #
+    def self.ridk_use_list
+      ruby_list = []
+      regex = /(\d+)\s-\s([^\s]+)\s\truby\s([^\s]+)\s/
+      cmd = "ridk use list"
+      stdout, status = Open3.capture2e(cmd)
+
+      stdout.each_line do |line|
+        if matched = regex.match(line)
+          idx, rubypath, rubyver = matched[1..3]
+          ruby_list << rubyver << [idx, "#{rubypath}/bin/ruby.exe"]
+        else
+          abort "Failed to execute 'ridk use list'"
+        end
+      end
+      Hash[*ruby_list]
+    end
+    
+    # @param [String] version
+    def self.ruby_path(version)
+      ruby_list = BenchmarkDriver::RidkUse.ridk_use_list
+      regex = Regexp.new(version)
+      matched = ruby_list.keys.find {|k| k =~ regex}
+
+      if ruby_list.has_key?(version)
+        ruby_list[version][1]
+      elsif matched
+        ruby_list[matched][1]
+      else
+        abort "version #{version} not found"
+      end
+    end
+
+    # @param [String] full_spec - "2.6.3", "2.6.3p62", "2.6.3,--jit", etc.
+    def self.parse_spec(full_spec)
+      name, spec = full_spec.split('::', 2)
+      spec ||= name # if `::` is not given, regard whole string as spec
+      version, *args = spec.shellsplit
+      BenchmarkDriver::Config::Executable.new(
+        name: name,
+        command: [BenchmarkDriver::RidkUse.ruby_path(version), *args],
+      )
+    end
+  end
+end

data/lib/benchmark_driver/ruby_interface.rb

@@ -71,6 +71,13 @@ module BenchmarkDriver
       end
     end
 
+    # ridk use command for RubyInstaller2 on Windows
+    def ridkuse(*versions)
+      versions.each do |version|
+        @executables << BenchmarkDriver::RidkUse.parse_spec(version)
+      end
+    end
+
     def executable(name:, command:)
       raise ArgumentError, "`command' should be an Array" unless command.kind_of? Array
       @executables << BenchmarkDriver::Config::Executable.new(name: name, command: command)

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.15.2'
+  VERSION = '0.15.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -113,6 +113,7 @@ files:
 - lib/benchmark_driver/output/simple.rb
 - lib/benchmark_driver/rbenv.rb
 - lib/benchmark_driver/repeater.rb
+- lib/benchmark_driver/ridkuse.rb
 - lib/benchmark_driver/ruby_interface.rb
 - lib/benchmark_driver/runner.rb
 - lib/benchmark_driver/runner/block.rb