rest-ftp-daemon 0.410.1 → 0.410.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 424ee4da6a28ad4aba3a61fb130181466d9adc6d
4
- data.tar.gz: a0dce83cb1cf81b10c4f7b22a27b739e238f8443
3
+ metadata.gz: 2b3b36ee449cbd6c6b17470b250c70d074a79f75
4
+ data.tar.gz: c42b57eb1a6177c4599692b7cf24c205c37020e7
5
5
  SHA512:
6
- metadata.gz: a0a1c2f8a5c9af54daf06b102e8e18514d8f7113306b19b32a9a3ee23c645c5d1d509915fe11946295898c5e3a000eb8dc03849044e3b75906bda45fd9232ad9
7
- data.tar.gz: 8c214ad3cbe11842760316d7cc193d356182a57483c9d44a224d3253d7f15c78badd141636924282abef37ecdb60f8d9e9159d912eff187ad7e1b75f9ba23bc2
6
+ metadata.gz: dae3f45a50aa835cad03301af5900680080fa210eb95a6a0f104a1025e42f7c1c5a4e153c29b0141b328e20b743f01af3957624c41446ad8a39ca3a02533c3f9
7
+ data.tar.gz: d32f13ed0b4021f56fdf29c17cf8ead52abfad781dbef5a14c39bbd29018322763508e4f8f4a7b7687432bbed3afe062c2e0eeb91ba0a7ecd324e48fe5a52103
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rest-ftp-daemon (0.410.1)
4
+ rest-ftp-daemon (0.410.2)
5
5
  activesupport (~> 4.2)
6
6
  api-auth
7
7
  bmc-daemon-lib (~> 0.3.4)
@@ -130,7 +130,7 @@ module RestFtpDaemon
130
130
  rescue Net::FTPConnectionError => exception
131
131
  return oops :started, exception, "ftp_connection_error"
132
132
  rescue StandardError => exception
133
- return oops :started, exception, "unexpected_error"
133
+ return oops :started, exception, "unexpected_before_error"
134
134
  end
135
135
 
136
136
  # Do the hard work
@@ -138,8 +138,24 @@ module RestFtpDaemon
138
138
  log_debug "Job.process work"
139
139
  set_status JOB_STATUS_WORKING
140
140
  work
141
+
142
+ rescue RestFtpDaemon::SourceNotFound => exception
143
+ return oops :ended, exception
144
+
145
+ rescue RestFtpDaemon::TargetFileExists => exception
146
+ return oops :ended, exception
147
+
148
+ rescue RestFtpDaemon::TargetDirectoryError => exception
149
+ return oops :ended, exception
150
+
151
+ rescue RestFtpDaemon::TargetPermissionError => exception
152
+ return oops :ended, exception
153
+
154
+ rescue RestFtpDaemon::AssertionFailed => exception
155
+ return oops :ended, exception
156
+
141
157
  rescue StandardError => exception
142
- return oops :started, exception, "unexpected_error"
158
+ return oops :started, exception, "unexpected_work_error"
143
159
  end
144
160
 
145
161
  # Finalize all this
@@ -147,7 +163,7 @@ module RestFtpDaemon
147
163
  log_debug "Job.process after"
148
164
  after
149
165
  rescue StandardError => exception
150
- return oops :started, exception, "unexpected_error"
166
+ return oops :started, exception, "unexpected_after_error"
151
167
  end
152
168
 
153
169
  # All done !
@@ -240,10 +256,10 @@ module RestFtpDaemon
240
256
 
241
257
  def set_info_location prefix, location
242
258
  return unless location.is_a? Location
243
- set_info prefix, :location_uri, location.to_s
244
- set_info prefix, :location_scheme, location.scheme
245
- set_info prefix, :location_path, location.path
246
- set_info prefix, :location_host, location.host
259
+ set_info prefix, :uri, location.to_s
260
+ set_info prefix, :scheme, location.scheme
261
+ set_info prefix, :host, location.host
262
+ set_info prefix, :path, location.path
247
263
  end
248
264
 
249
265
  private
@@ -152,24 +152,8 @@ module RestFtpDaemon
152
152
 
153
153
  rescue Errno::EINVAL => exception
154
154
  return oops :ended, exception, "invalid_argument", true
155
-
156
155
  # rescue Encoding::UndefinedConversionError => exception
157
156
  # return oops :ended, exception, "encoding_error", true
158
-
159
- rescue RestFtpDaemon::SourceNotFound => exception
160
- return oops :ended, exception
161
-
162
- rescue RestFtpDaemon::TargetFileExists => exception
163
- return oops :ended, exception
164
-
165
- rescue RestFtpDaemon::TargetDirectoryError => exception
166
- return oops :ended, exception
167
-
168
- rescue RestFtpDaemon::TargetPermissionError => exception
169
- return oops :ended, exception
170
-
171
- rescue RestFtpDaemon::AssertionFailed => exception
172
- return oops :ended, exception
173
157
  end
174
158
 
175
159
  def after
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |spec|
3
3
 
4
4
  # Project version
5
- spec.version = "0.410.1"
5
+ spec.version = "0.410.2"
6
6
 
7
7
  # Project description
8
8
  spec.name = "rest-ftp-daemon"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rest-ftp-daemon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.410.1
4
+ version: 0.410.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bruno MEDICI