drbqs 0.0.19 → 0.1.0

data/lib/drbqs/utility/temporary.rb

@@ -2,39 +2,40 @@ require 'tmpdir'
 
 module DRbQS
   module Temporary
-    @@root = nil
-    @@subdir = nil
-    @@filename = nil
+    @root = nil
+    @pid = nil
+    @subdir = nil
+    @filename = nil
 
-    def self.set_root_directory
-      if !@@root
-        pid = Process.pid
-        @@root = File.join(Dir.tmpdir, sprintf("drbqs_%s_%d_%d", ENV['USER'], pid, rand(10000)))
-        FileUtils.mkdir_p(@@root, :mode => 0700)
+    # Return root of temporary directory.
+    def self.root
+      if @pid != Process.pid
+        @pid = Process.pid
+        @root = File.join(Dir.tmpdir, sprintf("drbqs_%s_%d_%d", ENV['USER'], @pid, rand(10000)))
+        FileUtils.mkdir_p(@root, :mode => 0700)
       end
+      @root
     end
 
     def self.set_sub_directory(dir)
-      self.set_root_directory
-      @@filename = nil
-      @@subdir = File.join(@@root, dir)
+      @filename = nil
+      @subdir = File.join(self.root, dir)
     end
 
     def self.subdirectory
-      @@subdir && File.exist?(@@subdir) ? @@subdir : nil
+      @subdir && File.exist?(@subdir) ? @subdir : nil
     end
 
     # Return FileName object to generate names of temporary files on DRbQS nodes.
     def self.filename
-      unless @@filename
-        self.set_root_directory
-        if @@subdir
-          @@filename = FileName.new(File.join(@@subdir, sprintf("temp_%d", rand(10000))))
+      unless @filename
+        if @subdir
+          @filename = FileName.new(File.join(@subdir, sprintf("temp_%d", rand(10000))))
         else
-          @@filename = FileName.new(File.join(@@root, sprintf("temp_%d", rand(10000))))
+          @filename = FileName.new(File.join(self.root, sprintf("temp_%d", rand(10000))))
         end
       end
-      @@filename
+      @filename
     end
 
     # Create new temporary directory and return the path of directory.
@@ -52,26 +53,18 @@ module DRbQS
       end
     end
 
-    # Make root of temporary directory empty.
-    def self.delete
-      if @@root
-        FileUtils.rm_r(@@root)
-        FileUtils.mkdir_p(@@root, :mode => 0700)
-      end
-    end
-
     # Delete all temporary directory.
-    def self.delete_all
-      if @@root
-        FileUtils.rm_r(@@root)
-        @@root = nil
-        @@filename = nil
+    def self.delete
+      if @root
+        FileUtils.rm_r(@root)
+        @pid = nil
+        @root = nil
+        @filename = nil
       end
     end
 
-    # Return root of temporary directory.
-    def self.root
-      @@root
+    def self.socket_path
+      FileName.create(self.root, "socket", :add => :always, :type => :time)
     end
   end
 end

data/lib/drbqs/version.rb

@@ -1,3 +1,3 @@
 module DRbQS
-  VERSION = '0.0.19'
+  VERSION = '0.1.0'
 end

data/lib/drbqs/worker/worker_process_set.rb

@@ -1,6 +1,5 @@
 require 'drbqs/worker/serialize'
 require 'drbqs/worker/forked_process'
-require 'drbqs/utility/temporary.rb'
 
 module DRbQS
   class Worker
@@ -160,6 +159,9 @@ module DRbQS
                 data << h[:in].read_nonblock(READ_BYTE_SIZE)
               end
             rescue IO::WaitReadable
+            rescue
+              $stderr.puts "Stored data: " + data.inspect
+              raise
             end
             if !data.empty?
               num += 1

data/spec/command_line/command_base_spec.rb

@@ -5,7 +5,7 @@ require 'drbqs/command_line/command_line'
 describe DRbQS::Command::Base do
   context "when executing" do
     it "should execute." do
-      setting = mock('setting')
+      setting = double('setting')
       DRbQS::Setting::Base.stub(:new).and_return(setting)
       setting.should_receive(:parse!)
       setting.should_receive(:exec).with($stdout)
@@ -16,7 +16,7 @@ describe DRbQS::Command::Base do
 
     it "should define DRbQS::Command::Base.exec." do
       argv = [1, 2, 3]
-      obj = mock
+      obj = double
       DRbQS::Command::Base.should_receive(:new).and_return(obj)
       obj.should_receive(:parse_option)
       obj.should_receive(:exec)

data/spec/config/config_spec.rb

@@ -3,10 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe DRbQS::Config do
   before(:all) do
     FileUtils.mkdir_p(HOME_FOR_SPEC)
+    @config = DRbQS::Config.new
   end
 
   subject do
-    DRbQS::Config.new
+    @config
   end
 
   context "when setting new homedirectory" do
@@ -33,14 +34,14 @@ describe DRbQS::Config do
 
     it "should get directory existing." do
       lambda do
-        subject
+        DRbQS::Config.new
       end.should change { File.exist?(@dir) }.from(false).to(true)
     end
   end
 
   context "when saving samples" do
     before(:all) do
-      subject.save_sample
+      @config.save_sample
     end
 
     it "should get sample of ACL file." do
@@ -58,7 +59,7 @@ describe DRbQS::Config do
 
   context "when managing ACL file" do
     before(:all) do
-      @path = subject.directory.file_path('acl.txt')
+      @path = @config.directory.file_path('acl.txt')
       FileUtils.rm(@path) if File.exist?(@path)
     end
 

data/spec/config/ssh_host_spec.rb

@@ -76,6 +76,6 @@ describe DRbQS::Config::SSHHost do
   end
 
   after(:all) do
-    DRbQS::Temporary.delete_all
+    DRbQS::Temporary.delete
   end
 end

data/spec/execute/process_define_spec.rb

@@ -8,13 +8,14 @@ describe DRbQS::ProcessDefinition do
   end
 
   context "when creating without default process names" do
-    subject do
-      DRbQS::ProcessDefinition.new(nil, nil, nil)
+    before(:all) do
+      @process_def = DRbQS::ProcessDefinition.new(nil, nil, nil)
+      @process_def.load(definition_file('execute1.rb'))
+      @info = @process_def.information
     end
 
-    before(:all) do
-      subject.load(definition_file('execute1.rb'))
-      @info = subject.information
+    subject do
+      @process_def
     end
 
     it "should get server list." do
@@ -68,13 +69,14 @@ describe DRbQS::ProcessDefinition do
   end
 
   context "when there is no definition" do
-    subject do
-      DRbQS::ProcessDefinition.new(nil, nil, nil)
+    before(:all) do
+      @process_def = DRbQS::ProcessDefinition.new(nil, nil, nil)
+      @process_def.load(definition_file('no_def.rb'))
+      @info = @process_def.information
     end
 
-    before(:all) do
-      subject.load(definition_file('no_def.rb'))
-      @info = subject.information
+    subject do
+      @process_def
     end
 
     it "should get server list." do
@@ -117,9 +119,9 @@ describe DRbQS::ProcessDefinition do
       @tmp = '/tmp/drbqs_tmp_log' # defined in execute1.rb
       @process_def = DRbQS::ProcessDefinition.new(nil, nil, @port)
       @process_def.load(definition_file('execute1.rb'))
-      @server_setting = subject.__send__(:get_server_setting)[1][:setting]
-      @node_local_setting = subject.__send__(:get_node_data, :node_local)[:setting]
-      @node_ssh_setting = subject.__send__(:get_node_data, :node_ssh)[:setting]
+      @server_setting = @process_def.__send__(:get_server_setting)[1][:setting]
+      @node_local_setting = @process_def.__send__(:get_node_data, :node_local)[:setting]
+      @node_ssh_setting = @process_def.__send__(:get_node_data, :node_ssh)[:setting]
     end
 
     subject do
@@ -153,8 +155,8 @@ describe DRbQS::ProcessDefinition do
       @tmp = '/tmp/drbqs_tmp_log' # defined in execute1.rb
       @process_def = DRbQS::ProcessDefinition.new(nil, [:node_local], nil)
       @process_def.load(definition_file('execute1.rb'))
-      @server_setting = subject.__send__(:get_server_setting)[1][:setting]
-      @node_local_setting = subject.__send__(:get_node_data, :node_local)[:setting]
+      @server_setting = @process_def.__send__(:get_server_setting)[1][:setting]
+      @node_local_setting = @process_def.__send__(:get_node_data, :node_local)[:setting]
     end
 
     subject do
@@ -186,9 +188,9 @@ describe DRbQS::ProcessDefinition do
       @tmp = '/tmp/drbqs_tmp_log' # defined in execute1.rb
       @process_def = DRbQS::ProcessDefinition.new(nil, nil, nil)
       @process_def.load(definition_file('execute2.rb'))
-      @server_setting = subject.__send__(:get_server_setting)[1][:setting]
-      @node_local_setting = subject.__send__(:get_node_data, :node_local)[:setting]
-      @node_ssh_setting = subject.__send__(:get_node_data, :node_ssh)[:setting]
+      @server_setting = @process_def.__send__(:get_server_setting)[1][:setting]
+      @node_local_setting = @process_def.__send__(:get_node_data, :node_local)[:setting]
+      @node_ssh_setting = @process_def.__send__(:get_node_data, :node_ssh)[:setting]
     end
 
     subject do
@@ -201,4 +203,49 @@ describe DRbQS::ProcessDefinition do
       subject.execute_node
     end
   end
+
+
+  context "when testing consistency" do
+    before(:each) do
+      @process_def = DRbQS::ProcessDefinition.new(nil, nil, nil)
+    end
+
+    subject do
+      @process_def
+    end
+
+    it "should not raise error" do
+      subject.register.default(:server => :server_existent)
+      subject.register.server(:server_existent, "example.com") do |server, ssh|
+      end
+      lambda do
+        subject.test_consistency
+      end.should_not raise_error
+    end
+
+    it "should should raise error" do
+      subject.register.default(:server => :server_non_existent)
+      lambda do
+        subject.test_consistency
+      end.should_not raise_error
+    end
+
+    it "should not raise error" do
+      subject.register.default(:node => [:node1, :node2])
+      subject.register.node(:node1) do |node|
+      end
+      subject.register.node(:node2) do |node|
+      end
+      lambda do
+        subject.test_consistency
+      end.should_not raise_error
+    end
+
+    it "should raise an error for non-existent node" do
+      subject.register.default(:node => [:node1, :node2])
+      lambda do
+        subject.test_consistency
+      end.should raise_error
+    end
+  end
 end

data/spec/execute/register_spec.rb

@@ -42,7 +42,7 @@ describe DRbQS::ProcessDefinition::Register do
     it "should raise error for arguments without hostname." do
       load_file = 'file.rb'
       lambda do
-        subject.server(:server3) do |server|
+        subject.server(:server3) do |server, ssh|
           server.load load_file
         end
       end.should raise_error
@@ -78,6 +78,14 @@ describe DRbQS::ProcessDefinition::Register do
       setting.get(:shell).should == [bash]
       setting.mode_setting.get(:load).should == [load_file]
     end
+
+    it "should raise an error for invalid keys" do
+      lambda do
+        subject.server(:server6, "example.com", :invalid_key => "Hello") do |server|
+          ssh.shell "bash"
+        end
+      end.should raise_error
+    end
   end
 
   context "when registering a node" do
@@ -158,6 +166,15 @@ describe DRbQS::ProcessDefinition::Register do
         subject.node(:node_group, :group => :node_error)
       end.should raise_error
     end
+
+    it "should raise an error for invalid keys" do
+      uri = 'druby://:12345'
+      lambda do
+        subject.node(:node_error, :invalid_key => "Hello") do |node|
+          node.connect uri
+        end
+      end.should raise_error
+    end
   end
 
   context "when loading other server difinition" do
@@ -452,20 +469,25 @@ describe DRbQS::ProcessDefinition::Register do
       h[:node].should == nodes
     end
 
-    it "should set default value for some keys." do
-      subject.default(:log => '/tmp/drbqs/log', :some_key => 'some_value')
+    it "should set default value of log file." do
+      subject.default(:log => '/tmp/drbqs/log')
       h = subject.__default__
       h[:log].should == '/tmp/drbqs/log'
-      h[:some_key].should == 'some_value'
     end
 
     it "should clear values." do
-      subject.default(key1: 'val1', key2: 'val2', key3: 'val3')
-      subject.default_clear(:key1, :key2)
+      subject.default(:log => 'val1', :port => '12345', :server => :server1)
+      subject.default_clear(:log, :port)
       h = subject.__default__
-      h[:key1].should be_nil
-      h[:key2].should be_nil
-      h[:key3].should == 'val3'
+      h[:log].should be_nil
+      h[:port].should be_nil
+      h[:server].should == :server1
+    end
+
+    it "should raise an error for invalid keys" do
+      lambda do
+        subject.default(:invalid_key => 'val1')
+      end.should raise_error
     end
   end
 end

data/spec/ext/task/command_task_spec.rb

@@ -1,16 +1,14 @@
 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
+    cmd_exec = DRbQS::CommandTask::CommandExecute.new(['ls > /dev/null', "echo hello > /dev/null"])
+    cmd_exec.exec.should == [0, 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
+    cmd_exec.exec.should == [0]
   end
 end

data/spec/integration_test/09_server_process_data_spec.rb

@@ -64,7 +64,7 @@ describe DRbQS::Server do
   end
 
   after(:all) do
-    DRbQS::Temporary.delete_all
+    DRbQS::Temporary.delete
     @manage.send_exit_signal
     lambda do
       drbqs_wait_kill_server(@server_process_id)

data/spec/node/node_spec.rb

@@ -24,12 +24,12 @@ describe DRbQS::Node do
     it "should connect to server." do
       node_number = 10
       DRb::DRbObject.should_receive(:new_with_uri).and_return(@drb_object)
-      node_connection = mock('node connection')
+      node_connection = double('node connection')
       node_connection.stub(:node_number).and_return(node_number)
       node_connection.stub(:get_initialization).and_return(nil)
-      task_client = mock('task client')
+      task_client = double('task client')
       task_client.stub(:node_number).and_return(node_number)
-      worker = mock('worker')
+      worker = double('worker')
       worker.stub(:create_process)
       worker.stub(:on_error)
       worker.stub(:on_result)

data/spec/node/task_client_spec.rb

@@ -108,7 +108,7 @@ describe DRbQS::Node::TaskClient do
       @task_id = 3
       @task_ary = [[1, 3, 5, 7], :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      @get_task_id = subject.add_new_task(1)
+      @get_task_id = @task_client.add_new_task(1)
     end
 
     it "should have non empty task queue." do
@@ -138,8 +138,8 @@ describe DRbQS::Node::TaskClient do
       @task_id = 8
       @task_ary = [[1, 3, 5, 7], :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      @get_task_id = subject.add_new_task(1)
-      @dequeued_task = subject.dequeue_task
+      @get_task_id = @task_client.add_new_task(1)
+      @dequeued_task = @task_client.dequeue_task
     end
 
     it "should get a task" do
@@ -165,9 +165,9 @@ describe DRbQS::Node::TaskClient do
       @task_id = 27
       @task_ary = ["abcdef", :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      @get_task_id = subject.add_new_task(1)
-      @dequeued_task = subject.dequeue_task
-      subject.queue_result(1, :result_object)
+      @get_task_id = @task_client.add_new_task(1)
+      @dequeued_task = @task_client.dequeue_task
+      @task_client.queue_result(1, :result_object)
     end
 
     it "should have empty task queue." do
@@ -189,10 +189,10 @@ describe DRbQS::Node::TaskClient do
       @task_id = 28
       @task_ary = ["abcdef", :size, []]
       add_task_to_tuplespace(@task_id, @task_ary)
-      subject.add_new_task(1)
-      @dequeued_task = subject.dequeue_task
-      subject.queue_result(@task_id, :result_object)
-      @send_returned_value = subject.send_result
+      @task_client.add_new_task(1)
+      @dequeued_task = @task_client.dequeue_task
+      @task_client.queue_result(@task_id, :result_object)
+      @send_returned_value = @task_client.send_result
     end
 
     it "should get nil returned value." do