mach5-tools 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 836c5778b2617e690194d748246bf9485c3afa30
-  data.tar.gz: 84e9ac490ec32457f6af21ad229f7753e912ce7e
+  metadata.gz: d531491376f7d66a0280e9383c5ad05cb2370ba1
+  data.tar.gz: ed0e957e907164e64b17317f7ade8f8e09034433
 SHA512:
-  metadata.gz: c663eff8d089055752384ffddb161430e8bc7e0724063e64c749998e13d27620992c0fed7dd55e142725d8c717a5178e2f5ec7167d2742599f5b511611d9b25a
-  data.tar.gz: 1c57a2c5ad94f77f81a46740e79461b4ec485981b7f64ca897268a254f88586dc843a2049591d6ef7b5ef72c5ed875c1999673a3a76d64e3b92c41818bb3870e
+  metadata.gz: 6bbfe9364b097465db0285a1ae7f2f0dd9beccba1613376783f3924ec2c5d0375ca244bc8f8f6281e50651c4cac2a954bad7ae36987f961a7e8a7e341fd59fcf
+  data.tar.gz: 85c0f626d38a433c5df81684e4f90524cf7e0a3651a3ba0f1c5c5ab11f93bc3debac5343d922702153b0b12c14d0bf9df52c713252c28e9faef5ed3b21354733

data/TODO

@@ -3,10 +3,14 @@ v0.1.0
 [x] mach5 benchmark --only commit_id.benchmark
 
 v0.2.0
-[ ] mach5 graph
-[ ] mach5 graph --all
-[ ] mach5 graph --list (lista e mostrar o status: se ja existe ou nao)
-[ ] mach5 graph --only graph_id
+[x] mach5 chart
+[x] mach5 chart --all
+[x] mach5 chart --list (lista e mostrar o status: se ja existe ou nao)
+[x] mach5 chart --only graph_id
+[x] charts com tags
+[x] mais opções para add_serie
+[x] mais opções para x_axis e y_axis
+[x] definir o tipo do grafico (line ou bar)
 
 v0.3.0
 [ ] mach5 init (cria o Mach5file)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/mach5

@@ -23,6 +23,23 @@ class App < Thor
     end
   end
 
+  desc "chart", "Generate charts"
+  method_option :all, :type => :boolean, :aliases => "-a", :desc => "Generates all benchmarks even if it was already generated"
+  method_option :list, :type => :boolean, :aliases => "-l", :desc => "List all available charts"
+  method_option :only, :type => :array, :aliases => "-o", :desc => "Generates only the specified charts"
+  def chart
+    runner = Mach5::Runner.new(eval(File.open("Mach5file").readlines.join))
+    if options.list
+      runner.list_charts.each do |chart|
+        puts chart
+      end
+    elsif options.only
+      runner.chart(only: options.only)
+    else
+      runner.chart(all: options.all)
+    end
+  end
+
   default_task :benchmark
 end
 

data/lib/mach5-tools/benchmark.rb

@@ -27,6 +27,10 @@ module Mach5
       @memory.keys
     end
 
+    def tagged
+      @tags
+    end
+
     def has_tag?(commit_id)
       @tags.invert[commit_id]
     end

data/lib/mach5-tools/chart.rb

@@ -0,0 +1,62 @@
+module Mach5
+  class Chart
+    attr_accessor :type
+    attr_accessor :data_type
+    attr_accessor :size
+    attr_accessor :title
+    attr_accessor :x_axis
+    attr_accessor :y_axis
+    attr_accessor :series
+    attr_accessor :config
+    attr_reader :id
+
+    def initialize(id)
+      @id = id
+    end
+
+    def build
+      hash = {
+        "type" => @type,
+        "dataType" => @data_type,
+        "size" => {
+          "width" => size.split("x").map(&:to_i)[0],
+          "height" => size.split("x").map(&:to_i)[1]
+        },
+        "title" => {
+          "text" => @title
+        },
+        "xAxis" => {
+          "title" => {
+            "text" => @x_axis[:label]
+          }
+        },
+        "yAxis" => {
+          "title" => {
+            "text" => @y_axis
+          }
+        },
+        "series" => _series(@series)
+      }
+      hash["xAxis"]["categories"] = @x_axis[:categories] if @x_axis[:categories]
+      hash
+    end
+
+    def _series(series)
+      result = []
+      series.each do |s|
+        commit_id = @config.benchmarks.tagged[s[:commit_id]]
+        unless commit_id
+          commit_id = s[:commit_id]
+        end
+        serie = {
+          "label" => "#{s[:commit_id]}.#{s[:benchmark_id]}",
+          "file" =>  File.join(Dir.pwd, @config.output_folder, "#{commit_id}.#{s[:benchmark_id]}.json")
+        }
+        serie["label"] = s[:label] if s[:label]
+        serie["color"] = s[:color] if s[:color]
+        result << serie
+      end
+      result
+    end
+  end
+end

data/lib/mach5-tools/config.rb

@@ -10,10 +10,13 @@ module Mach5
     attr_accessor :project_name
     attr_accessor :output_folder
     attr_accessor :benchmarks
+    attr_accessor :charts
 
     def initialize(project_name, block)
       @project_name = project_name
       @benchmarks = Benchmark.new(Hash.new, Hash.new)
+      @charts = []
+      @output_folder = "_benchmark"
       instance_eval(&block)
     end
 
@@ -47,5 +50,71 @@ module Mach5
     def exec(command)
       @commands << command
     end
+
+    def chart(chart_id, &block)
+      @chart_series = []
+      @chart_type = "line"
+      @chart_size = "700x500"
+      @chart_title = "Benchmark"
+      @chart_x_axis = "X"
+      @chart_y_axis = "Y"
+      @data_type = "runs_total_time"
+      instance_eval(&block)
+      chart = Chart.new(chart_id)
+      chart.data_type = @data_type
+      chart.type = @chart_type
+      chart.size = @chart_size
+      chart.title = @chart_title
+      chart.x_axis = @chart_x_axis
+      chart.y_axis = @chart_y_axis
+      chart.series = @chart_series
+      chart.config = self
+      @charts << chart
+    end
+
+    def title(str)
+      @chart_title = str
+    end
+
+    def add_serie(benchmark, &block)
+      @serie_label = nil
+      @serie_color = nil
+      block.call if block
+      @chart_series << {commit_id: benchmark.keys[0], benchmark_id: benchmark.values[0], label: @serie_label, color: @serie_color}
+    end
+
+    def data_type(type)
+      @data_type = type
+    end
+
+    def x_axis(label, &block)
+      @chart_x_axis_categories = nil
+      block.call if block
+      @chart_x_axis = {label: label, categories: @chart_x_axis_categories}
+    end
+
+    def y_axis(label)
+      @chart_y_axis = label
+    end
+
+    def size(str)
+      @chart_size = str
+    end
+
+    def type(str)
+      @chart_type = str
+    end
+
+    def label(str)
+      @serie_label = str
+    end
+
+    def color(str)
+      @serie_color = str
+    end
+
+    def categories(cat)
+      @chart_x_axis_categories = cat
+    end
   end
 end

data/lib/mach5-tools/js/chart.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Line Chart</title>
+  </head>
+  <body>
+    <div id="container" style="width:100%; height:100%;"></div>
+    <script src="jquery.js"></script>
+    <script src="highcharts.js"></script>
+    <script type="text/javascript">
+    $('#container').height($(document).height());
+    $(window).resize(function() {
+      console.log($(window).height());
+      $('#container').height($(window).height());
+    });
+    </script>
+  </body>
+</html>

data/lib/mach5-tools/js/chart.js

@@ -0,0 +1,58 @@
+var page   = require('webpage').create(),
+    system = require('system'),
+    fs     = require('fs');
+
+page.viewportSize = { width: 960, height: 540 };
+
+var process_data = function(data, type) {
+  var table = new Array();
+  table[0] = new Array();
+  table[1] = new Array();
+  for (var i = 0; i < data.length; i++) {
+    table[0][i] = data[i].index;
+    table[1][i] = data[i][type];
+  }
+  return table;
+}
+
+var descriptor = eval(system.args[2])[0],
+    current_path = system.args[1],
+    output_image = system.args[3];
+
+if (typeof descriptor.size !== "undefined")
+  page.viewportSize = descriptor.size;
+
+page.open(current_path + '/chart.html', function() {
+  for (var i = 0; i < descriptor.series.length; i++) {
+    var file = fs.open(descriptor.series[i].file, 'r');
+    descriptor.series[i].data = eval(file.read());
+  }
+
+  page.evaluate(function(process_data, descriptor) {
+    $(function () {
+      var series = new Array();
+      for (var i = 0; i < descriptor.series.length; i++) {
+        series[i] = {
+          name: descriptor.series[i].label,
+          data: process_data(descriptor.series[i].data, descriptor.dataType)[1],
+          color: descriptor.series[i].color,
+          animation: false
+        };
+      }
+
+      $('#container').highcharts({
+        chart: {
+          type: descriptor.type,
+          animation: false
+        },
+        title: descriptor.title,
+        xAxis: descriptor.xAxis,
+        yAxis: descriptor.yAxis,
+        series: series
+      });
+    });
+  }, process_data, descriptor);
+
+  page.render(output_image);
+  phantom.exit();
+});