rest-ftp-daemon 0.246.1 → 0.247.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abe96d47d4bc9666c566914e38df996f7d9a1424
-  data.tar.gz: 49b460210783bac1cd04bd08ded49e0911bfa618
+  metadata.gz: dfea42c67617035fca1a3f0abcab1b09c427ef99
+  data.tar.gz: 8b722e96c9971953698baafbb68b6e008e36672d
 SHA512:
-  metadata.gz: b94c1dc6d4a30756c704c551a94732023c2476c4bf0f771c6152f003c364a3f819645a7cd7492be719aa72ef3c8adc9ed6bbdd339a18026fdb5e87ee4519569c
-  data.tar.gz: 4582e45f95358252b9e46beefc2addf61803ef79eac7a85e93c716819c1a1d73c57d2576c71afc6547645fd9fc752b32d0caa72b25413dea54597952a74da43e
+  metadata.gz: f2b49246644f04c9bb5ded2ffc17e059b249ceaf561be6c558f7192454d9d79deb5014b2f8af0be8b73956b169de4b8b08a62efdde7b0bb28a690ea6e8330340
+  data.tar.gz: 2b3026c4ee0d5a8a31136b52eca6f9a1a4a1f919967f74881a5e221e7dc8c27ace0596831878b5097f5c919e3640d4a485967d520edd73f52b1848ffcad55159

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.246.1)
+    rest-ftp-daemon (0.247.0)
       double-bag-ftps
       facter
       get_process_mem
@@ -19,7 +19,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -34,39 +34,40 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.2)
-    coderay (1.1.0)
+    coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     daemons (1.2.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.25)
+    domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
     double-bag-ftps (0.1.2)
+    enumerable-lazy (0.0.1)
     equalizer (0.0.11)
-    eventmachine (1.0.9.1)
+    eventmachine (1.2.0.1)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
     ffi (1.9.10)
     get_process_mem (0.2.0)
-    grape (0.14.0)
+    grape (0.16.2)
       activesupport
       builder
       hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
+      mustermann19 (~> 0.4.3)
       rack (>= 1.3.0)
       rack-accept
-      rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.5.0)
+    grape-entity (0.5.1)
       activesupport
       multi_json (>= 1.3.2)
     haml (4.0.7)
       tilt
-    hashie (3.4.3)
-    http (0.9.8)
+    hashie (3.4.4)
+    http (0.9.9)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -76,17 +77,19 @@ GEM
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    ice_nine (0.11.1)
+    ice_nine (0.11.2)
     json (1.8.3)
     method_source (0.8.2)
     minitest (5.8.4)
-    multi_json (1.11.2)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
+    mustermann19 (0.4.3)
+      enumerable-lazy
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
-    newrelic_rpm (3.14.2.312)
-    parser (2.3.0.2)
+    net-ssh (3.1.1)
+    newrelic_rpm (3.15.2.317)
+    parser (2.3.1.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.3)
@@ -96,15 +99,13 @@ GEM
     rack (1.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rainbow (2.1.0)
-    rake (10.5.0)
+    rake (11.1.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -119,7 +120,7 @@ GEM
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.0)
     settingslogic (2.0.9)
     slop (3.6.0)
     sys-cpu (0.7.2)
@@ -134,7 +135,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -150,7 +151,7 @@ DEPENDENCIES
   pry
   rake
   rest-ftp-daemon!
-  rspec (~> 3.1)
+  rspec
   rubocop (~> 0.32.0)
 
 BUNDLED WITH

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

@@ -23,13 +23,21 @@ module RestFtpDaemon
 
       desc "Read job with ID"
       params do
-        requires :id, type: String, desc: "ID of the Job to read", regexp: /[^\/]+/
+        requires :id, type: String, desc: "ID of the Job to read"#, regexp: /[^\/]+$//
       end
       get "/*id" do
         begin
           # Get job to display
           raise RestFtpDaemon::JobNotFound if params[:id].nil?
-          job = $queue.find_by_id(params[:id]) || $queue.find_by_id(params[:id], true)
+
+          # Find using matched parts
+          if params[:format]
+            job = $queue.find_by_id("#{params[:id]}.#{params[:format]}", false)
+          else
+            job = $queue.find_by_id(params[:id], true)
+          end
+
+          # Fail if none found
           raise RestFtpDaemon::JobNotFound if job.nil?
 
         rescue RestFtpDaemon::JobNotFound => exception

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

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

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

@@ -142,6 +142,9 @@ module RestFtpDaemon
       rescue Errno::EHOSTDOWN => exception
         return oops :ended, exception, "conn_host_is_down"
 
+      rescue Errno::EPIPE=> exception
+        return oops :ended, exception, "conn_broken_pipe"
+
       rescue Errno::ENETUNREACH => exception
         return oops :ended, exception, "conn_unreachable"
 

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

@@ -51,11 +51,11 @@ module RestFtpDaemon
   private
 
     def link p
-      klass = (p == @page)? " btn-info" : ""
+      klass = (p == @page)? "primary" : "default"
 
       url = Helpers.dashboard_filter_url(@filter)
 
-      "<a class='paginate btn btn-default%s' href='%s?page=%d'>%p</a>" % [
+      "<a class='btn btn-%s' href='%s?page=%d'>%p</a>" % [
         klass,
         @filter,
         p,

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

@@ -81,13 +81,29 @@ a.class {
   margin-bottom: 4px;
 }
 
+.paginator, .filters {
+  padding-bottom: 5px;
+}
+
+.paginator .btn, .filters .btn {
+  margin-bottom: 2px !important;
+}
+
+.filters {
+  padding-right: 5px;
+}
+
+.paginator {
+  padding-left: 20px;
+}
 
-.paginate {
+.paginator .btn {
   padding-left: 7px !important;
   padding-right: 7px !important;
 }
 
 
+
 /* Footer styles
 -------------------------------------------------- */
 html {

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

@@ -3,24 +3,23 @@
 - counts_all = $queue.jobs_count
 - jobs = @paginate.subset
 
+.btn-group.btn-group-xs.filters
+  - klass = @filter.empty? ? "btn-info" : ""
+  %a.btn.btn-default{href: Helpers.dashboard_filter_url(), class: klass}
+    ALL (#{counts_all})
+
+.btn-group.btn-group-xs.filters
+  - counts_by_status.each do |status, count|
+    - klass = (status.to_s == @filter) ? "btn-info" : ""
+    %a.btn.btn-default{href: Helpers.dashboard_filter_url(status), class: klass}
+      #{status} (#{count})
 
-.row
 
-  .col-md-4
-    .btn-group.btn-group-sm
-      - klass = @filter.empty? ? "btn-info" : ""
-      %a.btn.btn-default{href: Helpers.dashboard_filter_url(), class: klass}
-        ALL (#{counts_all})
-    .btn-group.btn-group-sm
-      - counts_by_status.each do |status, count|
-        - klass = (status.to_s == @filter) ? "btn-info" : ""
-        %a.btn.btn-default{href: Helpers.dashboard_filter_url(status), class: klass}
-          #{status} (#{count})
-
-  .col-md-8
-    .btn-group.btn-group-sm
-      = @paginate.browser
 
+.btn-group.btn-group-xs.paginator
+  = @paginate.browser
+
+%br
 %br
 
 .row

data/rest-ftp-daemon.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "http", "~> 0.8"
   spec.add_development_dependency "rubocop", "~> 0.32.0"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.246.1
+  version: 0.247.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement