benchmark_driver 0.14.15 → 0.14.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ba53ac98d5df0dcc334972063f4b15f811260b4788d10d2be857ddc27d2a61
-  data.tar.gz: ffa117eed05ef4dc19fe19f84c700961b5601311d922db324d79facc7ff06ec4
+  metadata.gz: 85135f24e2f936e148208e4a5af25ca67635521729fc4dc9ee9b212422c101c6
+  data.tar.gz: ac1a8cfd80db996f81fcb4f7e9be7fa7fcc78a4189032008d13304e515ef2ae7
 SHA512:
-  metadata.gz: 1f5155178c1ac60b5da8555cbcb45e6330d3d85480270a6cd60353ec885cf56d71fb9d87a869419e3b8032e992247036fe8034d81e9b5ecc0bfdfdcb4e9f7492
-  data.tar.gz: 299a48296dddab7823e3256578984a42de52ac30dd1fbe560f3fcd1f6c2f5ddfe3e53f9bf1057e1e7c5196622e2c994f388b8ce25289965347277fdf0760c0bf
+  metadata.gz: e0bacf5b0207c59aa3130c3982e147e0dfce21166466d7afa6cde5b027da58ebcdcab479e6578223c84fe952450ff8c356f402d583150f0cb939b2afdb1ac5cc
+  data.tar.gz: f4c8b9266e1e4f33a69f0130c8407a16017a4846eae7119fe6c404d0422cfcf9035d8ad77d07dc7c2d78185f10bd34aca37883ee70bb07b4c783607477d61f1c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.14.16
+
+- Output ERROR metrics for a command failure on ruby\_stdout runner instead of crashing it
+
 # v0.14.15
 
 - Remove an extra space from markdown output

data/lib/benchmark_driver/runner/ruby_stdout.rb

@@ -6,6 +6,8 @@ require 'open3'
 
 # Use stdout of ruby command
 class BenchmarkDriver::Runner::RubyStdout
+  CommandFailure = Class.new(StandardError)
+
   # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
   Job = ::BenchmarkDriver::Struct.new(
     :name,                   # @param [String] name - This is mandatory for all runner
@@ -83,15 +85,20 @@ class BenchmarkDriver::Runner::RubyStdout
             exec = context.executable
             repeat_params = { config: @config, larger_better: metric.larger_better }
             result = BenchmarkDriver::Repeater.with_repeat(repeat_params) do
-              stdout = with_chdir(job.working_directory) do
-                with_ruby_prefix(exec) { execute(*exec.command, *job.command) }
+              begin
+                stdout = with_chdir(job.working_directory) do
+                  with_ruby_prefix(exec) { execute(*exec.command, *job.command) }
+                end
+                script = StdoutToMetrics.new(
+                  stdout: stdout,
+                  value_from_stdout: job.value_from_stdout,
+                  environment_from_stdout: job.environment_from_stdout,
+                )
+                [script.value, script.environment]
+              rescue CommandFailure => e
+                $stderr.puts("\n```\n#{e.message}```\n")
+                [BenchmarkDriver::Result::ERROR, {}]
               end
-              script = StdoutToMetrics.new(
-                stdout: stdout,
-                value_from_stdout: job.value_from_stdout,
-                environment_from_stdout: job.environment_from_stdout,
-              )
-              [script.value, script.environment]
             end
             value, environment = result.value
 
@@ -129,7 +136,7 @@ class BenchmarkDriver::Runner::RubyStdout
   def execute(*args)
     stdout, stderr, status = Open3.capture3(*args)
     unless status.success?
-      raise "Failed to execute: #{args.shelljoin} (status: #{$?.exitstatus}):\n[stdout]:\n#{stdout}\n[stderr]:\n#{stderr}"
+      raise CommandFailure.new("Failed to execute: #{args.shelljoin} (status: #{$?.exitstatus}):\n\n[stdout]:\n#{stdout}\n[stderr]:\n#{stderr}")
     end
     stdout
   end

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.14.15'
+  VERSION = '0.14.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.14.15
+  version: 0.14.16
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler