rest-ftp-daemon 0.400.0 → 0.410.0.pre.1

data/lib/rest-ftp-daemon/views/dashboard_table.haml

@@ -1,10 +1,15 @@
 -# coding: utf-8
 - jobs.each do |job|
-  - progress = job.get_info(:transfer, :progress)
-  - source_count = job.get_info(:source, :count) || 0
-  - source_processed = job.get_info(:source, :processed) || 0
-  - source_current = job.get_info(:source, :current)
-  - bitrate = job.get_info(:transfer, :bitrate)
+  - work_progress     = job.get_info(:work, :progress)
+  - work_bitrate      = job.get_info(:work, :bitrate)
+  - work_sent         = job.get_info(:work, :sent)
+
+  - source_count      = job.get_info(:source, :count) || 0
+  - source_processed  = job.get_info(:source, :processed) || 0
+  - source_current    = job.get_info(:source, :current)
+
+  - job_working       = [JOB_STATUS_UPLOADING, JOB_STATUS_TRANSFORMING].include? job.status
+
   - trclass = JOB_STYLES[job.status]
   - runs = job.runs.to_i
 
@@ -16,21 +21,21 @@
       %a{href: dashboard_job_url(job)}
         %b= job.id
 
+    %td= job.pool
+
     %td= job.label
 
-    %td= job.pool
+    %td= job_type job
 
     %td{title: job.get_info(:source, :path)}
+      = location_label job.source_uri
       = token_highlight job.source
 
-    %td
-      = job_method_label (job.get_info :target, :method)
-
-    %td{title: job.get_info(:target, :url)}
+    %td{title: job.get_info(:target, :path)}
+      = location_label job.target_uri
       = token_highlight job.target
 
-    %td
-      = datetime_short(job.queued_at)
+    %td= datetime_short(job.queued_at)
 
     %td
       %span.push-status
@@ -39,21 +44,21 @@
       - if (job.status != JOB_STATUS_FINISHED) && (source_processed < source_count)
         = " (#{source_processed}/#{source_count})"
 
-      - if job.status == JOB_STATUS_UPLOADING
+      - if job_working
 
-        - unless progress.nil?
+        - unless work_progress.nil?
           %span.push-progress
-            = "#{progress}%"
+            = "#{work_progress}%"
         %br
         %span.push-filename
           %b= source_current unless source_current.nil?
 
     %td
       -# unless job.error || job.status == JOB_STATUS_FINISHED
-      - if job.status == JOB_STATUS_UPLOADING
+      - if job_working
         .progress
-          .progress-bar{style:"width: #{progress}%;"}
-            = format_bytes(job.get_info(:transfer, :sent), "B")
+          .progress-bar{style:"width: #{work_progress}%;"}
+            = "#{work_progress} %"
 
       - else
         .error{title: job.get_info(:error, :message)}
@@ -63,9 +68,9 @@
       = format_bytes(job.get_info(:transfer, :total), "B")
 
     %td.nobr.text-right{title: "time: #{job.exectime} s"}
-      - if bitrate
+      - if work_bitrate
         %span.push-bitrate
-          = format_bytes(bitrate, "bps")
+          = format_bytes(work_bitrate, "bps")
 
     %td
       - unless job.wid.nil?

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

@@ -92,6 +92,20 @@ module RestFtpDaemon
       # Inform the job
       job.oops_you_stop_now ex unless job.nil?
 
+    rescue RestFtpDaemon::AttributeMissing => ex
+      log_error "JOB MISSING ATTRIBUTE", ex.backtrace
+      worker_status WORKER_STATUS_CRASHED
+
+      # Inform the job
+      job.oops_you_stop_now ex unless job.nil?
+
+    rescue RestFtpDaemon::AssertionFailed => ex
+      log_error "JOB ASSERTION FAILED", ex.backtrace
+      worker_status WORKER_STATUS_CRASHED
+
+      # Inform the job
+      job.oops_you_stop_now ex unless job.nil?
+
     rescue StandardError => ex
       log_error "JOB UNHANDLED EXCEPTION ex[#{ex.class}] #{ex.message}", ex.backtrace
       worker_status WORKER_STATUS_CRASHED

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.400.0"
+  spec.version                    = "0.410.0-1"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -33,20 +33,30 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "http"
 
   # Runtime dependencies
-  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.3"
+  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.4"
   spec.add_runtime_dependency     "json", "~> 1.8"
   spec.add_runtime_dependency     "thin", "~> 1.7"
   spec.add_runtime_dependency     "activesupport", "~> 4.2"
+
   spec.add_runtime_dependency     "grape"
   spec.add_runtime_dependency     "grape-entity"
+  spec.add_runtime_dependency     "grape-swagger"
+  spec.add_runtime_dependency     "grape-swagger-entity"
+  spec.add_runtime_dependency     "grape-swagger-representable"
+
   spec.add_runtime_dependency     "settingslogic"
   spec.add_runtime_dependency     "rest-client", "~> 1.8"
   spec.add_runtime_dependency     "api-auth"
   spec.add_runtime_dependency     "haml"
-  spec.add_runtime_dependency     "net-sftp"
-  spec.add_runtime_dependency     "double-bag-ftps"
   spec.add_runtime_dependency     "facter"
   spec.add_runtime_dependency     "sys-cpu"
   spec.add_runtime_dependency     "get_process_mem"
   spec.add_runtime_dependency     "newrelic_rpm"
+
+
+  spec.add_runtime_dependency     "net-sftp"
+  spec.add_runtime_dependency     "double-bag-ftps"
+
+  spec.add_runtime_dependency     "streamio-ffmpeg"
+
 end

data/spec/rest-ftp-daemon/features/swagger_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe "Swagger", feature: true do
+
+  describe "GET #{MOUNT_SWAGGER_JSON}" do
+    let!(:response) { get MOUNT_SWAGGER_JSON }
+
+    it "responds successfully" do
+      expect(response.status).to eq 200
+    end
+
+    it "exposes a JSON hash" do
+      expect(JSON.parse(response.body)).to be_an_instance_of(Hash)
+    end
+
+    it "writes the API doc" do
+      json_file = File.expand_path "../../swagger.json"
+      puts "YEAH: #{json_file}"
+      File.write(json_file, response.body)
+    end
+
+  end # GET /swagger.json
+
+end

data/spec/spec_helper.rb

@@ -58,16 +58,16 @@ RSpec.configure do |config|
   end
 
   config.before :suite do
-    call_server(:start)
     puts
-    puts ">> waiting for server to bootup"
+    puts ">> starting up server..."
     puts
-    sleep 5
+    call_server(:start)
+    sleep 3
   end
 
   config.after :suite do
     puts
-    puts ">> shutting sown server"
+    puts ">> shutting down server..."
     puts
     call_server(:stop)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.400.0
+  version: 0.410.0.pre.1
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: grape-swagger
+  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: grape-swagger-entity
+  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: grape-swagger-representable
+  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: settingslogic
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-sftp
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: double-bag-ftps
+  name: sys-cpu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +305,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: facter
+  name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +319,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sys-cpu
+  name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +333,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: get_process_mem
+  name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,7 +347,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: newrelic_rpm
+  name: double-bag-ftps
+  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: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -342,8 +398,11 @@ files:
 - lib/rest-ftp-daemon/api/config.rb
 - lib/rest-ftp-daemon/api/dashboard.rb
 - lib/rest-ftp-daemon/api/debug.rb
-- lib/rest-ftp-daemon/api/job_presenter.rb
+- lib/rest-ftp-daemon/api/entities/job.rb
+- lib/rest-ftp-daemon/api/entities/options.rb
 - lib/rest-ftp-daemon/api/jobs.rb
+- lib/rest-ftp-daemon/api/root-real.rb
+- lib/rest-ftp-daemon/api/root-test.rb
 - lib/rest-ftp-daemon/api/root.rb
 - lib/rest-ftp-daemon/api/status.rb
 - lib/rest-ftp-daemon/constants.rb
@@ -354,7 +413,11 @@ files:
 - lib/rest-ftp-daemon/helpers/views.rb
 - lib/rest-ftp-daemon/job.rb
 - lib/rest-ftp-daemon/job_queue.rb
+- lib/rest-ftp-daemon/jobs/dummy.rb
+- lib/rest-ftp-daemon/jobs/transfer.rb
+- lib/rest-ftp-daemon/jobs/video.rb
 - lib/rest-ftp-daemon/launcher.rb
+- lib/rest-ftp-daemon/location.rb
 - lib/rest-ftp-daemon/metrics.rb
 - lib/rest-ftp-daemon/notification.rb
 - lib/rest-ftp-daemon/paginate.rb
@@ -362,10 +425,51 @@ files:
 - lib/rest-ftp-daemon/remote.rb
 - lib/rest-ftp-daemon/remote_ftp.rb
 - lib/rest-ftp-daemon/remote_sftp.rb
-- lib/rest-ftp-daemon/static/css/bootstrap.css
+- lib/rest-ftp-daemon/static/config.json
+- lib/rest-ftp-daemon/static/css/bootstrap.min.css
+- lib/rest-ftp-daemon/static/css/bootstrap.old.css
 - lib/rest-ftp-daemon/static/css/main.css
+- lib/rest-ftp-daemon/static/fonts/glyphicons-halflings-regular.eot
+- lib/rest-ftp-daemon/static/fonts/glyphicons-halflings-regular.svg
+- lib/rest-ftp-daemon/static/fonts/glyphicons-halflings-regular.ttf
+- lib/rest-ftp-daemon/static/fonts/glyphicons-halflings-regular.woff
+- lib/rest-ftp-daemon/static/fonts/glyphicons-halflings-regular.woff2
 - lib/rest-ftp-daemon/static/images/feature_newrelic.png
 - lib/rest-ftp-daemon/static/images/feature_reload.png
+- lib/rest-ftp-daemon/static/swagger.html
+- lib/rest-ftp-daemon/static/swagger/css/print.css
+- lib/rest-ftp-daemon/static/swagger/css/reset.css
+- lib/rest-ftp-daemon/static/swagger/css/screen.css
+- lib/rest-ftp-daemon/static/swagger/css/style.css
+- lib/rest-ftp-daemon/static/swagger/css/typography.css
+- lib/rest-ftp-daemon/static/swagger/fonts/DroidSans-Bold.ttf
+- lib/rest-ftp-daemon/static/swagger/fonts/DroidSans.ttf
+- lib/rest-ftp-daemon/static/swagger/images/collapse.gif
+- lib/rest-ftp-daemon/static/swagger/images/expand.gif
+- lib/rest-ftp-daemon/static/swagger/images/explorer_icons.png
+- lib/rest-ftp-daemon/static/swagger/images/favicon-16x16.png
+- lib/rest-ftp-daemon/static/swagger/images/favicon-32x32.png
+- lib/rest-ftp-daemon/static/swagger/images/favicon.ico
+- lib/rest-ftp-daemon/static/swagger/images/logo_small.png
+- lib/rest-ftp-daemon/static/swagger/images/pet_store_api.png
+- lib/rest-ftp-daemon/static/swagger/images/throbber.gif
+- lib/rest-ftp-daemon/static/swagger/images/wordnik_api.png
+- lib/rest-ftp-daemon/static/swagger/lib/backbone-min.js
+- lib/rest-ftp-daemon/static/swagger/lib/es5-shim.js
+- lib/rest-ftp-daemon/static/swagger/lib/handlebars-4.0.5.js
+- lib/rest-ftp-daemon/static/swagger/lib/highlight.9.1.0.pack.js
+- lib/rest-ftp-daemon/static/swagger/lib/highlight.9.1.0.pack_extended.js
+- lib/rest-ftp-daemon/static/swagger/lib/jquery-1.8.0.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/jquery.ba-bbq.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/jquery.slideto.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/jquery.wiggle.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/js-yaml.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/jsoneditor.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/lodash.min.js
+- lib/rest-ftp-daemon/static/swagger/lib/marked.js
+- lib/rest-ftp-daemon/static/swagger/lib/object-assign-pollyfill.js
+- lib/rest-ftp-daemon/static/swagger/lib/swagger-oauth.js
+- lib/rest-ftp-daemon/static/swagger/lib/swagger-ui.min.js
 - lib/rest-ftp-daemon/uri.rb
 - lib/rest-ftp-daemon/views/dashboard.haml
 - lib/rest-ftp-daemon/views/dashboard_counters.haml
@@ -388,6 +492,7 @@ files:
 - spec/rest-ftp-daemon/features/debug_spec.rb
 - spec/rest-ftp-daemon/features/jobs_spec.rb
 - spec/rest-ftp-daemon/features/status_spec.rb
+- spec/rest-ftp-daemon/features/swagger_spec.rb
 - spec/spec_helper.rb
 - spec/support/request_helpers.rb
 homepage: http://github.com/bmedici/rest-ftp-daemon
@@ -405,9 +510,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5