benchmark_driver 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d80a15877a535548463502efb2a1a39b708c3e7
-  data.tar.gz: 8a569023b7cde0b811f4bfc96c13587e863a7e1d
+SHA256:
+  metadata.gz: 53657321ac74e0c39a11ae6b2ed12ad00e54aae56afc72895554bf7ed9ca2c4f
+  data.tar.gz: e201229fddbf15331045d7098df78b89a5e91a472c58af8b05dc299bafdc5b9f
 SHA512:
-  metadata.gz: 2d44bf5752e35b615c219916d45828e0e535729b2290ca590d6c3d16b4ed8928afb2c66cdac65609af78f85792374a1715089efad2b6921f1616bcc43c74b824
-  data.tar.gz: a8744d5d19ac34aaf2951a6f7704a2fddc6f4eeeb7a9e079808a59469db16723b03aeff09a9d79b6563f8bda92795e8f99f1539225ffe28bc1b342e554443143
+  metadata.gz: 5a47674867279c0064e91f55bce5b4305f0b49866bf9c37f912dc3f4743e091df4d18de8645d0f005aef89112f996e4a86e50d6840352312ca9108cb69d8eccc
+  data.tar.gz: 9b34342a2989fd21197181e4a59083a313ed4f13e6a728a1918190299c0104faa6c90ee12d046a3a380f953785a2c7c148b2b2b5fa189d4f507e0cb4043760a9

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+# v0.13.1
+
+- Respect a magic comment in `prelude`
+
 # v0.13.0
 
 - Add support for benchmark with different versions of gems and preludes
+  - Only YAML is supported for now, Ruby interface will come later
 - [breaking change] Runner plugin interface is sightly changed
 
 # v0.12.0

data/README.md

@@ -170,7 +170,7 @@ end
 
 With following `blank_loop.yml`,
 
-```
+```yml
 loop_count: 20000000
 prelude: |
   class Array

data/lib/benchmark_driver/runner/ips.rb

@@ -70,7 +70,7 @@ class BenchmarkDriver::Runner::Ips
   # @param [BenchmarkDriver::Context] context
   def run_warmup(job, context:)
     warmup = WarmupScript.new(
-      prelude:    "#{context.prelude}\n#{job.prelude}",
+      preludes:   [context.prelude, job.prelude],
       script:     job.script,
       teardown:   job.teardown,
       loop_count: job.loop_count,
@@ -93,7 +93,7 @@ class BenchmarkDriver::Runner::Ips
   # @return [BenchmarkDriver::Metrics]
   def run_benchmark(job, context:)
     benchmark = BenchmarkScript.new(
-      prelude:    "#{context.prelude}\n#{job.prelude}",
+      preludes:   [context.prelude, job.prelude],
       script:     job.script,
       teardown:   job.teardown,
       loop_count: job.loop_count,
@@ -136,15 +136,16 @@ class BenchmarkDriver::Runner::Ips
   end
 
   def execute(*args)
-    IO.popen(args, &:read) # handle stdout?
+    stdout = IO.popen(args, &:read) # handle stdout?
     unless $?.success?
       raise "Failed to execute: #{args.shelljoin} (status: #{$?.exitstatus})"
     end
   end
 
-  WarmupScript = ::BenchmarkDriver::Struct.new(:prelude, :script, :teardown, :loop_count, :first_warmup_duration, :second_warmup_duration) do
+  WarmupScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count, :first_warmup_duration, :second_warmup_duration) do
     # @param [String] result - A file to write result
     def render(result:)
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
       <<-RUBY
 #{prelude}
 
@@ -188,9 +189,10 @@ File.write(#{result.dump}, [__bmdv_duration, __bmdv_loops].inspect)
   # @param [String] script
   # @param [String] teardown
   # @param [Integer] loop_count
-  BenchmarkScript = ::BenchmarkDriver::Struct.new(:prelude, :script, :teardown, :loop_count) do
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
     # @param [String] result - A file to write result
     def render(result:)
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
       <<-RUBY
 #{prelude}
 

data/lib/benchmark_driver/runner/memory.rb

@@ -62,7 +62,7 @@ class BenchmarkDriver::Runner::Memory
   # @return [BenchmarkDriver::Metrics]
   def run_benchmark(job, context:)
     benchmark = BenchmarkScript.new(
-      prelude:    "#{context.prelude}\n#{job.prelude}",
+      preludes:   [context.prelude, job.prelude],
       script:     job.script,
       teardown:   job.teardown,
       loop_count: job.loop_count,
@@ -103,8 +103,9 @@ class BenchmarkDriver::Runner::Memory
   # @param [String] script
   # @param [String] teardown
   # @param [Integer] loop_count
-  BenchmarkScript = ::BenchmarkDriver::Struct.new(:prelude, :script, :teardown, :loop_count) do
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
     def render
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
       <<-RUBY
 #{prelude}
 #{while_loop(script, loop_count)}

data/lib/benchmark_driver/runner/once.rb

@@ -51,7 +51,7 @@ class BenchmarkDriver::Runner::Once
   # @return [Float] duration
   def run_benchmark(job, context:)
     benchmark = BenchmarkScript.new(
-      prelude:    "#{context.prelude}\n#{job.prelude}",
+      preludes:   [context.prelude, job.prelude],
       script:     job.script,
       teardown:   job.teardown,
       loop_count: job.loop_count,
@@ -90,9 +90,10 @@ class BenchmarkDriver::Runner::Once
   # @param [String] script
   # @param [String] teardown
   # @param [Integer] loop_count
-  BenchmarkScript = ::BenchmarkDriver::Struct.new(:prelude, :script, :teardown, :loop_count) do
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
     # @param [String] result - A file to write result
     def render(result:)
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
       <<-RUBY
 #{prelude}
 __bmdv_before = Time.now

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fully-featured accurate benchmark driver for Ruby