benchmark_driver-output-charty 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ffe9ebe3b4c94f541a12dadf285fef51867f40891a047c9b95c3a884f1c10c
-  data.tar.gz: e10885bdf8b55ad4e69bab90fc97f4a7a11d5879616a1ce09a909e49ba0a4542
+  metadata.gz: 4ffde553e880c170e09f114efaef84f14a4da531dbcac1b9a249ef59a855f8e7
+  data.tar.gz: 2869bb6caecf58295468fe67dbde77f0d0eb375002fb316f423ddfd87150f48c
 SHA512:
-  metadata.gz: e47450cb7d71180641dabd30eb1a44b07af5767e6b2cdf3a50356027a6d0764cac76528e921efde74dde7149791658aedd7d43a4bde56e47e21d17d406c1c887
-  data.tar.gz: 0ac28259adbeeba197e6b20b8270fc366662495a9ae248c6250bb03fe87d9762dd8640202731440ac1acdbd4962d19aae746efc89d95885613f81998c1f37a42
+  metadata.gz: 3a0809d8e782be74c5ae65dcdd0326939502f16ad1621036794eac89fd51ba90536ff008822de661fbe4c40bcf24b8e8e5c9282017422d685cb339949ab68149
+  data.tar.gz: 82292840c90fe8ce63d50264876cb0f8d3dcb7e90c3d0ba2d195d024c8d57dfe49e05d718dc1f82516b849a91d1b382787ced0d0b9592a8bdbd4da63198de021

data/.gitignore

@@ -6,3 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+Gemfile.lock
+charty.png

data/README.md

@@ -2,21 +2,19 @@
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/benchmark_driver/output/charty`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
-
 ## Usage
 
 ```
 $ be benchmark-driver examples/single.yml -o charty --rbenv '2.5.3;2.6.2'
 ```
 
-![](https://github.com/284km/benchmark_driver-output-charty/blob/master/images/single.png)
+![](https://github.com/benchmark-driver/benchmark_driver-output-charty/blob/master/images/single.png)
 
 ```
 $ be benchmark-driver examples/multi.yml -o charty --rbenv '2.5.3;2.6.2'
 ```
 
-![](https://github.com/284km/benchmark_driver-output-charty/blob/master/images/multi.png)
+![](https://github.com/benchmark-driver/benchmark_driver-output-charty/blob/master/images/multi.png)
 
 ## Installation
 
@@ -34,10 +32,6 @@ Or install it yourself as:
 
     $ gem install benchmark_driver-output-charty
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -46,7 +40,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/284km/benchmark_driver-output-charty. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/benchmark-driver/benchmark_driver-output-charty. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -54,4 +48,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the BenchmarkDriver::Output::Charty project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/284km/benchmark_driver-output-charty/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the BenchmarkDriver::Output::Charty project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/benchmark-driver/benchmark_driver-output-charty/blob/master/CODE_OF_CONDUCT.md).

data/benchmark_driver-output-charty.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "benchmark_driver-output-charty"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["284km"]
   spec.email         = ["k.furuhashi10@gmail.com"]
 
   spec.summary       = %q{Show graph on benchmark_driver using charty.gem}
   spec.description   = %q{Show graph on benchmark_driver using charty.gem}
-  spec.homepage      = "https://github.com/284km/benchmark_driver-output-charty"
+  spec.homepage      = "https://github.com/benchmark-driver/benchmark_driver-output-charty"
   spec.license       = "MIT"
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -20,10 +20,10 @@ 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"
+  spec.add_dependency "benchmark_driver", ">= 0.15.1"
   spec.add_dependency "charty"
   spec.add_dependency "matplotlib"
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
 end

data/lib/benchmark_driver/output/charty.rb

@@ -4,49 +4,74 @@ require 'benchmark_driver'
 class BenchmarkDriver::Output::Charty < BenchmarkDriver::BulkOutput
   GRAPH_PATH = 'charty.png'
 
+  OPTIONS = {
+    chart: ['--output-chart CHART', Regexp.union(['bar', 'box']), 'Specify chart type: bar, box (default: bar)'],
+    path: ['--output-path PATH', String, "Chart output path (default: #{GRAPH_PATH})"]
+  }
+
   # @param [Array<BenchmarkDriver::Metric>] metrics
   # @param [Array<BenchmarkDriver::Job>] jobs
   # @param [Array<BenchmarkDriver::Context>] contexts
-  def initialize(contexts:, **)
+  def initialize(contexts:, options:, **)
     super
     @contexts = contexts
+    @chart = options.fetch(:chart, 'bar')
+    @path = options.fetch(:path, GRAPH_PATH)
   end
 
   # @param [Hash{ BenchmarkDriver::Job => Hash{ BenchmarkDriver::Context => { BenchmarkDriver::Metric => Float } } }] result
   # @param [Array<BenchmarkDriver::Metric>] metrics
   def bulk_output(job_context_result:, metrics:)
     print "rendering graph..."
-    charty = Charty::Plotter.new(:matplot)
+    charty = Charty::Plotter.new(:pyplot)
 
     metric = metrics.first # only one metric is supported for now
     if job_context_result.keys.size == 1
       job = job_context_result.keys.first
 
       names = job_context_result[job].keys.map(&:name)
-      values = job_context_result[job].values.map { |result| result.values.fetch(metric) }
-      barh = charty.barh do
-        series names, values
-        ylabel metric.unit
+      case @chart
+      when 'bar'
+        values = job_context_result[job].values.map { |result| result.values.fetch(metric) }
+        chart = charty.barh do
+          series names, values
+          ylabel metric.unit
+        end
+      when 'box'
+        values = job_context_result[job].values.map { |result| result.all_values.fetch(metric) }
+        chart = charty.box_plot do
+          labels names
+          data values
+          ylabel metric.unit
+        end
+      else
+        raise ArgumentError, "unexpected --output-chart: #{@chart}"
       end
-      barh.render("charty.png")
     else
       jobs = job_context_result.keys
-      values = @contexts.map{|context|
-        [
-          jobs.map{|job| "#{job.name}(#{context.name})" },
-          jobs.map{|job| job_context_result[job][context].values.fetch(metric).round }
-        ]
-      }
-
-      barh = charty.barh do
-        values.each do |value|
-          series *value
+
+      case @chart
+      when 'bar'
+        values = @contexts.map{|context|
+          [
+            jobs.map{|job| "#{job.name}(#{context.name})" },
+            jobs.map{|job| job_context_result[job][context].values.fetch(metric).round }
+          ]
+        }
+        chart = charty.barh do
+          values.each do |value|
+            series *value
+          end
+          ylabel metric.unit
         end
-        ylabel metric.unit
+      when 'box'
+        raise NotImplementedError, "--output-chart=box is not supported with multiple jobs"
+      else
+        raise ArgumentError, "unexpected --output-chart: #{@chart}"
       end
-      barh.render("charty.png")
     end
-    puts ": #{GRAPH_PATH}"
+    chart.save(@path)
+    puts ": #{@path}"
   end
 
   def with_job(job, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver-output-charty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - 284km
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark_driver
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: charty
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +116,7 @@ files:
 - images/multi.png
 - images/single.png
 - lib/benchmark_driver/output/charty.rb
-- lib/benchmark_driver/output/charty/version.rb
-homepage: https://github.com/284km/benchmark_driver-output-charty
+homepage: https://github.com/benchmark-driver/benchmark_driver-output-charty
 licenses:
 - MIT
 metadata: {}

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

@@ -1,7 +0,0 @@
-module BenchmarkDriver
-  module Output
-    module Charty
-      VERSION = "0.1.0"
-    end
-  end
-end