rest-ftp-daemon 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3a1ab299501727eeaaee03461b9bf1c5232560
-  data.tar.gz: 0a14c32e90788499358d23bfa13e72cabf0db639
+  metadata.gz: 4150d62047db1f0bc7c31f6eeed472c89d44a4ac
+  data.tar.gz: b1a38cd346b63103e4f6b4b3e450e7cc47e0958a
 SHA512:
-  metadata.gz: c0bf20c714364b79b9db0787dde6541f25ddaee5be447288ffc7f89f5fb0ccbc49aaa2583efdf2e23dfcaf9e55ffe307552063a64e1c8cdc3b9663861416bafc
-  data.tar.gz: 6170a2a82ea2e79a182e6efc5d24958645742f561d7c352b3eac8b35ea08e4c47226ca1a68a87bf977103a70de09bbd3a30925907182904a181cd5a0a960e3c2
+  metadata.gz: 355082cdf3eff7b6660fb72ac2ad24448caf036b03e7cfee52682a8a11425328145d4d5561d4e84c1c1f587c4afd25d781e00410d1fbdd102e067e838001bf97
+  data.tar.gz: 2ede5c40ad23bf63513a89d6ade5a54ed67fce3b19fe4fd02fda9ac3f84ffa70679bb4f0f201d9e214a66985605f81020caf269330675a14c1a17d20da9985ac

data/.rubocop.yml

@@ -776,7 +776,7 @@ Lint/EndAlignment:
   # The value `variable` means that in assignments, `end` should be aligned
   # with the start of the variable on the left hand side of `=`. In all other
   # situations, `end` should still be aligned with the keyword.
-  AlignWith: keyword
+  EnforcedStyleAlignWith: keyword
   SupportedStyles:
     - keyword
     - variable
@@ -787,7 +787,7 @@ Lint/DefEndAlignment:
   # The value `start_of_line` means that `end` should be aligned with method
   # calls like `private`, `public`, etc, if present in front of the `def`
   # keyword on the same line.
-  AlignWith: start_of_line
+  EnforcedStyleAlignWith: start_of_line
   SupportedStyles:
     - start_of_line
     - def

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (1.0.8)
+    rest-ftp-daemon (1.0.9)
+      CFPropertyList
       activesupport (= 4.2.7.1)
       api-auth
       aws-sdk-resources (~> 2.6)
@@ -27,7 +28,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
+    CFPropertyList (2.3.5)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)

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

@@ -29,20 +29,25 @@ module RestFtpDaemon
           Root.logger
         end
 
-        def exception_error error, http_code, exception
+        def exception_error error, http_code, exception, message = nil
           # Extract message lines
           lines = exception.message.lines
-            #.lines.collect(&:strip).reject(&:empty?)
 
           # Log error to file
           log_error "[#{error}] [#{http_code}] #{lines.shift} ", lines
 
+          # Default to exeption message if empty
+          message ||= exception.message
+
+          # Send it to rollbar
+          Rollbar.error exception, "api: #{exception.class.name}: #{exception.message}"
+
           # Return error
           error!({
-            error: error,
+            code: error,
+            message: message,
+            exception: exception.class.name,
             http_code: http_code,
-            class: exception.class.name,
-            message: exception.message,
           }, http_code)
         end
 
@@ -54,10 +59,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 :all do |exception|
-        Rollbar.error exception, "api: #{exception.class.name}: #{exception.message}"
-        # Rollbar.error exception, "api [#{error}]: #{exception.class.name}: #{exception.message}"
-        #error!({error: :internal_server_error, message: exception.message}, 500)
         exception_error :api_error, 500, exception
       end
 

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "1.0.8"
+  spec.version                    = "1.0.9"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "http"
   spec.add_development_dependency "ruby-prof"
 
+
   # Runtime dependencies
   spec.add_runtime_dependency     "bmc-daemon-lib", "0.7.4"
   spec.add_runtime_dependency     "json", "~> 1.8"
@@ -46,6 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     "rest-client", "~> 1.8"
   spec.add_runtime_dependency     "api-auth"
   spec.add_runtime_dependency     "haml"
+  spec.add_runtime_dependency     "CFPropertyList"
   spec.add_runtime_dependency     "facter"
   spec.add_runtime_dependency     "sys-cpu"
   spec.add_runtime_dependency     "get_process_mem"
@@ -58,4 +60,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     "aws-sdk-resources", '~> 2.6'
   spec.add_runtime_dependency     "streamio-ffmpeg"
 
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -276,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement