From 0600fdc62e7446caa75ffcff4d097338818e0df9 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Thu, 16 Feb 2012 22:17:50 +0000
Subject: Task.wait_for_completion fixed

---
 lib/opentox-client.rb |  2 ++
 lib/task.rb           | 11 +++++++++--
 test/task.rb          | 12 ++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/opentox-client.rb b/lib/opentox-client.rb
index 7c7fb11..0bd048c 100644
--- a/lib/opentox-client.rb
+++ b/lib/opentox-client.rb
@@ -1,4 +1,6 @@
+require "opentox-client/version"
 require 'rubygems'
+require "bundler/setup"
 require 'rdf'
 require 'rdf/raptor'
 require "rest-client"
diff --git a/lib/task.rb b/lib/task.rb
index aee6c62..50616d7 100644
--- a/lib/task.rb
+++ b/lib/task.rb
@@ -7,7 +7,13 @@ module OpenTox
 
     def self.create service_uri, params={}
       task = Task.new RestClient.post(service_uri,params).chomp
-      pid = Spork.spork { yield }
+      pid = Spork.spork do
+        begin
+          task.completed yield 
+        rescue => error
+          task.error error
+        end
+      end
       task.pid = pid
       task
     end
@@ -33,6 +39,7 @@ module OpenTox
     def wait_for_completion(dur=0.3)
       due_to_time = Time.new + DEFAULT_TASK_MAX_DURATION
       while self.running?
+        sleep dur
         raise "max wait time exceeded ("+DEFAULT_TASK_MAX_DURATION.to_s+"sec), task: '"+@uri.to_s+"'" if (Time.new > due_to_time)
       end
     end
@@ -46,7 +53,7 @@ module OpenTox
         res = RestClient.put(File.join(@uri,method.sub(/=/,'')),{})
         super unless res.code == 200
       when /\?/
-        return metadata[RDF::OT.hasStatus] == method.sub(/\?/,'').capitalize
+        return hasStatus == method.sub(/\?/,'').capitalize
       else
         return metadata[RDF::OT[method]].to_s
       end
diff --git a/test/task.rb b/test/task.rb
index 5828223..41316d1 100644
--- a/test/task.rb
+++ b/test/task.rb
@@ -2,7 +2,7 @@ require 'test/unit'
 $LOAD_PATH << File.join(File.dirname(__FILE__),'..','lib')
 require File.join File.dirname(__FILE__),'..','lib','opentox-client.rb'
 #require "./validate-owl.rb"
-#
+
 TASK_SERVICE_URI = "http://ot-dev.in-silico.ch/task"
 
 class TaskTest < Test::Unit::TestCase
@@ -14,9 +14,12 @@ class TaskTest < Test::Unit::TestCase
   end
 
   def test_create_and_complete
-    task = OpenTox::Task.create TASK_SERVICE_URI
+    task = OpenTox::Task.create TASK_SERVICE_URI do
+      sleep 1
+      "http://test.org"
+    end
     assert_equal "Running", task.hasStatus
-    task.completed "http://test.org"
+    task.wait_for_completion
     assert_equal "Completed", task.hasStatus
     assert_equal "http://test.org", task.resultURI
   end
@@ -26,9 +29,6 @@ class TaskTest < Test::Unit::TestCase
     task = OpenTox::Task.all(TASK_SERVICE_URI).last
     assert_equal OpenTox::Task, task.class
     #validate_owl(task.uri)
-    #puts task.uri
   end
-=begin
-=end
 
 end
-- 
cgit v1.2.3