drbqs 0.0.8 → 0.0.9

data/lib/drbqs/task.rb

@@ -36,11 +36,16 @@ module DRbQS
   end
 
   class CommandExecute
-    def initialize(cmd)
+
+    # :transfer    String or Array
+    # :compress    true or false
+    def initialize(cmd, opts = {})
       @cmd = cmd
       unless (Array === @cmd || String === @cmd)
         raise ArgumentError, "Invalid command: #{@cmd.inspect}"
       end
+      @transfer = opts[:transfer]
+      @compress = opts[:compress]
     end
 
     def exec
@@ -50,14 +55,22 @@ module DRbQS
       when String
         system(@cmd)
       end
-      $?.exitstatus
+      exit_status = $?.exitstatus
+      if @transfer
+        if Array === @transfer
+          @transfer.each { |path| DRbQS::FileTransfer.enqueue(path, @compress) }
+        else
+          DRbQS::FileTransfer.enqueue(@transfer, @compress)
+        end
+      end
+      exit_status
     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)
+    def initialize(cmd, opts = {}, &hook)
+      super(CommandExecute.new(cmd, {}), :exec, &hook)
     end
   end
 end

data/lib/drbqs/utils/filename.rb

@@ -0,0 +1,118 @@
+require 'fileutils'
+
+module DRbQS
+  class FileName
+
+    # The options are following:
+    # * :start
+    #     Fixnum
+    #     If ID string type is number, the ID starts from the specified number.
+    # 
+    # * :digit
+    #     Fixnum
+    #     ID number converted to a string with specified digit.
+    # 
+    # * :delimiter
+    #     String
+    # 
+    # * :type
+    #     :number or :time
+    #     If the value is :number, use a number for ID string.
+    #     If the value is :time, use current time.
+    # 
+    # * :position
+    #     :prefix, :suffix, or :middle
+    #     Set the position of an ID string.
+    def initialize(basepath, opts = {})
+      @basepath = File.expand_path(basepath)
+      @number = opts[:start] || 0
+      @digit = opts[:digit] || 2
+      @type = opts[:type] || :number
+      @position = opts[:position] || :suffix
+      @delimiter = opts[:delimiter] || (@position == :suffix ? '.' : '_')
+    end
+
+    def get_basepath(extension = nil)
+      if extension
+        extension = '.' + extension unless extension[0] == '.'
+        oldext = File.extname(@basepath)
+        if oldext.size > 0
+          @basepath.sub(Regexp.new("\\#{oldext}$"), extension)
+        else
+          @basepath + extension
+        end
+      else
+        @basepath
+      end
+    end
+    private :get_basepath
+
+    def get_addition(add, filename)
+      if add != :prohibit && (add == :always || File.exist?(filename))
+        case @type
+        when :time
+          t = Time.now
+          return t.strftime("%Y%m%d_%H%M%S_") + sprintf("%06d", t.usec)
+        when :number
+          s = sprintf("%0#{@digit}d", @number)
+          @number += 1
+          return s
+        else
+          raise "Invalid type of addition."
+        end
+      end
+      nil
+    end
+    private :get_addition
+
+    def add_addition(filename, addition)
+      case @position
+      when :prefix
+        dir, base = File.split(filename)
+        dir + '/' + addition + @delimiter + base
+      when :middle
+        dir, base = File.split(filename)
+        ext = File.extname(base)
+        if ext.size > 0
+          filename.sub(Regexp.new("\\#{ext}$"), @delimiter + addition + ext)
+        else
+          filename + @delimiter + addition
+        end
+      else # :suffix
+        filename + @delimiter + addition
+      end
+    end
+    private :add_addition
+
+    # The options are following:
+    # * :extension
+    #     String of extension
+    #     Use the extension if the value is specified.
+    # 
+    # * :add
+    #     :always    Always add an ID string.
+    #     :auto      If some file exists, add an ID string.
+    #     :prohibit  Even if some file exists, add no ID string.
+    # 
+    # * :directory
+    #     If the value is true and the parent directory does not exist,
+    #     create the directory.
+    def create(opts = {})
+      base = get_basepath(opts[:extension])
+      FileUtils.mkdir_p(File.dirname(base)) if opts[:directory]
+      if addition = get_addition(opts[:add], base)
+        path = add_addition(base, addition)
+        while File.exist?(path)
+          if addition = get_addition(opts[:add], base)
+            path = add_addition(base, addition)
+          else
+            raise "Can not create new filename."
+          end
+        end
+        path
+      else
+        base
+      end
+    end
+  end
+end

data/spec/filename_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe DRbQS::FileName do
+  it "should return unchanged filename" do
+    filename = DRbQS::FileName.new("abc.txt")
+    filename.create.should == File.expand_path(File.dirname('.') + '/abc.txt')
+  end
+
+  it "should return new filename with number" do
+    filename = DRbQS::FileName.new(__FILE__)
+    path = filename.create
+    File.exist?(path).should_not be_true
+    path.should match(/\.\d+$/)
+  end
+
+  it "should return new filename with time" do
+    filename = DRbQS::FileName.new(__FILE__, :type => :time)
+    path = filename.create
+    File.exist?(path).should_not be_true
+    path.should match(/\.[\d_]+$/)
+  end
+
+  it "should return same filename" do
+    filename = DRbQS::FileName.new(__FILE__)
+    path = filename.create(:add => :prohibit)
+    path.should == File.expand_path(__FILE__)
+  end
+
+  it "should return filename with prefix" do
+    filename = DRbQS::FileName.new(__FILE__, :position => :prefix)
+    path = filename.create
+    dir, name = File.split(path)
+    name.should match(/^\d+_/)
+  end
+
+  it "should return filename with addition before extension" do
+    filename = DRbQS::FileName.new(__FILE__, :position => :middle)
+    path = filename.create
+    dir, name = File.split(path)
+    ext = File.extname(name)
+    name.should match(Regexp.new("_\\d+\\#{ext}"))
+  end
+
+end

data/spec/message_spec.rb

@@ -68,4 +68,14 @@ describe DRbQS::MessageServer do
       end.should raise_error Rinda::RequestExpiredError
     end
   end
+
+  it "should get :request_status message" do
+    @message.write([:request_status, 'message_test'])
+    @message_server.get_message.should == :request_status
+  end
+
+  it "should send status" do
+    @message_server.send_status({})
+    @message.take([:status, nil]).should be_true
+  end
 end

data/spec/node_list_spec.rb

@@ -2,6 +2,32 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'drbqs/node_list'
 
+describe DRbQS::NodeHistory do
+  subject { DRbQS::NodeHistory.new }
+
+  it "should add new id" do
+    subject.add(1, 'hello')
+    ary = subject.each.to_a
+    ary.should have(1).items
+    ary[0][0].should == 1
+    ary[0][1].should have(2).items
+    ary[0][1][0].should == 'hello'
+    ary[0][1][1].should be_an_instance_of Time
+  end
+
+  it "should set disconnected" do
+    subject.add(1, 'hello')
+    subject.disconnect(1)
+    ary = subject.each.to_a
+    ary.should have(1).items
+    ary[0][0].should == 1
+    ary[0][1].should have(3).items
+    ary[0][1][0].should == 'hello'
+    ary[0][1][1].should be_an_instance_of Time
+    ary[0][1][2].should be_an_instance_of Time
+  end
+end
+
 describe DRbQS::NodeList do
   before(:all) do
     @node_list = DRbQS::NodeList.new
@@ -51,4 +77,18 @@ describe DRbQS::NodeList do
     end
   end
 
+  it "should add to history" do
+    node_list = DRbQS::NodeList.new
+    node_list.history.should_receive(:add)
+    node_list.get_new_id('hello')
+  end
+
+  it "should set disconnection to history" do
+    node_list = DRbQS::NodeList.new
+    node_list.history.should_receive(:disconnect)
+    node_list.get_new_id('hello')
+    node_list.set_check_connection
+    node_list.delete_not_alive
+  end
+
 end

data/spec/server_define_spec.rb

@@ -7,28 +7,39 @@ describe DRbQS::ServerDefinition do
     end
 
     it "should define server" do
-      @server_definition.should_receive(:define_server)
-      DRbQS.define_server do |server, argv, opts|
-        server.add_hook(:finish) do |serv|
-          serv.exit
+      lambda do
+        DRbQS.define_server do |server, argv, opts|
+          server.add_hook(:finish) do |serv|
+            serv.exit
+          end
         end
-      end
+      end.should change { @server_definition.instance_variable_get(:@default_server_opts) }.from(nil).to({})
     end
 
     it "should set parser of options" do
-      @server_definition.should_receive(:option_parser)
-      DRbQS.option_parser do |opt, hash|
-        opt.on('--test') do |v|
-          hash[:test] = true
+      lambda do
+        DRbQS.option_parser do |opt, hash|
+          opt.on('--test') do |v|
+            hash[:test] = true
+          end
         end
-      end
+      end.should change { @server_definition.instance_variable_get(:@option_parse) }.from(nil)
     end
 
     it "should parse options" do
-      @server_definition.should_receive(:parse_option)
-      DRbQS.parse_option(['--test'])
+      lambda do
+        DRbQS.parse_option(['--test'])
+      end.should change { @server_definition.instance_variable_get(:@argv) }.from(nil)
     end
 
+    it "should start server" do
+      DRbQS::Server.should_receive(:new)
+      begin
+        # After DRbQS::Server.new returns nil, raise error
+        DRbQS.start_server(:uri => 'druby://localhost:13500')
+      rescue
+      end
+    end
   end
 
 end

data/spec/ssh_shell_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-require 'drbqs/ssh_shell'
+require 'drbqs/ssh/shell'
 
 describe DRbQS::SSHShell do
   it "should split destination" do

data/spec/task_spec.rb

@@ -19,3 +19,16 @@ describe DRbQS::Task do
     task1.same_target?(task2).should be_true
   end
 end
+
+describe DRbQS::CommandExecute do
+  it "should execute command" do
+    cmd_exec = DRbQS::CommandExecute.new('ls > /dev/null')
+    cmd_exec.exec.should == 0
+  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
+  end
+end

data/spec/transfer_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe DRbQS::FileTransfer do
+  it "should enqueue path" do
+    DRbQS::FileTransfer.enqueue('hello/world')
+    DRbQS::FileTransfer.empty?.should_not be_true
+  end
+
+  it "should dequeue path" do
+    DRbQS::FileTransfer.dequeue.should == 'hello/world'
+    DRbQS::FileTransfer.empty?.should be_true
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: drbqs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +09:00
+date: 2011-03-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,39 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: net-ssh-shell
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Task queuing system over network that is implemented by dRuby.
 email: d@ytak.info
 executables: 
@@ -78,13 +111,13 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.rdoc
+- README.md
 files: 
 - .document
 - .rspec
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/drbqs-manage
@@ -101,6 +134,8 @@ files:
 - example/sum/sum.rb
 - example/sum2/server_def.rb
 - example/sum2/sum.rb
+- example/transfer/file.rb
+- example/transfer/server_def.rb
 - lib/drbqs.rb
 - lib/drbqs/acl_file.rb
 - lib/drbqs/client.rb
@@ -113,14 +148,18 @@ files:
 - lib/drbqs/server.rb
 - lib/drbqs/server_define.rb
 - lib/drbqs/server_hook.rb
-- lib/drbqs/ssh_shell.rb
+- lib/drbqs/ssh/host.rb
+- lib/drbqs/ssh/shell.rb
+- lib/drbqs/ssh/transfer.rb
 - lib/drbqs/task.rb
 - lib/drbqs/task_client.rb
 - lib/drbqs/task_generator.rb
+- lib/drbqs/utils/filename.rb
 - spec/acl_file_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
 - spec/data/acl.txt
+- spec/filename_spec.rb
 - spec/manage_spec.rb
 - spec/message_spec.rb
 - spec/node_list_spec.rb
@@ -136,6 +175,7 @@ files:
 - spec/test/test1.rb
 - spec/test1_spec.rb
 - spec/test2_spec.rb
+- spec/transfer_spec.rb
 has_rdoc: true
 homepage: http://github.com/ytaka/drbqs
 licenses: 
@@ -150,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3292588984449245047
+      hash: -3321628204237987958
       segments: 
       - 0
       version: "0"
@@ -171,6 +211,7 @@ test_files:
 - spec/acl_file_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
+- spec/filename_spec.rb
 - spec/manage_spec.rb
 - spec/message_spec.rb
 - spec/node_list_spec.rb
@@ -186,3 +227,4 @@ test_files:
 - spec/test/test1.rb
 - spec/test1_spec.rb
 - spec/test2_spec.rb
+- spec/transfer_spec.rb