jeka 0.2.1 → 0.2.2

data/README.rdoc

@@ -1,4 +1,4 @@
-= Jeka v0.2.1
+= Jeka v0.2.2
 
 Jeka is an awesome build/test/benchmarking tool.
 
@@ -22,7 +22,7 @@ Building a Jeka repository:
 
 Running implementations:
   
-  $ jeka run -n 5 "your_repository_folder/**/algorithm_*.rb" # it will generate a sqlite3 database named 'analysis.jeka'
+  $ jeka run -o analysis.jeka -n 5 "your_repository_folder/**/algorithm_*.rb" # it will generate a sqlite3 database named 'analysis.jeka'
 
 == Supported Compilers/Interpreters:
 

data/TODO

@@ -1,7 +1,9 @@
-0.2.2
-- helper para analisadores
-- mais opções na linha de comando (executar/compilar uma implementação dada)
-- mais compiladores
+- improve command line 
+  - run/build only one implementation/algorithm
 
-0.2.3
-- melhorar desempenho (memoria - nesse momento os modelos do db estao em memoria)
+- add more analysis
+  - lines of code
+  - density
+
+- improve performance
+  - memory: currently all the models are loaded in memory

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/jeka

@@ -17,12 +17,27 @@ run_optparse = OptionParser.new do |opts|
   opts.on '-n', '--n-repetitions N', Integer, 'Number of repetions' do |n|
     options[:n] = n
   end
+  
+  options[:b] = false
+  opts.on '-b', '--build', 'Number of repetions' do
+    options[:b] = true
+  end
+  
+  options[:o] = 'analysis.jeka'
+  opts.on '-o', '--output O', 'Number of repetions' do |o|
+    options[:o] = o
+  end
+  
 end
 
 build_optparse = OptionParser.new do |opts|
   opts.banner = "Usage: jeka build [options] file ..."
 end
 
+test_optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: jeka test [options] file ..."
+end
+
 def cmd(files, options)
   if not files.length == 1
     puts "ERROR: invalid number of files..."
@@ -39,15 +54,22 @@ def cmd(files, options)
       build(options)
     when :run
       run(options)
+    when :test
+      test(options)
   end
 end
 
+def test(options)
+  Jeka::Console::test
+end
+
 def build(options)
   Jeka::Console::build
 end
 
 def run(options)
-  Jeka::Console::run(options[:n])
+  build(options) if options[:b]
+  Jeka::Console::run(options[:n], options[:o])
 end
 
 def help()
@@ -64,6 +86,9 @@ begin
       when "run"
         options[:command] = :run
         files = run_optparse.parse!(ARGV[1..-1])
+      when "test"
+        options[:command] = :test
+        files = test_optparse.parse!(ARGV[1..-1])
       else
         help()
     end

data/jeka.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jeka"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
-  s.date = "2011-09-29"
+  s.date = "2011-10-08"
   s.description = "Jeka is an awesome build/test/benchmarking tool"
   s.email = "igorbonadio@gmail.com"
   s.executables = ["jeka"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
+    "TODO",
     "VERSION",
     "bin/jeka",
     "jeka.gemspec",
@@ -66,6 +67,7 @@ Gem::Specification.new do |s|
     "test/double/ruby/double.rb",
     "test/helper.rb",
     "test/test_algorithm.rb",
+    "test/test_console.rb",
     "test/test_gpp.rb",
     "test/test_implementation.rb",
     "test/test_test_case.rb"
@@ -84,6 +86,7 @@ Gem::Specification.new do |s|
     "test/double/ruby/double.rb",
     "test/helper.rb",
     "test/test_algorithm.rb",
+    "test/test_console.rb",
     "test/test_gpp.rb",
     "test/test_implementation.rb",
     "test/test_test_case.rb"

data/lib/jeka/algorithm.rb

@@ -46,7 +46,7 @@ module Jeka
       end
     end
     
-    def run(n=1, &block)
+    def run(n=1, check=false, &block)
       implementations.each do |imp|
         test_suites.each do |ts|
           ts.tests.each do |test|
@@ -54,6 +54,12 @@ module Jeka
               test_result = imp.compiler.run("#{test.input}\n")
               block.call(nil, :output, test_result[0]) if block_given?
               block.call(nil, :error, test_result[1]) if block_given? and (not test_result[2] == 0)
+              if block_given? and check
+                txt = "#{imp.name} -> #{ts.class}::#{test.name}"
+                unless test_result[0].join == test.output
+                  block.call(0, :test, "#{txt}...failures")
+                end
+              end
               Jeka::Analysis::Result.create(
                 stdout: test_result[0].join,
                 stderr: test_result[1].join,
@@ -86,6 +92,22 @@ module Jeka
       @@algorithms.keys.sort_by { |ts| ts.name }.collect{|ts| ts.new}
     end
     
+    def self.test_all(&block)
+      block.call(0, :step, "Testing algorithms...") if block_given?
+      s = self.algorithms.length + 1
+      i = 0
+      self.algorithms.each do |alg|
+        i += 1
+        block.call(100*i/s, :step, "Testing #{alg.class.to_s}...") if block_given?
+        if block_given?
+          alg.run(1, true, &block)
+        else
+          alg.run(1, true)
+        end
+      end
+      block.call(100, :done, "Done") if block_given?
+    end
+    
     def self.build_all(&block)
       block.call(0, :step, "Building algorithms...") if block_given?
       n = self.algorithms.length + 1
@@ -98,8 +120,8 @@ module Jeka
       block.call(100, :done, "Done") if block_given?
     end
     
-    def self.run_all(n=1, &block)
-      Jeka::Analysis::Database.create(File.join(Dir.getwd, "analysis.jeka"))
+    def self.run_all(n=1, output="analysis.jeka", &block)
+      Jeka::Analysis::Database.create(File.absolute_path(output))
       block.call(0, :step, "Running algorithms...") if block_given?
       s = self.algorithms.length + 1
       i = 0

data/lib/jeka/analysis/database.rb

@@ -3,9 +3,13 @@ module Jeka
     class Database
       def self.create(path)
         DataMapper.finalize
-        DataMapper.setup(:default, "sqlite://#{path}")
+        self.open(path)
         DataMapper.auto_migrate!
       end
+      
+      def self.open(path)
+        DataMapper.setup(:default, "sqlite://#{path}")
+      end
     end
   end
 end

data/lib/jeka/analysis/implementation.rb

@@ -10,6 +10,20 @@ module Jeka
       has 1,      :compiler
       has n,      :implementation_information
       has n,      :results
+      
+      def method_missing(method, *args)
+        if method =~ /^average_/
+          r = (/^average_(.*)/.match(method))[1].to_sym
+          avg = 0
+          i = 0
+          self.results.each do |result|
+            avg += result.send(r)
+            i += 1
+          end
+          return avg/i
+        end
+        raise NoMethodError
+      end
     end
   end
 end

data/lib/jeka/console.rb

@@ -11,9 +11,9 @@ module Jeka
       ok
     end
     
-    def self.run(n=1)
+    def self.run(n=1, output="analysis.jeka")
       error = false
-      Jeka::Algorithm.run_all(n) do |p, t, o|
+      Jeka::Algorithm.run_all(n, output) do |p, t, o|
         self._show(p, t, o, false)
       end
     end
@@ -25,6 +25,13 @@ module Jeka
       end
     end
     
+    def self.test
+      error = false
+      Jeka::Algorithm.test_all do |p, t, o|
+        self._show(p, t, o, false)
+      end
+    end
+    
     def self._show(p, t, o, s)
       case t
         when :step
@@ -40,6 +47,8 @@ module Jeka
               puts o
             end
           end
+        when :test
+          puts "       > #{o}"
         when :error
           o = o.join
           if o.length > 0

data/test/test_console.rb

@@ -0,0 +1,68 @@
+require 'helper'
+
+class TestConsole < Test::Unit::TestCase
+  
+  def TestConsole.command(cmd)
+    stdout_ = nil
+    stderr_ = nil
+    exit_status_ = nil
+    
+    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+      stdout_ = stdout.readlines
+      stderr_ = stderr.readlines
+      exit_status_ = wait_thr.value
+    end
+    
+    return stdout_, stderr_, exit_status_.exitstatus
+  end
+  
+  context "jeka run command" do
+    
+    should "shows help" do
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka run --help")
+      assert_equal "jeka v0.2.1\nUsage: jeka run [options] file ...\n    -n, --n-repetitions N            Number of repetions\n    -b, --build                      Number of repetions\n    -o, --output O                   Number of repetions\n",
+                   stdout.join
+      assert_equal 0, exit_status
+    end
+    
+    should "show help" do
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka run -h")
+      assert_equal "jeka v0.2.1\nUsage: jeka run [options] file ...\n    -n, --n-repetitions N            Number of repetions\n    -b, --build                      Number of repetions\n    -o, --output O                   Number of repetions\n",
+                   stdout.join
+      assert_equal 0, exit_status
+    end
+    
+    should "run algorithms" do
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka build 'test/**/algorithm_*.rb'")
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka run 'test/**/algorithm_*.rb'")
+      assert_equal "jeka v0.2.1\n[  0%] Running algorithms...\n[ 33%] Running AlgorithmBubbleSort...\n[ 66%] Running AlgorithmDouble...\n[100%] Done!\n",
+                   stdout.join
+      assert_equal 0, exit_status
+    end
+    
+    should "run algorithms 3 times" do
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka build 'test/**/algorithm_*.rb'")
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka run -n 3 'test/**/algorithm_*.rb'")
+      assert_equal "jeka v0.2.1\n[  0%] Running algorithms...\n[ 33%] Running AlgorithmBubbleSort...\n[ 66%] Running AlgorithmDouble...\n[100%] Done!\n",
+                   stdout.join
+      assert_equal 0, exit_status
+    end
+    
+    should "run and build algorithms" do
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka run -b 'test/**/algorithm_*.rb'")
+      assert_equal "jeka v0.2.1\n[  0%] Building algorithms...\n[ 33%] Building AlgorithmBubbleSort\n[ 66%] Building AlgorithmDouble\n[100%] Done!\n[  0%] Running algorithms...\n[ 33%] Running AlgorithmBubbleSort...\n[ 66%] Running AlgorithmDouble...\n[100%] Done!\n",
+                   stdout.join
+      assert_equal 0, exit_status
+    end
+    
+    should "run algorithms and create an output file" do
+      File.delete("output_teste.jeka") if File.exists?("output_teste.jeka")
+      stdout, stderr, exit_status = TestConsole.command("ruby bin/jeka run -b -o output_teste.jeka 'test/**/algorithm_*.rb'")
+      assert File.exists?("output_teste.jeka")
+      assert_equal 0, exit_status
+      File.delete("output_teste.jeka") if File.exists?("output_teste.jeka")
+    end
+    
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeka
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2011-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &70188295884960 !ruby/object:Gem::Requirement
+  requirement: &70192081814220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188295884960
+  version_requirements: *70192081814220
 - !ruby/object:Gem::Dependency
   name: data_mapper
-  requirement: &70188295884480 !ruby/object:Gem::Requirement
+  requirement: &70192081813120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188295884480
+  version_requirements: *70192081813120
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70188295884000 !ruby/object:Gem::Requirement
+  requirement: &70192081811400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188295884000
+  version_requirements: *70192081811400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70188295883520 !ruby/object:Gem::Requirement
+  requirement: &70192081810220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70188295883520
+  version_requirements: *70192081810220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70188295883040 !ruby/object:Gem::Requirement
+  requirement: &70192081809380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70188295883040
+  version_requirements: *70192081809380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70188295882560 !ruby/object:Gem::Requirement
+  requirement: &70192081807700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188295882560
+  version_requirements: *70192081807700
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &70188295882080 !ruby/object:Gem::Requirement
+  requirement: &70192081806460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188295882080
+  version_requirements: *70192081806460
 - !ruby/object:Gem::Dependency
   name: data_mapper
-  requirement: &70188295881600 !ruby/object:Gem::Requirement
+  requirement: &70192081805780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188295881600
+  version_requirements: *70192081805780
 description: Jeka is an awesome build/test/benchmarking tool
 email: igorbonadio@gmail.com
 executables:
@@ -115,6 +115,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - bin/jeka
 - jeka.gemspec
@@ -156,10 +157,10 @@ files:
 - test/double/ruby/double.rb
 - test/helper.rb
 - test/test_algorithm.rb
+- test/test_console.rb
 - test/test_gpp.rb
 - test/test_implementation.rb
 - test/test_test_case.rb
-- TODO
 homepage: http://github.com/igorbonadio/jeka
 licenses:
 - MIT
@@ -175,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3355155901599309883
+      hash: -4567337074381682559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,6 +198,7 @@ test_files:
 - test/double/ruby/double.rb
 - test/helper.rb
 - test/test_algorithm.rb
+- test/test_console.rb
 - test/test_gpp.rb
 - test/test_implementation.rb
 - test/test_test_case.rb