scccp 0.0.1 → 0.0.2

data/lib/scccp/scp.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 
 module Scccp
   class Scp
+    SIGNALS = [ :QUIT, :INT, :TERM, :USR1, :USR2, :HUP ]
+
     ATTRS = [
       :remote_host,
       :remote_user_name,
@@ -12,6 +14,7 @@ module Scccp
       :ok_folder,
       :ng_folder,
       :timeout,
+      :lockfile,
       :logger2ssh,
       :logger
     ]
@@ -30,7 +33,7 @@ module Scccp
         #v = instance_variable_get("@#{attr.to_s}")
         v = send(attr)
         case attr
-        when :remote_user_name,:remote_user_password,:timeout,:logger2ssh
+        when :remote_user_name,:remote_user_password,:timeout,:logger2ssh,:lockfile
           next
         when :queue_folder,:ok_folder,:ng_folder
           unless File.directory?(v)
@@ -45,8 +48,14 @@ module Scccp
       true
     end
 
+    def receive_signal(signal)
+      @killing = true
+    end
+
     def proceed
       attrs_ok?
+      SIGNALS.each { |sig| trap(sig){receive_signal(sig)} }
+
       opt = {}
       if remote_user_password
         opt[:password] = remote_user_password
@@ -64,15 +73,25 @@ module Scccp
           !(o =~ /\.(tmp|ok)$/)
       end
 
+      if lockfile
+        if File.exists?(lockfile)
+          logger.warn("lockfile:#{lockfile} already exists")
+          return :lockfile_error
+        end
+        File.open(lockfile, "w"){|f|f.write $$}
+      end
+
       logger.info("queue_folder is #{queue_folder}")
       logger.info("target is #{remote_host}:#{remote_path}")
       #logger.info(files.inspect)
+      uploaded_count = 0
 
       begin
         # ブロックで使うと途中で失敗した場合にscpインスタンスを
         # 使いまわせない（というか固まる）のでこんな感じの使い方で
         scp = Net::SCP.start(remote_host, remote_user_name, opt)
         files.each do |file|
+          break if @killing
           ok_file = file + '.ok'
           begin
             logger.info "uploading_start:#{file}"
@@ -84,6 +103,7 @@ module Scccp
             logger.info "uploading_finish:#{ok_file}"
             FileUtils.mv(file,ok_folder)
             FileUtils.mv(ok_file,ok_folder)
+            uploaded_count += 1
             true
           rescue => e
             logger.error e
@@ -103,7 +123,12 @@ module Scccp
         if scp
           scp.session.close
         end
+        if lockfile
+          FileUtils.rm lockfile
+        end
       end
+
+      uploaded_count
     end
   end
 end

data/lib/scccp/version.rb

@@ -1,3 +1,3 @@
 module Scccp
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test.rb

@@ -14,6 +14,7 @@ class TestScccp < Test::Unit::TestCase
   OK_FOLDER            = "#{SCCCP_WORKING_DIR}done/"
   NG_FOLDER            = "#{SCCCP_WORKING_DIR}error/"
   REMOTE_PATH          = "#{SCCCP_WORKING_DIR}remote/"
+  LOCK_FILE            = "#{SCCCP_WORKING_DIR}test.lock"
   REMOTE_USER_NAME     = 'paco'
   REMOTE_USER_PASSWORD = nil
   REMOTE_HOST          = "localhost"
@@ -72,6 +73,55 @@ class TestScccp < Test::Unit::TestCase
     assert_false File.exists?(NG_FOLDER + "testfile2.ok")
   end
 
+  # アップロードに5秒程度かかるように調整が必要
+  # 200個SCPで今の環境で5秒程度かかる
+  # スレッド立ててからsleep 1 (ロックファイルが出来る前に
+  # 後のプロセスが起動しないように)が良い感じで動くように
+  # 個々の値は将来調整しないといけないかもしれない
+  def prepare_heavy_test
+    (1..200).each do |i|
+      file = QUEUE_FOLDER + "#{i}.dat"
+      File.write(file,'test_data')
+    end
+  end
+
+
+  def test_signal
+    prepare_heavy_test
+
+    th = Thread.new do
+      scccp = Scccp::Scp.new(attr.merge({:lockfile=>LOCK_FILE}))
+      scccp.proceed
+    end
+
+    sleep 1
+
+    assert_equal true, File.exists?(LOCK_FILE)
+    `kill #{File.read(LOCK_FILE)}`
+
+    sleep 1
+    assert_equal false, File.exists?(LOCK_FILE)
+
+    th.join
+  end
+
+
+  def test_lockfile
+    prepare_heavy_test
+
+    th = Thread.new do
+      scccp = Scccp::Scp.new(attr.merge({:lockfile=>LOCK_FILE}))
+      scccp.proceed
+    end
+
+    sleep 1
+    assert_equal true, File.exists?(LOCK_FILE)
+
+    scccp2 = Scccp::Scp.new(attr.merge({:lockfile=>LOCK_FILE}))
+    assert_equal :lockfile_error, scccp2.proceed
+    th.join
+  end
+
   def test_connection_error
     scccp = Scccp::Scp.new(attr)
     scccp.remote_host = 'sefisfejisfe.sefijsefij.esfij'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scccp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp