fastlane-plugin-sftp 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132fa1cd768f7e5c72dec60fc0d0e795c5efed26
-  data.tar.gz: 711d7aa6ea3e25807eb10fd23de489f930db21ba
+  metadata.gz: bc66d85ec195721ab4c6a225cf10ca1f2e3fb17b
+  data.tar.gz: b6143dde40ce31cd9455793c83c00768aac0b7be
 SHA512:
-  metadata.gz: 3c5f7e5d52adca26d17d85203ca6cf1100ea1cd7f82fdfb2fec937921f334f4ce58f2cf08d06eb82d16fa85427d7f0e16f1059fcf29fc94b9fe29c760280a5f4
-  data.tar.gz: 95dde5e4e9c17a96dc413b25ad08b93e9ae68b6932734deabfb68292d8437dc44fba3dbb3ca1107d0103dfa41641bb955b82fa1ade8a00eed2c742b41adc953e
+  metadata.gz: c54feaffcef63bc4b86526dca8c741d230ccc5416973541a138f8974284462bffdc6d998d25669a6a7b88fcbe52e1ecb17f9c367b08c96830255fca2049104f4
+  data.tar.gz: 18ac204189bd30f664976663f02f9cbacf444e6c1bddb58982d904b46c51feda708802584e759662319c8989a978ac6e55151607b07d356de103610d0f9130d1

data/README.md

@@ -1,11 +1,6 @@
 # sftp plugin
 
-[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-sftp)  
-[![Gem](https://img.shields.io/gem/v/fastlane-plugin-sftp.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-sftp)
-[![Coverage Status](https://coveralls.io/repos/github/suculent/fastlane-plugin-sftp/badge.svg?branch=master)](https://coveralls.io/github/suculent/fastlane-plugin-sftp?branch=master)
-[![Build Status](https://travis-ci.org/oklimberg/fastlane-plugin-sftp.svg?branch=master)](https://travis-ci.org/oklimberg/fastlane-plugin-sftp)  
-[![Twitter: @oklimberg](https://img.shields.io/badge/contact-@oklimberg-blue.svg?style=flat)](https://twitter.com/oklimberg)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/suculent/fastlane-plugin-apprepo/blob/master/LICENSE)
+[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-sftp) [![Gem](https://img.shields.io/gem/v/fastlane-plugin-sftp.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-sftp)  [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/oklimberg/fastlane-plugin-sftp/blob/master/LICENSE) [![Build Status](https://travis-ci.org/oklimberg/fastlane-plugin-sftp.svg?branch=master)](https://travis-ci.org/oklimberg/fastlane-plugin-sftp) [![Coverage Status](https://coveralls.io/repos/github/oklimberg/fastlane-plugin-sftp/badge.svg?branch=master)](https://coveralls.io/github/oklimberg/fastlane-plugin-sftp?branch=master) [![Twitter: @oklimberg](https://img.shields.io/badge/contact-@oklimberg-blue.svg?style=flat)](https://twitter.com/oklimberg)
 
 ## Getting Started
 

data/lib/fastlane/plugin/sftp.rb

@@ -3,8 +3,6 @@ require 'fastlane/plugin/sftp/version'
 require 'fastlane'
 require 'fastlane_core'
 
-# require_relative 'apprepo/version'
-
 module Fastlane
   module Sftp
     # Return all .rb files inside the "actions" and "helper" directory

data/lib/fastlane/plugin/sftp/actions/sftp_download.rb

@@ -7,7 +7,7 @@ module Fastlane
     class SftpDownloadAction < Action
       def self.run(params)
         # sh 'bundle exec rubocop -D'
-        FastlaneCore::PrintTable.print_values(config: params, hide_keys: [:server_password], mask_keys: [:server_key, :server_key_passphrase], title: "SFTP Download #{Sftp::VERSION} Summary")
+        FastlaneCore::PrintTable.print_values(config: params, mask_keys: [:server_password, :server_key, :server_key_passphrase], title: "SFTP Download #{Sftp::VERSION} Summary")
 
         UI.success('SFTP Downloader running...')
         downloader = Sftp::Downloader.new(params)
@@ -26,21 +26,24 @@ module Fastlane
       end
 
       def self.details
-        # Optional:
-        "TODO"
+        "More information: https://github.com/oklimberg/fastlane-plugin-sftp/"
       end
 
       def self.available_options
         Sftp::Options.available_options_download
       end
 
-      def self.authors
-        ['oklimberg@gmail.com']
+      def self.author
+        'oklimberg'
       end
 
       def self.is_supported?(platform)
         true
       end
+
+      def self.category
+        :misc
+      end
     end
   end
 end

data/lib/fastlane/plugin/sftp/actions/sftp_upload.rb

@@ -7,7 +7,7 @@ module Fastlane
     class SftpUploadAction < Action
       def self.run(params)
         # sh 'bundle exec rubocop -D'
-        FastlaneCore::PrintTable.print_values(config: params, hide_keys: [:server_password], mask_keys: [:server_key, :server_key_passphrase], title: "SFTP Upload #{Sftp::VERSION} Summary")
+        FastlaneCore::PrintTable.print_values(config: params, mask_keys: [:server_password, :server_key, :server_key_passphrase], title: "SFTP Upload #{Sftp::VERSION} Summary")
 
         UI.success('SFTP Uploader running...')
         uploader = Sftp::Uploader.new(params)
@@ -26,21 +26,24 @@ module Fastlane
       end
 
       def self.details
-        # Optional:
-        "TODO"
+        "More information: https://github.com/oklimberg/fastlane-plugin-sftp/"
       end
 
       def self.available_options
         Sftp::Options.available_options_upload
       end
 
-      def self.authors
-        ['oklimberg@gmail.com']
+      def self.author
+        'oklimberg'
       end
 
       def self.is_supported?(platform)
         true
       end
+
+      def self.category
+        :misc
+      end
     end
   end
 end

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

@@ -44,9 +44,6 @@ module Fastlane
         # Login & Download all files using RSA key or username/password
         UI.message('download...')
         session = Helper::SftpHelper.login(host, user, password, rsa_keypath, rsa_keypath_passphrase)
-        if session.nil?
-          return false
-        end
         UI.message('Downloading files...')
 
         session.sftp.connect do |sftp|
@@ -70,6 +67,8 @@ module Fastlane
         downloads = []
         source_files.each do |source|
           begin
+            UI.message('Checking remote file')
+            UI.message("remote path #{source}")
             attrs = sftp.stat!(source)
             if attrs.directory?
               children = []
@@ -96,27 +95,15 @@ module Fastlane
       # @param [String] remote_file_path
       # @param [String] local_file_path
       def download_file(sftp, remote_file_path, local_file_path)
-        UI.message('Checking remote file')
-        UI.message("remote path #{remote_file_path}")
-        download = nil
-        begin
-          sftp.stat!(remote_file_path) do |response|
-            if response.ok?
-              UI.success('Loading remote file:')
-              download = sftp.download(remote_file_path, local_file_path) do |event, _uploader, *_args|
-                case event
-                when :open then
-                  UI.message("starting download of file #{remote_file_path} to #{local_file_path}")
-                when :finish then
-                  UI.success("download of file #{remote_file_path} to #{local_file_path} successful")
-                end
-              end
-            end
+        UI.success('Loading remote file:')
+        return sftp.download(remote_file_path, local_file_path) do |event, _uploader, *_args|
+          case event
+          when :open then
+            UI.message("starting download of file #{remote_file_path} to #{local_file_path}")
+          when :finish then
+            UI.success("download of file #{remote_file_path} to #{local_file_path} successful")
           end
-        rescue => e
-          UI.message("remote file not found #{e}")
         end
-        return download
       end
     end
   end

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

@@ -23,16 +23,19 @@ module Fastlane
                                        description: 'PASSWORD for your server (not for production)',
                                        conflicting_options: [:server_key],
                                        conflict_block: proc do |value|
-                                         UI.user_error!("You can't use 'password' and '#{value.key}' options in one run.")
+                                         UI.user_error!("You can't use 'server_password' and '#{value.key}' options in one run.")
                                        end),
           FastlaneCore::ConfigItem.new(key: :server_key,
                                        short_option: '-k',
-                                       optional: false,
+                                       optional: true,
                                        env_name: 'SERVER_KEY',
                                        description: 'RSA key for your server',
                                        conflicting_options: [:server_password],
                                        conflict_block: proc do |value|
-                                         UI.user_error!("You can't use 'repo_key' and '#{value.key}' options in one run.")
+                                         UI.user_error!("You can't use 'server_key' and '#{value.key}' options in one run.")
+                                       end,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Key file '#{value}' does not exist") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :server_key_passphrase,
                                        short_option: '-v',

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

@@ -12,26 +12,39 @@ module Fastlane
       #
 
       def self.login(host, user, password, rsa_keypath, rsa_keypath_passphrase)
-        if host.nil? || user.nil?
-          UI.user_error('server_url, server_user and server_password or server_key must be set')
-          return nil
+        if host.nil? || user.nil? || (password.nil? && rsa_keypath.nil?)
+          UI.user_error!('server_url, server_user and server_password or server_key must be set')
         end
 
         if rsa_keypath
+          # will raise an excetion if file is empty
           rsa_key = Helper::SftpHelper.load_rsa_key(rsa_keypath)
-          if rsa_key.nil?
-            UI.user_error("Failed to load RSA key... #{rsa_keypath}")
-          end
         end
 
+        logging_level = :warn
+        if ENV["DEBUG"] == "1"
+          logging_level = :debug
+        end
+        options = {
+          verbose: logging_level,
+          non_interactive: true
+        }
         if !rsa_key.nil?
           UI.message('Logging in with RSA key...')
-          session = Net::SSH.start(host, user, key_data: rsa_key, keys_only: true, passphrase: rsa_keypath_passphrase)
+          options = options.merge({
+            key_data: rsa_key,
+            keys_only: true,
+            passphrase: rsa_keypath_passphrase,
+            auth_methods: ["publickey"]
+          })
         else
           UI.message('Logging in with username/password...')
-          session = Net::SSH.start(host, user, password: password)
+          options = options.merge({
+            password: password,
+            auth_methods: ["password"]
+          })
         end
-        return session
+        return Net::SSH.start(host, user, options)
       end
 
       # Check file existence locally
@@ -52,22 +65,25 @@ module Fastlane
       end
 
       def self.remote_mkdir(sftp, remote_path)
-        sftp.mkdir(remote_path)
+        sftp.mkdir!(remote_path)
       rescue Net::SFTP::StatusException => e
-        raise if e.code != 11
+        # the returned code depends on the implementation of the SFTP server
+        # we handle code FX_FILE_ALREADY_EXISTS and FX_FAILURE the same
+        codes = Net::SFTP::Constants::StatusCodes
+        raise if e.code != codes::FX_FAILURE && e.code != codes::FX_FILE_ALREADY_EXISTS
         UI.message("Remote dir #{remote_path} exists.")
       end
 
       def self.load_rsa_key(rsa_keypath)
-        File.open(rsa_keypath, 'r') do |file|
-          rsa_key = [file.read]
-          if !rsa_key.nil?
-            UI.success('Successfully loaded RSA key...')
-          else
-            UI.user_error!('Failed to load RSA key...')
-          end
-          rsa_key
+        UI.user_error!("RSA key file #{rsa_keypath} does not exist") unless check_file(rsa_keypath)
+
+        rsa_key = IO.read(rsa_keypath)
+        if !rsa_key.to_s.empty?
+          UI.success('Successfully loaded RSA key...')
+        else
+          UI.user_error!("Failed to load RSA key... #{rsa_keypath}")
         end
+        return rsa_key
       end
 
       def self.generate_remote_path(user, target_dir)
@@ -75,7 +91,7 @@ module Fastlane
         if user != "root"
           path = File.join('/home', path)
         end
-        path
+        return path
       end
     end
   end

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

@@ -45,10 +45,8 @@ module Fastlane
         UI.message('upload...')
 
         session = Helper::SftpHelper.login(host, user, password, rsa_keypath, rsa_keypath_passphrase)
-        if session.nil?
-          return false
-        end
         UI.message('Uploading files...')
+
         session.sftp.connect do |sftp|
           Helper::SftpHelper.remote_mkdir(sftp, Helper::SftpHelper.generate_remote_path(user, target_dir))
           path = target_dir
@@ -82,17 +80,12 @@ module Fastlane
       # @param [String] local_file_path
       # @param [String] remote_file_path
       def upload_file(sftp, local_file_path, remote_file_path)
-        unless Helper::SftpHelper.check_file(local_file_path)
-          UI.message("local file #{local_file_path} not found #{e}")
-          return
-        end
-
         if File.file?(local_file_path)
           type = "file"
         else
           type = "folder"
         end
-        UI.message("starting upload of #{type} #{local_file_path} to #{local_file_path}")
+        UI.message("starting upload of #{type} #{local_file_path} to #{remote_file_path}")
         return sftp.upload(local_file_path, remote_file_path) do |event, _uploader, *args|
           case event
           when :mkdir then

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

@@ -1,7 +1,7 @@
 module Fastlane
   module Sftp
-    VERSION = "0.1.0".freeze
-    SUMMARY = 'Fastlane plugin for uploading files via SFTP'.freeze
+    VERSION = "1.0.0".freeze
+    SUMMARY = 'Fastlane plugin to upload or dowload files/folders via SFTP'.freeze
     DESCRIPTION = 'Fastlane plugin SFTP'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sftp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Oliver Limberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +204,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.116.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: o.limberg@portrix.net
+email: oklimberg@gmail
 executables: []
 extensions: []
 extra_rdoc_files: []