jubatus 0.4.0 → 0.4.1

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler'
 require 'simplecov' # for Ruby 1.9
 require 'rake/testtask'
-#require 'ci/reporter/rake/test_unit'
+require 'ci/reporter/rake/test_unit'
 
 Bundler::GemHelper.install_tasks
 
@@ -14,9 +14,9 @@ task :test do |test|
   end
 end
 
-## for Ruby 1.8
-#task :coverage do |coverage|
-#  system("rcov -o test/coverage -I lib:test  --exclude . --include-file lib/jubatus --aggregate coverage.info test/**/*.rb")
-#end
+# for Ruby 1.8
+task :coverage do |coverage|
+  system("rcov -o test/coverage -I lib:test  --exclude . --include-file lib/jubatus --aggregate coverage.info test/**/*.rb")
+end
 
 task :default => [:build]

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/jubatus.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
 
   files = `git ls-files`.split("\n")
-  excludes = ["patch/*"]
+  excludes = ["patch/*", "generate.sh"]
 
   gem.files       = files.reject { |f| excludes.any? { |e| File.fnmatch(e, f) } }
   gem.test_files  = gem.files.grep(%r{^(test|spec|features)/})

data/test/jubatus_test/anomaly/test.rb

@@ -50,6 +50,10 @@ class AnomalyTest < Test::Unit::TestCase
     TestUtil.kill_process(@srv)
   end
 
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
   def test_clear_row
     d = Jubatus::Anomaly::Datum.new([], [])
     (row_id, score) = @cli.add("name", d)
@@ -85,14 +89,13 @@ class AnomalyTest < Test::Unit::TestCase
 
   def test_get_config
     config = @cli.get_config("name")
-    assert_equal(JSON.parse(config).to_json, @config.to_json)
+    assert_equal(JSON.parse(config), @config)
   end
 
   def test_save
     assert_equal(true, @cli.save("name", "anomaly.save_test.model"))
   end
 
-
   def test_load
     model_name = "anomaly.load_test.model"
     @cli.save("name", model_name)

data/test/jubatus_test/classifier/test.rb

@@ -40,52 +40,43 @@ class ClassifierTest < Test::Unit::TestCase
     TestUtil.kill_process(@srv)
   end
 
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
   def test_get_config
     config = @cli.get_config("name")
-    assert_equal(@config.to_json, JSON.parse(config).to_json)
-
+    assert_equal(JSON.parse(config), @config)
   end
 
-
   def test_train
     string_values = [["key1", "val1"], ["key2", "val2"]]
     num_values = [["key1", 1.0], ["key2", 2.0]]
     d = Jubatus::Classifier::Datum.new(string_values, num_values)
     data = [["label", d]]
     assert_equal(@cli.train("name", data), 1)
-
   end
 
-
   def test_classify
     string_values = [["key1", "val1"], ["key2", "val2"]]
     num_values = [["key1", 1.0], ["key2", 2.0]]
     d = Jubatus::Classifier::Datum.new(string_values, num_values)
     data = [d]
     result = @cli.classify("name", data)
-
   end
 
-
   def test_save
     assert_equal(@cli.save("name", "classifier.save_test.model"), true)
-
   end
 
-
   def test_load
     model_name = "classifier.load_test.model"
     @cli.save("name", model_name)
     assert_equal(@cli.load("name", model_name), true)
-
   end
 
-
   def test_get_status
     @cli.get_status("name")
-
   end
 
-
 end
-

data/test/jubatus_test/graph/test.rb

@@ -31,6 +31,10 @@ class GraphTest < Test::Unit::TestCase
     TestUtil.kill_process(@srv)
   end
 
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
   def test_node_info
     edge_query = [["a", "b"], ["c", "d"], ["e", "f"]]
     node_query = [["0", "1"], ["2", "3"]]
@@ -40,7 +44,6 @@ class GraphTest < Test::Unit::TestCase
     Jubatus::Graph::Node.new(p, in_edges, out_edges)
   end
 
-
   def test_create_node
     name = "name"
     @cli.clear(name)
@@ -53,10 +56,8 @@ class GraphTest < Test::Unit::TestCase
     @cli.clear(name)
     nid = @cli.create_node(name)
     assert_equal(@cli.remove_node(name, nid), true)
-
   end
 
-
   def test_update_node
     name = "name"
     @cli.clear(name)
@@ -65,7 +66,6 @@ class GraphTest < Test::Unit::TestCase
     assert_equal(@cli.update_node(name, nid, prop), true)
   end
 
-
   def test_create_edge
     name = "name"
     @cli.clear(name)
@@ -76,7 +76,6 @@ class GraphTest < Test::Unit::TestCase
     eid = @cli.create_edge("name", tgt, ei)
   end
 
-
   def test_create_edge
     name = "name"
     @cli.clear(name)
@@ -86,5 +85,11 @@ class GraphTest < Test::Unit::TestCase
     ei = Jubatus::Graph::Edge.new(prop, src, tgt)
     eid = @cli.create_edge(src, tgt, ei)
   end
+
+  def test_get_config
+    config = @cli.get_config("name")
+    assert_equal(JSON.parse(config), @config)
+  end
+
 end
 

data/test/jubatus_test/recommender/test.rb

@@ -37,13 +37,15 @@ class RecommenderTest < Test::Unit::TestCase
     TestUtil.kill_process(@srv)
   end
 
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
   def test_get_config
     config = @cli.get_config("name")
-    assert_equal(@config.to_json, JSON.parse(config).to_json)
-
+    assert_equal(JSON.parse(config), @config)
   end
 
-
   def test_complete_row
     @cli.clear_row("name", "complete_row")
     string_values = [["key1", "val1"], ["key2", "val2"]]
@@ -52,10 +54,8 @@ class RecommenderTest < Test::Unit::TestCase
     @cli.update_row("name", "complete_row", d)
     d1 = @cli.complete_row_from_id("name", "complete_row")
     d2 = @cli.complete_row_from_datum("name", d)
-
   end
 
-
   def test_get_similar_row
     @cli.clear_row("name", "similar_row")
     string_values = [["key1", "val1"], ["key2", "val2"]]
@@ -64,10 +64,8 @@ class RecommenderTest < Test::Unit::TestCase
     @cli.update_row("name", "similar_row", d)
     s1 = @cli.similar_row_from_id("name", "similar_row", 10)
     s2 = @cli.similar_row_from_datum("name", d, 10)
-
   end
 
-
   def test_decode_row
     @cli.clear_row("name", "decode_row")
     string_values = [["key1", "val1"], ["key2", "val2"]]
@@ -79,7 +77,6 @@ class RecommenderTest < Test::Unit::TestCase
     assert_equal(d.num_values, decoded_row.num_values)
   end
 
-
   def test_get_row
     @cli.clear("name")
     string_values = [["key1", "val1"], ["key2", "val2"]]
@@ -88,51 +85,38 @@ class RecommenderTest < Test::Unit::TestCase
     @cli.update_row("name", "get_row", d)
     row_names = @cli.get_all_rows("name")
     assert_equal(row_names, ["get_row"])
-
   end
 
 
   def test_clear
     @cli.clear("name")
-
   end
 
-
   def test_calcs
     string_values = [["key1", "val1"], ["key2", "val2"]]
     num_values = [["key1", 1.0], ["key2", 2.0]]
     d = Jubatus::Recommender::Datum.new(string_values, num_values)
     assert_in_delta(@cli.calc_similarity("name", d, d), 1, 0.000001)
     assert_in_delta(@cli.calc_l2norm("name", d), Math.sqrt(1*1 + 1*1+ 1*1 + 2*2), 0.000001)
-
   end
 
-
   def test_clear
     @cli.clear("name")
-
   end
 
-
   def test_save
     assert_equal(@cli.save("name", "recommender.save_test.model"), true)
-
   end
 
-
   def test_load
     model_name = "recommender.load_test.model"
     @cli.save("name", model_name)
     assert_equal(@cli.load("name", model_name), true)
-
   end
 
-
   def test_get_status
     @cli.get_status("name")
-
   end
 
-
 end
 

data/test/jubatus_test/regression/test.rb

@@ -41,52 +41,44 @@ class RegressionTest < Test::Unit::TestCase
     TestUtil.kill_process(@srv)
   end
 
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
   def test_get_config
     config = @cli.get_config("name")
-    assert_equal(@config.to_json, JSON.parse(config).to_json)
-
+    assert_equal(JSON.parse(config), @config)
   end
 
-
   def test_train
     string_values = [["key1", "val1"], ["key2", "val2"]]
     num_values = [["key1", 1.0], ["key2", 2.0]]
     d = Jubatus::Regression::Datum.new(string_values, num_values)
     data = [[1.0, d]]
     assert_equal(@cli.train("name", data), 1)
-
   end
 
-
   def test_estimate
     string_values = [["key1", "val1"], ["key2", "val2"]]
     num_values = [["key1", 1.0], ["key2", 2.0]]
     d = Jubatus::Regression::Datum.new(string_values, num_values)
     data = [d]
     result = @cli.estimate("name", data)
-
   end
 
-
   def test_save
     assert_equal(@cli.save("name", "regression.save_test.model"), true)
-
   end
 
-
   def test_load
     model_name = "regression.load_test.model"
     @cli.save("name", model_name)
     assert_equal(@cli.load("name", model_name), true)
-
   end
 
-
   def test_get_status
     @cli.get_status("name")
-
   end
 
-
 end
 

data/test/jubatus_test/stat/test.rb

@@ -28,13 +28,15 @@ class StatTest < Test::Unit::TestCase
     TestUtil.kill_process(@srv)
   end
 
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
   def test_get_config
     config = @cli.get_config("name")
-    assert_equal(@config.to_json, JSON.parse(config).to_json)
-
+    assert_equal(JSON.parse(config), @config)
   end
 
-
   def test_stddev
     @cli.push("name", "stddev", 1.0)
     @cli.push("name", "stddev", 2.0)
@@ -42,10 +44,8 @@ class StatTest < Test::Unit::TestCase
     @cli.push("name", "stddev", 4.0)
     @cli.push("name", "stddev", 5.0)
     assert_equal(@cli.stddev("name", "stddev"), Math::sqrt(2.0))
-
   end
 
-
   def test_sum
     @cli.push("name", "sum", 1.0)
     @cli.push("name", "sum", 2.0)
@@ -53,10 +53,8 @@ class StatTest < Test::Unit::TestCase
     @cli.push("name", "sum", 4.0)
     @cli.push("name", "sum", 5.0)
     assert_equal(@cli.sum("name", "sum"), 15.0)
-
   end
 
-
   def test_max
     @cli.push("name", "max", 1.0)
     @cli.push("name", "max", 2.0)
@@ -64,10 +62,8 @@ class StatTest < Test::Unit::TestCase
     @cli.push("name", "max", 4.0)
     @cli.push("name", "max", 5.0)
     assert_equal(@cli.max("name", "max"), 5.0)
-
   end
 
-
   def test_min
     @cli.push("name", "min", 1.0)
     @cli.push("name", "min", 2.0)
@@ -75,10 +71,8 @@ class StatTest < Test::Unit::TestCase
     @cli.push("name", "min", 4.0)
     @cli.push("name", "min", 5.0)
     assert_equal(@cli.min("name", "min"), 1.0)
-
   end
 
-
   def test_entropy
     @cli.push("name", "entropy", 1.0)
     @cli.push("name", "entropy", 2.0)
@@ -86,10 +80,8 @@ class StatTest < Test::Unit::TestCase
     @cli.push("name", "entropy", 4.0)
     @cli.push("name", "entropy", 5.0)
     assert_equal(@cli.entropy("name", "entropy"), 0.0)
-
   end
 
-
   def test_moment
     @cli.push("name", "moment", 1.0)
     @cli.push("name", "moment", 2.0)
@@ -97,29 +89,21 @@ class StatTest < Test::Unit::TestCase
     @cli.push("name", "moment", 4.0)
     @cli.push("name", "moment", 5.0)
     assert_equal(@cli.moment("name", "moment", 3, 0.0), 45.0)
-
   end
 
-
   def test_save
     assert_equal(@cli.save("name", "stat.save_test.model"), true)
-
   end
 
-
   def test_load
     model_name = "stat.load_test.model"
     @cli.save("name", model_name)
     assert_equal(@cli.load("name", model_name), true)
-
   end
 
-
   def test_get_status
     @cli.get_status("name")
-
   end
 
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jubatus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc
@@ -55,7 +55,6 @@ files:
 - README.rst
 - Rakefile
 - VERSION
-- generate.sh
 - jubatus.gemspec
 - lib/jubatus/anomaly/client.rb
 - lib/jubatus/anomaly/types.rb

data/generate.sh

@@ -1,31 +0,0 @@
-#!/bin/bash -ue
-
-JUBATUS_DIR="jubatus-generate"
-JUBATUS_BRANCH="master"
-CLIENT_DIR="$(dirname "${0}")"
-
-[ $# -eq 0 ] || JUBATUS_BRANCH="${1}"
-
-rm -rf "${JUBATUS_DIR}"
-git clone https://github.com/jubatus/jubatus.git "${JUBATUS_DIR}"
-pushd "${JUBATUS_DIR}"
-git checkout "${JUBATUS_BRANCH}"
-popd
-
-# Ruby
-
-capitalize() {
-  echo "$(echo ${1:0:1} | tr 'a-z' 'A-Z')${1:1}"
-}
-
-rm -rf "${CLIENT_DIR}/lib"
-for IDL in "${JUBATUS_DIR}/src/server"/*.idl; do
-  NAMESPACE="$(capitalize $(basename "${IDL}" ".idl"))"
-  mpidl ruby "${IDL}" -m "Jubatus::${NAMESPACE}" -o "${CLIENT_DIR}/lib/jubatus"
-done
-
-for PATCH in "${CLIENT_DIR}/patch"/*.patch; do
-  patch -p0 --directory "${CLIENT_DIR}" < "${PATCH}"
-done
-
-rm -rf "${JUBATUS_DIR}"