drbqs 0.0.15 → 0.0.16

data/spec/execute/server_define_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe DRbQS::ServerDefinition do
+describe DRbQS::Execution::ServerDefinition do
   context "when we call class methods" do
     subject do
       DRbQS.class_variable_get(:@@server_def)

data/spec/ext/task/command_task_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'drbqs/ext/task'
+
+describe DRbQS::CommandTask::CommandExecute do
+  it "should execute command" do
+    cmd_exec = DRbQS::CommandTask::CommandExecute.new('ls > /dev/null')
+    cmd_exec.exec.should == 0
+  end
+
+  it "should enqueue files" do
+    DRbQS::Transfer.should_receive(:enqueue).exactly(2)
+    cmd_exec = DRbQS::CommandTask::CommandExecute.new('ls > /dev/null', :transfer => ['hello', 'world'])
+    cmd_exec.exec
+  end
+end

data/spec/integration_test/01_basic_usage_spec.rb

@@ -6,7 +6,7 @@ require_relative 'definition/task_obj_definition.rb'
 describe DRbQS do
   before(:all) do
     @tasks = 5.times.map do |i|
-      DRbQS::Task.new(Test1.new, :echo, [i])
+      DRbQS::Task.new(Test1.new, :echo, args: [i])
     end
     @process_id, @uri = drbqs_fork_server(14010, :task => @tasks)
     @node = DRbQS::Node.new(@uri, :log_file => $stdout, :continue => true)

data/spec/integration_test/02_use_generator_spec.rb

@@ -5,11 +5,11 @@ require_relative 'definition/task_obj_definition.rb'
 
 describe DRbQS do
   before(:all) do
-    @task_generators = [DRbQS::TaskGenerator.new(:iterate => 3), DRbQS::TaskGenerator.new(:iterate => 4)]
+    @task_generators = [DRbQS::Task::Generator.new(:iterate => 3), DRbQS::Task::Generator.new(:iterate => 4)]
     @task_generators.each do |tg|
       tg.set do
         @iterate.times do |i|
-          create_add_task(Test1.new, :echo, [i])
+          create_add(Test1.new, :echo, args: [i])
         end
       end
     end

data/spec/integration_test/04_use_unix_domain_spec.rb

@@ -6,7 +6,7 @@ require_relative 'definition/task_obj_definition.rb'
 describe DRbQS::Server do
   before(:all) do
     @tasks = 2.times.map do |i|
-      DRbQS::Task.new(Test1.new, :echo, [i])
+      DRbQS::Task.new(Test1.new, :echo, args: [i])
     end
     path = "/tmp/drbqs"
     @process_id, @uri = drbqs_fork_server(path, :task => @tasks)

data/spec/integration_test/05_server_exit_signal_spec.rb

@@ -6,7 +6,7 @@ require_relative 'definition/task_obj_definition.rb'
 describe DRbQS do
   before(:all) do
     @tasks = 3.times.map do |i|
-      DRbQS::Task.new(Test1.new, :echo, [i])
+      DRbQS::Task.new(Test1.new, :echo, args: [i])
     end
     @process_id, @uri = drbqs_fork_server(14050, :task => @tasks)
     @manage = DRbQS::Manage.new(:uri => @uri)

data/spec/integration_test/06_node_exit_after_task_spec.rb

@@ -1,20 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-require 'drbqs/manage/execute_node'
+require 'drbqs/execute/execute_node'
 require_relative 'definition/task_obj_definition.rb'
 
 describe DRbQS::Server do
   before(:all) do
     @wait = 2
     @tasks = 10.times.map do |i|
-      DRbQS::Task.new(Test2.new, :echo_wait, [@wait])
+      DRbQS::Task.new(Test2.new, :echo_wait, args: [@wait])
     end
-    @server_process_id, @uri = drbqs_fork_server(14060, :task => @tasks, :continue => true)
+    @server_process_id, @uri = drbqs_fork_server(14060, :task => @tasks, :opts => { :not_exit => true })
     @manage = DRbQS::Manage.new(:uri => @uri)
   end
 
   it "should send node exit" do
-    execute_node = DRbQS::ExecuteNode.new(@uri, nil, nil)
+    execute_node = DRbQS::Execution::ExecuteNode.new(@uri, nil, nil)
     execute_node.execute(1)
     client_process_id = execute_node.pid[0]
     sleep(@wait)

data/spec/integration_test/08_shutdown_unused_nodes_spec.rb

@@ -6,12 +6,12 @@ require 'drbqs/command_line/command_line'
 describe DRbQS::Server do
   before(:all) do
     @max_wait_time = 10
-    @server_process_id, @uri = drbqs_fork_server(14080, :continue => true, :opts => { :shutdown_unused_nodes => true })
+    @server_process_id, @uri = drbqs_fork_server(14080, :opts => { :shutdown_unused_nodes => true, :not_exit => true })
     @manage = DRbQS::Manage.new(:uri => @uri)
   end
 
   it "should send node exit" do
-    execute_node = DRbQS::ExecuteNode.new(@uri, nil, nil)
+    execute_node = DRbQS::Execution::ExecuteNode.new(@uri, nil, nil)
     execute_node.execute(1)
     client_process_id = execute_node.pid[0]
     th = Process.detach(client_process_id)

data/spec/integration_test/09_server_process_data_spec.rb

@@ -18,7 +18,7 @@ describe DRbQS::Server do
     @file = DRbQS::Temporary.file
     @initial_data = ['abc', 'def']
     @max_wait_time = 10
-    @server_process_id, @uri = drbqs_fork_server(14090, :continue => true) do |server|
+    @server_process_id, @uri = drbqs_fork_server(14090, :opts => { :not_exit => true }) do |server|
       server.add_hook(:process_data) do |srv, data|
         open(@file, 'a+') do |f|
           f.print data

data/spec/integration_test/definition/server01.rb

@@ -7,14 +7,13 @@ DRbQS.option_parser do |opt, hash|
   end
 end
 
-DRbQS.define_server(:finish_exit => true) do |server, argv, opts|
-  tgen = DRbQS::TaskGenerator.new(:step => opts[:step])
-  tgen.set(:generate => 2) do
+DRbQS.define_server do |server, argv, opts|
+  step = opts[:step]
+  server.task_generator(:generate => 2) do |reg|
     1.step(100, 50) do |i|
-      create_add_task(TestSum.new, :calc, [i, i + 10, @step]) do |srv, result|
+      reg.create_add(TestSum.new, :calc, args: [i, i + 10, step]) do |srv, result|
         puts result
       end
     end
   end
-  server.add_task_generator(tgen)
 end

data/spec/integration_test/definition/server02.rb

@@ -7,10 +7,8 @@ DRbQS.option_parser do |opt, hash|
   end
 end
 
-DRbQS.define_server(:finish_exit => true) do |server, argv, opts|
-  tgen = DRbQS::TaskGenerator.new(:step => opts[:step])
-  tgen.set(:generate => 2) do
+DRbQS.define_server do |server, argv, opts|
+  server.task_generator(:generate => 2) do
     raise "Error raise"
   end
-  server.add_task_generator(tgen)
 end

data/spec/node/node_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DRbQS::Node do
+  context "when starting node" do
+    def init_node_objects(object = {})
+      @uri = 'drbunix:/tmp/drb_test'
+      @drb_object = {
+        :message => Rinda::TupleSpace.new,
+        :queue => Rinda::TupleSpace.new,
+        :result => Rinda::TupleSpace.new,
+        :key => 'server_key',
+        :transfer => nil
+      }.merge(object)
+    end
+
+    subject do
+      DRbQS::Node.new(@uri, :log_file => STDOUT)
+    end
+
+    before(:all) do
+      init_node_objects
+    end
+
+    it "should connect to server." do
+      DRb::DRbObject.should_receive(:new_with_uri).and_return(@drb_object)
+      node_connection = mock('node connection')
+      node_connection.stub(:node_number).and_return(10)
+      node_connection.stub(:get_initialization).and_return(nil)
+      DRbQS::Node::Connection.should_receive(:new).and_return(node_connection)
+      DRbQS::Node::TaskClient.should_receive(:new)
+      subject.connect
+    end
+  end
+end

data/spec/server/message_spec.rb

@@ -110,7 +110,7 @@ describe DRbQS::Server::Message do
     end
 
     it "should send status" do
-      @message_server.send_status({})
+      @message_server.send_status('status message')
       sym, status = @message.take([:status, nil])
       status.should be_an_instance_of String
     end

data/spec/server/queue_spec.rb

@@ -18,7 +18,7 @@ describe DRbQS::Server::Queue do
   end
 
   before(:all) do
-    @task = { :obj => DRbQS::Task.new([1, 2, 3], :size, []), :id => nil }
+    @task = { :obj => DRbQS::Task.new([1, 2, 3], :size), :id => nil }
   end
 
   context "when initializing queue" do
@@ -222,9 +222,9 @@ describe DRbQS::Server::Queue do
     before(:all) do
       object_init
       @node_ids = [200, 300]
-      @tasks = [DRbQS::Task.new([1, 2, 3], :size, []),
-                DRbQS::Task.new([-1, -2], :size, []),
-                DRbQS::Task.new([8, 9, 10, 11], :size, [])]
+      @tasks = [DRbQS::Task.new([1, 2, 3], :size),
+                DRbQS::Task.new([-1, -2], :size),
+                DRbQS::Task.new([8, 9, 10, 11], :size)]
       @task_ids = @tasks.map do |t|
         subject.add(t)
       end
@@ -287,9 +287,9 @@ describe DRbQS::Server::Queue do
 
   context "when managing some tasks" do
     before(:all) do
-      @task_ary = [DRbQS::Task.new([1, 2, 3], :size, []),
-                   DRbQS::Task.new([1, 3], :size, []),
-                   DRbQS::Task.new([2, 1, 2, 3], :size, [])]
+      @task_ary = [DRbQS::Task.new([1, 2, 3], :size, note: 'task1'),
+                   DRbQS::Task.new([1, 3], :size, note: 'task2'),
+                   DRbQS::Task.new([2, 1, 2, 3], :size, note: 'task3')]
       object_init
       @node_id = 100
       @task_id_ary = @task_ary.map do |task|
@@ -325,4 +325,31 @@ describe DRbQS::Server::Queue do
     end
   end
 
+  context "when creating messages of calculating tasks" do
+    before(:all) do
+      @task_ary = [DRbQS::Task.new([1, 2, 3], :size, note: 'task1'),
+                   DRbQS::Task.new([1, 3], :size, note: 'task2'),
+                   DRbQS::Task.new([2, 1, 2, 3], :size, note: 'task3')]
+      object_init
+      @node_id = 100
+      @task_id_ary = @task_ary.map do |task|
+        subject.add(task)
+      end
+      @ts[:result].write([:accept, @task_id_ary[0], 100])
+      @ts[:result].write([:accept, @task_id_ary[1], 101])
+      @ts[:result].write([:result, @task_id_ary[0], @node_id, :result_object])
+    end
+
+    it "should return number of acceptances of signals." do
+      subject.get_accept_signal.should == 2
+    end
+    
+    it "should return calculating task messages." do
+      messages = subject.calculating_task_message
+      messages.should have(2).items
+      messages[100].should == [[@task_id_ary[0], 'task1']]
+      messages[101].should == [[@task_id_ary[1], 'task2']]
+    end
+  end
+
 end

data/spec/server/server_spec.rb

@@ -59,31 +59,43 @@ describe DRbQS::Server do
       server_hook = mock
       DRbQS::Server::Hook.stub!(:new).and_return(server_hook)
       server_hook.should_receive(:set_finish_exit)
-      DRbQS::Server.new(:finish_exit => true)
+      DRbQS::Server.new
     end
   end
 
   context "when starting DRbQS::Server" do
-    it "should not set DRbQS::FileTransfer" do
+    it "should not set DRbQS::Transfer" do
       server = DRbQS::Server.new
-      DRbQS::TransferClient.should_not_receive(:new)
+      DRbQS::Transfer::Client.should_not_receive(:new)
       DRb.should_receive(:start_service).once
       server.start
     end
 
-    it "should set DRbQS::FileTransfer" do
-      server = DRbQS::Server.new(:file_directory => '/tmp', :sftp_user => 'hello', :sftp_host => 'example.com')
-      DRbQS::TransferClient::SFTP.should_receive(:new).with('hello', 'example.com', '/tmp')
+    it "should set DRbQS::Transfer" do
+      dir = '/tmp/drbqs_transfer_test'
       DRb.should_receive(:start_service).once
+      server = DRbQS::Server.new(:file_directory => dir, :sftp_user => 'hello', :sftp_host => 'example.com')
       server.start
+      transfer = server.instance_variable_get(:@ts)[:transfer]
+      transfer.user.should == 'hello'
+      transfer.host.should == 'example.com'
+      transfer.directory.should == dir
+      File.exist?(dir).should be_true
+      FileUtils.rm_r(dir)
     end
 
-    it "should set DRbQS::FileTransfer by DRbQS::Server#set_file_transfer with optional arguments" do
+    it "should set DRbQS::Transfer by DRbQS::Server#set_file_transfer with optional arguments" do
+      dir = '/tmp/drbqs_transfer_test'
       server = DRbQS::Server.new
-      DRbQS::TransferClient::SFTP.should_receive(:new).with('hello', 'example.com', '/tmp')
       DRb.should_receive(:start_service).once
-      server.set_file_transfer('/tmp', :user => 'hello', :host => 'example.com')
+      server.set_file_transfer(dir, :user => 'hello', :host => 'example.com')
       server.start
+      transfer = server.instance_variable_get(:@ts)[:transfer]
+      transfer.user.should == 'hello'
+      transfer.host.should == 'example.com'
+      transfer.directory.should == dir
+      File.exist?(dir).should be_true
+      FileUtils.rm_r(dir)
     end
   end
 end

data/spec/server/transfer_setting_spec.rb

@@ -3,35 +3,70 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'drbqs/utility/temporary'
 
 describe DRbQS::Server::TransferSetting do
-  it "should return nil." do
-    setting = DRbQS::Server::TransferSetting.new('example.com', 'user', nil)
-    setting.create(nil).should be_nil
+  context "when setup does not execute" do
+    it "should return nil." do
+      setting = DRbQS::Server::TransferSetting.new('example.com', 'user', nil)
+      setting.setup_server(nil).should be_nil
+    end
   end
 
-  it "should return transfer client." do
-    dir = DRbQS::Temporary.file
-    setting = DRbQS::Server::TransferSetting.new('example.com', 'user', dir)
-    client = setting.create(nil)
-    client.should be_an_instance_of DRbQS::TransferClient
-    client.sftp.should be_an_instance_of DRbQS::TransferClient::SFTP
-    setting.create(nil).should be_nil
+  context "when setup transfer settings" do
+    it "should set transfer settings by initializing." do
+      dir = DRbQS::Temporary.file
+      setting = DRbQS::Server::TransferSetting.new('example.com', 'user', dir)
+      setting.setup_server(nil).should be_true
+      setting.user.should == 'user'
+      setting.host.should == 'example.com'
+      setting.directory.should == dir
+    end
+
+    it "should set directory by setup_server." do
+      dir = DRbQS::Temporary.file
+      setting = DRbQS::Server::TransferSetting.new('example.com', 'user', nil)
+      setting.setup_server(dir).should be_true
+      setting.user.should == 'user'
+      setting.host.should == 'example.com'
+      setting.directory.should == dir
+    end
+
+    it "should not set sftp settings." do
+      dir = DRbQS::Temporary.file
+      setting = DRbQS::Server::TransferSetting.new(nil, nil, dir)
+      setting.setup_server(nil).should be_true
+      setting.host.should be_nil
+      setting.directory.should == dir
+    end
   end
 
-  it "should return transfer client with a directory argument." do
-    dir = DRbQS::Temporary.file
-    setting = DRbQS::Server::TransferSetting.new('example.com', 'user', nil)
-    client = setting.create(dir)
-    client.should be_an_instance_of DRbQS::TransferClient
-    client.sftp.should be_an_instance_of DRbQS::TransferClient::SFTP
-    setting.create(dir).should be_nil
+  context "when creating transfer client" do
+    it "should return nil because setup is not executed." do
+      dir = DRbQS::Temporary.file
+      setting = DRbQS::Server::TransferSetting.new('example.com', 'user', dir)
+      setting.get_client(true).should be_nil
+    end
+    
+    it "should return local and sftp transfer client." do
+      dir = DRbQS::Temporary.file
+      setting = DRbQS::Server::TransferSetting.new('example.com', 'user', dir)
+      setting.setup_server(nil).should be_true
+      client = setting.get_client(true)
+      client.directory.should == dir
+      client.local.should be_an_instance_of DRbQS::Transfer::Client::Local
+      client.sftp.should be_an_instance_of DRbQS::Transfer::Client::SFTP
+    end
+    
+    it "should return only local transfer client." do
+      dir = DRbQS::Temporary.file
+      setting = DRbQS::Server::TransferSetting.new(nil, nil, dir)
+      setting.setup_server(nil).should be_true
+      client = setting.get_client(true)
+      client.directory.should == dir
+      client.local.should be_an_instance_of DRbQS::Transfer::Client::Local
+      client.sftp.should be_nil
+    end
   end
 
-  it "should return transfer client without sftp" do
-    dir = DRbQS::Temporary.file
-    setting = DRbQS::Server::TransferSetting.new(nil, nil, dir)
-    client = setting.create(nil)
-    client.should be_an_instance_of DRbQS::TransferClient
-    client.sftp.should be_nil
-    setting.create(nil).should be_nil
+  after(:all) do
+    DRbQS::Temporary.delete_all
   end
 end

data/spec/setting/base_spec.rb

@@ -32,4 +32,15 @@ describe DRbQS::Setting::Base do
       obj.parse!
     end.should_not change(obj, :string_for_shell)
   end
+
+  it "should clone an object." do
+    obj = DRbQS::Setting::Base.new(:all_keys_defined => true, :log_level => true, :daemon => true)
+    obj.value.daemon '/path/to/log'
+    obj.value.log_level 'debug'
+    obj_clone = obj.clone
+    obj.value.daemon << '/add'
+    obj.value.daemon.should_not == obj_clone.value.daemon
+    obj_clone.value.debug 'error'
+    obj_clone.value.debug.should_not == obj.value.debug
+  end
 end

data/spec/setting/data_container_spec.rb

@@ -88,5 +88,13 @@ describe DRbQS::Setting::Source::DataContainer do
       subject.key1 = 'def'
       subject.key1.should_not == container_clone.key1
     end
+
+    it "should not change a cloned object." do
+      subject.key1 = 'abc'
+      container_clone = DRbQS::Setting::Source.clone_container(subject)
+      subject.key1 << 'def'
+      container_clone.key1.should_not include('def')
+      subject.key1.should include('def')
+    end
   end
 end