benchmark_driver 0.15.18 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056db37cfc1c2453c9ab994d4b1241bb450ad7e138e69e2ae4a5995825976753
-  data.tar.gz: f827c814001e175ebcb878181ff0b6b411466bb34bf4ff4a34e02b0f1fdafdda
+  metadata.gz: 2aa17cc07885ff406870c16844aa57b9230f81a1be2104627af5e21131ba9fb9
+  data.tar.gz: 6b3d0dfcc8fe50785811a98eb1d62093a90463150aff7eb7d1773c07a9c72391
 SHA512:
-  metadata.gz: f34f11c0d5a30be2e232af08d00e2e1b2420a161aa18c1f020a0f342f53804b82da754c61632a008ec7822f710edab2af7a1dde18cf1a67a4e51ab14852b3b3a
-  data.tar.gz: e0601d752e1f55d95ae2c1b83f6dfaa432290b28856ceca553500597f8b06b508c34909df98cd96f3aaf0989df9d2ef76fa0c1e31099f80486b37fa641ce15dd
+  metadata.gz: dc65698d4628c758ec49a32769d9f4e86c1b3d2721777227e7bca285c32b75687e7ec05d93351c4df37ed789e1d96fb0e717fe56440b972e34f03ce04341ca9b
+  data.tar.gz: 139315d91d21b9f86a276a3257eec66bdff8f317dd358619d99a6fcdcafabbe9e1fb9a9837b4607f97dbcc2df911b0d11ac128d228c10c644d7336cecbf396e8

data/.github/workflows/test.yml

@@ -0,0 +1,36 @@
+name: test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "00 15 * * *"
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install benchmark targets
+        run: |
+          gem install haml -v 4.0.7
+          gem install haml -v 5.0.4
+      - run: VERBOSE=1 bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.16.1
+
+- Add --output-humanize option to --output=simple
+
+# v0.16.0
+
+- Support benchmarking inline Ruby scripts [#75](https://github.com/benchmark-driver/benchmark-driver/pull/75)
+- Require Ruby 2.5+
+- Fix `recorded` runner for Ruby 3.1's Psych
+
 # v0.15.18
 
 - Mention `--output=all` in help

data/README.md

@@ -1,4 +1,4 @@
-# BenchmarkDriver [![Build Status](https://travis-ci.org/benchmark-driver/benchmark-driver.svg?branch=master)](https://travis-ci.org/benchmark-driver/benchmark-driver)
+# BenchmarkDriver
 
 Fully-featured accurate benchmark driver for Ruby
 

data/benchmark_driver.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/exe/benchmark-driver

@@ -87,11 +87,11 @@ config = BenchmarkDriver::Config.new.tap do |c|
     end
   end
   begin
-    c.paths = parser.parse!(ARGV)
+    c.args = parser.parse!(ARGV)
   rescue OptionParser::InvalidArgument => e
     abort e.message
   end
-  if c.paths.empty?
+  if c.args.empty?
     abort "No YAML file is specified!\n\n#{parser.help}"
   end
 
@@ -112,24 +112,32 @@ config = BenchmarkDriver::Config.new.tap do |c|
 end
 
 # Parse benchmark job definitions
-jobs = config.paths.flat_map do |path|
+jobs = config.args.flat_map do |arg|
   job = { 'type' => config.runner_type }
 
-  # Treat *.rb as a single-execution benchmark, others are considered as YAML definition
-  if path.end_with?('.rb')
-    name = File.basename(path).sub(/\.rb\z/, '')
-    script = File.read(path)
+  # Three types of input:
+  #   * YAML file (*.yml, *.yaml): a regular benchmark with various params
+  #   * Ruby file (*.rb): a single-execution benchmark
+  #   * Ruby inline (any other argument): a multi-execution benchmark
+  if arg.end_with?('.yml') || arg.end_with?('.yaml')
+    yaml = File.read(arg)
+    job.merge!(YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml) : YAML.load(yaml))
+  elsif arg.end_with?('.rb')
+    name = File.basename(arg).sub(/\.rb\z/, '')
+    script = File.read(arg)
     prelude = script.slice!(/\A(^#[^\n]+\n)+/m) || '' # preserve magic comment
     job.merge!('prelude' => prelude, 'benchmark' => { name => script }, 'loop_count' => 1)
-  else
-    job.merge!(YAML.load_file(path))
+  else # Ruby inline
+    job.merge!('benchmark' => { arg => arg })
+    working_directory = Dir.pwd
   end
+  working_directory ||= File.expand_path(File.dirname(arg))
 
   begin
     # `working_directory` is YAML-specific special parameter, mainly for "command_stdout"
-    BenchmarkDriver::JobParser.parse(job, working_directory: File.expand_path(File.dirname(path)))
+    BenchmarkDriver::JobParser.parse(job, working_directory: working_directory)
   rescue ArgumentError
-    $stderr.puts "benchmark-driver: Failed to parse #{path.dump}."
+    $stderr.puts "benchmark-driver: Failed to parse #{arg.dump}."
     $stderr.puts '  YAML format may be wrong. See error below:'
     $stderr.puts
     raise

data/lib/benchmark_driver/config.rb

@@ -8,7 +8,7 @@ module BenchmarkDriver
     :runner_type,   # @param [String]
     :output_type,   # @param [String]
     :output_opts,   # @param [Hash{ Symbol => Object }]
-    :paths,         # @param [Array<String>]
+    :args,          # @param [Array<String>]
     :executables,   # @param [Array<BenchmarkDriver::Config::Executable>]
     :filters,       # @param [Array<Regexp>]
     :repeat_count,  # @param [Integer]

data/lib/benchmark_driver/output/simple.rb

@@ -1,13 +1,18 @@
 class BenchmarkDriver::Output::Simple
   NAME_LENGTH = 10
 
+  OPTIONS = {
+    humanize: ['--output-humanize true|false', TrueClass, 'Humanize result numbers (default: true)'],
+  }
+
   # @param [Array<BenchmarkDriver::Metric>] metrics
   # @param [Array<BenchmarkDriver::Job>] jobs
   # @param [Array<BenchmarkDriver::Context>] contexts
-  def initialize(metrics:, jobs:, contexts:)
+  def initialize(metrics:, jobs:, contexts:, options:)
     @metrics = metrics
     @context_names = contexts.map(&:name)
     @name_length = jobs.map(&:name).map(&:size).max
+    @humanize = options.fetch(:humanize, true)
   end
 
   def with_warmup(&block)
@@ -78,6 +83,8 @@ class BenchmarkDriver::Output::Simple
   end
 
   def humanize(value)
+    return value unless @humanize
+
     if BenchmarkDriver::Result::ERROR.equal?(value)
       return " %#{NAME_LENGTH}s" % 'ERROR'
     elsif value == 0.0

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.15.18'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.15.18
+  version: 0.16.1
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,9 +74,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -131,7 +131,7 @@ homepage: https://github.com/benchmark-driver/benchmark-driver
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,15 +139,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Fully-featured accurate benchmark driver for Ruby
 test_files: []

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.8
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-cache: bundler
-branches:
-  only:
-    - master
-before_install:
-  - gem install bundler -v 1.15.4
-  - gem install haml -v 4.0.7
-  - gem install haml -v 5.0.4
-script:
-  - VERBOSE=1 bundle exec rake