rest-ftp-daemon 0.242.3 → 0.242.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ecbe20206a3af518da510a31113cf02b3e198cf
-  data.tar.gz: bcae2929dc73d34920c7730a04c4c51836e58f17
+  metadata.gz: d53f8c7bc21a0fd6f23831d7bcc4241a6b6e39dd
+  data.tar.gz: 372c142eb3583d4d42ec36ccc8c28e50ca4701a0
 SHA512:
-  metadata.gz: da5f0d7ecde70351eea2a3857b3b0726953b3a1134b5023076b86ecadd5067859fa611bcec67613e0544f13bc9da8f561d722ecb6813aa855c01e0fcf084b6eb
-  data.tar.gz: ebc98fb0f9d944678cafa24253817f6e6d9669891356fd63037d5ba4bfb8682c18c49a213278ab624a9403ac7cafda746aea87fe391f59ae417a98f530febeef
+  metadata.gz: 20ed6e6d2eac731ef82d40a11aa66cbe7dcdd4aa6ed1a6a271ca919046f8e196897345a5f88d2b892c0a803d067ac21576671ce7d981c57bf12daf5bb573eef5
+  data.tar.gz: 91b60bd6c4e1fdcdd992b6e655ab9fd04729bbcb71e054ccde8e1b1e7602075b2a2b7566ad49f90d626cf7e6ed622e1ecd0b1a5577f4de8e186c3dbe52ce48bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.242.3)
+    rest-ftp-daemon (0.242.4)
       double-bag-ftps
       facter
       get_process_mem
@@ -65,7 +65,7 @@ GEM
       multi_json (>= 1.3.2)
     haml (4.0.7)
       tilt
-    hashie (3.4.2)
+    hashie (3.4.3)
     http (0.9.8)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -79,7 +79,7 @@ GEM
     ice_nine (0.11.1)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.1)
+    minitest (5.8.2)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     net-sftp (2.1.2)

data/README.md

@@ -61,7 +61,7 @@ Expected features in a short-time range :
 Installation
 ------------------------------------------------------------------------------------
 
-With Ruby (version 2.1 or higher) and rubygems properly installed, you only
+With Ruby (version 2.2 or higher) and rubygems properly installed, you only
 need to issue :
 
 ```
@@ -213,17 +213,17 @@ TODO for this document
 Debian install preparation
 ------------------------------------------------------------------------------------
 
-This project is available as a rubygem, requires Ruby 2.1 and rubygems installed.
+This project is available as a rubygem, requires Ruby 2.2 and rubygems installed.
 
-You may use `rbenv` and `ruby-build` to get the right Ruby version. If this is your case, ensure that ruby-build definitions are up-to-date and include ruby-2.1.0
+You may use `rbenv` and `ruby-build` to get the right Ruby version. If this is your case, ensure that ruby-build definitions are up-to-date and include ruby-2.2.0
 
 ```
 # apt-get install ruby-build rbenv
-# ruby-build --definitions | grep '2.1'
+# ruby-build --definitions | grep '2.2'
 ```
 
-Otherwise, you way have to update ruby-build to include Ruby 2.1.0 definitions.
-On Debian, 2.1.0 is not included in Wheezy and appears in Jessie's version of the package.
+Otherwise, you way have to update ruby-build to include Ruby 2.2.0 definitions.
+On Debian, 2.2.0 is not included in Wheezy and appears in Jessie's version of the package.
 
 Use a dedicated user for the daemon, switch to this user and enable rbenv
 

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

@@ -54,6 +54,7 @@ module RestFtpDaemon
         @paginate = Paginate.new result
         @paginate.only = params["only"]
         @paginate.page = params["page"]
+        @paginate.all = params.keys.include? "all"
 
         # Compile haml template
         output = render :dashboard

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

@@ -14,8 +14,9 @@ module RestFtpDaemon
         # Technical fields
         expose :wid, unless: lambda { |object, _options| object.wid.nil? }
 
-        expose :error
-        expose :status
+        # expose :error
+        expose :error_utf8, :as => :error
+        expose :status_utf8, :as => :status
         expose :queued_at
         expose :updated_at
         expose :started_at

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.242.3"
+APP_VER = "0.242.4"
 
 # Provide default config file information
 APP_LIB = File.expand_path File.dirname(__FILE__)

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

@@ -92,6 +92,13 @@ module RestFtpDaemon
       "<div class=\"transfer-method label #{klass}\">#{method.upcase}</div>"
     end
 
+    def self.job_runs_style runs
+      return  "label-outline"     if runs <= 0
+      return  "label-info"  if runs == 1
+      return  "label-warning"  if runs == 2
+      return  "label-danger"   if runs > 2
+    end
+
     # Dates and times: date with time generator
     def self.datetime_full datetime
       return "-"  if datetime.nil?

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

@@ -37,12 +37,12 @@ module RestFtpDaemon
 
       # Init context
       @id = job_id.to_s
-      @infos = {}
-      @updated_at = nil
+      # @infos = {}
+      #@updated_at = nil
       @started_at = nil
       @finished_at = nil
-      @error = nil
-      @status = nil
+      # @error = nil
+      # @status = nil
       @runs = 0
       @wid = nil
 
@@ -57,14 +57,19 @@ module RestFtpDaemon
         instance_variable_set "@#{name}", params[name]
       end
 
+      # Set job queue, thus reset
+      reset
+
+      # Read source file size and parameters
+      @notify_after_sec = Settings.at(:transfer, :notify_after_sec) rescue nil
+    end
+
+    def reset
       # Set super-default flags
       flag_default :mkdir, false
       flag_default :overwrite, false
       flag_default :tempfile, false
 
-      # Read source file size and parameters
-      @notify_after_sec = Settings.at(:transfer, :notify_after_sec) rescue nil
-
       # Flag current job
       @queued_at = Time.now
       @updated_at = Time.now
@@ -72,6 +77,11 @@ module RestFtpDaemon
       # Send first notification
       log_info "Job.initialize notify[queued] notify_after_sec[#{@notify_after_sec}] interval[#{JOB_UPDATE_INTERVAL}]"
       client_notify :queued
+
+      # Update job status
+      set_status JOB_STATUS_QUEUED
+      set_error nil
+      @infos = {}
     end
 
     def process
@@ -208,11 +218,6 @@ module RestFtpDaemon
       (@finished_at - @started_at).round(2)
     end
 
-    def set_queued
-      # Update job status
-      set_status JOB_STATUS_QUEUED
-    end
-
     def oops_after_crash exception
       oops :ended, exception, :crashed
     end
@@ -226,6 +231,15 @@ module RestFtpDaemon
       (Time.now - @queued_at).round(2)
     end
 
+    def status_utf8
+      utf8 @status
+    end
+
+    def error_utf8
+      utf8 @error
+    end
+
+
   protected
 
     def expand_path path
@@ -372,6 +386,7 @@ module RestFtpDaemon
     end
 
 
+
   private
 
     def log_context
@@ -403,23 +418,30 @@ module RestFtpDaemon
       end
     end
 
+    def utf8 value
+      value.to_s.encode("UTF-8")
+    end
+
     def set_error value
-      @mutex.synchronize do
-        @error = utf8_if_string value
-        touch_job
-      end
+      @error = value
+      touch_job
     end
 
     def set_status value
-      @mutex.synchronize do
-        @status = utf8_if_string value
-        touch_job
-      end
+      @status = value
+      touch_job
     end
 
+    # def set_status value
+    #   @mutex.synchronize do
+    #     @status = utf8_if_string value
+    #     touch_job
+    #   end
+    # end
+
     def utf8_if_string value
       return value unless (value.is_a? String) || (value.is_a? Symbol)
-      return value.to_s.encode("UTF-8")
+      return utf8 value
     end
 
     def flag_default name, default

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

@@ -109,6 +109,7 @@ module RestFtpDaemon
       # Check that item responds to "priorty" method
       raise "JobQueue.push: job should respond to priority method" unless job.respond_to? :priority
       raise "JobQueue.push: job should respond to id method" unless job.respond_to? :id
+      raise "JobQueue.push: job should respond to reset" unless job.respond_to? :reset
 
       @mutex.synchronize do
         # Store the job into the global jobs list, if not already inside
@@ -117,8 +118,8 @@ module RestFtpDaemon
         # Push job into the queue, if not already inside
         @queue.push(job) unless @queue.include?(job)
 
-        # Inform the job that it's been queued
-        job.set_queued if job.respond_to? :set_queued
+        # Inform the job that it's been queued / reset it
+        job.reset
 
         # Refresh queue order
         sort_queue!

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

@@ -2,6 +2,7 @@ module RestFtpDaemon
   class Paginate
 
     attr_writer :only
+    attr_accessor :all
 
     def initialize data
       # Defaults
@@ -11,6 +12,7 @@ module RestFtpDaemon
       @only = nil
       @page = 1
       @pages = 1
+      @all = false
 
       # Ensure data set is countable
       return unless data.is_a? Enumerable
@@ -29,6 +31,8 @@ module RestFtpDaemon
     end
 
     def browser
+      return if @all
+
       out = []
       1.upto(@pages) do |p|
         out << link(p)
@@ -37,6 +41,8 @@ module RestFtpDaemon
     end
 
     def subset
+      return @data if @all
+
       size = DEFAULT_PAGE_SIZE.to_i
       offset = (@page-1) * size
       @data[offset, size]

data/lib/rest-ftp-daemon/static/css/main.css

@@ -24,11 +24,13 @@ body, table tr td, .fixed {
 
 .label {
   font-size: 1em;
-  padding: 2px 3px 2px 3px;
+  padding: 2px 2px 2px 2px;
   margin-bottom: 1px;
   font-weight: normal;
   display: inline-block;
   font-family: sans-serif;
+
+  border: 1px solid transparent;
   }
 
 .label-outline {

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

@@ -3,6 +3,7 @@
 - counts_all = $queue.jobs_count
 - jobs = @paginate.subset
 
+
 .row
 
   .col-md-4

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

@@ -5,8 +5,9 @@
   - source_processed = job.get(:source_processed) || 0
   - source_current = job.get(:source_current)
   - bitrate = job.get :transfer_bitrate
-
   - trclass = DASHBOARD_JOB_STYLES[job.status]
+  - runs = job.runs.to_i
+
 
   - unless job.error.nil?
     - trclass = "warning"
@@ -32,7 +33,7 @@
 
     %td
       %span.push-status
-        = job.status
+        = job.status_utf8
 
       - if (job.status != JOB_STATUS_FINISHED) && (source_processed < source_count)
         = " (#{source_processed}/#{source_count})"
@@ -47,14 +48,15 @@
           %b= source_current unless source_current.nil?
 
     %td
-      - unless job.error || job.status == JOB_STATUS_FINISHED
+      -# unless job.error || job.status == JOB_STATUS_FINISHED
+      - if job.status == JOB_STATUS_UPLOADING
         .progress
           .progress-bar{style:"width: #{progress}%;"}
             = Helpers.format_bytes(job.get(:transfer_sent), "B")
 
       - else
         .error{title: job.get(:error_message)}
-          = Helpers.text_or_empty(job.error)
+          = Helpers.text_or_empty(job.error_utf8)
 
     %td.nobr.text-right
       = Helpers.format_bytes(job.get(:transfer_total), "B")
@@ -73,14 +75,8 @@
         .label.label-default.flag.worker-label= job.priority
 
     %td
-      - if job.runs.nil?
-        .label.label-info.flag.worker-label= "-"
-      - elsif job.runs == 1
-        .label.label-default.flag.worker-label= job.runs
-      - elsif job.runs == 2
-        .label.label-warning.flag.worker-label= job.runs
-      - elsif job.runs > 2
-        .label.label-danger.flag.worker-label= job.runs
+
+      .label.flag.worker-label{class: Helpers.job_runs_style(runs)}= runs
 
     -#%td
       - unless job.priority.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.242.3
+  version: 0.242.4
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler