spectre-ftp 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '055907f899bb094c17845e01db766dd1d643ef78d87981fc4bd007bf3b430b2e'
-  data.tar.gz: 3b9fb444b4949712f8df4891c4276a938aa04b4c34b9a5b7789023234a572722
+  metadata.gz: b8d6f6f87bd1046313a344b49321de16b08d13dd057ef2d1a2c13341b65111d7
+  data.tar.gz: 1f10d7313743695c98dc595736aa7fd4566c9e4b47e73fad364f2daffdff1df0
 SHA512:
-  metadata.gz: 3d0f4f82bf15afe3d0927a86af940ca8dfa291fdb4f4958f66811541666f202fec7922f8a38515a2500da14b70dd01276733ff607bc57b029539b6213f81c11f
-  data.tar.gz: 5ef3c799773931a559725d3f296358451e4e7db8c424deec11b7a549357db5716652511a3a582aab7ed7a47aa06dd4aa5f811e15bbda2bad7b4b9867a59d0345
+  metadata.gz: a5409c0acb1cefaf3b6cf392f7dfe6f6cefb97346eca7a078920c2c1f0ec84745bf5347b325bc2b8f0571d3f40e578d52c3212ac5dc5f253dc6acd9a4a7e85fa
+  data.tar.gz: f93d905e0264e1225716a24ace24aa944c667c5b4c887a7aed8412af0145692db462de5c3b8a5d1b437bf81dc273628a7c794f412b28de72e41b61f9f1287088

data/lib/spectre/ftp.rb

@@ -291,18 +291,24 @@ module Spectre
         @logger = logger
       end
 
+      def ftps(name, config = {}, &)
+        config[:ssl] ||= { implicit: true }
+        config[:port] ||= 990
+
+        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']
 
-        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 +320,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 +346,5 @@ module Spectre
     end
   end
 
-  Engine.register(FTP::Client, :ftp, :sftp) if defined? Engine
+  Engine.register(FTP::Client, :ftp, :sftp, :ftps) 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.2
 platform: ruby
 authors:
 - Christian Neubauer