benchmark_driver-output-rubybench 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a977f8e20db83f16767a4aecdb0fd396a98d2e6
-  data.tar.gz: ae279d4d48ee009a846ff9010a7c8ae4686f441b
+  metadata.gz: 21477e8cefe77e8ab842ee00ac21374e7ab6d298
+  data.tar.gz: 3598fd9427e9627d928f63e79f1056855a25f355
 SHA512:
-  metadata.gz: 93aee7f4e7653a61a3a88a440694ddaa24bf8694ba0531fc76f5dedfed41ccd7fe28d640b8ed774d4728fd825a1553eba3d9858fb0a31681666fb82aab9e9cf9
-  data.tar.gz: dec25a74a89cae38ada018f3bb85a678b20e5dcd69e4791e0084f5a2150674b6a8a0daaec17e820ed83f92f8640ed44fb2c3ab001ca5d9d93c6f1893470adf45
+  metadata.gz: a48a5eef910225ad66dcf9568872a517c19506c4be0eb85de3307dad015e2b92a8850d7da3085b8b1463ca6575ffa3f675627972cdb130fa37277efdac65cd03
+  data.tar.gz: 5c5a2c5f937578bb7c56dc3a0dd7839d80fc5f90aaab51c524eec2b211075025a069f33c60f260fac4a78e341e73fa679b1a912b20fe6c7c95710912cd54c0fc

data/benchmark_driver-output-rubybench.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "benchmark_driver", ">= 0.11"
+  spec.add_dependency "benchmark_driver", ">= 0.12"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/benchmark_driver/output/rubybench.rb

@@ -14,19 +14,12 @@ require 'net/http'
 #   ORGANIZATION_NAME
 class BenchmarkDriver::Output::Rubybench < BenchmarkDriver::BulkOutput
   # For maintainability, this doesn't support streaming progress output.
-  # @param [Hash{ BenchmarkDriver::Job => Hash{ BenchmarkDriver::Context => { BenchmarkDriver::Metric => Float } } }] result
+  # @param [Hash{ BenchmarkDriver::Job => Hash{ BenchmarkDriver::Context => BenchmarkDriver::Result } }] job_context_result
   # @param [Array<BenchmarkDriver::Metric>] metrics
-  def bulk_output(result:, metrics:)
+  def bulk_output(job_context_result:, metrics:)
     metrics.each do |metric|
-      result.each do |job, context_metric_value|
-        context_value = {}
-        context_metric_value.each do |context, metric_value|
-          if metric_value.key?(metric)
-            context_value[context] = metric_value[metric]
-          end
-        end
-
-        create_benchmark_run(job, metric, context_value)
+      job_context_result.each do |job, context_result|
+        create_benchmark_run(job, metric, context_result)
       end
     end
   end
@@ -36,8 +29,8 @@ class BenchmarkDriver::Output::Rubybench < BenchmarkDriver::BulkOutput
   # Create BenchmarkRun record on RubyBench
   # @param [BenchmarkDriver::Job] job
   # @param [BenchmarkDriver::Metric] metric
-  # @param [Hash{ BenchmarkDriver::Context => Float }] context_value
-  def create_benchmark_run(job, metric, context_value)
+  # @param [Hash{ BenchmarkDriver::Context => BenchmarkDriver::Result }] context_result
+  def create_benchmark_run(job, metric, context_result)
     http = Net::HTTP.new(ENV.fetch('API_URL', 'rubybench.org'), 443)
     http.use_ssl = true
     request = Net::HTTP::Post.new('/benchmark_runs')
@@ -51,12 +44,12 @@ class BenchmarkDriver::Output::Rubybench < BenchmarkDriver::BulkOutput
     end
 
     result_hash = {}
-    context_value.each do |context, value|
-      initiator_hash["benchmark_run[result][#{context.name}]"] = value
+    context_result.each do |context, result|
+      initiator_hash["benchmark_run[result][#{context.name}]"] = result.values.fetch(metric)
     end
 
-    context = context_value.keys.first
-    ruby_version = IO.popen([*context.executable.command, '-v'], &:read)
+    ruby_version = context_result.keys.first.executable.description
+    environment = context_result.values.first.environment
 
     request.set_form_data({
       'benchmark_result_type[name]' => metric.name,
@@ -64,7 +57,7 @@ class BenchmarkDriver::Output::Rubybench < BenchmarkDriver::BulkOutput
       'benchmark_type[category]' => job.name,
       'benchmark_type[script_url]' => ENV.fetch('BENCHMARK_TYPE_SCRIPT_URL'),
       'benchmark_type[digest]' => ENV.fetch('BENCHMARK_TYPE_DIGEST'),
-      'benchmark_run[environment]' => { 'Ruby version' => ruby_version }.merge(context.environment).to_yaml,
+      'benchmark_run[environment]' => { 'Ruby version' => ruby_version }.merge(environment).to_yaml,
       'repo' => ENV.fetch('REPO_NAME'),
       'organization' => ENV.fetch('ORGANIZATION_NAME'),
     }.merge(initiator_hash).merge(result_hash))

data/lib/benchmark_driver/output/rubybench/version.rb

@@ -1,7 +1,7 @@
 module BenchmarkDriver
   module Output
     class Rubybench
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver-output-rubybench
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -65,8 +65,6 @@ files:
 - README.md
 - Rakefile
 - benchmark_driver-output-rubybench.gemspec
-- bin/console
-- bin/setup
 - lib/benchmark_driver/output/rubybench.rb
 - lib/benchmark_driver/output/rubybench/version.rb
 homepage: https://github.com/ruby-bench/ruby-bench-suite

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "benchmark_driver/output/rubybench"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here