mach5-tools 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d531491376f7d66a0280e9383c5ad05cb2370ba1
-  data.tar.gz: ed0e957e907164e64b17317f7ade8f8e09034433
+  metadata.gz: bc58b2a9854f51ce02d29f53e1da689596a8e053
+  data.tar.gz: eb535dcde3b1b2d4758f5411ffad2ec2f5d6fb6a
 SHA512:
-  metadata.gz: 6bbfe9364b097465db0285a1ae7f2f0dd9beccba1613376783f3924ec2c5d0375ca244bc8f8f6281e50651c4cac2a954bad7ae36987f961a7e8a7e341fd59fcf
-  data.tar.gz: 85c0f626d38a433c5df81684e4f90524cf7e0a3651a3ba0f1c5c5ab11f93bc3debac5343d922702153b0b12c14d0bf9df52c713252c28e9faef5ed3b21354733
+  metadata.gz: 70455af7983728b62d62d069b2a3d33e554c634d0bddb8314d32da6df1068a78359a6de9b18b5fe7b81ff51e2169eb0b7f1f3c367ac4326e80fc1950b57ac3dd
+  data.tar.gz: c8a15833738b4c640c54bb80272be3d25b5870cbfe0f33cd1103a2ec55f6ac77e45d107cf5a681e7ad0c5fe5403f648f840dd1ca36eb328cbf7d181f9e5506f0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+script: bundle exec rake

data/TODO

@@ -12,8 +12,12 @@ v0.2.0
 [x] mais opções para x_axis e y_axis
 [x] definir o tipo do grafico (line ou bar)
 
+v0.2.1
+[x] 100% cobertura de testes
+[x] travis-ci
+[x] refatorar
+[x] BUG: quando não existe a pasta de output, "mach5 chart" quebra
+
 v0.3.0
 [ ] mach5 init (cria o Mach5file)
-[ ] mach5 generate benchmark filename benchmark1 benchmark2
-[ ] mach5 generate benchmark filename benchmark1 benchmark2 --fixture fixture_name
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/mach5-tools/runner.rb

@@ -109,6 +109,7 @@ module Mach5
       chart.series.each do |benchmark|
         benchmarks << "#{benchmark[:commit_id]}.#{benchmark[:benchmark_id]}" unless File.exists?("#{File.join(@config.output_folder, benchmark[:commit_id])}.#{benchmark[:benchmark_id]}.json")
       end
+      benchmarks
     end
 
     def find_new_benchmarks(benchmarks, commit)

data/mach5-tools.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mach5-tools 0.2.0 ruby lib
+# stub: mach5-tools 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mach5-tools"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/spec/benchmark_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 module Mach5
   describe Benchmark do
     before(:each) do
-      @memory = double('Memory')
-      @tags = double('Tags')
+      @memory = Hash.new
+      @tags = Hash.new
       @benchmark = Benchmark.new(@memory, @tags)
     end
 
@@ -31,5 +31,10 @@ module Mach5
       @tags.should_receive("[]=").with("v1.0.1", "ab7c4351a13b29ea4c21e3662f9f567ff19a854d")
       @benchmark.tag("ab7c4351a13b29ea4c21e3662f9f567ff19a854d", "v1.0.1")
     end
+
+    it "should verify if there is the given tag" do
+      @benchmark.tag("ab7c4351a13b29ea4c21e3662f9f567ff19a854d", "v1.0.1")
+      @benchmark.has_tag?("ab7c4351a13b29ea4c21e3662f9f567ff19a854d").should be == "v1.0.1"
+    end
   end
 end

data/spec/config_spec.rb

@@ -71,11 +71,18 @@ module Mach5
       config = Mach5::configure("MyProject") do
         chart "viterbi_vs_pd" do
           title "Viterbi vs Posterior Decoding"
-          add_serie "edd0982eed0c414631991aa1dea67c811d95373f" => "DishonestCasinoHMM.Viterbi"
+          add_serie "edd0982eed0c414631991aa1dea67c811d95373f" => "DishonestCasinoHMM.Viterbi" do
+            color "#00FF00"
+            label "Test"
+          end
           add_serie "edd0982eed0c414631991aa1dea67c811d95373f" => "DishonestCasinoHMM.PosteriorDecoding"
-          x_axis "Sequence Size"
+          x_axis "Sequence Size" do
+            categories [10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
+          end
           y_axis "Time (s)"
           size "100x200"
+          data_type "runs_total_time"
+          type "line"
         end
         output "_benchmark"
       end
@@ -93,7 +100,8 @@ module Mach5
         "xAxis" => {
           "title" => {
             "text" => "Sequence Size"
-          }
+          },
+          "categories" => [10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
         },
         "yAxis" => {
           "title" => {
@@ -101,8 +109,9 @@ module Mach5
           }
         },
         "series" => [{
-          "label" => "edd0982eed0c414631991aa1dea67c811d95373f.DishonestCasinoHMM.Viterbi",
-          "file" =>  "/_benchmark/edd0982eed0c414631991aa1dea67c811d95373f.DishonestCasinoHMM.Viterbi.json"
+          "label" => "Test",
+          "file" =>  "/_benchmark/edd0982eed0c414631991aa1dea67c811d95373f.DishonestCasinoHMM.Viterbi.json",
+          "color" => "#00FF00"
         },{
           "label" => "edd0982eed0c414631991aa1dea67c811d95373f.DishonestCasinoHMM.PosteriorDecoding",
           "file" =>  "/_benchmark/edd0982eed0c414631991aa1dea67c811d95373f.DishonestCasinoHMM.PosteriorDecoding.json"

data/spec/runner_spec.rb

@@ -34,7 +34,16 @@ module Mach5
         chart "viterbi_vs_pd" do
           title "Viterbi vs Posterior Decoding"
           add_serie "v1.0.0" => "DishonestCasinoHMM.Viterbi"
-          add_serie "edd0982eed0c414631991aa1dea67c811d95373f" => "DishonestCasinoHMM.PosteriorDecoding"
+          add_serie "c031c8e9afe1493a81274adbdb61b81bc30ef522" => "DishonestCasinoHMM.PosteriorDecoding"
+          x_axis "Sequence Size"
+          y_axis "Time (s)"
+          size "100x100"
+        end
+
+        chart "viterbi_vs_forward" do
+          title "Viterbi vs Posterior Forward"
+          add_serie "v1.0.0" => "DishonestCasinoHMM.Viterbi"
+          add_serie "c031c8e9afe1493a81274adbdb61b81bc30ef522" => "DishonestCasinoHMM.Forward"
           x_axis "Sequence Size"
           y_axis "Time (s)"
           size "100x100"
@@ -94,5 +103,59 @@ module Mach5
       @runner.should_receive(:after)
       @runner.benchmark({})
     end
+
+    it "should run only selected benchmarks" do
+      Kernel.should_receive(:system).with("git checkout c031c8e9afe1493a81274adbdb61b81bc30ef522")
+      @runner.should_receive(:before)
+      @runner.should_receive(:run).with(["DishonestCasinoHMM.PosteriorDecoding"]).and_return({})
+      @runner.should_receive(:after)
+      @runner.benchmark({only: ["c031c8e9afe1493a81274adbdb61b81bc30ef522.DishonestCasinoHMM.PosteriorDecoding"]})
+    end
+
+    it "should list benchmarks" do
+      @runner.list_benchmarks.should be == ["v1.0.0.DishonestCasinoHMM.Evaluate", "v1.0.0.DishonestCasinoHMM.Viterbi", "c031c8e9afe1493a81274adbdb61b81bc30ef522.DishonestCasinoHMM.Forward", "c031c8e9afe1493a81274adbdb61b81bc30ef522.DishonestCasinoHMM.Backward", "c031c8e9afe1493a81274adbdb61b81bc30ef522.DishonestCasinoHMM.PosteriorDecoding"]
+    end
+
+    it "should generate all charts" do
+      @runner.should_receive(:_generate_chart).twice
+      @runner.chart({all: true})
+    end
+
+    it "should generate only selected charts" do
+      @runner.should_receive(:_generate_chart)
+      @runner.chart({only: "viterbi_vs_pd"})
+    end
+
+    it "should generate only new charts" do
+      File.should_receive("exists?").with("_benchmark/viterbi_vs_pd.png").and_return(true)
+      File.should_receive("exists?").with("_benchmark/viterbi_vs_forward.png").and_return(false)
+      @runner.should_receive(:_generate_chart)
+      @runner.chart({})
+    end
+
+    it "should list benchmarks" do
+      @runner.list_charts.should be == ["viterbi_vs_pd", "viterbi_vs_forward"]
+    end
+
+    it "should generate charts" do
+      chart = double("Chart")
+      chart.stub(:build).and_return("chart.build")
+      chart.stub(:id).and_return("chart.id")
+      @runner.should_receive(:_check_benchmarks).with(chart).and_return([])
+      Kernel.should_receive(:system).with("phantomjs /Users/igorbonadio/Projetos/mach5-tools/lib/mach5-tools/js/chart.js /Users/igorbonadio/Projetos/mach5-tools/lib/mach5-tools/js \"[\\\"chart.build\\\"]\" _benchmark/chart.id.png")
+      @runner._generate_chart(chart)
+    end
+
+    it "should check if a benchmark needs to run" do
+      chart = double("Chart")
+      serie1 = double("Serie1")
+      serie1.stub(:[]).and_return("serie1.at")
+      serie2 = double("Serie2")
+      serie2.stub(:[]).and_return("serie2.at")
+      chart.stub(:series).and_return([serie1, serie2])
+      File.should_receive("exists?").with("_benchmark/serie1.at.serie1.at.json").and_return(false)
+      File.should_receive("exists?").with("_benchmark/serie2.at.serie2.at.json").and_return(true)
+      @runner._check_benchmarks(chart).size.should be == 1
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
@@ -8,5 +13,5 @@ require 'mach5-tools'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mach5-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Igor Bonadio
@@ -106,6 +106,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt