drbqs 0.0.17 → 0.0.18

data/spec/node/task_client_spec.rb

@@ -3,19 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'drbqs/node/task_client'
 
 describe DRbQS::Node::TaskClient do
-  def init_task_client(node_number = 10)
-    @node_number = node_number
+  def init_task_client(opts = {})
+    @node_number = opts[:number] || 10
     @ts_queue = Rinda::TupleSpace.new
     @ts_result = Rinda::TupleSpace.new
-    @task_client = DRbQS::Node::TaskClient.new(@node_number, @ts_queue, @ts_result)
+    @task_client = DRbQS::Node::TaskClient.new(@node_number, @ts_queue, @ts_result, opts[:group])
   end
 
-  def add_task_to_tuplespace(task_id, task_ary)
-    @ts_queue.write([task_id] + task_ary)
+  def add_task_to_tuplespace(task_id, task_ary, group = DRbQS::Task::DEFAULT_GROUP)
+    @ts_queue.write([group, task_id] + task_ary)
   end
 
   def check_empty_queue_tuplespace
-    @ts_queue.read_all([nil, nil, nil, nil]).size.should == 0
+    @ts_queue.read_all([nil, nil, nil, nil, nil]).size.should == 0
   end
 
   subject do
@@ -35,12 +35,12 @@ describe DRbQS::Node::TaskClient do
       subject.result_empty?.should be_true
     end
 
-    it "should not have calculating task." do
-      subject.calculating_task.should be_nil
+    it "should return no task." do
+      subject.get_task.should be_nil
     end
 
-    it "should return no task" do
-      subject.get_task.should be_nil
+    it "should not have group." do
+      subject.group.should == []
     end
   end
 
@@ -61,28 +61,54 @@ describe DRbQS::Node::TaskClient do
     end
   end
 
+  context "when getting task by group" do
+    before(:all) do
+      init_task_client(:group => [:grp1])
+      @task_id = 3
+      @task_ary = ["hello world", :size, []]
+      add_task_to_tuplespace(@task_id, @task_ary, :grp1)
+    end
+
+    it "should not return task." do
+      client = DRbQS::Node::TaskClient.new(100, @ts_queue, @ts_result, nil)
+      client.get_task.should be_nil
+    end
+
+    it "should return task." do
+      subject.get_task.should == @task_ary.dup.unshift(@task_id)
+    end
+
+    it "should take out task from tuplespace." do
+      check_empty_queue_tuplespace
+    end
+
+    it "should have group." do
+      subject.group.should == [:grp1]
+    end
+  end
+
   context "when getting new task" do
     before(:all) do
-      init_task_client(7)
+      init_task_client(:number => 7)
     end
 
     it "should return nil" do
-      subject.add_new_task.should be_nil
+      subject.add_new_task(1).should be_nil
     end
 
     it "should return nil" do
       add_task_to_tuplespace(100, [[1, 3, 5, 7], :size, []])
-      subject.add_new_task.should be_true
+      subject.add_new_task(1).should be_true
     end
   end
 
   context "when adding new task" do
     before(:all) do
-      init_task_client(7)
+      init_task_client(:number => 7)
       @task_id = 3
       @task_ary = [[1, 3, 5, 7], :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      subject.add_new_task
+      @get_task_id = subject.add_new_task(1)
     end
 
     it "should have non empty task queue." do
@@ -94,7 +120,7 @@ describe DRbQS::Node::TaskClient do
     end
 
     it "should have calculating task" do
-      subject.calculating_task.should == @task_id
+      @get_task_id.should be_include(@task_id)
     end
 
     it "should take out task from tuplespace." do
@@ -108,16 +134,16 @@ describe DRbQS::Node::TaskClient do
 
   context "when dequeueing a task" do
     before(:all) do
-      init_task_client(14)
+      init_task_client(:number => 14)
       @task_id = 8
       @task_ary = [[1, 3, 5, 7], :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      subject.add_new_task
+      @get_task_id = subject.add_new_task(1)
       @dequeued_task = subject.dequeue_task
     end
 
     it "should get a task" do
-      @dequeued_task.should == @task_ary
+      @dequeued_task.should == [@task_id] + @task_ary
     end
 
     it "should have empty task queue." do
@@ -129,19 +155,19 @@ describe DRbQS::Node::TaskClient do
     end
 
     it "should have calculating task." do
-      subject.calculating_task.should == @task_id      
+      @get_task_id.should be_include(@task_id)
     end
   end
 
   context "when queueing result" do
     before(:all) do
-      init_task_client(2)
+      init_task_client(:number => 2)
       @task_id = 27
       @task_ary = ["abcdef", :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      subject.add_new_task
+      @get_task_id = subject.add_new_task(1)
       @dequeued_task = subject.dequeue_task
-      subject.queue_result(:result_object)
+      subject.queue_result(1, :result_object)
     end
 
     it "should have empty task queue." do
@@ -153,24 +179,24 @@ describe DRbQS::Node::TaskClient do
     end
 
     it "should have calculating task." do
-      subject.calculating_task.should == @task_id
+      @get_task_id.should be_include(@task_id)
     end
   end
 
   context "when sending result" do
     before(:all) do
-      init_task_client(2)
-      @task_id = 27
+      init_task_client(:number => 2)
+      @task_id = 28
       @task_ary = ["abcdef", :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      subject.add_new_task
+      subject.add_new_task(1)
       @dequeued_task = subject.dequeue_task
-      subject.queue_result(:result_object)
+      subject.queue_result(@task_id, :result_object)
       @send_returned_value = subject.send_result
     end
 
     it "should get nil returned value." do
-      @send_returned_value.should be_nil
+      @send_returned_value.should == [@task_id]
     end
 
     it "should have empty task queue." do
@@ -181,35 +207,14 @@ describe DRbQS::Node::TaskClient do
       subject.result_empty?.should_not be_nil
     end
 
-    it "should not have calculating task." do
-      subject.calculating_task.should be_nil
-    end
-
     it "should get result from tuplespace." do
       @ts_result.take([:result, nil, nil, nil], 0).should be_true
     end
   end
 
-  context "when setting exit_after_task" do
-    before(:all) do
-      init_task_client(2)
-      @task_id = 27
-      @task_ary = ["abcdef", :size, []]
-      add_task_to_tuplespace(@task_id, @task_ary)
-      subject.add_new_task
-      subject.set_exit_after_task
-      @dequeued_task = subject.dequeue_task
-      subject.queue_result(:result_object)
-    end
-
-    it "should return true" do
-      subject.send_result.should be_true
-    end
-  end
-
   context "when dumping result queue" do
     before(:all) do
-      init_task_client(2)
+      init_task_client(:number => 2)
     end
 
     it "should return nil for empty result queue." do
@@ -218,8 +223,8 @@ describe DRbQS::Node::TaskClient do
 
     it "should return string for non empty result queue." do
       results = [:result_object1, :result_object2]
-      results.each do |sym|
-        subject.queue_result(sym)
+      results.each_with_index do |sym, i|
+        subject.queue_result(i, sym)
       end
       subject.dump_result_queue.should == Marshal.dump(results)
     end

data/spec/server/message_spec.rb

@@ -122,19 +122,23 @@ describe DRbQS::Server::Message do
 
   context "when setting special tasks" do
     it "should set initialization task" do
+      initialization_pattern = [:initialize, Array]
       lambda do
-        @message.take([:initialize, nil, Symbol, nil], 0)
+        @message.take(initialization_pattern, 0)
       end.should raise_error Rinda::RequestExpiredError
-      @message_server.set_initialization(DRbQS::Task.new(Object.new, :object_id))
-      @message.take([:initialize, nil, Symbol, nil], 0).should be_true
+      @message_server.set_initialization_tasks(DRbQS::Task.new(Object.new, :object_id))
+      @message_server.set_initialization_tasks(DRbQS::Task.new(Object.new, :object_id))
+      @message.take(initialization_pattern, 0)[1].should have(2).items
     end
 
     it "should set finalization task" do
+      finalization_pattern = [:finalize, Array]
       lambda do
-        @message.take([:finalization, nil, Symbol, nil], 0)
+        @message.take(finalization_pattern, 0)
       end.should raise_error Rinda::RequestExpiredError
-      @message_server.set_finalization(DRbQS::Task.new(Object.new, :object_id))
-      @message.take([:finalization, nil, Symbol, nil], 0).should be_true
+      tasks = [DRbQS::Task.new(Object.new, :object_id), DRbQS::Task.new(Object.new, :object_id)]
+      @message_server.set_finalization_tasks(tasks)
+      @message.take(finalization_pattern, 0)[1].should have(2).items
     end
   end
 

data/spec/server/queue_spec.rb

@@ -4,6 +4,8 @@ require 'drbqs/server/queue'
 require 'drbqs/task/task'
 
 describe DRbQS::Server::Queue do
+  QUEUE_OBJECT_PATTERN = [nil, nil, nil, nil, nil]
+
   def object_init
     @ts = {
       :queue => Rinda::TupleSpace.new,
@@ -86,7 +88,7 @@ describe DRbQS::Server::Queue do
     end
 
     it "should take objects from queue." do
-      @ts[:queue].take([nil, nil, nil, nil]).should be_true
+      @ts[:queue].take(QUEUE_OBJECT_PATTERN).should be_true
     end
 
     it "should return an array of calculating nodes." do
@@ -208,9 +210,10 @@ describe DRbQS::Server::Queue do
       subject.should_not be_finished
     end
 
-    it "should return task ID." do
-      (ary = @ts[:queue].take([nil, nil, nil, nil])).should be_true
-      ary[0].should == @task_id
+    it "should return task group and task ID." do
+      (ary = @ts[:queue].take(QUEUE_OBJECT_PATTERN)).should be_true
+      ary[0].should == DRbQS::Task::DEFAULT_GROUP
+      ary[1].should == @task_id
     end
 
     it "should return an array of calculating nodes." do

data/spec/server/server_hook_spec.rb

@@ -21,7 +21,7 @@ describe DRbQS::Server::Hook do
   it "should add a hook with name." do
     n = subject.number_of_hook(:finish)
     name = 'hello'
-    name_new = subject.add(:finish, name) do |server|
+    name_new = subject.add(:finish, name: name) do |server|
       3 + 4
     end
     name_new.should == name
@@ -71,6 +71,33 @@ describe DRbQS::Server::Hook do
     exec_flag[:second].should be_true
   end
 
+  it "should execute a hook repeatedly." do
+    exec_flag = {}
+    subject.add(:finish) do |server|
+      exec_flag[:exec] = true
+    end
+    10.times do |i|
+      exec_flag[:exec] = nil
+      subject.exec(:finish)
+      exec_flag[:exec].should be_true
+    end
+  end
+
+  it "should execute a hook three times." do
+    exec_flag = {}
+    subject.add(:finish, repeat: 3) do |server|
+      exec_flag[:exec] = true
+    end
+    3.times do |i|
+      exec_flag[:exec] = nil
+      subject.exec(:finish)
+      exec_flag[:exec].should be_true
+    end
+    exec_flag[:exec] = nil
+    subject.exec(:finish)
+    exec_flag[:exec].should be_nil
+  end
+
   it "should execute finish_exit that is special proc." do
     execute = nil
     subject.set_finish_exit do

data/spec/task/task_spec.rb

@@ -92,6 +92,17 @@ describe DRbQS::Task do
       Marshal.dump(task)
     end.should raise_error
   end
+
+  it "should get default group." do
+    task = DRbQS::Task.new([1, 2, 3], :size)
+    task.group.should == DRbQS::Task::DEFAULT_GROUP
+  end
+
+  it "should set group." do
+    group = :local
+    task = DRbQS::Task.new([1, 2, 3], :size, group: group)
+    task.group.should == group
+  end
 end
 
 describe DRbQS::Task::TaskSet::ContainerTask do
@@ -172,12 +183,38 @@ describe DRbQS::Task::TaskSet do
 
   it "should execute hooks of symbols." do
     server = mock('server')
-    obj = [TestTask.new(100), TestTask.new(200), TestTask.new(300)]
-    tasks = []
-    tasks << DRbQS::Task.new(obj[0], :some_method, hook: :test_hook)
-    tasks << DRbQS::Task.new(obj[1], :some_method, hook: :test_hook)
-    tasks << DRbQS::Task.new(obj[2], :some_method, hook: :test_hook)
+    args = [100, 200, 300]
+    tasks = args.map do |a|
+      DRbQS::Task.new(TestTask.new(a), :some_method, hook: :test_hook)
+    end
     task_set = DRbQS::Task::TaskSet.new(tasks)
-    task_set.exec_hook(server, [100, 200, 300])
+    task_set.exec_hook(server, args)
+  end
+
+  it "should get default group." do
+    tasks = 10.times.map do |a|
+      DRbQS::Task.new(TestTask.new(a), :some_method)
+    end
+    task_set = DRbQS::Task::TaskSet.new(tasks)
+    task_set.group.should == DRbQS::Task::DEFAULT_GROUP
+  end
+
+  it "should set group." do
+    group = :local
+    tasks = 10.times.map do |a|
+      DRbQS::Task.new(TestTask.new(a), :some_method, group: group)
+    end
+    task_set = DRbQS::Task::TaskSet.new(tasks)
+    task_set.group.should == group
+  end
+
+  it "should raise error for different groups." do
+    group = :local
+    tasks = 10.times.map do |a|
+      DRbQS::Task.new(TestTask.new(a), :some_method, group: "group#{a}".intern)
+    end
+    lambda do
+      DRbQS::Task::TaskSet.new(tasks)  
+    end.should raise_error ArgumentError
   end
 end

data/spec/utility/temporary_spec.rb

@@ -7,18 +7,22 @@ describe DRbQS::Temporary do
     DRbQS::Temporary.file
   end
 
+  subject do
+    DRbQS::Temporary
+  end
+
   it "should create base directory." do
-    File.exist?(DRbQS::Temporary.root).should be_true
+    File.exist?(subject.root).should be_true
   end
 
   it "should create empty directory." do
-    dir = DRbQS::Temporary.directory
+    dir = subject.directory
     File.directory?(dir).should be_true
     Dir.entries(dir).should have(2).items
   end
 
   it "should return new path of file." do
-    path = DRbQS::Temporary.file
+    path = subject.file
     File.exist?(path).should_not be_true
     open(path, 'w') do |f|
       f.puts 'hello'
@@ -26,14 +30,33 @@ describe DRbQS::Temporary do
   end
 
   it "should make directory empty." do
-    Dir.entries(DRbQS::Temporary.root).size.should > 2
-    DRbQS::Temporary.delete
-    Dir.entries(DRbQS::Temporary.root).should have(2).items
+    Dir.entries(subject.root).size.should > 2
+    subject.delete
+    Dir.entries(subject.root).should have(2).items
+  end
+
+  it "should set subdirectory." do
+    subject.set_sub_directory('abc')
+    subject.subdirectory.should be_nil
+  end
+
+  it "should get directory in subdirectory." do
+    subject.set_sub_directory('ABCD')
+    dir = subject.directory
+    File.exist?(subject.subdirectory).should be_true
+    dir.should match(/\/ABCD/)
+  end
+
+  it "should get file name in subdirectory." do
+    subject.set_sub_directory('EFGH')
+    file = subject.file
+    File.exist?(subject.subdirectory).should be_true
+    file.should match(/\/EFGH\//)
   end
 
-  it "should all directories." do
-    root = DRbQS::Temporary.root
-    DRbQS::Temporary.delete_all
+  it "should delete all directories." do
+    root = subject.root
+    subject.delete_all
     File.exist?(root).should_not be_true
   end
 end