rest-ftp-daemon 0.240.1 → 0.240.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f303cbe0f6a333e5e2010cab1bf7f354c6829180
-  data.tar.gz: 45f649a52043aeb05d4200b42dd5357da2c3ddd7
+  metadata.gz: 01c63d539e5f607adb376390b85cb2a9a9a43b8f
+  data.tar.gz: 643d5714d2347e85de8d097dc10d17df9939b9fc
 SHA512:
-  metadata.gz: 89baf03844b3cd88df85f7d5943a5c38d92f52e530a621fd95107e9b7fef72a37e3140022a723d7bdba3554feb644d07cea1a5fe96ee6eab62aa66225413f1cf
-  data.tar.gz: dd8fd4d1f3c94e4ff78297db15fdad98727df6efb396c8b2e39475449924e31ce6cf5f4331fa772e202390be05409ca69bbf59554576e7f84b885ced3af4fbaa
+  metadata.gz: 19cf92b19a08f61c88a3d09bb8262dbc7506c609567cc1bcc9cff2908d28b97eb1c0f1e6299a8a713c099c127dd69d4fced5a7d82fdb5a0ded174838af8aeef4
+  data.tar.gz: a462495c65b96be3d3798734a7bb6bd4413f81a110868318e671b0531485964fd4231177bbbca3ac94f6524d007ad2077f3238bab2639015f50812d933c85d3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.240.1)
+    rest-ftp-daemon (0.240.2)
       double-bag-ftps
       facter
       get_process_mem

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

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

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

@@ -37,7 +37,7 @@ module RestFtpDaemon
 
     def self.highlight_tokens path
       return unless path.is_a? String
-      path.gsub(/(\[[^\[]+\])/, '<span class="token">\1</span>')
+      path.gsub(/\[([^\[]+)\]/, '<span class="token">\1</span>')
     end
 
     def self.extract_filename path
@@ -113,5 +113,19 @@ module RestFtpDaemon
       path.sub(/([a-z]+:\/\/[^\/]+):[^\/]+\@/, '\1@' )
     end
 
+    def self.formatted_duration duration
+    out = []
+
+    hours = duration / (60 * 60)
+    minutes = (duration / 60) % 60
+    seconds = duration % 60
+
+    out << "#{hours}h" if hours>0
+    out << "#{minutes}mn" if (minutes>0) || (hours>0)
+    out << "#{seconds}s"
+
+    out.join(' ')
+  end
+
   end
 end

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

@@ -28,7 +28,7 @@ module RestFtpDaemon
           password: @url.password.to_s,
           verbose: verbosity,
           port: @url.port,
-          non_interactive: true,
+          #non_interactive: true,
           timeout: DEFAULT_SFTP_TIMEOUT
           )
     end

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

@@ -15,8 +15,11 @@ body, table tr td, .fixed {
 
 .token {
   display: inline-block;
-  background-color: #f8f8f8;
-  padding: 0 2px;
+  background-color: #fefefe;
+  padding: 0 3px;
+  margin: 0 2px;
+  border: 1px solid silver;
+  border-radius: 0.25em;
   }
 
 .label {

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

@@ -4,11 +4,14 @@
 
 .footer-signature.pull-left
 
-  © 2014
-  ·
+  ©
+  = "2014-#{Time.now.year}"
   %a{href: "http://bmconseil.com"}Bruno Medici Consultant
+
+  ·
+  %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub
   ·
-  %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub project page
+  %a{href: "http://refactorcop.com/bmedici/rest-ftp-daemon"} RefactorCop
 
 
 .footer-indicators.pull-right

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

@@ -31,16 +31,16 @@
           %th ID
           %th label
           %th source
-          %th <=>
+          %th mode
           %th target
           %th queued
           %th.error status
           %th{"min-width" => 120} error
-          %th.text-right size
+          %th.text-right filesize
           %th.text-right bitrate
-          %th W
-          %th P
-          %th R
+          %th{title: "Worker ID"} W
+          %th{title: "Priority"} P
+          %th{title: "Runs count"} R
 
         - unless @queue.empty?
           %tbody.jobs

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

@@ -18,14 +18,15 @@
       - trclass = "danger"
       - status = "DEAD"
 
-    - if vars[:updted_at].is_a? Time
-      - no_news_for = (Time.now - vars[:updted_at]).round(0)
-    - else
-      - no_news_for = "?"
 
     %tr{class: trclass.to_s}
       %td= wid
       %td= status
       %td= vars[:jid]
       %td.text-right
-        = "#{no_news_for} s"
+
+        - if vars[:updted_at].is_a? Time
+          - no_news_for = (Time.now - vars[:updted_at]).round(0)
+          = Helpers.formatted_duration no_news_for
+        - else
+          = "?"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.240.1
+  version: 0.240.2
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler