drbqs 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/drbqs-manage

@@ -6,18 +6,38 @@ require 'optparse'
 Version = '0.0.1'
 
 help_message =<<HELP
-Usage: #{File.basename(__FILE__)} <command> <uri>
+Usage: #{File.basename(__FILE__)} <command> [arguments ...]
 Manage DRbQS server by sending messages.
-<command> is 'exit-signal'.
+<command> is 'exit-signal', 'initialize', or 'ssh'.
 
 HELP
 
+command = ARGV[0]
+argv, command_args = DRbQS::Manage.split_arguments(ARGV)
+
+options = {}
+
 begin
   OptionParser.new(help_message) do |opt|
     opt.on('--debug', 'Set $DEBUG true.') do |v|
       $DEBUG = true
     end
-    opt.parse!(ARGV)
+    opt.on('--dir DIR', String, 'Set the base directory over ssh.') do |v|
+      options[:dir] = v
+    end
+    opt.on('--shell STR', String, 'Set the shell over ssh') do |v|
+      options[:shell] = v
+    end
+    opt.on('--rvm STR', String, 'Ruby version to use on RVM over ssh.') do |v|
+      options[:rvm] = v
+    end
+    opt.on('--rvm-init PATH', String, 'Path of script to initialize RVM over ssh.') do |v|
+      options[:rvm_init] = v
+    end
+    opt.on('--output PATH', String, 'File path that stdout and stderr are output to over ssh.') do |v|
+      options[:output] = v
+    end
+    opt.parse!(argv)
   end
 rescue OptionParser::InvalidOption
   $stderr.print <<MES
@@ -33,18 +53,26 @@ MES
   exit(2)
 end
 
-if ARGV.size != 2
-  raise "Invalid arguments number. Please refer '#{File.basename(__FILE__)} -h'."
+def check_argument_size(argv, check_method, n)
+  unless argv.size.__send__(check_method, n)
+    raise "Invalid arguments number. Please refer '#{File.basename(__FILE__)} -h'."
+  end
 end
 
-command = ARGV[0]
-uri = ARGV[1]
-
-manage = DRbQS::Manage.new(uri)
+manage = DRbQS::Manage.new
 
 case command
 when 'exit-signal'
-  manage.send_exit_signal
+  check_argument_size(argv, :==, 2)
+  uri = argv[1]
+  manage.send_exit_signal(uri)
+when 'initialize'
+  check_argument_size(argv, :==, 1)
+  manage.create_config
+when 'ssh'
+  check_argument_size(argv, :>=, 2)
+  dest = argv[1]
+  manage.execute_over_ssh(dest, options, command_args)
 else
   raise "Invalid command: #{command}"
 end

data/bin/drbqs-server

@@ -13,16 +13,12 @@ Start DRbQS server of definition files.
 HELP
 
 options = {
-  :log_file => STDOUT
+  :log_file => STDOUT,
+  :command_type => :server_start,
+  :acl => DRbQS::Config.get_acl_file
 }
 
-if n = ARGV.index('--')
-  command_argv = ARGV[0..(n - 1)]
-  server_argv = ARGV[(n + 1)..-1]
-else
-  command_argv = ARGV
-  server_argv = []
-end
+command_argv, server_argv = DRbQS::Manage.split_arguments(ARGV)
 
 begin
   OptionParser.new(help_message) do |opt|
@@ -46,6 +42,9 @@ begin
     opt.on('--debug', 'Set $DEBUG true.') do |v|
       $DEBUG = true
     end
+    opt.on('--test STR', String, 'Execute test.') do |v|
+      options[:command_type] = "test_#{v}"
+    end
     opt.parse!(command_argv)
   end
 rescue OptionParser::InvalidOption
@@ -72,4 +71,11 @@ command_argv.each do |path|
 end
 
 DRbQS.parse_option(server_argv)
-DRbQS.start_server(options)
+case options[:command_type]
+when /^test/
+  s = options[:command_type].split('_')[1].split(',')
+  type = s[0].intern
+  DRbQS.test_server(options, type, s[1..-1])
+else
+  DRbQS.start_server(options)
+end

data/drbqs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbqs}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2011-03-08}
+  s.date = %q{2011-03-20}
   s.description = %q{Task queuing system over network that is implemented by dRuby.}
   s.email = %q{d@ytak.info}
   s.executables = ["drbqs-manage", "drbqs-node", "drbqs-server"]
@@ -30,15 +30,19 @@ Gem::Specification.new do |s|
     "bin/drbqs-server",
     "drbqs.gemspec",
     "example/README.md",
+    "example/command/server_def.rb",
     "example/drbqs-manage-test.rb",
     "example/drbqs-node-test.rb",
     "example/drbqs-server-test.rb",
-    "example/server/server_def.rb",
+    "example/server/server.rb",
     "example/sum/server_def.rb",
     "example/sum/sum.rb",
+    "example/sum2/server_def.rb",
+    "example/sum2/sum.rb",
     "lib/drbqs.rb",
     "lib/drbqs/acl_file.rb",
     "lib/drbqs/client.rb",
+    "lib/drbqs/config.rb",
     "lib/drbqs/connection.rb",
     "lib/drbqs/manage.rb",
     "lib/drbqs/message.rb",
@@ -47,10 +51,12 @@ Gem::Specification.new do |s|
     "lib/drbqs/server.rb",
     "lib/drbqs/server_define.rb",
     "lib/drbqs/server_hook.rb",
+    "lib/drbqs/ssh_shell.rb",
     "lib/drbqs/task.rb",
     "lib/drbqs/task_client.rb",
     "lib/drbqs/task_generator.rb",
     "spec/acl_file_spec.rb",
+    "spec/config_spec.rb",
     "spec/connection_spec.rb",
     "spec/data/acl.txt",
     "spec/manage_spec.rb",
@@ -61,6 +67,7 @@ Gem::Specification.new do |s|
     "spec/server_hook_spec.rb",
     "spec/server_spec.rb",
     "spec/spec_helper.rb",
+    "spec/ssh_shell_spec.rb",
     "spec/task_client_spec.rb",
     "spec/task_generator_spec.rb",
     "spec/task_spec.rb",
@@ -71,10 +78,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ytaka/drbqs}
   s.licenses = ["GPL3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{dRuby Queueing System}
   s.test_files = [
     "spec/acl_file_spec.rb",
+    "spec/config_spec.rb",
     "spec/connection_spec.rb",
     "spec/manage_spec.rb",
     "spec/message_spec.rb",
@@ -84,6 +92,7 @@ Gem::Specification.new do |s|
     "spec/server_hook_spec.rb",
     "spec/server_spec.rb",
     "spec/spec_helper.rb",
+    "spec/ssh_shell_spec.rb",
     "spec/task_client_spec.rb",
     "spec/task_generator_spec.rb",
     "spec/task_spec.rb",

data/example/command/server_def.rb

@@ -0,0 +1,14 @@
+# 
+# Usage:
+#  drbqs-server server_def.rb
+# 
+
+DRbQS.define_server(:finish_exit => true) do |server, argv, opts|
+  tgen = DRbQS::TaskGenerator.new(:sleep_time => 2)
+  tgen.set do
+    3.times do |i|
+      add_task(DRbQS::CommandTask.new(["sleep #{@sleep_time}", 'echo hello world']))
+    end
+  end
+  server.add_task_generator(tgen)
+end

data/example/sum/server_def.rb

@@ -12,12 +12,14 @@ DRbQS.option_parser do |opt, hash|
   end
 end
 
-DRbQS.define_server do |server, argv, opts|
+DRbQS.define_server(:check_alive => 5) do |server, argv, opts|
   start_num = (argv[0] || 10).to_i
-  end_num = (argv[1] || 100).to_i
+  end_num = (argv[1] || 50).to_i
   step_num = opts[:step] || 10
   start_num.step(end_num, step_num) do |i|
-    task = DRbQS::Task.new(Sum.new(i - 10, i), :exec)
+    task = DRbQS::Task.new(Sum.new(i - 10, i), :exec) do |srv, ret|
+      puts "Receive: #{ret.inspect}"
+    end
     server.queue.add(task)
   end
 

data/example/sum/sum.rb

@@ -4,6 +4,7 @@ class Sum
   end
 
   def exec
+    sleep(3) # Waiting time to interrupt
     (@num[0]..@num[1]).inject(0) { |sum, i| sum += i }
   end
 end

data/example/sum2/server_def.rb

@@ -0,0 +1,27 @@
+# 
+# Usage:
+#  drbqs-server server_def.rb -- 30 50
+#  drbqs-server server_def.rb -- 100 500 --step 100
+# 
+
+require_relative 'sum.rb'
+
+DRbQS.option_parser do |opt, hash|
+  opt.on('--step NUM', Integer) do |v|
+    hash[:step] = v
+  end
+end
+
+DRbQS.define_server(:finish_exit => true) do |server, argv, opts|
+  tgen = DRbQS::TaskGenerator.new(:start_num => (argv[0] || 10).to_i,
+                                  :end_num => (argv[1] || 100).to_i,
+                                  :step_num => opts[:step] || 10)
+  tgen.set do
+    @start_num.step(@end_num, @step_num) do |i|
+      create_add_task(Sum.new(i - 10, i), :exec) do |srv, ret|
+        puts "Receive: #{ret.inspect}"
+      end
+    end
+  end
+  server.add_task_generator(tgen)
+end

data/example/sum2/sum.rb

@@ -0,0 +1,9 @@
+class Sum
+  def initialize(start_num, end_num)
+    @num = [start_num, end_num]
+  end
+
+  def exec
+    (@num[0]..@num[1]).inject(0) { |sum, i| sum += i }
+  end
+end

data/lib/drbqs/config.rb

@@ -0,0 +1,52 @@
+require 'fileutils'
+require 'singleton'
+
+module DRbQS
+
+  class Config
+
+    @@data = {
+      :dir => ENV['HOME'] + '/.drbqs/'
+    }
+
+    ACL_SAMPLE =<<SAMPLE
+deny all
+allow localhost
+allow 127.0.0.1
+SAMPLE
+
+    class << self
+      def get_path(name)
+        File.join(@@data[:dir], name)
+      end
+      private :get_path
+
+      def set_directory(dir)
+        @@data[:dir] = dir
+      end
+
+      def check_directory_create
+        unless File.exist?(@@data[:dir])
+          FileUtils.mkdir_p(@@data[:dir])
+          FileUtils.chmod(0700, @@data[:dir])
+        end
+      end
+
+      def save_sample
+        path = get_path('acl.txt.sample')
+        unless File.exist?(path)
+          open(path, 'w') { |f| f.print ACL_SAMPLE }
+        end
+      end
+
+      def get_acl_file
+        path = File.join(@@data[:dir], 'acl.txt')
+        if File.exist?(path)
+          return path
+        end
+        return nil
+      end
+    end
+  end
+
+end

data/lib/drbqs/manage.rb

@@ -3,13 +3,28 @@ require 'socket'
 module DRbQS
 
   class Manage
-    def initialize(access_uri)
-      @access_uri = access_uri
+    def self.split_arguments(argv, split = '--')
+      if n = argv.index(split)
+        [argv[0..(n - 1)], argv[(n + 1)..-1]]
+      else
+        [argv, []]
+      end
     end
 
-    def send_exit_signal
-      obj = DRbObject.new_with_uri(@access_uri)
+    def create_config
+      Config.check_directory_create
+      Config.save_sample
+    end
+
+    def send_exit_signal(access_uri)
+      obj = DRbObject.new_with_uri(access_uri)
       obj[:message].write([:exit_server, "Command of #{Socket.gethostname}"])
     end
+
+    def execute_over_ssh(dest, opts, command)
+      ssh = DRbQS::SSHShell.new(dest, opts)
+      ssh.get_environment
+      ssh.start(command)
+    end
   end
 end

data/lib/drbqs/queue.rb

@@ -44,7 +44,10 @@ module DRbQS
     def requeue_for_deleted_node_id(deleted)
       deleted.each do |node_id|
         if task_id_ary = @calculating[node_id]
-          task_id_ary.each { |task_id| queue_task(task_id) }
+          task_id_ary.each do |task_id|
+            queue_task(task_id)
+            @logger.info("Requeue: task #{task_id}.") if @logger
+          end
           @calculating.delete(node_id)
         end
       end

data/lib/drbqs/server.rb

@@ -5,8 +5,10 @@ require 'drbqs/server_hook'
 
 module DRbQS
   class CheckAlive
+    DEFAULT_INTERVAL_TIME = 300
+
     def initialize(interval)
-      @interval = interval || 300
+      @interval = interval || DEFAULT_INTERVAL_TIME
       @last = Time.now
     end
 
@@ -22,6 +24,9 @@ module DRbQS
   # When we set both empty_queue_hook and task_generator,
   # empty_queue_hook is prior to task_generator.
   class Server
+    WAIT_TIME_NODE_EXIT = 3
+    WAIT_TIME_NEW_RESULT = 1
+
     attr_reader :queue
 
     # :port
@@ -88,7 +93,8 @@ module DRbQS
     def check_connection(force = nil)
       if force || @check_alive.significant_interval?
         @logger.debug("Check connection") if @logger
-        @message.check_connection
+        deleted_node_ids = @message.check_connection
+        @queue.requeue_for_deleted_node_id(deleted_node_ids)
         @check_alive.set_checking
       end
     end
@@ -102,7 +108,7 @@ module DRbQS
       if @task_generator.size > 0 && @queue.empty?
         if tasks = @task_generator[0].new_tasks
           tasks.each { |t| @queue.add(t) }
-          @logger.debug("Generator add #{tasks.size} tasks.") if @logger
+          @logger.info("Generator add #{tasks.size} tasks.") if @logger
         else
           @task_generator.delete_at(0)
           @logger.info("Generator creates all tasks and then has been deleted.") if @logger
@@ -141,13 +147,10 @@ module DRbQS
     end
     private :exec_hook
 
-    WAIT_NODE_EXIT = 3
-    WAIT_NEW_RESULT = 1
-
     def exit
       @message.send_exit
       until @message.node_not_exist?
-        sleep(WAIT_NODE_EXIT)
+        sleep(WAIT_TIME_NODE_EXIT)
         check_connection(true)
       end
       Kernel.exit
@@ -166,8 +169,13 @@ module DRbQS
     end
     private :check_message
 
-    def wait
+    def task_generator_init
       @task_generator.each { |tgen| tgen.init }
+    end
+    private :task_generator_init
+
+    def wait
+      task_generator_init
       loop do
         check_message
         check_connection
@@ -175,9 +183,18 @@ module DRbQS
         exec_hook
         @logger.debug("Calculating tasks: #{@queue.calculating_task_number}") if @logger
         if count_results <= 1
-          sleep(WAIT_NEW_RESULT)
+          sleep(WAIT_TIME_NEW_RESULT)
         end
       end
     end
+
+    def test_task_generator(opts = {})
+      task_generator_init
+      @task_generator.each_with_index do |t, i|
+        puts "Test task generator [#{i}]"
+        set_num, task_num = t.debug_all_tasks(opts)
+        puts "Create: task sets #{set_num}, all tasks #{task_num}"
+      end
+    end
   end
 end

data/lib/drbqs/server_define.rb

@@ -12,9 +12,11 @@ HELP
       @option_parse = nil
       @opts = {}
       @argv = nil
+      @default_server_opts = nil
     end
 
-    def define_server(&block)
+    def define_server(default_opts = {}, &block)
+      @default_server_opts = default_opts
       if @server_create
         raise ArgumentError, "The server has already defined."
       end
@@ -38,33 +40,41 @@ HELP
       @argv = opt_argv  
     end
 
+    def create_server(options)
+      server = DRbQS::Server.new(@default_server_opts.merge(options))
+      @server_create.call(server, @argv, @opts)
+      server.set_signal_trap
+      server
+    end
+    private :create_server
+
     def start_server(options)
       unless @server_create
         raise "Can not get server definition."
       end
-      server = DRbQS::Server.new(options)
-      @server_create.call(server, @argv, @opts)
-      server.set_signal_trap
+      server = create_server(options)
       server.start
       server.wait
     end
-  end
-
-  @@server_def = ServerDefinition.new
-
-  def self.define_server(&block)
-    @@server_def.define_server(&block)
-  end
 
-  def self.option_parser(&block)
-    @@server_def.option_parser(&block)
+    def test_server(options, type, arg = [])
+      server = create_server(options)
+      case type
+      when :task
+        puts "*** Test of Task Generators ***"
+        server.test_task_generator(:limit => arg[0] ? arg[0].to_i : nil, :progress => true)
+      else
+        puts "*** Not be yet implemented ***"
+      end
+    end
   end
 
-  def self.parse_option(opt_argv)
-    @@server_def.parse_option(opt_argv)
-  end
+  @@server_def = ServerDefinition.new
 
-  def self.start_server(options)
-    @@server_def.start_server(options)
+  class << self
+    [:define_server, :option_parser, :parse_option,
+     :start_server, :test_server].each do |m|
+      define_method(m, &@@server_def.method(m))
+    end
   end
 end

data/lib/drbqs/ssh_shell.rb

@@ -0,0 +1,92 @@
+require 'net/ssh'
+require 'net/ssh/shell'
+
+module DRbQS
+
+  # Requirements:
+  #   bash
+  #   nohup
+  class SSHShell
+    class GetInvalidExitStatus < StandardError
+    end
+
+    attr_reader :user, :host, :directory, :port
+
+    DEFAULT_RVM_SCRIPT = '$HOME/.rvm/scripts/rvm'
+    DEFAULT_OUTPUT_FILE = 'drbqs_nohup.log'
+
+    # :shell     shell to use
+    # :dir       base directory of ssh server
+    # :rvm       version of ruby on rvm
+    # :rvm_init  path of script to initialize rvm
+    # :output    file to output of stdout and stderr
+    def initialize(dest, opts = {})
+      @user, @host, @port = split_destination(dest)
+      if !(@host && @user)
+        raise "Invalid destination of ssh server."
+      end
+      @shell = opts[:shell] || 'bash'
+      @rvm = opts[:rvm]
+      @rvm_init = opts[:rvm_init]
+      if (@rvm || @rvm_init) && !(String === @rvm_init)
+        @rvm_init = DEFAULT_RVM_SCRIPT
+      end
+      @out = opts[:output] || DEFAULT_OUTPUT_FILE
+      @directory = opts[:dir]
+    end
+
+    def split_destination(dest)
+      if (n = dest.index("@")) && n > 0
+        user = dest[0..(n - 1)]
+        host_dir = dest[(n + 1)..-1]
+      else
+        raise "Not include '@': #{dest}"
+      end
+      if n = host_dir.index(':')
+        host = host_dir[0..(n - 1)]
+        port = host_dir[(n + 1)..-1]
+      else
+        host = host_dir
+        port = nil
+      end
+      [user && user.size > 0 ? user : nil,
+       host && host.size > 0 ? host : nil,
+       port && port.size > 0 ? port.to_i : nil]
+    end
+    private :split_destination
+
+    def shell_exec(sh, cmd)
+      pr = sh.execute!(cmd)
+      if pr.exit_status != 0
+        raise GetInvalidExitStatus, "Can not execute '#{cmd}' on #{@host} properly."
+      end
+    end
+    private :shell_exec
+
+    def execute_command(*cmds)
+      Net::SSH.start(@host, @user, :port => @port) do |ssh|
+        ssh.shell(@shell) do |sh|
+          shell_exec(sh, "cd #{@directory}") if @directory
+          shell_exec(sh, "source #{@rvm_init}") if @rvm_init
+          shell_exec(sh, "rvm use #{@rvm}") if @rvm
+          cmds.each do |c|
+            sh.execute c
+          end
+          sh.execute "exit"
+        end
+      end
+    end
+    private :execute_command
+
+    def get_environment
+      execute_command('echo "directory: " `pwd`',
+                      'echo "files:"',
+                      'ls',
+                      'if which rvm > /dev/null; then rvm info; else ruby -v; fi')
+    end
+
+    def start(*args)
+      execute_command("nohup #{args.join(' ')} > #{@out} 2>&1 &")
+    end
+  end
+end

data/lib/drbqs/task.rb

@@ -8,7 +8,7 @@ module DRbQS
     attr_reader :hook
 
     # Nodes execute obj.method_sym(*args).
-    # Server executes &hook with a server instance and an array of result
+    # Server executes &hook with a server instance and an object of result
     # after the server accepts the results from nodes.
     def initialize(obj, method_sym, args = [], &hook)
       begin
@@ -35,4 +35,29 @@ module DRbQS
     end
   end
 
+  class CommandExecute
+    def initialize(cmd)
+      @cmd = cmd
+      unless (Array === @cmd || String === @cmd)
+        raise ArgumentError, "Invalid command: #{@cmd.inspect}"
+      end
+    end
+
+    def exec
+      case @cmd
+      when Array
+        @cmd.each { |c| system(c) }
+      when String
+        system(@cmd)
+      end
+      $?.exitstatus
+    end
+  end
+
+  class CommandTask < Task
+    # &hook takes a server instance and exit number of command.
+    def initialize(cmd, &hook)
+      super(CommandExecute.new(cmd), :exec, &hook)
+    end
+  end
 end

data/lib/drbqs/task_generator.rb

@@ -1,4 +1,7 @@
 module DRbQS
+  class DRbQS::TaskCreatingError < StandardError
+  end
+
   class TaskGenerator
     def initialize(data = {})
       data.each do |key, val|
@@ -32,7 +35,11 @@ module DRbQS
       @__iterate__ = iterate
       @__fiber_init__ = lambda do
         @__fiber__ = Fiber.new do
-          instance_eval(&block)
+          begin
+            instance_eval(&block)
+          rescue => err
+            raise DRbQS::TaskCreatingError, "\n  #{err.to_s}"
+          end
           nil
         end
       end
@@ -68,8 +75,12 @@ module DRbQS
       nil
     end
 
+    DEBUG_TASK_PROGRESS = 1000
+
     # Create all tasks for test and return [group_number, task_number] if all tasks created properly.
-    def debug_all_tasks(limit = nil)
+    def debug_all_tasks(opts = {})
+      limit = opts[:limit]
+      progress = opts[:progress]
       group_number = 0
       task_number = 0
       while ary = new_tasks
@@ -78,6 +89,12 @@ module DRbQS
             raise "Invalid #{i}th task: #{t.inspect}"
           end
           task_number += 1
+          if progress && (task_number % DEBUG_TASK_PROGRESS == 0)
+            puts "#{task_number} tasks have been created."
+          end
+          if limit && task_number > limit
+            break
+          end
         end
         group_number += 1
       end

data/lib/drbqs.rb

@@ -14,6 +14,10 @@ module DRbQS
   autoload :Task, 'drbqs/task'
   autoload :TaskGenerator, 'drbqs/task_generator'
   autoload :Manage, 'drbqs/manage'
+  autoload :Config, 'drbqs/config'
+  autoload :SSHShell, 'drbqs/ssh_shell'
+  autoload :CommandTask, 'drbqs/task'
+  autoload :CommandExecute, 'drbqs/task'
 
   ROOT_DEFAULT_PORT = 13500
 end

data/spec/config_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe DRbQS::Config do
+  it "should return nil" do
+    DRbQS::Config.set_directory(File.dirname(__FILE__) + '/not_exist_path')
+    DRbQS::Config.get_acl_file.should be_nil
+  end
+
+  it "should return existing path" do
+    path = File.dirname(__FILE__) + '/data'
+    DRbQS::Config.set_directory(path)
+    DRbQS::Config.get_acl_file.should == File.join(path, 'acl.txt')
+  end
+end

data/spec/manage_spec.rb

@@ -27,12 +27,12 @@ describe DRbQS do
 
     @uri = 'druby://:13501'
 
-    @manage = DRbQS::Manage.new(@uri)
+    @manage = DRbQS::Manage.new
   end
 
   it "should send exit signal" do
     lambda do
-      @manage.send_exit_signal
+      @manage.send_exit_signal(@uri)
     end.should_not raise_error
     lambda do
       i = 0
@@ -47,4 +47,11 @@ describe DRbQS do
     end.should_not raise_error
   end
 
+  it "should split arguments" do
+    ary = ['abc', 'def', '--', '123', '45', '6']
+    a1, a2 = DRbQS::Manage.split_arguments(ary)
+    a1.should == ['abc', 'def']
+    a2.should == ['123', '45', '6']
+  end
+
 end

data/spec/ssh_shell_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'drbqs/ssh_shell'
+
+describe DRbQS::SSHShell do
+  it "should split destination" do
+    ssh = DRbQS::SSHShell.new('user@hostname')
+    ssh.user.should == 'user'
+    ssh.host.should == 'hostname'
+    ssh.port.should be_nil
+    ssh.directory.should be_nil
+  end
+
+  it "should split destination including directory" do
+    ssh = DRbQS::SSHShell.new('user@hostname:22', :dir => '/path/to/directory')
+    ssh.user.should == 'user'
+    ssh.host.should == 'hostname'
+    ssh.port.should == 22
+    ssh.directory.should == '/path/to/directory'
+  end
+
+  it "should raise error: not include '@'" do
+    lambda do
+      DRbQS::SSHShell.new('userhostname')
+    end.should raise_error
+  end
+
+  it "should raise error: empty user name" do
+    lambda do
+      DRbQS::SSHShell.new('@hostname')
+    end.should raise_error
+  end
+
+  it "should raise error: empty host name" do
+    lambda do
+      DRbQS::SSHShell.new('user:22')
+    end.should raise_error
+  end
+
+end

metadata

@@ -1,83 +1,85 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: drbqs
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.8
 platform: ruby
-authors:
+authors: 
 - Takayuki YAMAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-08 00:00:00.000000000 +09:00
+
+date: 2011-03-20 00:00:00 +09:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &84782980 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *84782980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &84782720 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *84782720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &84782460 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *84782460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &84782210 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *84782210
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &84781940 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *84781940
+  version_requirements: *id005
 description: Task queuing system over network that is implemented by dRuby.
 email: d@ytak.info
-executables:
+executables: 
 - drbqs-manage
 - drbqs-node
 - drbqs-server
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .rspec
 - Gemfile
@@ -90,15 +92,19 @@ files:
 - bin/drbqs-server
 - drbqs.gemspec
 - example/README.md
+- example/command/server_def.rb
 - example/drbqs-manage-test.rb
 - example/drbqs-node-test.rb
 - example/drbqs-server-test.rb
-- example/server/server_def.rb
+- example/server/server.rb
 - example/sum/server_def.rb
 - example/sum/sum.rb
+- example/sum2/server_def.rb
+- example/sum2/sum.rb
 - lib/drbqs.rb
 - lib/drbqs/acl_file.rb
 - lib/drbqs/client.rb
+- lib/drbqs/config.rb
 - lib/drbqs/connection.rb
 - lib/drbqs/manage.rb
 - lib/drbqs/message.rb
@@ -107,10 +113,12 @@ files:
 - lib/drbqs/server.rb
 - lib/drbqs/server_define.rb
 - lib/drbqs/server_hook.rb
+- lib/drbqs/ssh_shell.rb
 - lib/drbqs/task.rb
 - lib/drbqs/task_client.rb
 - lib/drbqs/task_generator.rb
 - spec/acl_file_spec.rb
+- spec/config_spec.rb
 - spec/connection_spec.rb
 - spec/data/acl.txt
 - spec/manage_spec.rb
@@ -121,6 +129,7 @@ files:
 - spec/server_hook_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- spec/ssh_shell_spec.rb
 - spec/task_client_spec.rb
 - spec/task_generator_spec.rb
 - spec/task_spec.rb
@@ -129,35 +138,38 @@ files:
 - spec/test2_spec.rb
 has_rdoc: true
 homepage: http://github.com/ytaka/drbqs
-licenses:
+licenses: 
 - GPL3
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3292588984449245047
+      segments: 
       - 0
-      hash: -184598193
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: dRuby Queueing System
-test_files:
+test_files: 
 - spec/acl_file_spec.rb
+- spec/config_spec.rb
 - spec/connection_spec.rb
 - spec/manage_spec.rb
 - spec/message_spec.rb
@@ -167,6 +179,7 @@ test_files:
 - spec/server_hook_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- spec/ssh_shell_spec.rb
 - spec/task_client_spec.rb
 - spec/task_generator_spec.rb
 - spec/task_spec.rb