jeka 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/jeka

@@ -29,7 +29,7 @@ def build(folder)
   init(folder) do |dir|
     begin
       make = Jeka::Make.new(dir)
-      puts "jeka: building #{dir}"
+      puts "[build] #{dir}"
       make.build
     rescue
     end
@@ -41,11 +41,10 @@ def test(folder)
   init(folder) do |dir|
     begin
       make = Jeka::Make.new(dir)
-      make.test do |implementation, input, output, result|
+      make.test do |i, t, r|
         ok = "error"
-        ok = "ok" if result
-        puts "jeka: testing #{implementation.folder} with #{input}...#{ok}"
-        return unless result
+        ok = "ok" if r
+        puts "[test] #{i.algorithm.name} - #{i.language} - #{t.name}: #{ok}"
       end
     rescue
     end
@@ -56,10 +55,14 @@ end
 def benchmark(folder)
   init(folder) do |dir|
     begin
+      ok = false
       make = Jeka::Make.new(dir)
-      puts "jeka: benchmarking #{dir}"
+      print "[benchmark] #{dir}... "
+      ok = true
       make.benchmark(10)
+      puts "ok"
     rescue
+      puts "error" if ok
     end
     benchmark(dir)
   end
@@ -67,7 +70,7 @@ end
 
 def site(folder)  
   build(folder)
-  test(folder)
+  benchmark(folder)
   
   Dir.mkdir("_jeka") unless Dir.exists?("_jeka")
   Dir.mkdir("_jeka/algorithms") unless Dir.exists?("_jeka/algorithms")
@@ -82,14 +85,13 @@ def _site(folder)
   init(folder) do |dir|
     begin
       make = Jeka::Make.new(dir)
-      puts "jeka: generating #{dir}"
-      make.generate_site(10) do |algorithm, implementations, date|
-        falgorithm = File.new(File.join("_jeka/algorithms/_posts", "#{algorithm[1]["date"].to_s}-#{algorithm[1]["name"].gsub(" ", "_")}.textile"), "w")
-        falgorithm.write(algorithm[0])
-        implementations.each do |imp|
-          fimplementation = File.new(File.join("_jeka/implementations/_posts", "#{algorithm[1]["date"].to_s}-#{imp[1].gsub(" ", "_")}.textile"), "w")
-          fimplementation.write(imp[0])
-        end
+      puts "[site] #{dir}"
+      algorithm, implementations = make.generate_site
+      falgorithm = File.new(File.join("_jeka/algorithms/_posts", "2011-01-01-#{algorithm[0].name.gsub(" ", "_")}.textile"), "w")
+      falgorithm.write(algorithm[1])
+      implementations.each do |imp|
+        fimplementation = File.new(File.join("_jeka/implementations/_posts", "2011-01-01-#{imp[0].comment.gsub(" ", "_")}.textile"), "w")
+        fimplementation.write(imp[1])
       end
     rescue
     end

data/jeka.gemspec

@@ -0,0 +1,91 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jeka}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Igor Bonadio"]
+  s.date = %q{2011-07-16}
+  s.default_executable = %q{jeka}
+  s.description = %q{Jeka is an awesome build/test/benchmarking tool}
+  s.email = %q{igorbonadio@gmail.com}
+  s.executables = ["jeka"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/jeka",
+    "jeka.gemspec",
+    "lib/jeka.rb",
+    "lib/jeka/algorithm.rb",
+    "lib/jeka/implementation.rb",
+    "lib/jeka/jeka_helper.rb",
+    "lib/jeka/make.rb",
+    "lib/jeka/test.rb",
+    "test/example/01_bubble_sort/_algorithm.yaml",
+    "test/example/01_bubble_sort/_description.textile",
+    "test/example/01_bubble_sort/_references.textile",
+    "test/example/01_bubble_sort/_tests/test_01.yaml",
+    "test/example/01_bubble_sort/_tests/test_02.yaml",
+    "test/example/01_bubble_sort/cpp/_implementation.yaml",
+    "test/example/01_bubble_sort/cpp/bubble.cpp",
+    "test/example/01_bubble_sort/ruby/_implementation.yaml",
+    "test/example/01_bubble_sort/ruby/bubble.rb",
+    "test/helper.rb",
+    "test/site/algorithm.textile",
+    "test/site/cpp.textile",
+    "test/site/ruby.textile",
+    "test/test_algorithm.rb",
+    "test/test_implementation.rb",
+    "test/test_make.rb",
+    "test/test_test.rb"
+  ]
+  s.homepage = %q{http://github.com/igorbonadio/jeka}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Jeka is an awesome build/test/benchmarking tool}
+  s.test_files = [
+    "test/example/01_bubble_sort/ruby/bubble.rb",
+    "test/helper.rb",
+    "test/test_algorithm.rb",
+    "test/test_implementation.rb",
+    "test/test_make.rb",
+    "test/test_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/jeka/algorithm.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+
+module Jeka
+    
+  class Algorithm < JekaHelper
+    
+    jeka_reader :name
+    jeka_reader :type
+    jeka_reader :complexity
+    jeka_reader :description
+    jeka_reader :references
+    
+    def initialize(folder)
+      super(File.join(folder, "_algorithm.yaml"))
+      @implementations = nil
+      @tests = nil
+    end
+    
+    def tests
+      return @tests = Test::test_set(File.join(@folder, "_tests")) unless @tests
+      return @tests
+    end
+    
+    def implementations
+      unless @implementations
+        @implementations = []
+        @jeka["implementations"].each do |i|
+          imp = Implementation.new(File.join(@folder, i))
+          imp.algorithm = self
+          @implementations << imp
+        end
+      end
+      return @implementations
+    end
+        
+  end
+  
+end

data/lib/jeka/implementation.rb

@@ -1,57 +1,111 @@
 require 'yaml'
+require 'benchmark'
 
 module Jeka
 
-  class Implementation
-    attr_reader :folder
-    attr_reader :info
+  class Implementation < JekaHelper
+    
+    jeka_reader :language
+    jeka_reader :source
+    jeka_reader :comment
+    
+    attr_accessor :algorithm
     
     def initialize(folder)
-      if folder[-1] == "/"
-        @folder = folder
-      else
-        @folder = "#{folder}/"
-      end
-      _load
+      super(File.join(folder, "_implementation.yaml"))
     end
     
-    def _load
-      @info = YAML::load(File.open(File.join(@folder, '_info.yaml'))) if File.exists?(File.join(@folder, '_info.yaml'))
-      @run = YAML::load(File.open(File.join(@folder, '_run.yaml'))) if File.exists?(File.join(@folder, '_run.yaml'))
-      @build = YAML::load(File.open(File.join(@folder, '_build.yaml'))) if File.exists?(File.join(@folder, '_build.yaml'))
+    def source_code
+      f = File.open(File.join(@folder, source), "r")
+      return f.readlines.join()
     end
     
-    def run(output, input)
-      out = []
-      arg = nil
-      arg = File.join(@folder, @run['arguments']) if @run['arguments']
-      command = @run['command']
-      new_command = @run['command'].sub("$", @folder)
-      while not new_command == command
-        command = new_command
-        new_command = new_command.sub("$", @folder)
+    def build
+      if @jeka["build"]
+        command = @jeka["build"]["command"].gsub("$", @folder)
+        system(command)
       end
-      if output
-        system("#{command} #{arg if arg} #{"< #{input}" if input}")
+    end
+    
+    def run(input, verbose)
+      command = "#{@jeka["run"]["command"].gsub("$", @folder)} #{"< #{input}" if input}"
+      if verbose
+        system(command)
       else
-        IO.popen("#{command} #{arg if arg} #{"< #{input}" if input}") do |io|
+        out = ""
+        IO.popen(command) do |io|
           out = io.readlines
         end
+        return out.join("")
       end
-      return out.join("\n")
     end
     
-    def build
-      if @build
-        command = @build["command"]
-        new_command = @build["command"].sub("$", @folder)
-        while not new_command == command
-          command = new_command
-          new_command = new_command.sub("$", @folder)
+    def benchmark(input, n)
+      b = Benchmark.measure {run(input, false)}.to_a
+      bench = Hash.new
+      bench[:user_cpu_time] = b[1]
+      bench[:system_cpu_time] = b[2]
+      bench[:childrens_use_cpu_time] = b[3]
+      bench[:childrens_system_cpu_time] = b[4]
+      bench[:elapsed_real_time] = b[5]
+      (n-1).times do
+        b = Benchmark.measure {run(input, false)}.to_a
+        bench[:user_cpu_time] += b[1]
+        bench[:system_cpu_time] += b[2]
+        bench[:childrens_use_cpu_time] += b[3]
+        bench[:childrens_system_cpu_time] += b[4]
+        bench[:elapsed_real_time] += b[5]
+      end
+      bench[:user_cpu_time] /= n
+      bench[:system_cpu_time] /= n
+      bench[:childrens_use_cpu_time] /= n
+      bench[:childrens_system_cpu_time] /= n
+      bench[:elapsed_real_time] /= n
+      
+      filename = File.join(@folder, File.basename(input).gsub(/\..*/, ".benchmark"))
+      f = File.open(filename, "w")
+      f.write(bench)
+      f.close
+      
+      return bench
+    end
+    
+    def benchmark_results
+      benchmarks = []
+      n = 0
+      dir = Dir.new(@folder)
+      dir.each do |d|
+        if d.index(/^test_.*\.benchmark$/)
+          f = File.open(File.join(@folder, d), "r")
+          benchmarks << eval(f.readlines.join(""))
+          n += 1
         end
-        system(new_command)
       end
+      
+      bench = Hash.new
+      bench[:language] = language
+      bench[:comment] = comment
+      bench[:user_cpu_time] = 0
+      bench[:system_cpu_time] = 0
+      bench[:childrens_use_cpu_time] = 0
+      bench[:childrens_system_cpu_time] = 0
+      bench[:elapsed_real_time] = 0
+      benchmarks.each do |b|
+        bench[:user_cpu_time] += b[:user_cpu_time]
+        bench[:system_cpu_time] += b[:system_cpu_time]
+        bench[:childrens_use_cpu_time] += b[:childrens_use_cpu_time]
+        bench[:childrens_system_cpu_time] += b[:childrens_system_cpu_time]
+        bench[:elapsed_real_time] += b[:elapsed_real_time]
+      end
+      bench[:user_cpu_time] /= n
+      bench[:system_cpu_time] /= n
+      bench[:childrens_use_cpu_time] /= n
+      bench[:childrens_system_cpu_time] /= n
+      bench[:elapsed_real_time] /= n
+      
+      return bench
     end
+    
   end
   
 end

data/lib/jeka/jeka_helper.rb

@@ -0,0 +1,16 @@
+module Jeka
+  class JekaHelper
+    
+    def initialize(path)
+      @folder = "#{File.dirname(path)}/"
+      @jeka = YAML::load(File.open(path))
+    end
+    
+    def self.jeka_reader(name)
+      define_method(name) do
+        return @jeka[name.to_s] unless @jeka[name.to_s].kind_of? Hash
+        return File.open(File.join(@folder, @jeka[name.to_s]["file"])).readlines.join("")
+      end
+    end
+  end
+end

data/lib/jeka/make.rb

@@ -1,162 +1,80 @@
 # encoding: utf-8
 
 require 'yaml'
-
 require 'benchmark'
+require 'uri'
 
 module Jeka
   
   class Make
-    attr_reader :jeka
-    attr_reader :folder
     
     def initialize(folder)
-      @folder = folder
-      _load
-    end
-    
-    def _load
-      @jeka = YAML::load(File.open(File.join(@folder, '_jeka.yaml')))
-      @implementations = []
-      @jeka["implementations"].each do |implementation|
-        @implementations << Implementation.new(File.join(@folder, implementation))
-      end
-      @test_set = TestSet.new(File.join(@folder, @jeka["tests"]))
-    end
-    
-    def test(&block)
-      return _test_all unless block
-      @implementations.each do |implementation|
-        @test_set.each do |input, output|
-          block.call(implementation, input, output, implementation.run(false, input) == File.open(output).readlines.join("\n"))
-        end
-      end
-    end
-    
-    def _test_all
-      @implementations.each do |implementation|
-        @test_set.each do |input, output|
-          return false unless implementation.run(false, input) == File.open(output).readlines.join("\n")
-        end
-      end
-      return true
+      @algorithm = Algorithm.new(folder)
     end
     
     def build
-      @implementations.each do |implementation|
-        implementation.build
+      @algorithm.implementations.each do |i|
+        i.build
       end
     end
     
-    def benchmark(n, &block)
-      @implementations.each do |implementation|
-        @test_set.each do |input, output|
-          results = []
-          n.times do
-            results << Benchmark.measure { implementation.run(true, input) }
-         end
-         analysis = _benchmark_analysis(results, implementation.folder, input[input.rindex("/")+1..-7])
-         block.call(implementation, input, output, analysis) if block
+    def test
+      @algorithm.implementations.each do |i|
+        @algorithm.tests.each do |t|
+          out = i.run(t.generate, false)
+          yield i, t, out == "#{t.output}\n"
         end
       end
     end
     
-    def _benchmark_analysis(results, folder, test)
-      analysis = [0, 0, 0, 0, 0, 0]
-      count = 0;
-      results.each do |r|
-        r = r.to_a
-        5.times do |i|
-          analysis[i+1] += r[i+1]
+    def benchmark(n)
+      @algorithm.implementations.each do |i|
+        @algorithm.tests.each do |t|
+          i.benchmark(t.generate, n)
         end
-        count += 1
       end
-      analysis.map! {|a| a/count}
-      analysis[0] = "##{test}"
-      f = File.new(File.join(folder, "#{test}.benchmark"), "w")
-      f.write(analysis)
-      return analysis
     end
     
-    def generate_site(n, &block)
-      algorithm = ""
-      implementations = []
-      
-      result_alg = {}
-      benchmark(n) do |implementation, input, output, analysis|
-        if result_alg[implementation.info["language"]]
-          a = result_alg[implementation.info["language"]][1]
-          a << analysis[1..-1]
-          result_alg[implementation.info["language"]][1] = a
-        else
-          result_alg[implementation.info["language"]] = [implementation.info["comment"], [analysis[1..-1]], File.join(implementation.folder, implementation.info["source"])]
-        end
+    def generate_site
+      bench = []
+      @algorithm.implementations.each do |i|
+        bench << i.benchmark_results
       end
-      algorithm, implementations = _generete_site(result_alg)
-      #puts algorithm
-      block.call([algorithm, @jeka], implementations) if block
+      bench = _sort_bench(bench)
+      _generete_site(bench)
     end
     
-    def _generete_site(result)
+    def _generete_site(bench)
       implementations = []
       page = "---\n"
       page += "layout: algorithm\n"
-      page += "title: #{@jeka["name"]}\n"
+      page += "title: #{@algorithm.name}\n"
       page += "---\n\n"
-      page += "h1. #{@jeka["name"]}\n\n"
-      page += "h2. #{@jeka["type"]}\n\n"
+      page += "h1. #{@algorithm.name}\n\n"
+      page += "h2. #{@algorithm.type}\n\n"
       page += "h3. Descrição\n\n"
-      file = File.new(File.join(@folder, "_description.textile"), "r")
-      description = file.readlines
-      page += "#{description.join("")}\n\n"
+      page += "#{@algorithm.description}\n\n"
       page += "h3. Complexidade\n\n"
-      page += "#{@jeka["complexity"]}\n\n"
+      page += "#{@algorithm.complexity}\n\n"
       page += "h3. Referências\n\n"
-      file = File.new(File.join(@folder, "_references.textile"), "r")
-      references = file.readlines
-      page += "#{references.join()}\n\n"
+      page += "#{@algorithm.references}\n\n"
       page += "h3. Implementações\n\n"
       page += "|_. Linguagem |_. Comentário |_. Código fonte |_. Tempo de execução médio |\n"
-      imp = []
-      result.each do |lang, result|
-        implementations << [_generate_source_page(File.join(result[2]), "ruby"), result[0]]
-        total = [0,0,0,0,0]
-        total_index = 0
-        result[1].each do |r|
-          total_index += 1
-          r.each_with_index do |v, i|
-            total[i] += v
-          end
-        end
-        total.each_with_index do |v, i|
-          total[i] = total[i]/total_index
-        end
-        imp << ["| #{lang} | #{result[0]} | \"ver\":#{URI.escape("../../../../implementations/#{@jeka["date"].year}/#{'%02d' % @jeka["date"].month}/#{'%02d' % @jeka["date"].day}/#{result[0].gsub(" ", "_")}.html")} | #{total[3]}s |\n", total[3]]
-      end
-      imp = sort_imp(imp)
-      imp.each do |i|
-        page += i[0]
+      bench.each do |b|
+        page += "| #{b[:language]} | #{b[:comment]} | \"ver\":#{
+          URI.escape("../../../../implementations/2011/01/01/#{b[:comment].gsub(" ", "_")
+        }.html")} | #{b[:elapsed_real_time]}s |\n"
       end
       page += "\n"
-      return page, implementations
-    end
-    
-    def sort_imp(imp)
-      for i in 0..(imp.size-1) do
-        for j in (i+1)..(imp.size-1) do
-          if imp[i][1] > imp[j][1]
-            temp = imp[i]
-            imp[i] = imp[j]
-            imp[j] = temp
-          end
-        end
+      
+      @algorithm.implementations.each do |i|
+        implementations << [i, _generate_source_page(i.source_code, "ruby")]
       end
-      return imp
+      
+      return [@algorithm, page], implementations
     end
     
-    def _generate_source_page(file, lang)
-      f = File.new(file, "r")
-      src = f.readlines.join()
+    def _generate_source_page(src, lang)
       page = "---\n"
       page += "layout: implementation\n"
       page += "title: Bubble Sort\n"
@@ -167,6 +85,19 @@ module Jeka
       return page
     end
     
+    def _sort_bench(bench)
+      for i in 0..(bench.size-1) do
+        for j in (i+1)..(bench.size-1) do
+          if bench[i][:elapsed_real_time] > bench[j][:elapsed_real_time]
+            temp = bench[i]
+            bench[i] = bench[j]
+            bench[j] = temp
+          end
+        end
+      end
+      return bench
+    end
+        
   end
       
 end

data/lib/jeka/test.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+
+module Jeka
+  
+  class Test < JekaHelper
+    
+    jeka_reader :name
+    jeka_reader :input
+    jeka_reader :output
+    
+    def initialize(file)
+      super(file)
+      @file = file
+      @generated = false
+    end
+    
+    def generate
+      filename = "#{@file}.input"
+      unless @generated
+        ftest = File.open(filename, "w")
+        ftest.write(input)
+        ftest.close
+      end
+      return filename
+    end
+    
+  end
+  
+  def Test.test_set(folder)
+    tests = []
+    test_dir = Dir.new(folder)
+    test_dir.each do |d|
+      tests << Test.new(File.join(folder, d)) if d.index(/test_.*\.yaml$/) == 0
+    end
+    return tests
+  end
+  
+end

data/lib/jeka.rb

@@ -1,5 +1,7 @@
 ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 
+require File.join(ROOT_PATH, '/jeka/jeka_helper')
+require File.join(ROOT_PATH, '/jeka/algorithm')
+require File.join(ROOT_PATH, '/jeka/test')
 require File.join(ROOT_PATH, '/jeka/implementation')
 require File.join(ROOT_PATH, '/jeka/make')
-require File.join(ROOT_PATH, '/jeka/test_set')

data/test/example/01_bubble_sort/_algorithm.yaml

@@ -0,0 +1,12 @@
+name: Bubble Sort
+type: Sorting
+description: {
+  file: _description.textile
+}
+references: {
+  file: _references.textile
+}
+complexity: O(n^2)
+implementations:
+  - ruby
+  - cpp

data/test/example/01_bubble_sort/_tests/test_01.yaml

@@ -0,0 +1,3 @@
+name: Sequencia decrescente
+input: 9 9 8 7 6 5 4 3 2 1
+output: 1 2 3 4 5 6 7 8 9

data/test/example/01_bubble_sort/_tests/test_02.yaml

@@ -0,0 +1,3 @@
+name: Sequencia aleatoria
+input: 9 8 9 1 3 4 7 6 2 5
+output: 1 2 3 4 5 6 7 8 9

data/test/example/01_bubble_sort/cpp/_implementation.yaml

@@ -0,0 +1,9 @@
+language: c++
+source: bubble.cpp
+comment: Implementação simples em C++
+build: {
+  command: g++ -o $bubble $bubble.cpp 
+}
+run: {
+  command: ./$bubble
+}

data/test/example/01_bubble_sort/ruby/_implementation.yaml

@@ -0,0 +1,6 @@
+language: ruby
+source: bubble.rb
+comment: Implementação simples em Ruby
+run: {
+  command: ruby $bubble.rb
+}

data/test/test_algorithm.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+class TestAlgorithm < Test::Unit::TestCase
+  
+  context "The example" do
+    
+    should "open the bubble sort algorithms" do
+      algorithm = Jeka::Algorithm.new(File.join(File.dirname(__FILE__), "example", "01_bubble_sort"))
+      assert_equal algorithm.name, "Bubble Sort"
+      assert_equal algorithm.type, "Sorting"
+      assert_equal algorithm.description, File.open(File.join(File.dirname(__FILE__), "example", "01_bubble_sort", "_description.textile")).readlines.join("")
+      assert_equal algorithm.references, File.open(File.join(File.dirname(__FILE__), "example", "01_bubble_sort", "_references.textile")).readlines.join("")
+      assert_equal algorithm.complexity, "O(n^2)"
+      assert_equal algorithm.tests.length, 2
+      assert_equal algorithm.implementations.length, 2
+    end
+    
+  end
+  
+end

data/test/test_implementation.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestImplementation < Test::Unit::TestCase
+  
+  context "The example" do
+    
+    should "open the bubble sort implementation" do
+      implementation = Jeka::Implementation.new(File.join(File.dirname(__FILE__), "example", "01_bubble_sort", "cpp"))
+      assert_equal implementation.language, "c++"
+      assert_equal implementation.source, "bubble.cpp"
+      assert_equal implementation.comment, "Implementação simples em C++"
+    end
+    
+  end
+  
+end

data/test/test_make.rb

@@ -7,8 +7,8 @@ class TestMake < Test::Unit::TestCase
     should "pass all the tests" do
       make = Jeka::Make.new(File.join(File.dirname(__FILE__), "example", "01_bubble_sort"))
       make.build
-      make.test do |implementation, input, output, result|
-        assert result
+      make.test do |i, t, r|
+        assert r
       end
     end
     
@@ -22,11 +22,11 @@ class TestMake < Test::Unit::TestCase
       fruby = fruby.readlines.join()
       make = Jeka::Make.new(File.join(File.dirname(__FILE__), "example", "01_bubble_sort"))
       make.build
-      make.generate_site(1) do |algorithm, implementations|
-        assert_equal falgorithm, algorithm[0].gsub(/(\d)*\.(\d)*s/, "*")
-        assert_equal fruby, implementations[0][0]
-        assert_equal fcpp, implementations[1][0]
-      end
+      make.benchmark(1)
+      algorithm, implementations = make.generate_site
+      assert_equal falgorithm, algorithm[1].gsub(/(\d)*\.(\d)*s/, "*")
+      assert_equal fruby, implementations[0][1]
+      assert_equal fcpp, implementations[1][1]
     end
     
   end

data/test/test_test.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+class TestTest < Test::Unit::TestCase
+  
+  context "The example" do
+    
+    should "open the bubble sort tests" do
+      test = Jeka::Test.new(File.join(File.dirname(__FILE__), "example", "01_bubble_sort", "_tests", "test_01.yaml"))
+      assert_equal test.name, "Sequencia decrescente"
+      assert_equal test.input, "9 9 8 7 6 5 4 3 2 1"
+      assert_equal test.output, "1 2 3 4 5 6 7 8 9"
+    end
+    
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Igor Bonadio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 -03:00
+date: 2011-07-16 00:00:00 -03:00
 default_executable: jeka
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,29 +91,30 @@ files:
 - Rakefile
 - VERSION
 - bin/jeka
+- jeka.gemspec
 - lib/jeka.rb
+- lib/jeka/algorithm.rb
 - lib/jeka/implementation.rb
+- lib/jeka/jeka_helper.rb
 - lib/jeka/make.rb
-- lib/jeka/test_set.rb
+- lib/jeka/test.rb
+- test/example/01_bubble_sort/_algorithm.yaml
 - test/example/01_bubble_sort/_description.textile
-- test/example/01_bubble_sort/_jeka.yaml
 - test/example/01_bubble_sort/_references.textile
-- test/example/01_bubble_sort/_tests/1.input
-- test/example/01_bubble_sort/_tests/1.output
-- test/example/01_bubble_sort/_tests/2.input
-- test/example/01_bubble_sort/_tests/2.output
-- test/example/01_bubble_sort/cpp/_build.yaml
-- test/example/01_bubble_sort/cpp/_info.yaml
-- test/example/01_bubble_sort/cpp/_run.yaml
+- test/example/01_bubble_sort/_tests/test_01.yaml
+- test/example/01_bubble_sort/_tests/test_02.yaml
+- test/example/01_bubble_sort/cpp/_implementation.yaml
 - test/example/01_bubble_sort/cpp/bubble.cpp
-- test/example/01_bubble_sort/ruby/_info.yaml
-- test/example/01_bubble_sort/ruby/_run.yaml
+- test/example/01_bubble_sort/ruby/_implementation.yaml
 - test/example/01_bubble_sort/ruby/bubble.rb
 - test/helper.rb
 - test/site/algorithm.textile
 - test/site/cpp.textile
 - test/site/ruby.textile
+- test/test_algorithm.rb
+- test/test_implementation.rb
 - test/test_make.rb
+- test/test_test.rb
 has_rdoc: true
 homepage: http://github.com/igorbonadio/jeka
 licenses: 
@@ -128,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2111267639951866997
+      hash: -2500968058579272860
       segments: 
       - 0
       version: "0"
@@ -150,4 +151,7 @@ summary: Jeka is an awesome build/test/benchmarking tool
 test_files: 
 - test/example/01_bubble_sort/ruby/bubble.rb
 - test/helper.rb
+- test/test_algorithm.rb
+- test/test_implementation.rb
 - test/test_make.rb
+- test/test_test.rb

data/lib/jeka/test_set.rb

@@ -1,27 +0,0 @@
-module Jeka
-
-  class TestSet
-    def initialize(folder)
-      @folder = folder
-      _load
-    end
-    
-    def _load
-      tests_dir = Dir.new(@folder)
-      @input = []
-      @output = []
-      tests_dir.each do |test|
-        @input << File.join(@folder, test) if test.include?(".input")
-        @output << File.join(@folder, test) if test.include?(".output")
-      end
-    end
-    
-    def each
-      @test = []
-      @input.each_with_index do |input, i|
-        yield input, @output[i]
-      end
-    end
-  end
-  
-end

data/test/example/01_bubble_sort/_jeka.yaml

@@ -1,8 +0,0 @@
-name: Bubble Sort
-type: Sorting
-tests: _tests
-date: 2011-01-01
-complexity: O(n^2)
-implementations:
-  - ruby
-  - cpp

data/test/example/01_bubble_sort/_tests/1.input

@@ -1 +0,0 @@
-9 9 8 7 6 5 4 3 2 1

data/test/example/01_bubble_sort/_tests/1.output

@@ -1 +0,0 @@
-1 2 3 4 5 6 7 8 9

data/test/example/01_bubble_sort/_tests/2.input

@@ -1 +0,0 @@
-9 9 1 8 2 7 3 6 4 5

data/test/example/01_bubble_sort/_tests/2.output

@@ -1 +0,0 @@
-1 2 3 4 5 6 7 8 9

data/test/example/01_bubble_sort/cpp/_build.yaml

@@ -1 +0,0 @@
-command: g++ -o $bubble $bubble.cpp

data/test/example/01_bubble_sort/cpp/_info.yaml

@@ -1,3 +0,0 @@
-language: c++
-source: bubble.cpp
-comment: Implementação simples em C++

data/test/example/01_bubble_sort/cpp/_run.yaml

@@ -1 +0,0 @@
-command: ./$bubble

data/test/example/01_bubble_sort/ruby/_info.yaml

@@ -1,3 +0,0 @@
-language: ruby
-source: bubble.rb
-comment: Implementação simples em Ruby

data/test/example/01_bubble_sort/ruby/_run.yaml

@@ -1 +0,0 @@
-command: ruby $bubble.rb