benchmark_driver 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f0184a1b8d3890b19912cd547083868ae3be9e906017cb8170b3397d58871e
-  data.tar.gz: 49542a6ffef9e91df5455db9b3a10e6253d063a34899d7d0af6ca68402160514
+  metadata.gz: 35017290d925f5c26a003c0110768c477f813200cabacca2bdb6b7f1920dbdc0
+  data.tar.gz: 8902078f79879de35e13654710f25048d601c09ff6fd07a6f34de59d9d01c518
 SHA512:
-  metadata.gz: d8caa0d45f6362df183d22029608469a9fb71d9884e87723e8d550c3a78b57ed942a6d01ed94179cb5ef7f616747c9bf47fe476cd035feb16360e021105364da
-  data.tar.gz: 43087d5deb87f297af786099b537c41fa23c81fb1113e00dd2c19c7004a433ccfccb63f68bb1b4cd72448a487c383588b19870f1ed61177b815d934c34d295e8
+  metadata.gz: 2d94cdef0fa82b088c5d15fb697f4f555223183b263a7a69622849ddb31f0281658a062dfe00fad56fae5a6761e3d2ddb0d70137ea8c330ccad3b0a506cc7d9e
+  data.tar.gz: 03c250fd66144397b636a40b8437cdce619be12b084f4a441727840c79e339ddd88c82bfd0f4558672e65bc6f6ed3e0f885b8feb9314cf0e211a83ad6edfc751

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.14.6
+
+- Improve option parser validation
+- Add `--timeout` option only for Linux having timeout(1)
+- Support `--version` option
+- Fix help output for `-e`/`--rbenv` in benchmark-driver command
+
 # v0.14.5
 
 - Fix wrong spacing format in simple / markdown output

data/exe/benchmark-driver

@@ -10,18 +10,18 @@ require 'yaml'
 config = BenchmarkDriver::Config.new.tap do |c|
   executables = []
   bundler = false
+  timeout = false
+
   parser = OptionParser.new do |o|
-    o.banner = "Usage: #{File.basename($0, '.*')} [options] [YAML|RUBY]"
-    o.on('-r', '--runner [TYPE]', 'Specify runner type: ips, time, memory, once (default: ips)') do |d|
-      abort '-r, --runner must take argument but not given' if d.nil?
+    o.version = BenchmarkDriver::VERSION
+    o.banner = "Usage: #{File.basename($0, '.*')} [options] RUBY|YAML..."
+    o.on('-r', '--runner TYPE', String, 'Specify runner type: ips, time, memory, once (default: ips)') do |d|
       c.runner_type = d
     end
-    o.on('-o', '--output [TYPE]', 'Specify output type: compare, simple, markdown, record (default: compare)') do |out|
-      abort '-o, --output must take argument but not given' if out.nil?
+    o.on('-o', '--output TYPE', String, 'Specify output type: compare, simple, markdown, record (default: compare)') do |out|
       c.output_type = out
     end
-    o.on('-e', '--executables [EXECS]', 'Ruby executables (e1::path1,arg1,...; e2::path2,arg2;...)') do |e|
-      abort '--executable must take argument but not given' if e.nil?
+    o.on('-e', '--executables EXECS', String, 'Ruby executables (e1::path1 arg1; e2::path2 arg2;...)') do |e|
       e.split(';').each do |name_path|
         name, path = name_path.split('::', 2)
         path ||= name # if `::` is not given, regard whole string as path
@@ -30,20 +30,15 @@ config = BenchmarkDriver::Config.new.tap do |c|
         executables << BenchmarkDriver::Config::Executable.new(name: name, command: command)
       end
     end
-    o.on('--rbenv [VERSIONS]', 'Ruby executables in rbenv (x.x.x,arg1,...;y.y.y,arg2,...;...)') do |r|
-      abort '--rbenv must take argument but not given' if r.nil?
+    o.on('--rbenv VERSIONS', String, 'Ruby executables in rbenv (x.x.x arg1;y.y.y arg2;...)') do |r|
       r.split(';').each do |version|
         executables << BenchmarkDriver::Rbenv.parse_spec(version)
       end
     end
-    o.on('--repeat-count [NUM]', 'Try benchmark NUM times and use the fastest result or the worst memory usage') do |v|
-      begin
-        c.repeat_count = Integer(v)
-      rescue ArgumentError
-        abort "-r, --repeat-count must take Integer, but got #{v.inspect}"
-      end
+    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
-    o.on('--repeat-result [TYPE]', 'Yield "best", "average" or "worst" result with --repeat-count (default: best)') do |v|
+    o.on('--repeat-result TYPE', String, 'Yield "best", "average" or "worst" result with --repeat-count (default: best)') do |v|
       unless BenchmarkDriver::Repeater::VALID_TYPES.include?(v)
         raise ArgumentError.new("--repeat-result must be #{BenchmarkDriver::Repeater::VALID_TYPES.join(', ')} but got #{v.inspect}")
       end
@@ -52,21 +47,24 @@ config = BenchmarkDriver::Config.new.tap do |c|
     o.on('--bundler', 'Install and use gems specified in Gemfile') do |v|
       bundler = v
     end
-    o.on('--filter [REGEXP]', 'Filter out benchmarks with given regexp') do |v|
+    o.on('--filter REGEXP', String, 'Filter out benchmarks with given regexp') do |v|
       c.filters << Regexp.compile(v)
     end
-    o.on('--run-duration [SECONDS]', 'Warmup estimates loop_count to run for this duration (default: 3)') do |v|
-      begin
-        c.run_duration = Float(v)
-      rescue ArgumentError
-        abort "--run-duration must take Float, but got #{v.inspect}"
-      end
+    o.on('--run-duration SECONDS', Float, 'Warmup estimates loop_count to run for this duration (default: 3)') do |v|
+      c.run_duration = v
     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...
     o.on('-v', '--verbose', 'Verbose mode. Multiple -v options increase visilibity (max: 2)') do |v|
       c.verbose += 1
     end
   end
-  c.paths = parser.parse!(ARGV)
+  begin
+    c.paths = parser.parse!(ARGV)
+  rescue OptionParser::InvalidArgument => e
+    abort e.message
+  end
   if c.paths.empty?
     abort "No YAML file is specified!\n\n#{parser.help}"
   end
@@ -75,10 +73,13 @@ config = BenchmarkDriver::Config.new.tap do |c|
   unless executables.empty?
     c.executables = executables
   end
-  if bundler
-    c.executables.each do |exec|
+  c.executables.each do |exec|
+    if bundler
       exec.command << '-rbundler/setup'
     end
+    if timeout
+      exec.command = ['timeout', timeout.to_s, *exec.command]
+    end
   end
 
   c.freeze

data/lib/benchmark_driver/config.rb

@@ -11,6 +11,7 @@ module BenchmarkDriver
     :repeat_count,  # @param [Integer]
     :repeat_result, # @param [String]
     :run_duration,  # @param [Float]
+    :timeout,       # @param [Float,nil]
     :verbose,       # @param [Integer]
     defaults: {
       runner_type: 'ips',
@@ -28,6 +29,7 @@ module BenchmarkDriver
     :repeat_count,  # @param [Integer]
     :repeat_result, # @param [String]
     :run_duration,  # @param [Float]
+    :timeout,       # @param [Float,nil]
     :verbose,       # @param [Integer]
   )
 

data/lib/benchmark_driver/runner.rb

@@ -20,12 +20,10 @@ module BenchmarkDriver
         end
       end
 
-      runner_config = Config::RunnerConfig.new(
-        repeat_count: config.repeat_count,
-        repeat_result: config.repeat_result,
-        run_duration: config.run_duration,
-        verbose: config.verbose,
-      )
+      runner_config = Config::RunnerConfig.new
+      runner_config.members.each do |member|
+        runner_config[member] = config[member]
+      end
 
       jobs.group_by{ |j| j.respond_to?(:contexts) && j.contexts }.each do |contexts, contexts_jobs|
         contexts_jobs.group_by(&:metrics).each do |metrics, metrics_jobs|

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.14.5'
+  VERSION = '0.14.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler