woolen_common 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 799baa9abff2065c04e70662e90a9a1754a165e2
-  data.tar.gz: 754d6aa29d5474ecb45bff416e28f9d4b89ca7cc
+  metadata.gz: 4070f2c35867c4802790bd9bf6baa522b8c527d1
+  data.tar.gz: b55fc9b5d9e9db649c4b8bcab4262542f5436e60
 SHA512:
-  metadata.gz: fd5dc49d77bf3793409e4b1b6d22fb3f542de6ed8d36e787e3c69526b84063fa25a35ba724188c5f320e0ac495ac059626e1f8f0eac993d26874a6edf38bfd35
-  data.tar.gz: 7f91800811ca360e4ecf93b3de2a81cf09d6da77e505030854d6908828a9df3063d509ee52c3fd76c47d7a68feb9f101f0f12ddc0503a45ae430b0c4cf833a10
+  metadata.gz: 8a52c69f86f8633486443abc869f9da09170321f9beaa09b25ad2693a4fcf0ec7113f2ff5f6de8b72e3f083c339d7a6ddaf2bb60524a4cbf790d402a98fa911a
+  data.tar.gz: 6a4ef906ea35ce4d4efa9635d34aee38caee639beb67f5ad9ee7cf7cfae9539425d4f19e4e2346350d0b5b991f5195befb20cff97bf0f6f2ee0f52453964dac2

data/lib/woolen_common/ssh_proxy.rb

@@ -10,18 +10,19 @@ begin
 
             class << self
                 attr_accessor :the_ssh_instances
+
                 def get_ssh_proxy(ip, user, password, port=22, max_ssh=10, time_out=10)
                     @the_ssh_instances ||= {}
                     @the_ssh_instances[ip] ||= {}
                     @the_ssh_instances[ip][port] ||= {}
                     @the_ssh_instances[ip][port][user] ||= {}
-                    @the_ssh_instances[ip][port][user][password] ||= self.new(ip, user, password, port=22, max_ssh=10, time_out=10)
+                    @the_ssh_instances[ip][port][user][password] ||= self.new(ip, user, password, port, max_ssh, time_out)
                     @the_ssh_instances[ip][port][user][password]
                 end
             end
 
             def initialize(ip, user, password, port=22, max_ssh=10, time_out=10)
-                debug "ssh setup : [ user::#{user},password::#{password},port:#{port} ]"
+                debug "ssh setup : [ user::#{user},password::#{password},port:#{port}, time_out #{time_out} ]"
                 @ip = ip
                 @user = user
                 @password = password
@@ -32,9 +33,9 @@ begin
             end
 
             def get_pool
-                @ssh_connection_pool ||= ::WoolenCommon::ConnectionPool.new({:size => @max_ssh, :timeout => @time_out}) do
+                @ssh_connection_pool ||= ::WoolenCommon::ConnectionPool.new({ :size => @max_ssh, :timeout => @time_out }) do
                     debug "ip:#{@ip},@password:#{@password},@port:#{@port}"
-                    ::WoolenCommon::SshProxy.new(@ip, @user, :password => @password, :port => @port,:proxy_conn_timeout => @time_out)
+                    ::WoolenCommon::SshProxy.new(@ip, @user, :password => @password, :port => @port, :proxy_conn_timeout => @time_out)
                 end
             end
 
@@ -57,8 +58,9 @@ begin
             class << self
 
                 attr_accessor :the_ssh_instances
-                def get_ssh_proxy(ip,port,user,passwd)
-                    options = {:port => port,:password => passwd}
+
+                def get_ssh_proxy(ip, port, user, passwd)
+                    options = { :port => port, :password => passwd }
                     @the_ssh_instances ||= {}
                     @the_ssh_instances[ip] ||= {}
                     @the_ssh_instances[ip][port] ||= {}
@@ -73,6 +75,7 @@ begin
                 @user = user
                 @options = options
                 @conn_retry = options[:proxy_conn_retry] || 5
+                options[:paranoid] = false # for disable the public key verify
                 options.delete :proxy_conn_retry if options[:proxy_conn_retry]
                 # 超时时间设置30秒太长了，不是很合理，实际上5秒没有回复，那就是出问题了
                 @conn_timeout = options[:proxy_conn_timeout] || 5
@@ -185,7 +188,7 @@ begin
                     proxy_reset_conn
                 end
                 @ssh_conn.sftp.connect! do |sftp_session|
-                    return sftp_session.upload!(local_path,remote_path)
+                    return sftp_session.upload!(local_path, remote_path)
                 end
             end
 
@@ -195,7 +198,7 @@ begin
                     proxy_reset_conn
                 end
                 @ssh_conn.sftp.connect do |sftp_session|
-                    return sftp_session.upload(local_path,remote_path)
+                    return sftp_session.upload(local_path, remote_path)
                 end
             end
         end

data/lib/woolen_common/version.rb

@@ -1,3 +1,3 @@
 module WoolenCommon
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woolen_common
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - just_woolen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler