benchmark_driver 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad73033408aa70dae54e87ff9fbcfee14ba00ecf22201113f3f09083c57e9781
-  data.tar.gz: d6bc8f3296d6cbc1565a3fd69e69ad6eda942a72d7b5d388f415b81911f11339
+  metadata.gz: e04ca43a3337139b2b4608642785f79e058062c9559a77bb488c4b6171d6f6a5
+  data.tar.gz: 9f3d95083d39c13dcb7586a949df6d6ac95253f5ae0f36c1e611e1ed45316a6c
 SHA512:
-  metadata.gz: 769c47a0c5a81ef93d6e264458b401fc1174f6847796c8c763ef0a258e4d3f9946761564789e1063370d8938e91af4f71b5f7b2ab5503f3de87dc3bef6579e87
-  data.tar.gz: 3cdfd3dcf42fa8aaf231027101be1f270e660e2488b4a7a107a52602d8e60d601d2869ee5b47f3c3831b57583c6a055fbbb9ea2ba5170b84b94f68227f9f3561
+  metadata.gz: 513c1e5dbe4703708fb13cf970b1c96c14ff008ebfc5f13381388d5d857f1b76089cfd1b8347ef8a50461af5aa9aeed79180f1dcd68341586cb77081bed01cd1
+  data.tar.gz: a90e8729e8724ad50fb42731d5e3fa53acb5a722e3eb2ae26f18a435f9cb02af6eb0a6a69a2676cb02cceab9d7cc563b751e477819497f99fcedf42a918362a6

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.15.8
+
+- Add `--rvm` option and `.rvm` Ruby interface to use RVM
+
 # v0.15.7
 
 - Add `median` to --repeat-result options

data/README.md

@@ -75,6 +75,7 @@ Usage: benchmark-driver [options] [YAML|RUBY]
     -o, --output [TYPE]              Specify output type: compare, simple, markdown, record (default: compare)
     -e, --executables [EXECS]        Ruby executables (e1::path1 arg1; e2::path2 arg2;...)
         --rbenv [VERSIONS]           Ruby executables in rbenv (x.x.x arg1;y.y.y arg2;...)
+        --rvm [VERSIONS]             Ruby executables in rvm (x.x.x arg1;y.y.y arg2;...)
         --repeat-count [NUM]         Try benchmark NUM times and use the fastest result or the worst memory usage
         --repeat-result [TYPE]       Yield "best", "average" or "worst" result with --repeat-count (default: best)
         --bundler                    Install and use gems specified in Gemfile

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('--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)
+      end
+    end if system("which rvm > #{File::NULL} 2>&1")
     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)

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/rvm'
 require 'benchmark_driver/repeater'
 require 'benchmark_driver/ridkuse'
 require 'benchmark_driver/ruby_interface'

data/lib/benchmark_driver/rbenv.rb

@@ -11,7 +11,7 @@ module BenchmarkDriver
       path
     end
 
-    # @param [String] full_spec - "2.5.0", "2.5.0,--jit", "JIT::2.5.0,--jit", etc.
+    # @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, regard whole string as spec

data/lib/benchmark_driver/repeater.rb

@@ -62,14 +62,7 @@ module BenchmarkDriver
       end
 
       def median_result_i(a)
-        b = a.dup
-        b.sort!
-        x = y = nil
-        until b.empty? do
-          x = b.pop
-          y = b.shift
-        end
-        x || y
+        a.sort[a.size/2]
       end
 
       def median_result(values, rest_on_average)

data/lib/benchmark_driver/ridkuse.rb

@@ -43,7 +43,7 @@ module BenchmarkDriver
       end
     end
 
-    # @param [String] full_spec - "2.6.3", "2.6.3p62", "2.6.3,--jit", etc.
+    # @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

data/lib/benchmark_driver/ruby_interface.rb

@@ -71,6 +71,12 @@ module BenchmarkDriver
       end
     end
 
+    def rvm(*versions)
+      versions.each do |version|
+        @executables << BenchmarkDriver::Rvm.parse_spec(version)
+      end
+    end
+
     # ridk use command for RubyInstaller2 on Windows
     def ridkuse(*versions)
       versions.each do |version|

data/lib/benchmark_driver/rvm.rb

@@ -0,0 +1,48 @@
+require 'shellwords'
+require 'pathname'
+
+module BenchmarkDriver
+  module Rvm
+    # Execute "which -a ruby" command to get a list of Ruby versions from $PATH.
+    def self.system_ruby_path
+      env_rubies = `which -a ruby`
+      abort "Failed to execute 'which -a ruby'" unless $?.success?
+
+      env_rubies.each_line do |line|
+        if !line.match(ENV['rvm_path'])
+          return line.rstrip
+        end
+      end
+      abort "System ruby not found"
+    end
+
+    # @param [String] version
+    def self.ruby_path(version)
+      path = if version == 'system'
+        system_ruby_path
+      else
+        rubies = Pathname.new("#{ENV['rvm_path']}/rubies")
+        abort "Rubies path '#{rubies}' not found" unless rubies.exist?
+        ruby_root = rubies.children.detect { |path| path.directory? && path.basename.to_s.match(version) }
+        abort "Version '#{version}' not found" unless ruby_root
+        "#{ruby_root}/bin/ruby"
+      end
+
+      unless File.exist?(path)
+        abort "Binary '#{path}' not found"
+      end
+      path
+    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, regard whole string as spec
+      version, *args = spec.shellsplit
+      BenchmarkDriver::Config::Executable.new(
+        name: name,
+        command: [BenchmarkDriver::Rvm.ruby_path(version), *args],
+      )
+    end
+  end
+end

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.15.7'
+  VERSION = '0.15.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.8
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - lib/benchmark_driver/runner/recorded.rb
 - lib/benchmark_driver/runner/ruby_stdout.rb
 - lib/benchmark_driver/runner/time.rb
+- lib/benchmark_driver/rvm.rb
 - lib/benchmark_driver/struct.rb
 - lib/benchmark_driver/version.rb
 homepage: https://github.com/benchmark-driver/benchmark-driver
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fully-featured accurate benchmark driver for Ruby