rest-ftp-daemon 0.245.1 → 0.246.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 543ad77656660d81d07cf854694e58db9c31fb3b
-  data.tar.gz: 8562831e868f6215c41d58096f593d49265887d9
+  metadata.gz: 9b2dbcef0066dfcba34977015d1ac5f6ffba2a49
+  data.tar.gz: 28a9f886e9b2fd3d1553ad81e7bad7a5057e8ed7
 SHA512:
-  metadata.gz: 06381f06990e68bfe3a1c4091291c91bb0fed0f3e98e12b60123b11e3b529c2406c301c4a3f450d5121447a7bde0d6a2a7763338323a453eff23d0396f50fd0c
-  data.tar.gz: 962fba554f02dcb527fbfe9d27cf369bcd196feb374a27a4df872063a3f93bc5517bf81d6caedc2dd0cf7c20d00ca702392e480fb6ba8aa45be9075d3adaad02
+  metadata.gz: da64e4991cca801aaa527b85acfb33e87010cb289d0ce6d01553fcfb18239fb8c0e57e5a7bd659a088230cb6a21a120c4299e824fc16ac53d1bf01846ed96075
+  data.tar.gz: a46a0b53ed9ac39c5f287010214fa5cb4a684a377dd3332a8bbbad5f6db40becae3a87ac3065a30f8afe01187ae375b9d59858cabf41f4759cce41396f01ba0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.245.1)
+    rest-ftp-daemon (0.246.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)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -46,7 +46,7 @@ GEM
     double-bag-ftps (0.1.2)
     equalizer (0.0.11)
     eventmachine (1.0.9.1)
-    facter (2.4.4)
+    facter (2.4.6)
       CFPropertyList (~> 2.2.6)
     ffi (1.9.10)
     get_process_mem (0.2.0)
@@ -79,14 +79,14 @@ GEM
     ice_nine (0.11.1)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.3)
+    minitest (5.8.4)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.2)
-    newrelic_rpm (3.14.1.311)
-    parser (2.3.0.1)
+    newrelic_rpm (3.14.2.312)
+    parser (2.3.0.2)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.3)
@@ -98,13 +98,13 @@ GEM
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rainbow (2.0.0)
+    rainbow (2.1.0)
     rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
+    rspec-core (3.4.2)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/README.md

@@ -21,7 +21,7 @@ Features
   * environment-aware configuration in a YAML file
   * daemon process is tagged with its name and environment in process lists
   * global dashboard directly served within the daemon HTTP interface
-  * support pooling of worker to separate capacity among jobs
+  * support pooling of worker to dedicate workers to groups of jobs
 
 * File management ans transferts
   * allow authentication in FTP target in a standard URI-format
@@ -46,23 +46,21 @@ Status
 ------------------------------------------------------------------------------------
 
 Though it may need more robust tests, this gem has been used successfully in production for
-a while without glitches at France Télévisions.
+a while without any glitches at France Télévisions.
 
 Expected features in a short-time range :
 
 * Provide swagger-style API documentation
 * Authenticate API clients
-* Allow more transfer protocols (sFTP, HTTP POST etc)
+* Allow more transfer protocols (HTTP POST etc)
 * Expose JSON status of workers on `GET /jobs/` for automated monitoring
 
 
 
-
 Installation
 ------------------------------------------------------------------------------------
 
-With Ruby (version 2.2 or higher) and rubygems properly installed, you only
-need to issue :
+With Ruby (version 2.3 or higher) and rubygems properly installed, you only need :
 
 ```
 gem install rest-ftp-daemon
@@ -74,19 +72,19 @@ If that is not the case yet, see section [Debian install preparation](#debian-in
 Usage
 ------------------------------------------------------------------------------------
 
-You must provide a configuration file for the daemon to start, either
-explicitly using option `--config` or implicitly at `/etc/rest-ftp-daemon.yml`.
-(A sample file is provided see `--help` for more info about it.)
+You must provide a configuration file for the daemon to start, either explicitly using
+option `--config` or implicitly at `/etc/rest-ftp-daemon.yml`. A sample file is provided, issue
+`--help` to get more info.
 
-You can then simply start the daemon on the standard port, or on a specific port using `-p`
+You then simply start the daemon on its standard port, or on a specific port using `-p`
 
 ```
 $ rest-ftp-daemon -p 3000 start
 ```
 
-Check that the daemon is running and exposes a JSON status structure on `http://localhost:3000/status`.
+Check that the daemon is running and exposes a JSON status structure at `http://localhost:3000/status`.
 
-The dashboard will provide a global view on `http://localhost:3000/`
+The dashboard will provide an overview at `http://localhost:3000/`
 
 If the daemon appears to exit quickly when launched, it may be caused by logfiles that can't be written (check files permissions or owner).
 
@@ -106,7 +104,7 @@ Launcher options :
 | -v      | --version     |               | Show the current version                                    |
 
 
-Examples
+Usage and examples
 ------------------------------------------------------------------------------------
 
 #### Start a job to transfer a file named "file.iso" to a local FTP server
@@ -141,11 +139,13 @@ curl -H "Content-Type: application/json" -X POST -D /dev/stdout -d \
 
 #### Start a job with a specific pool name
 
+The daemon spawns groups of workers (worker pools) to work on groups of jobs (job pools). Any ```pool``` attribute not declared in configuration will land into the ```"default"``` pool.
+
 ```
 curl -H "Content-Type: application/json" -X POST -D /dev/stdout -d \
 '{"pool": "maxxxxx",source":"~/file.iso",target":"ftp://anonymous@localhost/incoming/dest2.iso"}' "http://localhost:3000/jobs"
 ```
-This job will be handled by the "maxxxxx" workers only, or by the default worker is this pool is not declared.
+This job will be handled by the "maxxxxx" workers only, or by the ```"default"``` worker is this pool is not declared.
 
 
 #### Get info about a job with ID="q89j.1"
@@ -221,27 +221,33 @@ TODO for this document
 Debian install preparation
 ------------------------------------------------------------------------------------
 
-This project is available as a rubygem, requires Ruby 2.2 and rubygems installed.
+This project is available as a rubygem, requires Ruby 2.3 and rubygems installed.
+
+#### Using rbenv and ruby-build
 
-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
+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 the right Ruby version.
 
 ```
-# apt-get install ruby-build rbenv
-# ruby-build --definitions | grep '2.2'
+# git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+# git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+# echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+# echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+# ruby-build --definitions | grep '2.3'
 ```
 
-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.
+Otherwise, you way have to update ruby-build to include Ruby 2.3.0 definitions.
+On Debian, 2.3.0 is not included in Wheezy and appears in Jessie's version of the package.
+
+#### Dedicated user
 
 Use a dedicated user for the daemon, switch to this user and enable rbenv
 
 ```
 # adduser --disabled-password --gecos "" rftpd
 # su rftpd -l
-# echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
-# echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 ```
 
+#### Ruby version
 
 Install the right ruby version and activate it
 
@@ -251,6 +257,8 @@ Install the right ruby version and activate it
 # rbenv rehash
 ```
 
+#### Daemon installation
+
 Update RubyGems and install the gem from rubygems.org
 
 ```

data/bin/rest-ftp-daemon

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-# Try to load external libs
-app_root = File.expand_path File.dirname(__FILE__) + "/../"
+# Try to load external libs, helpers and constants
 begin
   require "thin"
   require "optparse"
@@ -11,11 +10,8 @@ begin
 rescue LoadError
   raise "EXITING: some of basic libs were not found: thin, optparse, socket, settingslogic"
 end
-
-
-# Load helpers and constants
 [:constants, :helpers].each do |lib|
-  require File.expand_path("#{app_root}/lib/rest-ftp-daemon/#{lib}")
+  require_relative "../lib/rest-ftp-daemon/#{lib}"
 end
 puts
 
@@ -57,11 +53,12 @@ end
 # Load config, and merge options from ARGV into settings
 # FIXME: file configuration detection could reside in settings.rb
 APP_CONF ||= DEFAULT_CONFIG_PATH
-APP_ENV ||= "production"
+APP_ENV ||= ENV_PRODUCTION
 abort "EXITING: cannot read configuration file: #{APP_CONF}" unless File.exist? APP_CONF
 begin
   # Import settings
-  require File.expand_path("#{app_root}/lib/rest-ftp-daemon/settings")
+  # require File.expand_path("#{app_root}/lib/rest-ftp-daemon/settings")
+  require_relative "../lib/rest-ftp-daemon/settings"
 
   # Set defaults
   Settings.init_defaults
@@ -129,6 +126,7 @@ puts
 
 # Start Thin with this rackup configuration, changing to app_root first
 begin
+  app_root = File.expand_path(File.dirname(__FILE__) + "/../")
   Dir.chdir app_root
   Thin::Runner.new(argv.flatten).run!
 rescue RuntimeError => e

data/config.ru

@@ -23,8 +23,8 @@ GC::Profiler.enable if Settings.newrelic_enabled?
 use Rack::Static, urls: ["/css", "/js", "/images"], root: "#{APP_LIBS}/static/"
 
 # Rack reloader and mini-profiler
-unless Settings.namespace == "production"
-  use Rack::Reloader, 0
+unless Settings.namespace == ENV_PRODUCTION
+  use Rack::Reloader, 1
   # use Rack::MiniProfiler
 end
 

data/lib/rest-ftp-daemon.rb

@@ -11,13 +11,6 @@ require "thread"
 require "singleton"
 require "newrelic_rpm"
 
-# Development libs      /?pp=flamegraph
-# unless Settings.namespace == "production"
-#   require 'rack-mini-profiler'
-#   # require 'stackprof'
-#   require 'flamegraph'
-# end
-
 # Project's libs
 require_relative "rest-ftp-daemon/constants"
 require_relative "rest-ftp-daemon/array"

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

@@ -23,53 +23,65 @@ module RestFtpDaemon
               #:encoding => Encoding::ASCII_8BIT
           haml_engine.render(binding, values)
         end
+
+        def build_dashboard filter = ''
+          # Initialize Facter
+          Facter.loadfacts
+
+          # Detect QS filters
+          @filter = filter.to_s
+          @page = params["page"].to_i
+
+          # Get jobs for this view, order jobs by their weights
+          jobs_with_status = $queue.jobs_with_status(filter).reverse
+
+          # Provide queue only if no filtering set
+          if filter.empty?
+            @jobs_queued = $queue.jobs_queued
+          else
+            @jobs_queued = []
+          end
+
+          # Get workers status
+          @worker_variables = $pool.worker_variables
+
+          # Build paginator
+          @paginate = Paginate.new jobs_with_status
+          @paginate.filter = filter
+          @paginate.page = @page
+          @paginate.all = params.keys.include? "all"
+
+          # Compile haml template
+          output = render :dashboard
+
+          # Send response
+          env["api.format"] = :html
+          format "html"
+          status 200
+          content_type "text/html"
+          body output
+        end
+
       end
 
 
       ### Common request logging
-
       before do
         log_info "HTTP #{request.request_method} #{request.fullpath}", params
       end
 
 
       ### DASHBOARD
-
+      desc "Show a global dashboard"
       get "/" do
-        # Initialize Facter
-        Facter.loadfacts
-
-        # Detect QS filters
-        @only = params["only"].to_s
-
-        # Get jobs for this view, order jobs by their weights
-        jobs_with_status = $queue.jobs_with_status(@only).reverse
-
-        # Provide queue only if no filtering set
-        if @only.empty?
-          @jobs_queued = $queue.jobs_queued
-        else
-          @jobs_queued = []
-        end
-
-        # Get workers status
-        @worker_variables = $pool.worker_variables
-
-        # Build paginator
-        @paginate = Paginate.new jobs_with_status
-        @paginate.only = params["only"]
-        @paginate.page = params["page"]
-        @paginate.all = params.keys.include? "all"
-
-        # Compile haml template
-        output = render :dashboard
+        build_dashboard()
+      end
 
-        # Send response
-        env["api.format"] = :html
-        format "html"
-        status 200
-        content_type "text/html"
-        body output
+      params do
+        optional :filter, type: String, desc: "Filter for the jobs list"#, regexp: /[^\/]+/
+      end
+      get ":filter" do
+        build_dashboard(params["filter"])
       end
 
     end

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

@@ -16,8 +16,8 @@ module RestFtpDaemon
       format :json
       content_type :json, 'application/json; charset=utf-8'
 
-      mount RestFtpDaemon::API::Jobs => "/jobs"
-      mount RestFtpDaemon::API::Dashbaord => "/"
+      mount RestFtpDaemon::API::Jobs => MOUNT_JOBS
+      mount RestFtpDaemon::API::Dashbaord => MOUNT_BOARD
 
 
       ### INITIALIZATION
@@ -48,6 +48,13 @@ module RestFtpDaemon
       end
 
 
+      ### ROOT URL ACCESS
+
+      get "/" do
+        redirect Helpers.dashboard_filter_url()
+      end
+
+
       ### SHOW ROUTES
 
       desc "Show application routes"

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

@@ -1,10 +1,10 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.245.1"
+APP_VER = "0.246.0"
 
 # Provide default config file information
-APP_LIB = File.expand_path File.dirname(__FILE__)
+APP_LIB = File.expand_path(File.dirname(__FILE__))
 APP_ROOT = File.expand_path(File.dirname(__FILE__) + "/../../")
 
 DEFAULT_CONFIG_PATH = File.expand_path "/etc/#{APP_NAME}.yml"
@@ -36,7 +36,7 @@ JOB_TEMPFILE_LEN        = 8
 JOB_UPDATE_INTERVAL     = 1
 
 
-# Jobs and workers statuses
+# Jobs statuses
 JOB_STATUS_PREPARING    = "preparing"
 JOB_STATUS_RUNNING      = "running"
 JOB_STATUS_CHECKING_SRC = "checking_source"
@@ -49,7 +49,15 @@ JOB_STATUS_DISCONNECTING= "remote_disconnect"
 JOB_STATUS_FINISHED     = "finished"
 JOB_STATUS_FAILED       = "failed"
 JOB_STATUS_QUEUED       = "queued"
+JOB_STYLES = {
+  JOB_STATUS_QUEUED      => :active,
+  JOB_STATUS_FAILED      => :warning,
+  JOB_STATUS_FINISHED    => :success,
+  JOB_STATUS_UPLOADING   => :info,
+  JOB_STATUS_RENAMING    => :info,
+  }
 
+# Worker statuses
 WORKER_STATUS_STARTING  = "starting"
 WORKER_STATUS_WAITING   = "waiting"
 WORKER_STATUS_RUNNING   = "running"
@@ -57,6 +65,12 @@ WORKER_STATUS_FINISHED  = "finished"
 WORKER_STATUS_TIMEOUT   = "timeout"
 WORKER_STATUS_CRASHED   = "crashed"
 WORKER_STATUS_CLEANING  = "cleaning"
+WORKER_STYLES = {
+  WORKER_STATUS_WAITING  => :success,
+  WORKER_STATUS_RUNNING  => :info,
+  WORKER_STATUS_CRASHED  => :danger,
+  WORKER_STATUS_FINISHED => :success,
+  }
 
 
 # Logging and startup
@@ -75,6 +89,10 @@ LOG_INDENT              = "\t"
 BIND_PORT_TIMEOUT       = 3
 BIND_PORT_LOCALHOST     = "127.0.0.1"
 
+ENV_PRODUCTION           = "production"
+MOUNT_JOBS               = "/jobs"
+MOUNT_BOARD              = "/board"
+
 
 # Notifications
 NOTIFY_PREFIX           = "rftpd"
@@ -82,22 +100,6 @@ NOTIFY_USERAGENT        = "#{APP_NAME}/v#{APP_VER}"
 NOTIFY_IDENTIFIER_LEN   = 4
 
 
-# Dashboard row styles
-DASHBOARD_JOB_STYLES = {
-  JOB_STATUS_QUEUED      => :active,
-  JOB_STATUS_FAILED      => :warning,
-  JOB_STATUS_FINISHED    => :success,
-  JOB_STATUS_UPLOADING   => :info,
-  JOB_STATUS_RENAMING    => :info,
-  }
-DASHBOARD_WORKER_STYLES = {
-  WORKER_STATUS_WAITING  => :success,
-  WORKER_STATUS_RUNNING  => :info,
-  WORKER_STATUS_CRASHED  => :danger,
-  WORKER_STATUS_FINISHED => :success,
-  }
-
-
 # Initialize defaults
 APP_STARTED = Time.now
 APP_LIBS = File.dirname(__FILE__)

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

@@ -132,8 +132,12 @@ module RestFtpDaemon
     out.join(" ")
     end
 
-    def self.dashboard_job_link job
-      "/jobs/#{job.id}" if job.respond_to? :id
+    def self.dashboard_job_url job
+      "#{MOUNT_JOBS}/#{job.id}" if job.respond_to? :id
+    end
+
+    def self.dashboard_filter_url filter = ''
+      "#{MOUNT_BOARD}/#{filter}"
     end
 
   end

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

@@ -82,7 +82,7 @@ module RestFtpDaemon
 
       # Status filtering: only those jobs
       else
-        @jobs.select { |job| job.status == status.to_sym }
+        @jobs.select { |job| job.status.to_s == status.to_s }
 
       end
     end

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

@@ -1,7 +1,7 @@
 module RestFtpDaemon
   class Paginate
 
-    attr_writer :only
+    attr_writer :filter
     attr_accessor :all
 
     def initialize data
@@ -9,7 +9,7 @@ module RestFtpDaemon
       @pages = 0
       @total = 0
       @data = []
-      @only = nil
+      @filter = ''
       @page = 1
       @pages = 1
       @all = false
@@ -53,9 +53,11 @@ module RestFtpDaemon
     def link p
       klass = (p == @page)? " btn-info" : ""
 
-      "<a class='paginate btn btn-default%s' href='?only=%s&page=%d'>%p</a>" % [
+      url = Helpers.dashboard_filter_url(@filter)
+
+      "<a class='paginate btn btn-default%s' href='%s?page=%d'>%p</a>" % [
         klass,
-        @only,
+        @filter,
         p,
         p
       ]

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

@@ -8,13 +8,13 @@
 
   .col-md-4
     .btn-group.btn-group-sm
-      - klass = @only.empty? ? "btn-info" : ""
-      %a.btn.btn-default{href: "?only=", class: klass}
+      - 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 == @only) ? "btn-info" : ""
-        %a.btn.btn-default{href: "?only=#{status}", class: klass}
+        - klass = (status.to_s == @filter) ? "btn-info" : ""
+        %a.btn.btn-default{href: Helpers.dashboard_filter_url(status), class: klass}
           #{status} (#{count})
 
   .col-md-8

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

@@ -5,7 +5,7 @@
   - source_processed = job.get(:source_processed) || 0
   - source_current = job.get(:source_current)
   - bitrate = job.get :transfer_bitrate
-  - trclass = DASHBOARD_JOB_STYLES[job.status]
+  - trclass = JOB_STYLES[job.status]
   - runs = job.runs.to_i
 
   - unless job.error.nil?
@@ -13,7 +13,7 @@
 
   %tr{class: trclass.to_s}
     %td
-      %a{href: Helpers.dashboard_job_link(job)}
+      %a{href: Helpers.dashboard_job_url(job)}
         %b= job.id
 
     %td= job.label

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

@@ -14,7 +14,7 @@
     - wid = vars[:wid]
     - status = vars[:status]
     - alive = $pool.worker_alive? wid
-    - trclass = DASHBOARD_WORKER_STYLES[status]
+    - trclass = WORKER_STYLES[status]
 
     - unless alive
       - trclass = "danger"
@@ -28,8 +28,8 @@
       %td= vars[:jid]
       %td.text-right
 
-        - if vars[:updted_at].is_a? Time
-          - no_news_for = (Time.now - vars[:updted_at]).round(0)
+        - if vars[:updated_at].is_a? Time
+          - no_news_for = (Time.now - vars[:updated_at]).round(0)
           = Helpers.formatted_duration no_news_for
         - else
           = "?"

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

@@ -46,7 +46,7 @@ module RestFtpDaemon
     def worker_status status, job = nil
       # Update thread variables
       Thread.current.thread_variable_set :status, status
-      Thread.current.thread_variable_set :updted_at, Time.now
+      Thread.current.thread_variable_set :updated_at, Time.now
 
       # Nothin' to log if "silent"
       return unless @log_worker_status_changes
@@ -61,7 +61,7 @@ module RestFtpDaemon
 
     def worker_jid jid
       Thread.current.thread_variable_set :jid, jid
-      Thread.current.thread_variable_set :updted_at, Time.now
+      Thread.current.thread_variable_set :updated_at, Time.now
     end
 
   end

data/rest-ftp-daemon.gemspec

@@ -1,8 +1,8 @@
 # coding: utf-8
 
 # Libs
-app_root = File.dirname(__FILE__)
-require File.expand_path("#{app_root}/lib/rest-ftp-daemon/constants")
+require_relative "lib/rest-ftp-daemon/constants"
+
 
 # Gemspec
 Gem::Specification.new do |spec|

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Dashboard", feature: true do
 
-  describe "GET /" do
+  describe "GET #{MOUNT_BOARD}" do
     context 'without a password' do
       it 'is forbidden' do
         expect(HTTP.accept(:json).get("http://localhost:#{RequestHelpers::PORT}").status).to eq 401
@@ -12,14 +12,14 @@ describe "Dashboard", feature: true do
     context "with a password" do
       it "can be accessed" do
         expect(
-            get("/").status
+            get(MOUNT_BOARD).status
         ).to eq 200
       end
     end
 
     it "has an HTML representation" do
       expect(
-        get("/", accept: 'html').status
+        get(MOUNT_BOARD, accept: 'html').status
       ).to eq 200
     end
   end # GET /

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

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe "Jobs", feature: true do
 
-  describe "GET /jobs" do
-    let!(:response) { get "/jobs" }
+  describe "GET #{MOUNT_JOBS}" do
+    let!(:response) { get MOUNT_JOBS }
 
     it "responds successfully" do
       expect(response.status).to eq 200
@@ -14,9 +14,9 @@ describe "Jobs", feature: true do
     end
   end # GET /jobs
 
-  describe "POST /jobs" do
+  describe "POST #{MOUNT_JOBS}" do
     def jobs_list
-      JSON.parse get("/jobs").body
+      JSON.parse get(MOUNT_JOBS).body
     end
 
     context "when params are valid" do
@@ -24,43 +24,55 @@ describe "Jobs", feature: true do
         {
           source: "/tmp/foo",
           target: "/tmp/bar",
+          priority: 6,
+          pool: "pool666",
         }
       end
 
       it "issues a 201 response" do
         expect(
-          post("/jobs", json: params).status,
+          post(MOUNT_JOBS, json: params).status,
         ).to eq 201
       end
 
       it "exposes the new job id" do
-        response = JSON.parse post("/jobs", json: params)
+        response = JSON.parse post(MOUNT_JOBS, json: params)
         expect(response["id"]).not_to be_nil
       end
 
       it "assigns a status" do
-        response = JSON.parse post("/jobs", json: params)
+        response = JSON.parse post(MOUNT_JOBS, json: params)
         expect(response["status"]).to match(/^(queued|failed)$/)
       end
 
+      it "assigns a pool" do
+        response = JSON.parse post(MOUNT_JOBS, json: params)
+        expect(response["pool"]).to match(/^(default|pool666)$/)
+      end
+
+      it "assigns a priority" do
+        response = JSON.parse post(MOUNT_JOBS, json: params)
+        expect(response["priority"]).to eq 6
+      end
+
       it "creates a new job" do
         expect {
-          post("/jobs", json: params)
+          post(MOUNT_JOBS, json: params)
         }.to change { jobs_list.size }.by(1)
       end
     end
   end # POST /jobs
 
-  describe "GET /jobs/:id" do
+  describe "GET #{MOUNT_JOBS}/:id" do
     let(:creation_response) do
-      JSON.parse post("/jobs", json: { source: "/tmp/foo", target: "/tmp/bar" }).body
+      JSON.parse post(MOUNT_JOBS, json: { source: "/tmp/foo", target: "/tmp/bar" }).body
     end
 
     let(:job_id) { creation_response.fetch("id") }
 
     it "is properly exposed" do
       expect(
-        get("/jobs/#{job_id}").status,
+        get("#{MOUNT_JOBS}/#{job_id}").status,
       ).to eq 200
     end
   end # GET /jobs/:id

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 require "pathname"
 require "http"
-require_relative "support/request_helpers"
 require "pry"
 
+require_relative "support/request_helpers"
+require_relative "../lib/rest-ftp-daemon/constants"
+
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.245.1
+  version: 0.246.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler