jeka 0.1.1 → 0.2.0

data/Gemfile

@@ -2,6 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem "dm-sqlite-adapter", ">= 0"
+gem "data_mapper", ">= 0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -10,4 +12,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem "dm-sqlite-adapter", ">= 0"
+  gem "data_mapper", ">= 0"
 end

data/Gemfile.lock

@@ -1,20 +1,73 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
+    bcrypt-ruby (2.1.4)
+    data_mapper (1.1.0)
+      dm-aggregates (= 1.1.0)
+      dm-constraints (= 1.1.0)
+      dm-core (= 1.1.0)
+      dm-migrations (= 1.1.0)
+      dm-serializer (= 1.1.0)
+      dm-timestamps (= 1.1.0)
+      dm-transactions (= 1.1.0)
+      dm-types (= 1.1.0)
+      dm-validations (= 1.1.0)
+    data_objects (0.10.6)
+      addressable (~> 2.1)
+    dm-aggregates (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-constraints (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-core (1.1.0)
+      addressable (~> 2.2.4)
+    dm-do-adapter (1.1.0)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.1.0)
+    dm-migrations (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-serializer (1.1.0)
+      dm-core (~> 1.1.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+    dm-sqlite-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_sqlite3 (~> 0.10.2)
+    dm-timestamps (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-transactions (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-types (1.1.0)
+      bcrypt-ruby (~> 2.1.4)
+      dm-core (~> 1.1.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+      stringex (~> 1.2.0)
+      uuidtools (~> 2.1.2)
+    dm-validations (1.1.0)
+      dm-core (~> 1.1.0)
+    do_sqlite3 (0.10.6)
+      data_objects (= 0.10.6)
+    fastercsv (1.5.4)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
+    json (1.4.6)
+    rake (0.9.2)
+    rcov (0.9.10)
     shoulda (2.11.3)
+    stringex (1.2.2)
+    uuidtools (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  data_mapper
+  dm-sqlite-adapter
   jeweler (~> 1.5.2)
   rcov
   shoulda

data/README.rdoc

@@ -1,8 +1,8 @@
-= Jeka v0.1.0
+= Jeka v0.2.0
 
 Jeka is an awesome build/test/benchmarking tool.
 
-It uses Jekyll (https://github.com/mojombo/jekyll) to create a website with informations about algorithms.
+This new version changed a lot! Now, Jeka generates a database containing information about your algorithms and in the future, you will be able to do any kind of analysis you want with the help of plugins.
 
 == Applications
 
@@ -12,25 +12,17 @@ It uses Jekyll (https://github.com/mojombo/jekyll) to create a website with info
 
 == Creating a Jeka Repository
 
-See an example here[link:https://github.com/igorbonadio/jeka/tree/master/test/example]
+See an example here[link:https://github.com/igorbonadio/jeka/tree/master/test/bubble_sort]
 
 == Using
 
 Building a Jeka repository:
   
-  $ jeka build <dir>
+  $ jeka build "your_repository_folder/**/algorithm_*.rb"
 
-Testing implementations:
+Running implementations:
   
-  $ jeka test <dir>
-
-Benchmarking implementations:
-  
-  $ jeka benchmark <dir>
-
-Creating a Jekyll site:
-  
-  $ jeka site <dir>
+  $ jeka run "your_repository_folder/**/algorithm_*.rb" # it will generate a sqlite3 database named 'analysis.jeka'
 
 == For the future
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/jeka

@@ -1,117 +1,87 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 
-require File.join(File.expand_path(File.dirname(__FILE__)), '/../lib/jeka')
-require 'uri'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'jeka'
 
-def help
-  puts "Usage: p-lang [option] folder"
-  puts " options:"
-  puts "   build"
-  puts "   test"
-  puts "   benchmark"
-  puts "   site"
-  puts " Example:"
-  puts "   jeka build test/example/01_bubble_sort/"
-end
-
-def init(folder)
-  jeka_dir = Dir.new(folder)
-  jeka_dir.each do |d|
-    dir = File.join(folder, d)
-    if (File.directory?(dir) and d != "." and d != "..")
-      yield dir
-    end
+def build(files)
+  Dir.glob(files).each do |d|
+    require File.join(File.join(Dir.getwd, d))
   end
-end
-
-def build(folder)
-  init(folder) do |dir|
-    begin
-      make = Jeka::Make.new(dir)
-      puts "[build] #{dir}"
-      make.build
-    rescue
+  
+  error = false
+  Jeka::Algorithm.build_all do |p, t, o|
+    case t
+      when :step
+        p = p.to_s
+        while p.length < 3
+          p = " " + p
+        end
+        puts "[#{p}%] #{o}"
+      when :output
+        o = o.join
+        if o.length > 0
+          puts o
+        end
+      when :error
+        o = o.join
+        if o.length > 0
+          puts o
+        end
+        error = true
+      when :done
+        if error
+          puts "[100%] Some error occurs..."
+        else
+          puts "[100%] Done!"
+        end
     end
-    build(dir)
   end
 end
 
-def test(folder)
-  init(folder) do |dir|
-    begin
-      make = Jeka::Make.new(dir)
-      make.test do |i, t, r|
-        ok = "error"
-        ok = "ok" if r
-        puts "[test] #{i.algorithm.name} - #{i.language} - #{t.name}: #{ok}"
-      end
-    rescue
-    end
-    test(dir)
+def run(files)
+  Dir.glob(files).each do |d|
+    require File.join(File.join(Dir.getwd, d))
   end
-end
-
-def benchmark(folder)
-  init(folder) do |dir|
-    begin
-      ok = false
-      make = Jeka::Make.new(dir)
-      print "[benchmark] #{dir}... "
-      ok = true
-      make.benchmark(10)
-      puts "ok"
-    rescue
-      puts "error" if ok
+  
+  error = false
+  Jeka::Algorithm.run_all do |p, t, o|
+    case t
+      when :step
+        p = p.to_s
+        while p.length < 3
+          p = " " + p
+        end
+        puts "[#{p}%] #{o}"
+      when :error
+        o = o.join
+        if o.length > 0
+          puts o
+        end
+        error = true
+      when :done
+        if error
+          puts "[100%] Some error occurs..."
+        else
+          puts "[100%] Done!"
+        end
     end
-    benchmark(dir)
   end
 end
 
-def site(folder)  
-  build(folder)
-  benchmark(folder)
-  
-  Dir.mkdir("_jeka") unless Dir.exists?("_jeka")
-  Dir.mkdir("_jeka/algorithms") unless Dir.exists?("_jeka/algorithms")
-  Dir.mkdir("_jeka/algorithms/_posts") unless Dir.exists?("_jeka/algorithms/_posts")
-  Dir.mkdir("_jeka/implementations/") unless Dir.exists?("_jeka/implementations/")
-  Dir.mkdir("_jeka/implementations/_posts") unless Dir.exists?("_jeka/implementations/_posts")
-  
-  _site(folder)
-end
-
-def _site(folder)
-  init(folder) do |dir|
-    begin
-      make = Jeka::Make.new(dir)
-      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
-    _site(dir)
-  end
+def help
+  puts "usage: jeka [build|run] [regexp|file|dir]"
 end
 
 if ARGV.length == 2
   case ARGV[0]
     when "build"
       build(ARGV[1])
-    when "test"
-      test(ARGV[1])
-    when "benchmark"
-      benchmark(ARGV[1])
-    when "site"
-      site(ARGV[1])
+    when "run"
+      run(ARGV[1])
     else
-      help
+      help()
   end
 else
-  help
+  help()
 end

data/jeka.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jeka}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   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.authors = [%q{Igor Bonadio}]
+  s.date = %q{2011-09-18}
   s.description = %q{Jeka is an awesome build/test/benchmarking tool}
   s.email = %q{igorbonadio@gmail.com}
-  s.executables = ["jeka"]
+  s.executables = [%q{jeka}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -30,62 +29,91 @@ Gem::Specification.new do |s|
     "jeka.gemspec",
     "lib/jeka.rb",
     "lib/jeka/algorithm.rb",
+    "lib/jeka/analysis.rb",
+    "lib/jeka/analysis/algorithm.rb",
+    "lib/jeka/analysis/compiler.rb",
+    "lib/jeka/analysis/compiler_option.rb",
+    "lib/jeka/analysis/database.rb",
+    "lib/jeka/analysis/implementation.rb",
+    "lib/jeka/analysis/implementation_information.rb",
+    "lib/jeka/analysis/result.rb",
+    "lib/jeka/analysis/source_file.rb",
+    "lib/jeka/analysis/test.rb",
+    "lib/jeka/analysis/test_case.rb",
+    "lib/jeka/compilers.rb",
+    "lib/jeka/compilers/compiler.rb",
+    "lib/jeka/compilers/gpp.rb",
+    "lib/jeka/compilers/ruby.rb",
+    "lib/jeka/console.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",
+    "lib/jeka/test_case.rb",
+    "test/bubble_sort/_tests/_test_01.rb",
+    "test/bubble_sort/algorithm_bubble_sort.rb",
+    "test/bubble_sort/cpp/_implementation.yaml",
+    "test/bubble_sort/cpp/bubble_sort.cpp",
+    "test/bubble_sort/ruby/_implementation.yaml",
+    "test/bubble_sort/ruby/bubble_sort.rb",
+    "test/double/_tests/_test_01.rb",
+    "test/double/algorithm_double.rb",
+    "test/double/cpp/double.cpp",
+    "test/double/ruby/double.rb",
     "test/helper.rb",
-    "test/site/algorithm.textile",
-    "test/site/cpp.textile",
-    "test/site/ruby.textile",
     "test/test_algorithm.rb",
+    "test/test_gpp.rb",
     "test/test_implementation.rb",
-    "test/test_make.rb",
-    "test/test_test.rb"
+    "test/test_test_case.rb"
   ]
   s.homepage = %q{http://github.com/igorbonadio/jeka}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{Jeka is an awesome build/test/benchmarking tool}
   s.test_files = [
-    "test/example/01_bubble_sort/ruby/bubble.rb",
+    "test/bubble_sort/_tests/_test_01.rb",
+    "test/bubble_sort/algorithm_bubble_sort.rb",
+    "test/bubble_sort/ruby/bubble_sort.rb",
+    "test/double/_tests/_test_01.rb",
+    "test/double/algorithm_double.rb",
+    "test/double/ruby/double.rb",
     "test/helper.rb",
     "test/test_algorithm.rb",
+    "test/test_gpp.rb",
     "test/test_implementation.rb",
-    "test/test_make.rb",
-    "test/test_test.rb"
+    "test/test_test_case.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_runtime_dependency(%q<dm-sqlite-adapter>, [">= 0"])
+      s.add_runtime_dependency(%q<data_mapper>, [">= 0"])
       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"])
+      s.add_development_dependency(%q<dm-sqlite-adapter>, [">= 0"])
+      s.add_development_dependency(%q<data_mapper>, [">= 0"])
     else
+      s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
+      s.add_dependency(%q<data_mapper>, [">= 0"])
       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"])
+      s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
+      s.add_dependency(%q<data_mapper>, [">= 0"])
     end
   else
+    s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
+    s.add_dependency(%q<data_mapper>, [">= 0"])
     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"])
+    s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
+    s.add_dependency(%q<data_mapper>, [">= 0"])
   end
 end