scccp 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scccp (0.0.2)
+    scccp (0.0.4)
       net-scp
 
 GEM

data/example/sample.rb

@@ -1,18 +1,11 @@
-# https://github.com/pacojp/batchbase
-require 'batchbase'
 require 'scccp'
 
-include Batchbase::Core
-#create_logger('/tmp/batchbase_test_sample1.log')
-create_logger(STDERR)
-
 REMOTE_HOST = 'localhost'
 REMOTE_USER_NAME = 'paco'
 REMOTE_USER_PASSWORD = nil
 WORK_SPACE = '/tmp/test/scccp_sample/'
 REMOTE_PATH = WORK_SPACE + 'remote/'
 QUEUE_FOLDER = WORK_SPACE + 'from/'
-LOCKFILE = WORK_SPACE + '.scccp.lock'
 OK_FOLDER = WORK_SPACE + 'ok'
 NG_FOLDER = WORK_SPACE + 'ng'
 
@@ -26,16 +19,12 @@ touch /tmp/test/scccp_sample/from/file2.tmp
 touch /tmp/test/scccp_sample/from/file3.ok
 MKDIR
 
-execute do
-  scccp = Scccp::Scp.new()
-  scccp.logger               = logger
-  scccp.remote_host          = REMOTE_HOST
-  scccp.remote_user_name     = REMOTE_USER_NAME
-  scccp.remote_user_password = REMOTE_USER_PASSWORD
-  scccp.remote_path          = REMOTE_PATH
-  scccp.queue_folder         = QUEUE_FOLDER
-  scccp.lockfile             = LOCKFILE
-  scccp.ok_folder            = OK_FOLDER
-  scccp.ng_folder            = NG_FOLDER
-  scccp.proceed
-end
+scccp = Scccp::Scp.new
+scccp.remote_host          = REMOTE_HOST
+scccp.remote_user_name     = REMOTE_USER_NAME
+scccp.remote_user_password = REMOTE_USER_PASSWORD
+scccp.remote_path          = REMOTE_PATH
+scccp.queue_folder         = QUEUE_FOLDER
+scccp.ok_folder            = OK_FOLDER
+scccp.ng_folder            = NG_FOLDER
+scccp.proceed

data/example/sample_with_batchbase.rb

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+require 'scccp'
+
+require 'batchbase'
+include Batchbase::Core
+# https://github.com/pacojp/batchbase
+#
+# 2重起動防止
+# シグナル管理
+# デーモン化
+#
+
+#create_logger('/tmp/batchbase_test_sample1.log')
+create_logger(STDOUT)
+def receive_signal(signal)
+  logger.info("receive signal #{signal}")
+  @stop = true
+end
+set_signal_observer(:receive_signal,self)
+@stop = false
+
+REMOTE_HOST = 'localhost'
+REMOTE_USER_NAME = 'paco'
+REMOTE_USER_PASSWORD = nil
+WORK_SPACE = '/tmp/test/scccp_sample/'
+REMOTE_PATH = WORK_SPACE + 'remote/'
+QUEUE_FOLDER = WORK_SPACE + 'from/'
+LOCKFILE = WORK_SPACE + '.scccp.lock'
+OK_FOLDER = WORK_SPACE + 'ok'
+NG_FOLDER = WORK_SPACE + 'ng'
+
+<<`MKDIR`
+mkdir -p /tmp/test/scccp_sample/from
+mkdir -p /tmp/test/scccp_sample/ok
+mkdir -p /tmp/test/scccp_sample/ng
+mkdir -p /tmp/test/scccp_sample/remote
+touch /tmp/test/scccp_sample/from/file1
+touch /tmp/test/scccp_sample/from/file2.tmp
+touch /tmp/test/scccp_sample/from/file3.ok
+MKDIR
+
+execute(:pid_file=>LOCKFILE) do
+  scccp = Scccp::Scp.new()
+  scccp.logger               = logger
+  scccp.remote_host          = REMOTE_HOST
+  scccp.remote_user_name     = REMOTE_USER_NAME
+  scccp.remote_user_password = REMOTE_USER_PASSWORD
+  scccp.remote_path          = REMOTE_PATH
+  scccp.queue_folder         = QUEUE_FOLDER
+  scccp.ok_folder            = OK_FOLDER
+  scccp.ng_folder            = NG_FOLDER
+  set_signal_observer(:receive_signal,scccp)
+
+  loop do
+    cnt = scccp.proceed
+    logger.info "#{cnt} files uploaded"
+    break_loop = false
+    5.times do
+      sleep 1
+      if @stop
+        break_loop = true
+        break
+      end
+    end
+    break if break_loop
+  end
+end

data/lib/scccp/scp.rb

@@ -3,8 +3,6 @@ require 'fileutils'
 
 module Scccp
   class Scp
-    SIGNALS = [ :QUIT, :INT, :TERM, :USR1, :USR2, :HUP ]
-
     ATTRS = [
       :remote_host,
       :remote_user_name,
@@ -15,7 +13,6 @@ module Scccp
       :ok_folder,
       :ng_folder,
       :timeout,
-      :lockfile,
       :logger2ssh,
       :logger
     ]
@@ -24,10 +21,11 @@ module Scccp
     end
 
     def initialize(opts={})
+      self.remote_port = 22
+      self.logger      = Logger.new(STDOUT)
       opts.each do |k, v|
         send("#{k}=", v)
       end
-      self.remote_port ||= 22
     end
 
     def attrs_ok?
@@ -35,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,:lockfile
+        when :remote_user_name,:remote_user_password,:timeout,:logger2ssh
           next
         when :queue_folder,:ok_folder,:ng_folder
           unless File.directory?(v)
@@ -56,7 +54,6 @@ module Scccp
 
     def proceed
       attrs_ok?
-      SIGNALS.each { |sig| trap(sig){receive_signal(sig)} }
 
       opt = {}
       opt[:port] = remote_port
@@ -76,16 +73,11 @@ 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 $$}
+      unless @__not_first_time_to_proceed
+        logger.info("queue_folder is #{queue_folder}")
+        logger.info("target is #{remote_user_name}@#{remote_host}:#{remote_port}:#{remote_path}")
+        @__not_first_time_to_proceed = true
       end
-
-      logger.info("queue_folder is #{queue_folder}")
-      logger.info("target is #{remote_host}:#{remote_port}:#{remote_path}")
       #logger.info(files.inspect)
       uploaded_count = 0
 
@@ -126,9 +118,6 @@ module Scccp
         if scp
           scp.session.close
         end
-        if lockfile
-          FileUtils.rm lockfile
-        end
       end
 
       uploaded_count

data/lib/scccp/version.rb

@@ -1,3 +1,3 @@
 module Scccp
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test.rb

@@ -85,43 +85,6 @@ class TestScccp < Test::Unit::TestCase
     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'
@@ -133,7 +96,6 @@ class TestScccp < Test::Unit::TestCase
     assert_true File.exists?(QUEUE_FOLDER + "testfile2")
   end
 
-
   def test_scccp
     assert_true File.exists?(@l_file)
     assert_true File.exists?(@l_file1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scccp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -40,6 +40,7 @@ files:
 - README.md
 - Rakefile
 - example/sample.rb
+- example/sample_with_batchbase.rb
 - lib/scccp.rb
 - lib/scccp/scp.rb
 - lib/scccp/version.rb