drbqs 0.0.19 → 0.1.0

data/spec/server/history_spec.rb

@@ -11,18 +11,22 @@ describe DRbQS::Server::History do
     end
   end
 
-  subject do
-    DRbQS::Server::History.new
-  end
-
   context "when setting events" do
     before(:all) do
-      subject.set(1, :abc)
-      subject.set(1, :def)
-      subject.set(2, 'ABC', 'DEF')
-      subject.set(3, :ghi)
-      subject.set(1, :jkl)
-      subject.set(2, 123, 456)
+      @history = DRbQS::Server::History.new
+    end
+
+    subject do
+      @history
+    end
+
+    before(:all) do
+      @history.set(1, :abc)
+      @history.set(1, :def)
+      @history.set(2, 'ABC', 'DEF')
+      @history.set(3, :ghi)
+      @history.set(1, :jkl)
+      @history.set(2, 123, 456)
     end
 
     it "should have 3 items." do
@@ -61,6 +65,14 @@ describe DRbQS::Server::History do
   end
 
   context "when executing a method" do
+    before(:all) do
+      @history = DRbQS::Server::History.new
+    end
+
+    subject do
+      @history
+    end
+
     it "should add new event" do
       id = 1
       subject.set(id, :connect)

data/spec/server/queue_spec.rb

@@ -60,7 +60,7 @@ describe DRbQS::Server::Queue do
   context "when adding a task" do
     before(:all) do
       object_init
-      @task_id = subject.add(@task[:obj])
+      @task_id = @queue_server.add(@task[:obj])
     end
 
     it "should return number of acceptances of signals." do
@@ -100,7 +100,7 @@ describe DRbQS::Server::Queue do
     before(:all) do
       object_init
       @node_id = 100
-      @task_id = subject.add(@task[:obj])
+      @task_id = @queue_server.add(@task[:obj])
       @ts[:result].write([:accept, @task_id, @node_id])
     end
 
@@ -141,9 +141,9 @@ describe DRbQS::Server::Queue do
     before(:all) do
       object_init
       @node_id = 100
-      @task_id = subject.add(@task[:obj])
+      @task_id = @queue_server.add(@task[:obj])
       @ts[:result].write([:accept, @task_id, @node_id])
-      subject.get_accept_signal
+      @queue_server.get_accept_signal
       @ts[:result].write([:result, @task_id, @node_id, :result_object])
     end
 
@@ -180,10 +180,10 @@ describe DRbQS::Server::Queue do
     before(:all) do
       object_init
       @node_id = 100
-      @task_id = subject.add(@task[:obj])
+      @task_id = @queue_server.add(@task[:obj])
       @ts[:result].write([:accept, @task_id, @node_id])
-      subject.get_accept_signal
-      subject.requeue_for_deleted_node_id([@node_id])
+      @queue_server.get_accept_signal
+      @queue_server.requeue_for_deleted_node_id([@node_id])
     end
 
     it "should return number of acceptances of signals." do
@@ -229,11 +229,11 @@ describe DRbQS::Server::Queue do
                 DRbQS::Task.new([-1, -2], :size),
                 DRbQS::Task.new([8, 9, 10, 11], :size)]
       @task_ids = @tasks.map do |t|
-        subject.add(t)
+        @queue_server.add(t)
       end
       @ts[:result].write([:accept, @task_ids[0], @node_ids[0]])
       @ts[:result].write([:accept, @task_ids[1], @node_ids[1]])
-      subject.get_accept_signal
+      @queue_server.get_accept_signal
     end
 
     it "should return number of acceptances of signals." do
@@ -296,7 +296,7 @@ describe DRbQS::Server::Queue do
       object_init
       @node_id = 100
       @task_id_ary = @task_ary.map do |task|
-        subject.add(task)
+        @queue_server.add(task)
       end
       @ts[:result].write([:accept, @task_id_ary[0], 100])
       @ts[:result].write([:accept, @task_id_ary[1], 101])
@@ -336,7 +336,7 @@ describe DRbQS::Server::Queue do
       object_init
       @node_id = 100
       @task_id_ary = @task_ary.map do |task|
-        subject.add(task)
+        @queue_server.add(task)
       end
       @ts[:result].write([:accept, @task_id_ary[0], 100])
       @ts[:result].write([:accept, @task_id_ary[1], 101])

data/spec/server/server_spec.rb

@@ -56,8 +56,8 @@ describe DRbQS::Server do
     end
 
     it "should set finish hook" do
-      server_hook = mock
-      DRbQS::Server::Hook.stub!(:new).and_return(server_hook)
+      server_hook = double
+      DRbQS::Server::Hook.stub(:new).and_return(server_hook)
       server_hook.should_receive(:set_finish_exit)
       DRbQS::Server.new
     end

data/spec/server/transfer_setting_spec.rb

@@ -67,6 +67,6 @@ describe DRbQS::Server::TransferSetting do
   end
 
   after(:all) do
-    DRbQS::Temporary.delete_all
+    DRbQS::Temporary.delete
   end
 end

data/spec/setting/source_spec.rb

@@ -158,30 +158,31 @@ describe DRbQS::Setting::Source do
 
   context "when cloning an object" do
     before(:all) do
-      subject.register_key(:key1, :check => [:>, 1])
-      subject.register_key(:key2, :bool => true)
-      subject.register_key(:key3, :add => true)
-      subject.register_key(:key4, :default => [1, 2, 3])
-      @source_new = subject.clone
+      @source_orig = DRbQS::Setting::Source.new
+      @source_orig.register_key(:key1, :check => [:>, 1])
+      @source_orig.register_key(:key2, :bool => true)
+      @source_orig.register_key(:key3, :add => true)
+      @source_orig.register_key(:key4, :default => [1, 2, 3])
+      @source_new = @source_orig.clone
     end
 
     it "should have different @cond." do
       obj_new = @source_new.instance_variable_get(:@cond)
-      obj_old = subject.instance_variable_get(:@cond)
+      obj_old = @source_orig.instance_variable_get(:@cond)
       obj_new.should == obj_old
       obj_new.object_id.should_not == obj_old.object_id
     end
 
     it "should have different @default." do
       obj_new = @source_new.instance_variable_get(:@default)
-      obj_old = subject.instance_variable_get(:@default)
+      obj_old = @source_orig.instance_variable_get(:@default)
       obj_new.should == obj_old
       obj_new.object_id.should_not == obj_old.object_id
     end
 
     it "should have different @value." do
       obj_new = @source_new.instance_variable_get(:@value)
-      obj_old = subject.instance_variable_get(:@value)
+      obj_old = @source_orig.instance_variable_get(:@value)
       [:key1, :key2, :key3, :key4].each do |k|
         obj_new.__send__(k).should == obj_old.__send__(k)
       end
@@ -189,13 +190,13 @@ describe DRbQS::Setting::Source do
 
     it "should have different @argument_condition." do
       obj_new = @source_new.instance_variable_get(:@argument_condition)
-      obj_old = subject.instance_variable_get(:@argument_condition)
+      obj_old = @source_orig.instance_variable_get(:@argument_condition)
       obj_new.should == obj_old
     end
 
     it "should have same value of @all_keys_defined." do
       @source_new.instance_variable_get(:@all_keys_defined).should ==
-        subject.instance_variable_get(:@all_keys_defined)
+        @source_orig.instance_variable_get(:@all_keys_defined)
     end
   end
 

data/spec/task/task_spec.rb

@@ -39,7 +39,7 @@ describe DRbQS::Task do
   end
 
   it "should execute hook of block." do
-    mock = mock('for task')
+    mock = double('for task')
     task = DRbQS::Task.new(mock, :calc) do |server, result|
       mock.hook_method(server, result)
     end
@@ -48,7 +48,7 @@ describe DRbQS::Task do
   end
 
   it "should execute hook of symbol." do
-    mock = mock('for task')
+    mock = double('for task')
     task = DRbQS::Task.new(mock, :calc, hook: :hook_method)
     mock.should_receive(:hook_method).with(:server, :result)
     task.exec_hook(:server, :result)
@@ -167,8 +167,8 @@ describe DRbQS::Task::TaskSet do
   end
 
   it "should execute hooks of blocks." do
-    server = mock('server')
-    methods_for_hook = mock('hook')
+    server = double('server')
+    methods_for_hook = double('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)
@@ -182,7 +182,7 @@ describe DRbQS::Task::TaskSet do
   end
 
   it "should execute hooks of symbols." do
-    server = mock('server')
+    server = double('server')
     args = [100, 200, 300]
     tasks = args.map do |a|
       DRbQS::Task.new(TestTask.new(a), :some_method, hook: :test_hook)

data/spec/utility/misc_spec.rb

@@ -54,7 +54,7 @@ describe DRbQS::Misc do
     end
 
     after(:all) do
-      DRbQS::Temporary.delete_all
+      DRbQS::Temporary.delete
     end
   end
 

data/spec/utility/temporary_spec.rb

@@ -29,12 +29,6 @@ describe DRbQS::Temporary do
     end
   end
 
-  it "should make directory empty." do
-    Dir.entries(subject.root).size.should > 2
-    subject.delete
-    Dir.entries(subject.root).should have(2).items
-  end
-
   it "should set subdirectory." do
     subject.set_sub_directory('abc')
     subject.subdirectory.should be_nil
@@ -56,7 +50,7 @@ describe DRbQS::Temporary do
 
   it "should delete all directories." do
     root = subject.root
-    subject.delete_all
+    subject.delete
     File.exist?(root).should_not be_true
   end
 end

data/spec/utility/transfer/transfer_client_connect_spec.rb

@@ -46,7 +46,7 @@ describe DRbQS::Transfer::Client::Local do
   end
 
   after(:all) do
-    DRbQS::Temporary.delete_all
+    DRbQS::Temporary.delete
   end
 end
 
@@ -69,7 +69,7 @@ describe DRbQS::Transfer::Client::SFTP do
   it "should transfer files." do
     tmp_dir, files = create_sample_transfer_files(1)
     source_path = files[0]
-    sftp = mock('sftp')
+    sftp = double('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)
@@ -78,13 +78,13 @@ describe DRbQS::Transfer::Client::SFTP do
 
   it "should download files. (incomplete)" do
     tmp_dir, files = create_sample_transfer_files(1)
-    sftp = mock('sftp')
+    sftp = double('sftp')
     sftp.should_receive(:download)
     Net::SFTP.set_mock(sftp)
     @client.download(files)
   end
 
   after(:all) do
-    DRbQS::Temporary.delete_all
+    DRbQS::Temporary.delete
   end
 end

data/spec/utility/transfer/transfer_file_list_spec.rb

@@ -10,7 +10,7 @@ describe DRbQS::Transfer::FileList do
   end
 
   it "should download files." do
-    client = mock('transfer client')
+    client = double('transfer client')
     DRbQS::Transfer::Client.stub(:get).and_return(client)
     client.should_receive(:download).with(@files, nil)
     file_list = DRbQS::Transfer::FileList.new(*@files)
@@ -18,7 +18,7 @@ describe DRbQS::Transfer::FileList do
   end
 
   it "should download files with readonly." do
-    client = mock('transfer client')
+    client = double('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)

data/spec/utility/transfer/transfer_spec.rb

@@ -31,13 +31,13 @@ describe DRbQS::Transfer do
 
   it "should enqueue path." do
     path = create_file('file1.txt', 'file1')
-    DRbQS::Transfer.enqueue(path)
+    DRbQS::Transfer.enqueue(path).should == File.basename(path)
     DRbQS::Transfer.dequeue.should == path
   end
 
   it "should compress and enqueue path." do
     path = create_file('file2.txt', 'file2')
-    DRbQS::Transfer.enqueue(path, :compress => true)
+    DRbQS::Transfer.enqueue(path, :compress => true).should == File.basename(path) + '.gz'
     DRbQS::Transfer.dequeue.should == path + '.gz'
   end
 
@@ -54,7 +54,7 @@ describe DRbQS::Transfer do
     path = create_file('file4.txt', 'file4')
     rename = 'dir/rename.txt'
     new_path = File.join(@tmp, rename)
-    DRbQS::Transfer.enqueue(path, :rename => rename)
+    DRbQS::Transfer.enqueue(path, :rename => rename).should == File.basename(rename)
     DRbQS::Transfer.dequeue.should == new_path
     File.exist?(new_path).should be_true
   end
@@ -63,7 +63,7 @@ describe DRbQS::Transfer do
     path = create_file('file5.txt', 'file5')
     rename = 'dir2/rename.txt'
     new_path = File.join(@tmp, rename + '.gz')
-    DRbQS::Transfer.enqueue(path, :rename => rename, :compress => true)
+    DRbQS::Transfer.enqueue(path, :rename => rename, :compress => true).should == File.basename(rename) + '.gz'
     DRbQS::Transfer.dequeue.should == new_path
     File.exist?(new_path).should be_true
   end
@@ -73,7 +73,7 @@ describe DRbQS::Transfer do
              create_file('file8.txt', 'file8'),
              create_file('file8.txt', 'file8')]
     files.each do |path|
-      DRbQS::Transfer.enqueue(path)
+      DRbQS::Transfer.enqueue(path).should == File.basename(path)
     end
     DRbQS::Transfer.dequeue_all.should == files
     DRbQS::Transfer.empty?.should be_true
@@ -81,14 +81,14 @@ describe DRbQS::Transfer do
 
   it "should enqueue path of directory." do
     path = create_directory('dir/dir1')
-    DRbQS::Transfer.enqueue(path)
+    DRbQS::Transfer.enqueue(path).should == File.basename(path)
     DRbQS::Transfer.dequeue.should == path
   end
 
   it "should compress and enqueue path of directory." do
     path = create_directory('dir/dir2')
     file_path = create_file('dir/dir2/test.txt', 'hello world')
-    DRbQS::Transfer.enqueue(path, :compress => true)
+    DRbQS::Transfer.enqueue(path, :compress => true).should == File.basename(path) + '.tar.gz'
     DRbQS::Transfer.dequeue.should == path + '.tar.gz'
   end
 
@@ -96,10 +96,25 @@ describe DRbQS::Transfer do
     path = create_directory('dir/dir3')
     file_path = create_file('dir/dir3/test.txt', 'hello world')
     rename = 'rename_dir'
-    DRbQS::Transfer.enqueue(path, :compress => true, :rename => rename)
+    DRbQS::Transfer.enqueue(path, :compress => true, :rename => rename).should == rename + '.tar.gz'
     DRbQS::Transfer.dequeue.should == File.join(@tmp, 'dir', rename + '.tar.gz')
   end
 
+  it "should return nil for a nonexistent file." do
+    DRbQS::Transfer.enqueue("nonexistent/file.txt").should be_nil
+    DRbQS::Transfer.empty?.should be_true
+  end
+
+  it "should return nil for a nonexistent file with a compress option." do
+    DRbQS::Transfer.enqueue("nonexistent/file.txt", :compress => true).should be_nil
+    DRbQS::Transfer.empty?.should be_true
+  end
+
+  it "should return nil for a nonexistent file with a rename option." do
+    DRbQS::Transfer.enqueue("nonexistent/file.txt", :rename => "hello.txt").should be_nil
+    DRbQS::Transfer.empty?.should be_true
+  end
+
   after(:all) do
     FileUtils.rm_r(@tmp)
   end

metadata

@@ -1,104 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: drbqs
 version: !ruby/object:Gem::Version
-  version: 0.0.19
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Takayuki YAMAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12438740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *12438740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12438160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *12438160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: filename
-  requirement: &12437700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12437700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: user_config
-  requirement: &12437200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *12437200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &12436460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12436460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: net-ssh-shell
-  requirement: &12435840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12435840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &12435360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *12435360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: sys-proctable
-  requirement: &12434980 !ruby/object:Gem::Requirement
-    none: false
+  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: *12434980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Task queuing system over network that is implemented by dRuby.
 email:
 - d@ytak.info
@@ -125,35 +162,37 @@ files:
 - bin/drbqs-ssh
 - docs/FormatExecute.md
 - docs/GettingStarted.md
+- docs/TestProfiler.md
 - drbqs.gemspec
-- example/README.md
-- example/command/server_def.rb
-- example/error_server/error.rb
-- example/error_server/server_def.rb
-- example/error_task/error.rb
-- example/error_task/server_def.rb
-- example/execute/execute.rb
-- example/execute/server.rb
-- example/execute/task.rb
-- example/group/execute.rb
-- example/group/server.rb
-- example/group/sum.rb
-- example/mandelbrot/README.md
-- example/mandelbrot/execute.rb
-- example/mandelbrot/mandelbrot.rb
-- example/mandelbrot/server.rb
-- example/server/server.rb
-- example/simple/README.md
-- example/simple/execute.rb
-- example/simple/server.rb
-- example/simple/task.rb
-- example/sum/server_def.rb
-- example/sum/sum.rb
-- example/sum2/execute_def.rb
-- example/sum2/server_def.rb
-- example/sum2/sum.rb
-- example/transfer/file.rb
-- example/transfer/server_def.rb
+- examples/README.md
+- examples/command/server_def.rb
+- examples/error_server/error.rb
+- examples/error_server/server_def.rb
+- examples/error_task/error.rb
+- examples/error_task/server_def.rb
+- examples/execute/README.md
+- examples/execute/execute.rb
+- examples/execute/server.rb
+- examples/execute/sum.rb
+- examples/group/execute.rb
+- examples/group/server.rb
+- examples/group/sum.rb
+- examples/mandelbrot/README.md
+- examples/mandelbrot/execute.rb
+- examples/mandelbrot/mandelbrot.rb
+- examples/mandelbrot/server.rb
+- examples/server/server.rb
+- examples/simple/README.md
+- examples/simple/execute.rb
+- examples/simple/server.rb
+- examples/simple/task.rb
+- examples/sum/server_def.rb
+- examples/sum/sum.rb
+- examples/sum2/execute_def.rb
+- examples/sum2/server_def.rb
+- examples/sum2/sum.rb
+- examples/transfer/file.rb
+- examples/transfer/server_def.rb
 - lib/drbqs.rb
 - lib/drbqs/command_line/argument.rb
 - lib/drbqs/command_line/command_base.rb
@@ -285,27 +324,26 @@ files:
 - spec/worker/worker_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: drbqs
-rubygems_version: 1.8.5
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: dRuby Queueing System
 test_files: []
 has_rdoc: