rest-ftp-daemon 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600fd270b56ee28655dc53f4d26ea36a981ce12d
-  data.tar.gz: 0cfdedcc42952c16ea033e9bef0038b9c2d7e512
+  metadata.gz: db11803efd6d48d4e7aff83543e9ff091e7a4d61
+  data.tar.gz: 1460828d4e7b088ac1324b89f6b72e128dc310f8
 SHA512:
-  metadata.gz: 17ab1d9fd9b525c45960bfce72444d4bd74d1fd5776651509fa0d27049a220405750eb5187a76e77263df79050303ba9cc75249497ac7619bbaca88410beab44
-  data.tar.gz: f129e25039898082cea1368f5e29a6b23ce830e7bfd21a41c0939f76fdcf0ea143ccb17cdd3940bca55f3eeb66bd752d02b2b004968574adf38ef82a56134f62
+  metadata.gz: 89fd7fe8e10cb110b4ce02ca0f87e7fb47a2255fa18022e550da05fdaadebaf6a4d833715ce9fd1cff6ec5a30e21839e1ba297771c25930343c039085b43e883
+  data.tar.gz: 918633eac9d2fbe931de4b4ca41225ac08a8bf58a6b54eaf19d4e1bcbebb211c74ac9320902f88d5c256dbfdf8d4a597f34276d251afe565f69c7a06bafa8826

data/Dockerfile

@@ -1,6 +1,6 @@
 # Docker headers
 FROM ruby:2.3.0-slim
-MAINTAINER Bruno MEDICI <opensource@bmconseil.com>
+MAINTAINER Bruno MEDICI <rest-ftp-daemon@bmconseil.com>
 
 
 # Environment
@@ -18,7 +18,7 @@ RUN gem install bundler --no-rdoc --no-ri
 WORKDIR                             $INSTALL_PATH
 ADD Gemfile                         $INSTALL_PATH
 ADD Gemfile.lock                    $INSTALL_PATH
-ADD *.gemspec 		$INSTALL_PATH
+ADD rest-ftp-daemon.gemspec 		$INSTALL_PATH
 RUN bundle install --system --without="development test" -j4
 
 
@@ -29,4 +29,4 @@ ADD . $INSTALL_PATH
 
 # App run
 EXPOSE 3000
-CMD ["bin/*", "-c", "/etc/rftpd.yml", "-f", "start"]
+CMD ["bin/rest-ftp-daemon", "-c", "/etc/rftpd.yml", "-f", "start"]

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (1.1.0)
+    rest-ftp-daemon (1.0.3)
       activesupport (~> 4.2)
       api-auth
       aws-sdk-resources (~> 2)
-      bmc-daemon-lib (~> 0.6.0)
+      bmc-daemon-lib (~> 0.7)
       double-bag-ftps
       facter
       get_process_mem
@@ -36,21 +36,21 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    api-auth (2.0.1)
+    api-auth (2.1.0)
     ast (2.3.0)
-    aws-sdk-core (2.6.38)
+    aws-sdk-core (2.6.46)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.38)
-      aws-sdk-core (= 2.6.38)
+    aws-sdk-resources (2.6.46)
+      aws-sdk-core (= 2.6.46)
     aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bmc-daemon-lib (0.6.0)
+    bmc-daemon-lib (0.7.3)
       chamber (~> 2.9.1)
-    builder (3.2.2)
+    builder (3.2.3)
     chamber (2.9.1)
       hashie (~> 3.3)
       thor (~> 0.19.1)
@@ -70,9 +70,9 @@ GEM
     eventmachine (1.2.1)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
-    ffi (1.9.14)
+    ffi (1.9.17)
     get_process_mem (0.2.1)
-    grape (0.18.0)
+    grape (0.19.1)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -85,8 +85,8 @@ GEM
     grape-entity (0.6.0)
       activesupport
       multi_json (>= 1.3.2)
-    grape-swagger (0.25.2)
-      grape (>= 0.12.0)
+    grape-swagger (0.26.0)
+      grape (>= 0.16.2)
     grape-swagger-entity (0.1.5)
       grape-entity
       grape-swagger (>= 0.20.4)
@@ -108,7 +108,7 @@ GEM
     i18n (0.7.0)
     ice_nine (0.11.2)
     jmespath (1.3.1)
-    json (1.8.3)
+    json (1.8.6)
     method_source (0.8.2)
     mime-types (2.99.3)
     minitest (5.10.1)
@@ -120,7 +120,7 @@ GEM
       mustermann (= 0.4.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (4.0.1)
     netrc (0.11.0)
     newrelic_rpm (3.17.2.327)
     parser (2.3.3.1)
@@ -130,11 +130,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (2.0.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rainbow (2.1.0)
+    rainbow (2.2.1)
     rake (12.0.0)
     representable (3.0.2)
       declarative (~> 0.0.5)
@@ -143,7 +143,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rollbar (2.13.3)
+    rollbar (2.14.0)
       multi_json
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -158,8 +158,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rubocop (0.47.0)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -185,7 +185,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.1.2)
+    unicode-display_width (1.1.3)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)

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

@@ -16,6 +16,7 @@ module RestFtpDaemon
       expose :dir
       expose :name
       expose :path
+      expose :filepath
 
       expose :aws_region ,unless: Proc.new {|obj| obj.aws_region.nil?}
       expose :aws_bucket, unless: Proc.new {|obj| obj.aws_bucket.nil?}

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

@@ -25,7 +25,7 @@ module RestFtpDaemon
   class TargetPermissionError     < BaseException; end
 
   class VideoMissingBinary        < BaseException; end
+  class VideoNotFound             < BaseException; end
   class VideoMovieError           < BaseException; end
 
-
-end
+end

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

@@ -304,14 +304,15 @@ module RestFtpDaemon
         include_backtrace = true
       end
 
-      # Log backtrace ?
-      message = "oops signal[#{signal}] exception[#{exception.class}] error[#{error}] #{exception.message}"
-      if include_backtrace
-        log_error message, exception.backtrace
-      else
-        log_error message
-      end
-
+      # Log message and backtrace ?
+      log_error "OOPS: #{exception.class}", {
+        exception: exception.class.to_s,
+        message: exception.message,
+        error: error,
+        signal: signal,
+        }  
+      log_debug "OOPS: backtrace below", exception.backtrace if include_backtrace
+  
       # Log to Rollbar
       Rollbar.warning exception, "oops [#{error}]: #{exception.class.name}: #{exception.message}"
 
@@ -347,4 +348,4 @@ module RestFtpDaemon
     add_transaction_tracer :initialize,     category: :task
 
   end
-end
+end

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

@@ -64,8 +64,9 @@ module RestFtpDaemon
       s3_error:                 Aws::S3::Errors::ServiceError,
 
       video_missing_binary:     RestFtpDaemon::VideoMissingBinary,
+      video_not_found:          RestFtpDaemon::VideoNotFound,
       video_movie_error:        RestFtpDaemon::VideoMovieError,
-      video_ffmpeg_error:             FFMPEG::Error,
+      video_ffmpeg_error:       FFMPEG::Error,
 
       # rescue Encoding::UndefinedConversionError => exception
       #   return oops :ended, exception, "encoding_error", true

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

@@ -12,12 +12,12 @@ module RestFtpDaemon
 
     # Process job
     def do_before
-      log_info "JobVideo.before source_loc.path: #{@source_loc.path}"
-      log_info "JobVideo.before target_loc.path: #{@target_loc.path}"
+      log_info "JobVideo.before source_loc.filepath: #{@source_loc.filepath}"
+      log_info "JobVideo.before target_loc.filepath: #{@target_loc.filepath}"
 
       # Ensure FFMPEG lib is available
-      check_ffmpeg_binary :ffmpeg_binary
       check_ffmpeg_binary :ffprobe_binary
+      check_ffmpeg_binary :ffmpeg_binary
 
       # Ensure source and target are FILE
       raise RestFtpDaemon::AssertionFailed                         unless @video_options.is_a? Hash
@@ -35,7 +35,7 @@ module RestFtpDaemon
       # Add the source file name if none found in the target path
       target_final = @target_loc.clone
       target_final.name = @source_loc.name unless target_final.name
-      log_info "JobVideo.work target_final.path [#{target_final.path}]"
+      log_info "JobVideo.work target_final.filepath [#{target_final.filepath}]"
 
       # Ensure target directory exists
       t_dir = @target_loc.filedir
@@ -60,7 +60,10 @@ module RestFtpDaemon
       set_info INFO_SOURCE_CURRENT, source.name
       begin
         movie = FFMPEG::Movie.new(source.path)
+      rescue Errno::ENOENT => exception
+        raise RestFtpDaemon::VideoNotFound, exception.message
       rescue StandardError => exception
+        log_error "FFMPEG Error [#{exception.class}] : #{exception.message}"
         raise RestFtpDaemon::VideoMovieError, exception.message
       else
         set_info :ffmpeg_size, movie.size
@@ -117,12 +120,3 @@ module RestFtpDaemon
 
   end
 end
-
-# require "stringio"
-# def capture_stderr
-#   real_stderr, $stderr = $stderr, StringIO.new
-#   yield
-#   $stderr.string
-# ensure
-#   $stderr = real_stderr
-# end

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

@@ -60,13 +60,14 @@ module RestFtpDaemon
     def path
       File.join(@dir.to_s, name.to_s)
     end
+    def filepath
+      # "/#{path}"
+      File.join('/', @dir.to_s, name.to_s)
+    end
 
     def filedir
       "/#{@dir}"
     end
-    def filepath
-      "/#{path}"
-    end
 
     def local_files
       Dir.glob("/#{path}").collect do |file|

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "1.0.2"
+  spec.version                    = "1.0.3"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ruby-prof"
 
   # Runtime dependencies
-  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.6.0"
+  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.7"
   spec.add_runtime_dependency     "json", "~> 1.8"
   spec.add_runtime_dependency     "thin", "~> 1.7"
   spec.add_runtime_dependency     "activesupport", "~> 4.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement