spectre-ftp 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '055907f899bb094c17845e01db766dd1d643ef78d87981fc4bd007bf3b430b2e'
-  data.tar.gz: 3b9fb444b4949712f8df4891c4276a938aa04b4c34b9a5b7789023234a572722
+  metadata.gz: 7e46fba6cb0d3e4b4d028a9c6a55f83560a4f17bd35d7539e250806c234eca1d
+  data.tar.gz: a0d862670094baa553b7a23d46eaac7b3a6bbde87f2ad8b0f432ee2dbe560667
 SHA512:
-  metadata.gz: 3d0f4f82bf15afe3d0927a86af940ca8dfa291fdb4f4958f66811541666f202fec7922f8a38515a2500da14b70dd01276733ff607bc57b029539b6213f81c11f
-  data.tar.gz: 5ef3c799773931a559725d3f296358451e4e7db8c424deec11b7a549357db5716652511a3a582aab7ed7a47aa06dd4aa5f811e15bbda2bad7b4b9867a59d0345
+  metadata.gz: dc6eeb05d1e853f16351a8dbb598e0bd5768bb13ac9af72235ecb64fa599d7505ffc703c99a75c87e7fda80bcdf1dca9c23a55e34f8180ca5c0801757f5a01db
+  data.tar.gz: 50cec5fc3bef75a2ad843ee618580bf6025691076cc8d5989818ec2b90d65d8e3af5590471979fd97266b780925a2f1ebeb8bd8685f6ca0b239cbec393c1f635

data/lib/spectre/ftp.rb

@@ -291,18 +291,34 @@ module Spectre
         @logger = logger
       end
 
+      def ftps(name, config = {}, &)
+        config[:ssl] = true
+        config[:port] ||= 990
+        config[:implicit] = true
+
+        ftp(name, config, &)
+      end
+
+      def ftpes(name, config = {}, &)
+        config[:ssl] = true
+        config[:port] ||= 21
+        config[:implicit] = false
+
+        ftp(name, config, &)
+      end
+
       def ftp(name, config = {}, &)
         cfg = @config[name] || {}
 
-        host = config[:host] || cfg['host'] || name
-        username = config[:username] || cfg['username']
-        password = config[:password] || cfg['password']
+        hostname = config.delete(:host) || cfg['host'] || name
+        username = config.delete(:username) || cfg['username']
+        password = config.delete(:password) || cfg['password']
 
-        opts = {}
-        opts[:ssl] = config[:ssl]
-        opts[:port] = config[:port] || cfg['port'] || 21
+        config[:port] = config[:port] || cfg['port'] || 21
+        config[:ssl] = config[:ssl] || cfg['ssl'] || false
+        config[:implicit_ftps] = config.delete(:implicit) || cfg['implicit'] || false
 
-        ftp_conn = FTPConnection.new(host, username, password, opts, @logger)
+        ftp_conn = FTPConnection.new(hostname, username, password, config, @logger)
 
         begin
           ftp_conn.instance_eval(&)
@@ -314,23 +330,22 @@ module Spectre
       def sftp(name, config = {}, &)
         cfg = @config[name] || {}
 
-        host = config[:host] || cfg['host'] || name
-        username = config[:username] || cfg['username']
-        password = config[:password] || cfg['password']
+        host = config.delete(:host) || cfg['host'] || name
+        username = config.delete(:username) || cfg['username']
+        password = config.delete(:password) || cfg['password']
 
-        opts = {}
-        opts[:password] = password
-        opts[:port] = config[:port] || cfg['port'] || 22
-        opts[:keys] = [cfg['key']] if cfg.key? 'key'
-        opts[:passphrase] = cfg['passphrase'] if cfg.key? 'passphrase'
+        config[:password] = password
+        config[:port] ||= cfg['port'] || 22
+        config[:keys] = [cfg['key']] if cfg.key? 'key'
+        config[:passphrase] = cfg['passphrase'] if cfg.key? 'passphrase'
 
-        opts[:auth_methods] = []
-        opts[:auth_methods].push 'publickey' if opts[:keys]
-        opts[:auth_methods].push 'password' if opts[:password]
+        config[:auth_methods] = []
+        config[:auth_methods].push 'publickey' if config[:keys]
+        config[:auth_methods].push 'password' if config[:password]
 
-        opts[:non_interactive] = true
+        config[:non_interactive] = true
 
-        sftp_con = SFTPConnection.new(host, username, opts, @logger)
+        sftp_con = SFTPConnection.new(host, username, config, @logger)
 
         begin
           sftp_con.instance_eval(&)
@@ -341,5 +356,5 @@ module Spectre
     end
   end
 
-  Engine.register(FTP::Client, :ftp, :sftp) if defined? Engine
+  Engine.register(FTP::Client, :ftp, :sftp, :ftps, :ftpes) if defined? Engine
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectre-ftp
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Christian Neubauer