fastlane-plugin-sftp 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac51bdf322cdc7fd294125577506123707da8e7b
-  data.tar.gz: 4a15b34323794f3d2471d7cfec0fd1ae8b8ff04c
+SHA256:
+  metadata.gz: f3b2c8f4ce3e0604fc61cc5098dec0ae3d979d8d5e9fbdceb46e57386774bff3
+  data.tar.gz: 472bb98699439418ed7418ffcdb48031fb469fe52dffa7cb60fff755d70100ec
 SHA512:
-  metadata.gz: 06a5384854ea56c9fa2ae0164d3eda938bb85967122ade3f3588deb672c5034cd19c42d34d3b8270de0b1fda81f838438193d331e8e76e3bf584580961692289
-  data.tar.gz: bce48cc6866ce9e166bd4c7e488280c0a03b75d04c604c76a5c29bb2cc53cc8853b3fc1720fdf970f0b0a61bb5a0ad5231f6f654ff2947b3a1112cf4c62db0c9
+  metadata.gz: 17a129525e9c2031755cbcff56fdef2195440eb0223e0588c869f83773359ac29f141d7088c4dbe04102adcf6e3512e78a5f1d4daf56a69f526939da8f1f47f6
+  data.tar.gz: 5a3c3dbaa36e97cebd02105dcee4f346b3815632dcc45a5d7a432279daa2d6ccc2922dcb5885c29f1482ad5361eb9be71c6a99c9922fbc171d6e047be1d5bea0

data/lib/fastlane/plugin/sftp/helper/options.rb

@@ -67,6 +67,15 @@ module Fastlane
       def self.available_options_upload
         return [].concat(general_options).concat(
           [
+            FastlaneCore::ConfigItem.new(
+              key: :delete_target_dir,
+              short_option: '-b',
+              optional: true,
+              env_name: 'DELETE_TARGET_DIR',
+              type: Boolean,
+              description: 'Specify, if an existing target folder should be deleted prior to uploading files',
+              default_value: false
+            ),
             FastlaneCore::ConfigItem.new(
               key: :target_dir,
               short_option: '-x',

data/lib/fastlane/plugin/sftp/helper/sftp_helper.rb

@@ -90,6 +90,37 @@ module Fastlane
         UI.user_error!("remote folder #{remote_path} does not exist and could not be created") unless folder_exists
       end
 
+      def self.remote_rmdir(sftp, remote_path)
+        return unless remote_dir_exists?(sftp, remote_path)
+
+        # make sure the remote directory is empty
+        sftp.dir.entries(remote_path).each do |entry|
+          next if entry.name == "." || entry.name == ".."
+
+          path_value = remote_path + File::SEPARATOR + entry.name
+          UI.message("entry #{path_value}")
+          begin
+            if entry.directory?
+              remote_rmdir(sftp, path_value)
+            else
+              sftp.remove!(path_value)
+            end
+          rescue Net::SFTP::StatusException => e
+            UI.user_error!("could not delete file #{path_value}: #{e.message}")
+          end
+        end
+
+        begin
+          sftp.rmdir!(remote_path)
+        rescue Net::SFTP::StatusException => e
+          UI.user_error!("Could not delete remote directory #{remote_path}: #{e.message}")
+        end
+
+        # check for existence again
+        folder_exists = remote_dir_exists?(sftp, remote_path)
+        UI.user_error!("remote folder #{remote_path} still exists after deletion") if folder_exists
+      end
+
       def self.remote_dir_exists?(sftp, remote_path)
         UI.message("Checking remote directory #{remote_path}")
         attrs = sftp.stat!(remote_path)

data/lib/fastlane/plugin/sftp/helper/uploader.rb

@@ -25,6 +25,7 @@ module Fastlane
       attr_accessor :target_dir
       attr_accessor :root_path
       attr_accessor :files
+      attr_accessor :delete_target_dir
 
       def initialize(options)
         self.options = options unless options.nil?
@@ -36,6 +37,7 @@ module Fastlane
         self.rsa_keypath_passphrase = options[:server_key_passphrase]
         self.files = options[:file_paths]
         self.target_dir = options[:target_dir]
+        self.delete_target_dir = options[:delete_target_dir]
       end
 
       #
@@ -50,6 +52,7 @@ module Fastlane
         UI.message('Uploading files...')
 
         session.sftp.connect do |sftp|
+          Helper::SftpHelper.remote_rmdir(sftp, target_dir) if delete_target_dir
           Helper::SftpHelper.remote_mkdir(sftp, target_dir)
           uploads = []
           files.each do |file|

data/lib/fastlane/plugin/sftp/version.rb

@@ -1,6 +1,6 @@
 module Fastlane
   module Sftp
-    VERSION = "1.1.0".freeze
+    VERSION = "1.2.0".freeze
     SUMMARY = 'Fastlane plugin to upload or dowload files/folders via SFTP'.freeze
     DESCRIPTION = 'Fastlane plugin SFTP'.freeze
   end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sftp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Oliver Limberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -253,8 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Plugin to upload files via SFTP