rest-ftp-daemon 0.304.0 → 0.305.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879a66df142ffdef4e82af5932e0ae6f862382b1
-  data.tar.gz: d81bb16f0c971a2b7a07e0902aa5ab40bce438e7
+  metadata.gz: c2802386f8b827e27d25b54c13cc87fd53eb2e1f
+  data.tar.gz: e7025e6844c9469ff02b1a1eb3c1bf204d6910c7
 SHA512:
-  metadata.gz: e2fb79546eb167872017b0995e7c055fd26ffea32272c17403e4a278e4b13f63a6245c2e5bb277061a90c6eddef6ad72e7bb00cead8a9d312058213db8b3a8f2
-  data.tar.gz: 39548d2cfbe17d534a4e03f7060399fbb8e8f06fce93a0190c86fe1360d9064b56bf8cb9c70cfc8e508fe19dd8af8e69107aecfbfab944e323cbd6a935f75471
+  metadata.gz: e9dff222b7810f70a7cba87452ef23e19c1d8dfac637e0dbe7ca3d6ec2a50bf7a6cabf2cd1da5f68a5de88b58b3abb694c6ff3ee79f9955f809bf5bb1d976e36
+  data.tar.gz: 9578b8b8521da9e393fed22a119caf8343bc9a9d5df56eae2e4b685a6f705b9d3033be38f340e6731e36e611c1783e5ea618cd5703a67cd5acd7c92adec28eeb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.304.0)
+    rest-ftp-daemon (0.305.0)
       api-auth
       bmc-daemon-lib (~> 0.2)
       double-bag-ftps

data/README.md

@@ -234,6 +234,7 @@ transfer:
   notify_after: 5           # wait at least X seconds between HTTP notifications
 
   debug_ftp: false
+  debug_ftps: false
   debug_sftp: false
 
   retry_on:                 # job error values that will allow a retry

data/defaults.yml

@@ -30,6 +30,7 @@ transfer:
   notify_after: 5           # wait at least X seconds between HTTP notifications
 
   debug_ftp: false
+  debug_ftps: false
   debug_sftp: false
 
   retry_on:                 # job error values that will allow a retry

data/lib/rest-ftp-daemon/api/root.rb

@@ -3,6 +3,9 @@ require "grape"
 module RestFtpDaemon
   module API
     class Root < Grape::API
+      include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+
 
       ### LOGGING & HELPERS
       helpers do

data/lib/rest-ftp-daemon/job.rb

@@ -156,11 +156,20 @@ module RestFtpDaemon
       rescue OpenSSL::SSL::SSLError => exception
         return oops :ended, exception, "conn_openssl_error"
 
+      rescue Net::FTPReplyError => exception
+        return oops :ended, exception, "ftp_reply_error"
+
+      rescue Net::FTPTempError => exception
+        return oops :ended, exception, "ftp_temp_error"
+
       rescue Net::FTPPermError => exception
         return oops :ended, exception, "ftp_perm_error"
 
-      rescue Net::FTPTempError => exception
-        return oops :ended, exception, "net_temp_error"
+      rescue Net::FTPProtoError => exception
+        return oops :ended, exception, "ftp_proto_error"
+
+      rescue Net::FTPError => exception
+        return oops :ended, exception, "ftp_error"
 
       rescue Net::SFTP::StatusException => exception
         return oops :ended, exception, "sftp_exception"
@@ -313,30 +322,21 @@ module RestFtpDaemon
       set_info :target, :host, target_uri.host
       @target_path = Path.new target_uri.path, true
 
-      #puts "@target_path: #{@target_path.inspect}"
-
-      # Prepare remote
-      #FIXME: use a "case" statement on @target_url.class
-
+      # Prepare remote (case would be preferable but too hard to use,
+      # as target could be of a descendent class of URI:XXX and not matching directlry)
       if target_uri.is_a? URI::FTP
         log_info "Job.prepare target_method FTP"
-        # set_info :target, :method, :ftp
         set_info :target, :method, JOB_METHOD_FTP
-        #@target_method = :ftp
         @remote = RemoteFTP.new target_uri, log_prefix, debug: @config[:debug_ftp]
 
       elsif (target_uri.is_a? URI::FTPES) || (target_uri.is_a? URI::FTPS)
         log_info "Job.prepare target_method FTPES"
-        # set_info :target, :method, :ftpes
         set_info :target, :method, JOB_METHOD_FTPS
-        # @target_method = :ftpes
-        @remote = RemoteFTP.new target_uri, log_prefix, debug: @config[:debug_sftp], ftpes: true
+        @remote = RemoteFTP.new target_uri, log_prefix, debug: @config[:debug_ftps], ftpes: true
 
       elsif target_uri.is_a? URI::SFTP
         log_info "Job.prepare target_method SFTP"
-        # set_info :target, :method, :sftp
         set_info :target, :method, JOB_METHOD_SFTP
-        # @target_method = :sftp
         @remote = RemoteSFTP.new target_uri, log_prefix, debug: @config[:debug_sftp]
 
       else
@@ -386,6 +386,7 @@ module RestFtpDaemon
 
       # Handle each source file matched, and start a transfer
       source_processed = 0
+      targets = []
       sources.each do |source|
         # Compute target filename
         full_target = @target_path.clone
@@ -398,6 +399,10 @@ module RestFtpDaemon
         # Do the transfer, for each file
         remote_push source, full_target
 
+        # Add it to transferred target names
+        targets << full_target.full
+        set_info :target, :files, targets
+
         # Update counters
         set_info :source, :processed, source_processed += 1
       end

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.304.0"
+  spec.version                    = "0.305.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -16,7 +16,9 @@ Gem::Specification.new do |spec|
 
 
   # List files and executables
-  spec.files                      = `git ls-files -z`.split("\x0").reject{ |f| f == "dashboard.png"}
+  spec.files                      = `git ls-files -z`.
+                                      split("\x0").
+                                      reject{ |f| f =~ /^dashboard.+\.png/ }
   spec.executables                = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths              = ["lib"]
   spec.required_ruby_version      = ">= 2.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.304.0
+  version: 0.305.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler