rest-ftp-daemon 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4150d62047db1f0bc7c31f6eeed472c89d44a4ac
-  data.tar.gz: b1a38cd346b63103e4f6b4b3e450e7cc47e0958a
+  metadata.gz: 8b4fcd8815838898224c5d74c5c3fcc2612487af
+  data.tar.gz: 56826233e4ec35d6551b2f21370b07433c41db7b
 SHA512:
-  metadata.gz: 355082cdf3eff7b6660fb72ac2ad24448caf036b03e7cfee52682a8a11425328145d4d5561d4e84c1c1f587c4afd25d781e00410d1fbdd102e067e838001bf97
-  data.tar.gz: 2ede5c40ad23bf63513a89d6ade5a54ed67fce3b19fe4fd02fda9ac3f84ffa70679bb4f0f201d9e214a66985605f81020caf269330675a14c1a17d20da9985ac
+  metadata.gz: 11970060c0b2cb72f7d0e2301f9eb496000a4f9999aa84c709e416d4d48ca8c9ccd419868452971e259ae7a5d9fe05f7863c876c3f032fe77378bb431e2279d2
+  data.tar.gz: 4396336daa3b239d29dbaec967f18c2a89fe44109359c6da0fdd3cea73cc8accbd2085c517ce715e21f8078f6c58373af8634ff1a7bf161c651207f0ebaee148

data/.rubocop.yml

@@ -229,7 +229,7 @@ Style/BracesAroundHashParameters:
 
 # Indentation of `when`.
 Style/CaseIndentation:
-  IndentWhenRelativeTo: case
+  EnforcedStyle: case
   SupportedStyles:
     - case
     - end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (1.0.9)
+    rest-ftp-daemon (1.0.10)
       CFPropertyList
       activesupport (= 4.2.7.1)
       api-auth
@@ -35,15 +35,15 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     api-auth (2.1.0)
     ast (2.3.0)
-    aws-sdk-core (2.7.15)
+    aws-sdk-core (2.9.21)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.15)
-      aws-sdk-core (= 2.7.15)
+    aws-sdk-resources (2.9.21)
+      aws-sdk-core (= 2.9.21)
     aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -59,19 +59,18 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     daemons (1.2.4)
-    declarative (0.0.8)
-      uber (>= 0.0.15)
+    declarative (0.0.9)
+    declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20161129)
+    diff-lcs (1.3)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     double-bag-ftps (0.1.3)
     equalizer (0.0.11)
-    eventmachine (1.2.1)
+    eventmachine (1.2.3)
     facter (2.4.6)
-      CFPropertyList (~> 2.2.6)
-    ffi (1.9.17)
+    ffi (1.9.18)
     get_process_mem (0.2.1)
     grape (0.19.1)
       activesupport
@@ -91,28 +90,28 @@ GEM
     grape-swagger-entity (0.1.5)
       grape-entity
       grape-swagger (>= 0.20.4)
-    grape-swagger-representable (0.1.3)
-      grape-swagger (>= 0.20.2)
+    grape-swagger-representable (0.1.4)
+      grape-swagger (>= 0.20.4)
       representable
     haml (4.0.7)
       tilt
-    hashie (3.4.6)
-    http (2.1.0)
+    hashie (3.5.5)
+    http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.1)
+    http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (0.7.0)
+    i18n (0.8.1)
     ice_nine (0.11.2)
     jmespath (1.3.1)
     json (1.8.6)
     method_source (0.8.2)
     mime-types (2.99.3)
-    minitest (5.10.1)
+    minitest (5.10.2)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     mustermann (0.4.0)
@@ -121,10 +120,10 @@ GEM
       mustermann (= 0.4.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.0.1)
+    net-ssh (4.1.0)
     netrc (0.11.0)
     newrelic_rpm (3.17.2.327)
-    parser (2.3.3.1)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -132,34 +131,36 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
-    representable (3.0.2)
-      declarative (~> 0.0.5)
-      uber (>= 0.0.15, < 0.2.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rollbar (2.14.0)
+    rollbar (2.14.1)
       multi_json
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.47.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -177,16 +178,16 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     tool (0.2.3)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.3)
+    unf_ext (0.0.7.4)
+    unicode-display_width (1.2.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)

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

@@ -33,6 +33,12 @@ module RestFtpDaemon
           # Extract message lines
           lines = exception.message.lines
 
+          # Add some backtrace lines 
+          http500_backtrace = LOG_HTP500_BACKTRACE.to_i
+          unless LOG_HTP500_BACKTRACE.to_i.zero?
+            lines += exception.backtrace[0..http500_backtrace] if exception.backtrace.is_a?(Array)
+          end
+
           # Log error to file
           log_error "[#{error}] [#{http_code}] #{lines.shift} ", lines
 
@@ -59,14 +65,15 @@ module RestFtpDaemon
 
 
       ## EXCEPTION HANDLERS
-      # rescue_from Grape::Exceptions::ValidationErrors do |exception|
-      #   exception_error :api_content_type, 406, exception, "The requested content-type is not supported"
-      # end
-
       rescue_from Grape::Exceptions::InvalidMessageBody do |exception|
         exception_error :api_invalid_message_body, 400, exception, "Bad request: message body does not match declared format, check command syntax"
       end
-
+      rescue_from RestFtpDaemon::SchemeUnsupported do |exception|
+        exception_error :unsupported_scheme, 422, exception, "Bad request: unsupported scheme"
+      end
+      rescue_from RestFtpDaemon::LocationParseError do |exception|
+        exception_error :location_parse_error, 422, exception, "Bad request: location parse error"
+      end
       rescue_from :all do |exception|
         exception_error :api_error, 500, exception
       end

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

@@ -54,6 +54,7 @@ context: {
 # Constants: logger to be cleaned up
 LOG_PIPE_LEN            = 10
 LOG_INDENT              = "\t"
+LOG_HTP500_BACKTRACE    = 5
 
 
 # Jobs statuses

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

@@ -24,7 +24,6 @@ module RestFtpDaemon
       target_permission_error:  RestFtpDaemon::TargetPermissionError,
       target_not_supported:     RestFtpDaemon::TargetUnsupported,
       assertion_failed:         RestFtpDaemon::AssertionFailed,
-      location_parse_error:     RestFtpDaemon::LocationParseError,
 
       conn_socket_error:        SocketError,
       conn_eof:                 EOFError,

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

@@ -27,11 +27,11 @@ module RestFtpDaemon
       # Check parameters
       # unless url.is_a? String
       #   raise RestFtpDaemon::AssertionFailed, "location/init/string: #{url.inspect}"
-      # end   
+      # end
       debug nil
 
       @url = url.clone
-      debug :url, url
+      debug :url, @url
       @tokens = []
 
       # Detect tokens in string
@@ -39,10 +39,10 @@ module RestFtpDaemon
       debug :tokens, @tokens.inspect
 
       # First resolve tokens
-      resolve_tokens! url
+      resolve_tokens! @url
 
       # Build URI from parameters
-      build_uri url
+      build_uri @url
 
       # Extract dir and name
       build_dir_name
@@ -147,8 +147,10 @@ module RestFtpDaemon
 
     def build_dir_name
       # Store URL parts (remove leading slashes in dir)
-      @dir      = extract_dirname(@uri.path).gsub(/^\//, '')
+      @dir      = extract_dirname(@uri.path).to_s.gsub(/^\//, '')
       @name     = extract_filename(@uri.path)
+      # @dir      = File.dirname(@uri.path)
+      # @name     = File.basename(@uri.path)
 
       debug :dir, dir
       debug :name, name

data/rest-ftp-daemon.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler