drbqs 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d97c7024904ace9423e4447cf220ee2c2b6a5b32
-  data.tar.gz: e2ea40c666d2033eebe43659f833ea032f05a720
+  metadata.gz: cda668d2f4eb4adb76ec3bfa7a86f9259f6648ca
+  data.tar.gz: c292472af4ff45420dc7458cf9fd221cb91a3e20
 SHA512:
-  metadata.gz: 6cb2dfd423583c9426ce5138144dd46a37455c62208164c3ef26425578f991ce8e9e69998897170fb00e2cd13147846a89135d8a8048d6e7d48c413bd2944445
-  data.tar.gz: 069f933a4cdc05074e70e9a4081fe33e289a6f7959c9e9949f34f5e229bd4e968acb6ed9f594c4dc394923ee738eb79f033fe70231aa21a72abccff4f3492e9d
+  metadata.gz: 6b739f04e4e4f954b6bfe4de3f843787f1a2067c1201e52901d65f9076e0edd2e7b461ddcee5eb72087a7b84c4f52a5f2a7a19cfe5384483a209f6986aea69a1
+  data.tar.gz: a8fded1572bbc275f4db48ebe1577c07fdcc0e102fa55ef8e6b3cbf58799f18d9c2efff6ebfa9c0910ef837b8c3a28ceffe94bc759202514a5aead8e6eba99d1

data/drbqs.gemspec

@@ -2,30 +2,29 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "drbqs/version"
 
-Gem::Specification.new do |s|
-  s.name        = "drbqs"
-  s.version     = DRbQS::VERSION
-  s.authors     = ["Takayuki YAMAGUCHI"]
-  s.email       = ["d@ytak.info"]
-  s.homepage    = ""
-  s.summary     = "dRuby Queueing System"
-  s.description = "Task queuing system over network that is implemented by dRuby."
+Gem::Specification.new do |spec|
+  spec.name        = "drbqs"
+  spec.version     = DRbQS::VERSION
+  spec.authors     = ["Takayuki YAMAGUCHI"]
+  spec.email       = ["d@ytak.info"]
+  spec.homepage    = ""
+  spec.summary     = "dRuby Queueing System"
+  spec.description = "Task queuing system over network that is implemented by dRuby."
+  spec.license = "GPLv3"
 
-  s.rubyforge_project = "drbqs"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec", ">= 2.14.1"
-  s.add_development_dependency "yard", ">= 0.7.2"
-  s.add_runtime_dependency 'filename', '>= 0.1.0'
-  s.add_runtime_dependency "user_config", ">= 0.0.2"
-  s.add_runtime_dependency 'net-ssh', '>= 2.1.0'
-  s.add_runtime_dependency 'net-ssh-shell', '>= 0.2.0'
-  s.add_runtime_dependency "net-sftp", ">= 2.0.5"
-  s.add_runtime_dependency "sys-proctable"
-  s.add_runtime_dependency "activesupport"
+  spec.add_development_dependency "rspec", ">= 2.14.1"
+  spec.add_development_dependency "yard", ">= 0.7.2"
+  spec.add_runtime_dependency 'filename', '>= 0.1.0'
+  spec.add_runtime_dependency "user_config", ">= 0.0.2"
+  spec.add_runtime_dependency 'net-ssh', '>= 2.1.0'
+  spec.add_runtime_dependency 'net-ssh-shell', '>= 0.2.0'
+  spec.add_runtime_dependency "net-sftp", ">= 2.0.5"
+  spec.add_runtime_dependency "sys-proctable"
+  spec.add_runtime_dependency "activesupport"
 end

data/lib/drbqs.rb

@@ -14,6 +14,7 @@ require 'drbqs/execute/server_define'
 require 'drbqs/utility/misc'
 
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/array/extract_options'
 
 module DRbQS

data/lib/drbqs/command_line/command_ssh.rb

@@ -28,6 +28,7 @@ HELP
           set(:rvm_init, '--rvm-init PATH', String, 'Path of script to initialize RVM over ssh.')
           set(:output, '-o DIR', '--output DIR', String, 'Directory path that a server and nodes output.')
           set(:nice, '--nice NUM', Integer, 'Set the value of nice for a server and nodes. The default is 10.')
+          set(:bundler, '--bundler', 'Use bundler to execute filename-create, drbqs-server, and drbqs-node.')
         end
         setting.set_argument(*args)
         case setting.get_argument[0]

data/lib/drbqs/manage/manage.rb

@@ -57,20 +57,22 @@ module DRbQS
       config.save_sample
     end
 
-    [:get_status, :get_history, :send_exit_signal, :send_node_exit_after_task,
+    [:get_status, :get_response, :get_history, :send_exit_signal, :send_node_exit_after_task,
      :send_node_wake, :send_node_sleep, :send_data].each do |method_name|
       def_delegator :signal_sender, method_name, method_name
     end
 
     def server_respond?
+      ret = nil
       begin
-        get_status
-        true
+        if get_response
+          ret = true
+        end
       rescue DRbQS::Manage::NotSetURI
         raise
       rescue
-        nil
       end
+      ret
     end
 
     # If the server responds, this method returns true.

data/lib/drbqs/manage/send_signal.rb

@@ -67,6 +67,14 @@ module DRbQS
         end
         nil
       end
+
+      def get_response
+        send_signal_to_server(:request_response, [sender_id, Time.now])
+        if mes = wait_response([:response, sender_id, nil])
+          return true
+        end
+        nil
+      end
     end
   end
 end

data/lib/drbqs/manage/ssh_execute.rb

@@ -3,10 +3,27 @@ require 'drbqs/manage/ssh_shell'
 module DRbQS
   class Manage
     class SSHExecute
+      COMMAND_NICE = "nice"
+      COMMAND_DRBQS_SERVER = "drbqs-server"
+      COMMAND_DRBQS_NODE = "drbqs-node"
+      COMMAND_FILENAME_CREATE = "filename-create"
+
+      # @param [String] dest Destination name
+      # @param [Hash] opts Option hash
+      # @option opts [boolean] :bundler  Use bundler to execute commands: filename-create, drbqs-server, and drbqs-node
+      # @option opts [String] :shell     Same as options DRbQS::Manage::SSHShell
+      # @option opts [String] :keys      Same as options DRbQS::Manage::SSHShell
+      # @option opts [IO]     :io        Same as options DRbQS::Manage::SSHShell
+      # @option opts [String] :directory Same as options DRbQS::Manage::SSHShell
+      # @option opts [String] :rvm       Same as options DRbQS::Manage::SSHShell
+      # @option opts [String] :rvm_init  Same as options DRbQS::Manage::SSHShell
+      # @option opts [Hash]   :env       Same as options DRbQS::Manage::SSHShell
       def initialize(dest, opts = {})
         @ssh_host = DRbQS::Config.new.ssh_host
+        opts = opts.dup
         path, options = @ssh_host.get_options(dest)
         dest = options.delete(:dest) || dest
+        @bundler = opts.delete(:bundler)
         @ssh_shell = DRbQS::Manage::SSHShell.new(dest, options.merge(opts))
       end
 
@@ -18,20 +35,28 @@ module DRbQS
         @ssh_shell.get_environment
       end
 
+      # Add "bundle exec" if \@bundler is true
+      def command_ruby(cmd)
+        if @bundler
+          cmd = "bundle exec #{cmd}"
+        end
+        cmd
+      end
+      private :command_ruby
+
       # Keys are :nice and :daemon.
       def add_command_options(cmd, daemon, nice)
+        s = ''
         if nice
-          s = "nice "
+          s << "nice "
           s << "-n #{nice.to_s} " if Integer === nice
-        else
-          s = ''
         end
         s << cmd << " --daemon " << daemon
       end
       private :add_command_options
 
       def create_new_directory(sh, dir)
-        process, result = sh.exec("filename-create new -a always -D self -t time #{dir}", :check => true)
+        process, result = sh.exec("#{command_ruby(COMMAND_FILENAME_CREATE)} new -a always -D self -t time #{dir}", :check => true)
         result.strip!
       end
       private :create_new_directory
@@ -41,7 +66,7 @@ module DRbQS
         ret = nil
         @ssh_shell.start do |sh|
           dir = create_new_directory(sh, opts[:daemon] || 'drbqs_server_log')
-          cmd = add_command_options('drbqs-server', File.join(dir, 'daemon_server.log'), opts[:nice])
+          cmd = add_command_options(command_ruby(COMMAND_DRBQS_SERVER), File.join(dir, 'daemon_server.log'), opts[:nice])
           cmd << " --log-file " << File.join(dir, 'server.log') << ' '
           cmd << cmd_options.join(' ')
           process, result = sh.exec(cmd)
@@ -55,7 +80,7 @@ module DRbQS
         ret = nil
         @ssh_shell.start do |sh|
           dir = create_new_directory(sh, opts[:daemon] || 'drbqs_node_log')
-          cmd = add_command_options('drbqs-node', File.join(dir, 'daemon_node.log'), opts[:nice])
+          cmd = add_command_options(command_ruby(COMMAND_DRBQS_NODE), File.join(dir, 'daemon_node.log'), opts[:nice])
           cmd << ' --log-prefix ' << File.join(dir, 'node') << ' ' << cmd_options.join(' ')
           process, result = sh.exec(cmd)
           ret = (process.exit_status == 0)

data/lib/drbqs/manage/ssh_shell.rb

@@ -63,19 +63,20 @@ module DRbQS
       # @option opts [String] :shell     The shell to use.
       # @option opts [String] :keys      Path of a ssh key.
       # @option opts [IO]     :io        IO to output results of commands.
-      # @option opts [Hash]   :env       Same as options DRbQS::Manage::SSHShell::RubyEnvironment.
       # @option opts [String] :directory Same as options DRbQS::Manage::SSHShell::RubyEnvironment.
       # @option opts [String] :rvm       Same as options DRbQS::Manage::SSHShell::RubyEnvironment.
       # @option opts [String] :rvm_init  Same as options DRbQS::Manage::SSHShell::RubyEnvironment.
+      # @option opts [Hash]   :env       Same as options DRbQS::Manage::SSHShell::RubyEnvironment.
       def initialize(dest, opts = {})
         @user, @host, @port = split_destination(dest)
         if !(@host && @user)
           raise ArgumentError, "Invalid ssh server: host=#{@host.inspect}, user=#{@user.inspect}."
         end
+        opts = opts.dup
         @keys = opts.delete(:keys)
         @shell = opts.delete(:shell) || DEFAULT_SHELL
-        @ruby_environment = DRbQS::Manage::SSHShell::RubyEnvironment.new(opts)
-        @out = opts[:io]
+        @out = opts.delete(:io)
+        @ruby_environment = DRbQS::Manage::SSHShell::RubyEnvironment.new(opts.slice(:directory, :rvm, :rvm_init, :env))
         @ssh = nil
       end
 

data/lib/drbqs/server/message.rb

@@ -49,6 +49,9 @@ module DRbQS
           return [mes, arg]
         when :request_status
           @logger.info("Get status request from #{arg.to_s}")
+        when :request_response
+          @logger.info("Get respond request from #{arg[0].to_s} at #{arg[1].to_s}")
+          return [mes, arg]
         when :request_history
           @logger.info("Get history request from #{arg.to_s}")
         when :sleep_node
@@ -130,6 +133,14 @@ module DRbQS
         @message.write([:status, server_status_string])
       end
 
+      def send_only_response(sender_id, request_time)
+        begin
+          @message.take([:response, sender_id, nil], 0)
+        rescue Rinda::RequestExpiredError
+        end
+        @message.write([:response, sender_id, request_time])
+      end
+
       def send_history(history_string)
         begin
           @message.take([:history, nil], 0)

data/lib/drbqs/server/server.rb

@@ -374,6 +374,8 @@ module DRbQS
           self.exit
         when :request_status
           send_status_for_request
+        when :request_response
+          @message.send_only_response(arg[0], arg[1])
         when :request_history
           @message.send_history(@queue.all_logs)
         when :exit_after_task

data/lib/drbqs/setting/ssh.rb

@@ -10,6 +10,7 @@ module DRbQS
           [:directory, :shell, :rvm, :rvm_init, :output, :connect].each do |key|
             register_key(key, :check => 1)
           end
+          register_key(:bundler, :bool => true)
           register_key(:nice, :check => 1, :default => [10])
           set_argument_condition(:>=, 0)
         end
@@ -66,7 +67,7 @@ module DRbQS
       # this method raises an error.
       def parse!
         super
-        [:directory, :shell, :rvm, :rvm_init, :nice].each do |key|
+        [:directory, :shell, :rvm, :rvm_init, :nice, :bundler].each do |key|
           if val = get_first(key)
             @options[key] = val
           end

data/lib/drbqs/version.rb

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

data/spec/manage/send_signal_spec.rb

@@ -44,4 +44,13 @@ describe DRbQS::Manage::SendSignal do
       @ts.take([:server, :new_data, data], 0)
     end.should_not raise_error 
   end
+
+  it "should send request of response." do
+    t = Time.now
+    Time.should_receive(:now).and_return(t)
+    sender_id = @send_signal.sender_id
+    @ts.should_receive(:write).with([:server, :request_response, [sender_id, t]])
+    @ts.should_receive(:take).once.and_return([:response, [sender_id, t]])
+    @send_signal.get_response
+  end
 end

data/spec/server/message_spec.rb

@@ -62,6 +62,13 @@ describe DRbQS::Server::Message do
       @message_server.get_message.should == [:request_status]
     end
 
+    it "should get :request_response message" do
+      t = Time.now
+      sender_id = "sender_id"
+      @message.write([:server, :request_response, [sender_id, t]])
+      @message_server.get_message.should == [:request_response, [sender_id, t]]
+    end
+
     it "should get :node_error message" do
       node_id = 74
       @message.write([:server, :node_error, [node_id, 'Error occurs.']])
@@ -115,6 +122,16 @@ describe DRbQS::Server::Message do
       status.should be_an_instance_of String
     end
 
+    it "should send only response" do
+      sender_id = "sender_id"
+      t = Time.now
+      @message_server.send_only_response(sender_id, t)
+      sym, sender_id2, t2 = @message.take([:response, sender_id, nil])
+      sym.should == :response
+      sender_id2.should == sender_id
+      t2.should == t
+    end
+
     after(:all) do
       clear_all_node
     end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: drbqs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Takayuki YAMAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: filename
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: user_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: net-ssh-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Task queuing system over network that is implemented by dRuby.
@@ -148,9 +148,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -323,7 +323,8 @@ files:
 - spec/worker/worker_process_set_spec.rb
 - spec/worker/worker_spec.rb
 homepage: ''
-licenses: []
+licenses:
+- GPLv3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -331,16 +332,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: drbqs
+rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4