drbqs 0.0.15 → 0.0.16

data/spec/spec_helper.rb

@@ -61,7 +61,7 @@ def drbqs_fork_server(uri_arg, opts = {}, &block)
         task_args = [task_args]
       end
       task_args.each do |arg|
-        if DRbQS::TaskGenerator === arg
+        if DRbQS::Task::Generator === arg
           server.add_task_generator(arg)
         else
           server.queue.add(arg)
@@ -69,12 +69,6 @@ def drbqs_fork_server(uri_arg, opts = {}, &block)
       end
     end
 
-    unless opts[:continue]
-      server.add_hook(:finish) do |serv|
-        serv.exit
-      end
-    end
-
     server.set_signal_trap
     server.start
     server.wait

data/spec/task/registrar_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'drbqs/task/task'
+
+describe DRbQS::Task::Registrar do
+  subject do
+    DRbQS::Task::Registrar.new({})
+  end
+
+  it "should raise error for invalid argumuents." do
+    lambda do
+      subject.add("neither DRbQS::Task nor Array")
+    end.should raise_error ArgumentError
+  end
+
+  it "should call Fiber.yield." do
+    task = DRbQS::Task.new([1, 2, 3], :size, note: "calculate size of an array")
+    Fiber.should_receive(:yield).with(task)
+    subject.add(task)
+  end
+
+  it "should call Fiber.yield for each task." do
+    task_ary = 5.times.map do |i|
+      DRbQS::Task.new(i, :to_s, note: "convert to string")
+    end
+    Fiber.should_receive(:yield).exactly(task_ary.size).times
+    subject.add(task_ary)
+  end
+
+  it "should call Fiber.yield with :wait." do
+    Fiber.should_receive(:yield).with(:wait)
+    subject.wait
+  end
+end

data/spec/task/task_generator_spec.rb

@@ -2,24 +2,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 require 'drbqs/task/task'
 
-describe DRbQS::TaskGenerator do
+describe DRbQS::Task::Generator do
   def check_task_ary(tasks, num, cl = DRbQS::Task)
     tasks.should have(num).items
     tasks.all? { |t| cl === t }.should be_true
   end
 
-  subject { DRbQS::TaskGenerator.new(:abc => 'ABC', :def => 123, :data => [1, 2, 3]) }
+  subject { DRbQS::Task::Generator.new(:abc => 'ABC', :def => 123, :data => [1, 2, 3]) }
 
   it "should initialize instance varibles" do
-    source = subject.instance_variable_get('@source')
-    source.instance_variable_get('@abc').should == 'ABC'
-    source.instance_variable_get('@def').should == 123
+    registrar = subject.instance_variable_get('@registrar')
+    registrar.instance_variable_get('@abc').should == 'ABC'
+    registrar.instance_variable_get('@def').should == 123
   end
 
   it "should create new tasks" do
-    subject.set(:generate => 2) do
+    subject.set(:generate => 2) do |reg|
       @data.each do |i|
-        create_add_task(i, :to_s)
+        reg.create_add(i, :to_s)
       end
     end
     subject.init
@@ -29,22 +29,22 @@ describe DRbQS::TaskGenerator do
   end
 
   it "should should create task sets" do
-    subject.set(:generate => 2, :collect => 10) do
+    subject.set(:generate => 2, :collect => 10) do |reg|
       100.times do |i|
-        create_add_task(i, :to_s)
+        reg.create_add(i, :to_s)
       end
     end
     subject.init
     5.times do |i|
-      check_task_ary(subject.new_tasks, 2, DRbQS::TaskSet)
+      check_task_ary(subject.new_tasks, 2, DRbQS::Task::TaskSet)
     end
     subject.new_tasks.should be_nil
   end
 
   it "should debug generator" do
-    subject.set(:generate => 2) do
+    subject.set(:generate => 2) do |reg|
       @data.each do |i|
-        create_add_task(i, :to_s)
+        reg.create_add(i, :to_s)
       end
     end
     subject.init
@@ -54,12 +54,12 @@ describe DRbQS::TaskGenerator do
   end
 
   it "should wait" do
-    subject.set(:generate => 2) do
+    subject.set(:generate => 2) do |reg|
       @data.each do |i|
         if i == 2
-          wait_all_tasks
+          reg.wait
         end
-        create_add_task(i, :to_s)
+        create_add(i, :to_s)
       end
     end
     subject.init

data/spec/task/task_spec.rb

@@ -2,46 +2,126 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 require 'drbqs/task/task'
 
+class TestTask
+  def initialize(result)
+    @result = result
+  end
+
+  def calc
+  end
+
+  def test_hook(srv, result)
+    @result.should == result
+  end
+end
+
 describe DRbQS::Task do
-  it "should not set hook" do
+  it "should not set hook." do
     task = DRbQS::Task.new([1, 2, 3], :size)
     task.hook.should be_nil
   end
 
-  it "should set hook" do
+  it "should set hook of block." do
     task = DRbQS::Task.new([1, 2, 3], :size) do |server, ret|
       p ret
     end
     task.hook.should be_an_instance_of Proc
   end
 
-  it "should have same targets" do
-    task1 = DRbQS::Task.new([1, 2, 3], :concat, [3, 4, 5])
-    task2 = DRbQS::Task.new([1, 2, 3], :concat, [3, 4, 5])
-    task1.same_target?(task2).should be_true
+  it "should set hook of symbol." do
+    task = DRbQS::Task.new([1, 2, 3], :size, hook: :to_s)
+    task.hook.should == :to_s
+  end
+
+  it "should return nil for nonexistent hook." do
+    task = DRbQS::Task.new([1, 2, 3], :size)
+    task.exec_hook(nil, nil).should be_nil
+  end
+
+  it "should execute hook of block." do
+    mock = mock('for task')
+    task = DRbQS::Task.new(mock, :calc) do |server, result|
+      mock.hook_method(server, result)
+    end
+    mock.should_receive(:hook_method).with(:server, :result)
+    task.exec_hook(:server, :result)
+  end
+
+  it "should execute hook of symbol." do
+    mock = mock('for task')
+    task = DRbQS::Task.new(mock, :calc, hook: :hook_method)
+    mock.should_receive(:hook_method).with(:server, :result)
+    task.exec_hook(:server, :result)
+  end
+
+  it "should set note." do
+    note_string = "Return size"
+    task = DRbQS::Task.new([1, 2, 3], :size, note: note_string)
+    task.note.should == note_string
+  end
+
+  it "should not have note." do
+    note_string = "Return size"
+    task = DRbQS::Task.new([1, 2, 3], :size)
+    task.note.should be_nil
+  end
+
+  it "should have empty argument array." do
+    task = DRbQS::Task.new([1, 2, 3], :size)
+    task.args.should == []
+  end
+
+  it "should set arguments." do
+    ary = [3, 4, 5]
+    task = DRbQS::Task.new([1, 2, 3], :concat, args: ary)
+    task.args.should == ary
+  end
+
+  it "should marshalize." do
+    task = DRbQS::Task.new(TestTask.new(100), :calc, hook: :test_hook)
+    lambda do
+      Marshal.dump(task)
+    end.should_not raise_error
+  end
+
+  it "should not marshalize." do
+    task = DRbQS::Task.new(TestTask.new(100), :calc) do |srv, res|
+      p res
+    end
+    lambda do
+      Marshal.dump(task)
+    end.should raise_error
   end
 end
 
-describe DRbQS::CommandExecute do
-  it "should execute command" do
-    cmd_exec = DRbQS::CommandExecute.new('ls > /dev/null')
-    cmd_exec.exec.should == 0
+describe DRbQS::Task::TaskSet::ContainerTask do
+  it "should dump and load" do
+    obj = [[1], [1, 2], [1, 2, 3]]
+    tasks = obj.map do |ary|
+      DRbQS::Task.new(ary, :size)
+    end
+    container = DRbQS::Task::TaskSet::ContainerTask.new(tasks)
+    dump = Marshal.dump(container)
+    Marshal.load(dump).should == container
   end
 
-  it "should enqueue files" do
-    DRbQS::FileTransfer.should_receive(:enqueue).exactly(2)
-    cmd_exec = DRbQS::CommandExecute.new('ls > /dev/null', :transfer => ['hello', 'world'])
-    cmd_exec.exec
+  it "should execute each task" do
+    obj = [[1, 3, 4], [2], [1, 2, 3]]
+    tasks = obj.map do |ary|
+      DRbQS::Task.new(ary, :size)
+    end
+    container = DRbQS::Task::TaskSet::ContainerTask.new(tasks)
+    container.exec.should == [3, 1, 3]
   end
 end
 
-describe DRbQS::TaskContainer do
+describe DRbQS::Task::TaskSet::ContainerWithoutHook do
   it "should dump and load" do
     obj = [[1], [1, 2], [1, 2, 3]]
     tasks = obj.map do |ary|
       DRbQS::Task.new(ary, :size)
     end
-    container = DRbQS::TaskContainer.new(tasks)
+    container = DRbQS::Task::TaskSet::ContainerWithoutHook.new(tasks)
     dump = Marshal.dump(container)
     Marshal.load(dump).should == container
   end
@@ -51,15 +131,33 @@ describe DRbQS::TaskContainer do
     tasks = obj.map do |ary|
       DRbQS::Task.new(ary, :size)
     end
-    container = DRbQS::TaskContainer.new(tasks)
+    container = DRbQS::Task::TaskSet::ContainerWithoutHook.new(tasks)
     container.exec.should == [3, 1, 3]
   end
 end
 
-describe DRbQS::TaskSet do
-  it "should execute hooks" do
-    server = double('server')
-    methods_for_hook = double('hook')
+describe DRbQS::Task::TaskSet do
+  it "should use DRbQS::Task::TaskSet::ContainerTask." do
+    tasks = [DRbQS::Task.new([1, 2], :to_s), DRbQS::Task.new([1, 2], :size, hook: :to_s)]
+    task_set = DRbQS::Task::TaskSet.new(tasks)
+    task_set.obj.should be_an_instance_of DRbQS::Task::TaskSet::ContainerTask
+  end
+
+  it "should use DRbQS::Task::TaskSet::ContainerWithoutHook." do
+    tasks = []
+    tasks << DRbQS::Task.new([1, 2], :to_s) do |srv, result|
+      p result
+    end
+    tasks << DRbQS::Task.new([1, 2], :size) do |srv, result|
+      p result
+    end
+    task_set = DRbQS::Task::TaskSet.new(tasks)
+    task_set.obj.should be_an_instance_of DRbQS::Task::TaskSet::ContainerWithoutHook
+  end
+
+  it "should execute hooks of blocks." do
+    server = mock('server')
+    methods_for_hook = mock('hook')
     methods_for_hook.should_receive(:m0).exactly(1)
     methods_for_hook.should_receive(:m1).exactly(1)
     methods_for_hook.should_receive(:m2).exactly(1)
@@ -68,7 +166,18 @@ describe DRbQS::TaskSet do
     tasks << DRbQS::Task.new(obj[0], :size, &methods_for_hook.method(:m0))
     tasks << DRbQS::Task.new(obj[1], :size, &methods_for_hook.method(:m1))
     tasks << DRbQS::Task.new(obj[2], :size, &methods_for_hook.method(:m2))
-    task_set = DRbQS::TaskSet.new(tasks)
-    task_set.hook.call(server, [1, 2, 3])
+    task_set = DRbQS::Task::TaskSet.new(tasks)
+    task_set.exec_hook(server, [1, 2, 3])
+  end
+
+  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)
+    task_set = DRbQS::Task::TaskSet.new(tasks)
+    task_set.exec_hook(server, [100, 200, 300])
   end
 end

data/spec/utility/misc_spec.rb

@@ -2,9 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 require 'drbqs/utility/temporary'
 
-describe DRbQS::LoggerDummy do
+describe DRbQS::Misc::LoggerDummy do
   subject do
-    DRbQS::LoggerDummy.new
+    DRbQS::Misc::LoggerDummy.new
   end
 
   it "should respond to info." do

data/spec/utility/transfer/transfer_client_connect_spec.rb

@@ -0,0 +1,90 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'drbqs/utility/temporary'
+require 'drbqs/utility/transfer/transfer'
+require 'drbqs/utility/transfer/transfer_client'
+
+def create_sample_transfer_files(n = nil)
+  tmp_dir = DRbQS::Temporary.directory
+  files = []
+  (n || 3).times do |i|
+    path = File.join(tmp_dir, "test%d.txt" % i)
+    files << path
+    open(path, 'w') do |f|
+      f.puts (i * i).to_s
+    end
+  end
+  [tmp_dir, files]
+end
+
+describe DRbQS::Transfer::Client::Local do
+  before(:all) do
+    @dir = DRbQS::Temporary.directory
+    @client = DRbQS::Transfer::Client::Local.new(@dir)
+  end
+
+  it "should move files." do
+    tmp_dir, files = create_sample_transfer_files
+    @client.transfer(files)
+    files.all? do |path|
+      !File.exist?(path)
+    end.should be_true
+    files.all? do |path|
+      File.exist?(File.join(@dir, File.basename(path)))
+    end.should be_true
+  end
+
+  it "should copy files." do
+    tmp_dir, files = create_sample_transfer_files
+    @client.download(files)
+    files.all? do |path|
+      File.exist?(path)
+    end.should be_true
+    files.all? do |path|
+      File.exist?(File.join(@dir, File.basename(path)))
+    end.should be_true
+  end
+
+  after(:all) do
+    DRbQS::Temporary.delete_all
+  end
+end
+
+describe DRbQS::Transfer::Client::SFTP do
+  module Net::SFTP
+    def self.set_mock(m)
+      @mock = m
+    end
+
+    def self.start(user, host, &block)
+      yield(@mock)
+    end
+  end
+
+  before(:all) do
+    @dir = DRbQS::Temporary.directory
+    @client = DRbQS::Transfer::Client::SFTP.new('user_name', 'example.com', @dir)
+  end
+
+  it "should transfer files." do
+    tmp_dir, files = create_sample_transfer_files(1)
+    source_path = files[0]
+    sftp = mock('sftp')
+    sftp.should_receive(:upload).with(source_path, File.join(@dir, File.basename(source_path)))
+    FileUtils.should_receive(:rm_r).with(source_path)
+    Net::SFTP.set_mock(sftp)
+    @client.transfer(files)
+  end
+
+  it "should download files. (incomplete)" do
+    tmp_dir, files = create_sample_transfer_files(1)
+    sftp = mock('sftp')
+    sftp.should_receive(:download)
+    Net::SFTP.set_mock(sftp)
+    @client.download(files)
+  end
+
+  after(:all) do
+    DRbQS::Temporary.delete_all
+  end
+end

data/spec/utility/transfer/transfer_file_list_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'drbqs/utility/transfer/transfer'
+require 'drbqs/utility/transfer/transfer_client'
+require 'drbqs/utility/transfer/transfer_file_list'
+
+describe DRbQS::Transfer::FileList do
+  before(:all) do
+    @files = Dir.glob("#{File.dirname(__FILE__)}/*.rb")
+  end
+
+  it "should download files." do
+    client = mock('transfer client')
+    DRbQS::Transfer::Client.stub(:get).and_return(client)
+    client.should_receive(:download).with(@files, nil)
+    file_list = DRbQS::Transfer::FileList.new(*@files)
+    file_list.path
+  end
+
+  it "should download files with readonly." do
+    client = mock('transfer client')
+    DRbQS::Transfer::Client.stub(:get).and_return(client)
+    client.should_receive(:download).with(@files, true)
+    file_list = DRbQS::Transfer::FileList.new(*@files, :readonly => true)
+    file_list.path
+  end
+end