rest-ftp-daemon 0.410.1 → 0.410.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424ee4da6a28ad4aba3a61fb130181466d9adc6d
-  data.tar.gz: a0dce83cb1cf81b10c4f7b22a27b739e238f8443
+  metadata.gz: 2b3b36ee449cbd6c6b17470b250c70d074a79f75
+  data.tar.gz: c42b57eb1a6177c4599692b7cf24c205c37020e7
 SHA512:
-  metadata.gz: a0a1c2f8a5c9af54daf06b102e8e18514d8f7113306b19b32a9a3ee23c645c5d1d509915fe11946295898c5e3a000eb8dc03849044e3b75906bda45fd9232ad9
-  data.tar.gz: 8c214ad3cbe11842760316d7cc193d356182a57483c9d44a224d3253d7f15c78badd141636924282abef37ecdb60f8d9e9159d912eff187ad7e1b75f9ba23bc2
+  metadata.gz: dae3f45a50aa835cad03301af5900680080fa210eb95a6a0f104a1025e42f7c1c5a4e153c29b0141b328e20b743f01af3957624c41446ad8a39ca3a02533c3f9
+  data.tar.gz: d32f13ed0b4021f56fdf29c17cf8ead52abfad781dbef5a14c39bbd29018322763508e4f8f4a7b7687432bbed3afe062c2e0eeb91ba0a7ecd324e48fe5a52103

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.410.1)
+    rest-ftp-daemon (0.410.2)
       activesupport (~> 4.2)
       api-auth
       bmc-daemon-lib (~> 0.3.4)

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

@@ -130,7 +130,7 @@ module RestFtpDaemon
       rescue Net::FTPConnectionError => exception
         return oops :started, exception, "ftp_connection_error"
       rescue StandardError => exception
-        return oops :started, exception, "unexpected_error"
+        return oops :started, exception, "unexpected_before_error"
       end
 
       # Do the hard work
@@ -138,8 +138,24 @@ module RestFtpDaemon
         log_debug "Job.process work"
         set_status JOB_STATUS_WORKING
         work
+
+      rescue RestFtpDaemon::SourceNotFound => exception
+        return oops :ended, exception
+
+      rescue RestFtpDaemon::TargetFileExists => exception
+        return oops :ended, exception
+
+      rescue RestFtpDaemon::TargetDirectoryError => exception
+        return oops :ended, exception
+
+      rescue RestFtpDaemon::TargetPermissionError => exception
+        return oops :ended, exception
+
+      rescue RestFtpDaemon::AssertionFailed => exception
+        return oops :ended, exception
+
       rescue StandardError => exception
-        return oops :started, exception, "unexpected_error"
+        return oops :started, exception, "unexpected_work_error"
       end
 
       # Finalize all this
@@ -147,7 +163,7 @@ module RestFtpDaemon
         log_debug "Job.process after"
         after
       rescue StandardError => exception
-        return oops :started, exception, "unexpected_error"
+        return oops :started, exception, "unexpected_after_error"
       end
 
         # All done !
@@ -240,10 +256,10 @@ module RestFtpDaemon
 
     def set_info_location prefix, location
       return unless location.is_a? Location
-      set_info prefix, :location_uri,    location.to_s
-      set_info prefix, :location_scheme, location.scheme
-      set_info prefix, :location_path,   location.path
-      set_info prefix, :location_host,   location.host
+      set_info prefix, :uri,    location.to_s
+      set_info prefix, :scheme, location.scheme
+      set_info prefix, :host,   location.host
+      set_info prefix, :path,   location.path
     end
 
   private

data/lib/rest-ftp-daemon/jobs/transfer.rb

@@ -152,24 +152,8 @@ module RestFtpDaemon
 
     rescue Errno::EINVAL => exception
       return oops :ended, exception, "invalid_argument", true
-
     # rescue Encoding::UndefinedConversionError => exception
     #   return oops :ended, exception, "encoding_error", true
-
-    rescue RestFtpDaemon::SourceNotFound => exception
-      return oops :ended, exception
-
-    rescue RestFtpDaemon::TargetFileExists => exception
-      return oops :ended, exception
-
-    rescue RestFtpDaemon::TargetDirectoryError => exception
-      return oops :ended, exception
-
-    rescue RestFtpDaemon::TargetPermissionError => exception
-      return oops :ended, exception
-
-    rescue RestFtpDaemon::AssertionFailed => exception
-      return oops :ended, exception
     end
 
     def after

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.410.1"
+  spec.version                    = "0.410.2"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.410.1
+  version: 0.410.2
 platform: ruby
 authors:
 - Bruno MEDICI