batchbase 0.0.5 → 0.0.6

data/lib/batchbase/core.rb

@@ -136,7 +136,7 @@ module Batchbase
       @__signal_observers ||= []
     end
 
-    def set_signal_observer(method_name)
+    def set_signal_observer(method_name,object=self)
       @__signal_observers ||= []
       case method_name
       when String
@@ -145,7 +145,7 @@ module Batchbase
       else
         raise ArgumentError.new('method_name must be String or Symbol')
       end
-      @__signal_observers << method_name
+      @__signal_observers << [object,method_name]
     end
 
     def parse_options(options,argv=ARGV)
@@ -277,9 +277,9 @@ module Batchbase
     #
     def r_signal(signal)
       sent_signal = false
-      signal_observers.each do |method_name|
+      signal_observers.each do |ar|
         begin
-          self.send method_name,signal
+          ar[0].send ar[1],signal
           sent_signal = true
         rescue => e
           message = "signal #{signal} received. but can not call '#{method_name}'"

data/lib/batchbase/version.rb

@@ -1,3 +1,3 @@
 module Batchbase
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/batch_signal_other_class.rb

@@ -0,0 +1,27 @@
+class BatchSignalOtherClass
+  include Batchbase::Core
+  skip_logging
+
+  def initialize
+  end
+
+  TEST_FILE = '/tmp/.batchbase_batch.txt'
+
+  def proceed(opt={})
+    @shutdown = false
+    sc = SomeClass.new
+    set_signal_observer(:r_sig,sc)
+    set_signal_observer(:receive_signal)
+
+    execute(opt) do
+      sleep 4
+    end
+  end
+end
+
+class SomeClass
+  RECEIVE_SIGNAL_FILE = '/tmp/.batchbase_test.receive_signal.pid'
+  def r_sig(sig)
+    File.write(RECEIVE_SIGNAL_FILE,$$)
+  end
+end

data/test/test.rb

@@ -11,6 +11,7 @@ require 'Fileutils'
 
 require 'batch'
 require 'batch_too_long'
+require 'batch_signal_other_class'
 
 class TestBatchbase < Test::Unit::TestCase
 
@@ -18,6 +19,7 @@ class TestBatchbase < Test::Unit::TestCase
   PID_FILE_DAEMONIZE_TEST = '/tmp/.batchbase_daemonize_test.pid'
   LOG_FILE       = '/tmp/batchbase_test.log'
   PROCESS_NAME   = 'batchbase_test_hogehoge'
+  RECEIVE_SIGNAL_FILE = '/tmp/.batchbase_test.receive_signal.pid'
 
   def setup
     delete_file(pid_file)
@@ -26,6 +28,7 @@ class TestBatchbase < Test::Unit::TestCase
     delete_file(Batch::TEST_FILE) # HACKME したとまとめる、、、
     delete_file(FILE_PG_TEST)
     delete_file(LOG_FILE)
+    delete_file(RECEIVE_SIGNAL_FILE)
   end
 
   def new_batch_instance
@@ -254,6 +257,23 @@ class TestBatchbase < Test::Unit::TestCase
     assert_equal false,File.exists?(PID_FILE_FORCE)
   end
 
+  def test_signal_other_obj
+    assert_equal false,File.exists?(PID_FILE_FORCE)
+    assert_equal false,File.exists?(RECEIVE_SIGNAL_FILE)
+    pid = fork do
+      b = BatchSignalOtherClass.new
+      b.skip_logging
+      b.proceed(:pid_file=>PID_FILE_FORCE,:not_set_observer=>true)
+    end
+    sleep 1
+    assert_equal false,File.exists?(RECEIVE_SIGNAL_FILE)
+    pid_by_file = File.read(PID_FILE_FORCE).chomp.to_i
+    assert_equal pid,pid_by_file
+    `kill #{pid}`
+    sleep 1
+    assert_equal true,File.exists?(RECEIVE_SIGNAL_FILE)
+  end
+
   #
   # オブザーバーを設定していない場合は
   # デフォルトの挙動をするように変更して

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batchbase
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -63,6 +63,7 @@ files:
 - readme.md
 - test/batch.rb
 - test/batch_by_hand.rb
+- test/batch_signal_other_class.rb
 - test/batch_too_long.rb
 - test/by_hand.rb
 - test/check_logger.rb
@@ -96,9 +97,11 @@ summary: oreore batch base class
 test_files:
 - test/batch.rb
 - test/batch_by_hand.rb
+- test/batch_signal_other_class.rb
 - test/batch_too_long.rb
 - test/by_hand.rb
 - test/check_logger.rb
 - test/pg_for_test.rb
 - test/test.rb
 - test/test_helper.rb
+has_rdoc: