benchmark_driver 0.15.13 → 0.15.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae35c25d0a6bd2e2c5d5e04522c81fb99f020d4e53cd0ecb67964cdef95460c
-  data.tar.gz: 8af270bebabda4f1da320542a46f4ab4cee421a024996b9ddf6b46a2da7ff354
+  metadata.gz: 6d1052380e38062b6a13370022a91959621902cf2d08263d29fc504c9297655f
+  data.tar.gz: 32067954ee2170d157f974ead3dce80aa7a2d0dca6f322f2aae053693775a656
 SHA512:
-  metadata.gz: 2a0c0f81f4e0f5854eb10c139dfbe94e90993239121a318007567a7edcb6193cf5fe455dfe6b41223bd5244b754c56579604d3b67e0599385c897ff9d268fca1
-  data.tar.gz: f0b8927b886d57f43b6bdd48958e12f6c7870713b60a64f36ea5c04b3d89722c718c1057a59b3e2d0aa77a1609d8ad9cd193b241ec0ebb10f68a78bea3ea7209
+  metadata.gz: d8d5417b30e026ea54fe080f434b89fde4c36f8136b3ea082b972d032730ed421d019c5eb2213efbcf5d0e905cc41ced746db31a0af5f1f3c8edfb1ecfb16320
+  data.tar.gz: 72da43bfd0d31749296ceb806da6210a86d55ad1046a06a8b2664e023c8ace1f782e1df1f7919205d4e9e95abc736440360fab1a1f8c6824028abc0698ebd2a8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.15.14
+
+- YAML's `type` key allows a value with `/` to specify a relative path of a runner plugin
+
 # v0.15.13
 
 - Show a command and stdout on `-vv` for `ips`, `time`, and `block` runner

data/exe/benchmark-driver

@@ -124,7 +124,7 @@ jobs = config.paths.flat_map do |path|
 
   begin
     # `working_directory` is YAML-specific special parameter, mainly for "command_stdout"
-    BenchmarkDriver::JobParser.parse(job, default_params: { working_directory: File.dirname(path) })
+    BenchmarkDriver::JobParser.parse(job, working_directory: File.dirname(path))
   rescue ArgumentError
     $stderr.puts "benchmark-driver: Failed to parse #{path.dump}."
     $stderr.puts '  YAML format may be wrong. See error below:'

data/lib/benchmark_driver/job_parser.rb

@@ -3,24 +3,27 @@ require 'benchmark_driver/runner'
 module BenchmarkDriver
   class << JobParser = Module.new
     # @param [Hash] config
-    # @param [Hash] default_params - Special default values not written in job definition
-    def parse(config, default_params: {})
+    # @param [Hash] working_directory - YAML-specific special parameter for "command_stdout" and a relative path in type
+    def parse(config, working_directory: nil)
       config = symbolize_keys(config)
       type = config.fetch(:type)
       if !type.is_a?(String)
         raise ArgumentError.new("Invalid type: #{config[:type].inspect} (expected String)")
-      elsif !type.match(/\A[A-Za-z0-9_]+\z/)
-        raise ArgumentError.new("Invalid type: #{config[:type].inspect} (expected to include only [A-Za-z0-9_])")
+      elsif !type.match(/\A[A-Za-z0-9_\/]+\z/)
+        raise ArgumentError.new("Invalid type: #{config[:type].inspect} (expected to include only [A-Za-z0-9_\/])")
       end
       config.delete(:type)
 
       # Dynamic dispatch for plugin support
-      require "benchmark_driver/runner/#{type}"
+      if type.include?('/')
+        require File.join(working_directory || '.', type)
+        type = File.basename(type)
+      else
+        require "benchmark_driver/runner/#{type}"
+      end
       job = ::BenchmarkDriver.const_get("Runner::#{camelize(type)}::JobParser", false).parse(**config)
-      default_params.each do |key, value|
-        if job.respond_to?(key) && job.respond_to?("#{key}=") && job.public_send(key).nil?
-          job.public_send("#{key}=", value)
-        end
+      if job.respond_to?(:working_directory) && job.respond_to?(:working_directory=) && job.working_directory.nil?
+        job.working_directory = working_directory
       end
       job
     end

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.15.13'
+  VERSION = '0.15.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.15.13
+  version: 0.15.14
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler