scccp 0.0.2 → 0.0.3

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,8 @@
 scccp
 =====
 
-automatically scp files in a specified folder
+automatically scp files in a specified folder with some features
+
+* double process check.(should not run multiple process for same purpose)
+* create and send ok file.
+* mv files to proper folder which moving process done.

data/example/sample.rb

@@ -12,6 +12,7 @@ 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'
 
@@ -33,6 +34,7 @@ execute do
   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

data/lib/scccp/scp.rb

@@ -10,6 +10,7 @@ module Scccp
       :remote_user_name,
       :remote_user_password,
       :remote_path,
+      :remote_port,
       :queue_folder,
       :ok_folder,
       :ng_folder,
@@ -26,6 +27,7 @@ module Scccp
       opts.each do |k, v|
         send("#{k}=", v)
       end
+      self.remote_port ||= 22
     end
 
     def attrs_ok?
@@ -57,6 +59,7 @@ module Scccp
       SIGNALS.each { |sig| trap(sig){receive_signal(sig)} }
 
       opt = {}
+      opt[:port] = remote_port
       if remote_user_password
         opt[:password] = remote_user_password
       end
@@ -82,7 +85,7 @@ module Scccp
       end
 
       logger.info("queue_folder is #{queue_folder}")
-      logger.info("target is #{remote_host}:#{remote_path}")
+      logger.info("target is #{remote_host}:#{remote_port}:#{remote_path}")
       #logger.info(files.inspect)
       uploaded_count = 0
 

data/lib/scccp/version.rb

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

data/test/test.rb

@@ -3,7 +3,6 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 require 'test/unit'
-require 'Fileutils'
 
 require 'scccp'
 
@@ -14,6 +13,7 @@ class TestScccp < Test::Unit::TestCase
   OK_FOLDER            = "#{SCCCP_WORKING_DIR}done/"
   NG_FOLDER            = "#{SCCCP_WORKING_DIR}error/"
   REMOTE_PATH          = "#{SCCCP_WORKING_DIR}remote/"
+  REMOTE_PORT          = 22
   LOCK_FILE            = "#{SCCCP_WORKING_DIR}test.lock"
   REMOTE_USER_NAME     = 'paco'
   REMOTE_USER_PASSWORD = nil
@@ -162,4 +162,28 @@ class TestScccp < Test::Unit::TestCase
     assert_true File.exists?(@l_file_tmp)
     assert_true File.exists?(@l_file_ok)
   end
+
+  def test_scccp_with_port
+    assert_true File.exists?(@l_file)
+    assert_true File.exists?(@l_file1)
+    scccp = Scccp::Scp.new()
+    scccp.logger               = Logger.new('/dev/null')
+    scccp.remote_host          = REMOTE_HOST
+    # ここが増えただけ
+    scccp.remote_port          = REMOTE_PORT
+    scccp.remote_user_name     = REMOTE_USER_NAME
+    scccp.remote_user_password = REMOTE_USER_PASSWORD
+    scccp.remote_path          = REMOTE_PATH
+    scccp.queue_folder         = 'hohogege'
+    scccp.ok_folder            = OK_FOLDER
+    scccp.ng_folder            = NG_FOLDER
+    scccp.queue_folder = QUEUE_FOLDER
+    scccp.proceed
+
+    assert_true File.exists?(REMOTE_PATH + "testfile2")
+    assert_true File.exists?(REMOTE_PATH + "testfile2.ok")
+
+    assert_true File.exists?(@l_file_tmp)
+    assert_true File.exists?(@l_file_ok)
+  end
 end

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+
+require 'bundler'
+Bundler.setup
+Bundler.require(:test)
+
 $: << File.dirname(__FILE__) + '/../lib'
 
 require 'scccp'

metadata

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