rest-ftp-daemon 0.20.0 → 0.30.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc0NWU3ZTFkMDMxNzJkYzNmZmZhNzRlODZlYzdiNDI4Y2NlMWE2Ng==
+    YThkNmNkZTEwNzM2YzcwM2I2N2NiOWE5OTQwNDI1N2M0NTFjZWZhOA==
   data.tar.gz: !binary |-
-    NmM2NTA1MDViYzU1MDc0MDViNTI0MWY2NDQ1NjAzY2FkNDcxMTA1Yw==
+    ZTllMzMyNGMzNTE1M2U5ZTBjZTc3MWJmYWNiYWJlNzQwM2NiNmMxNQ==
 SHA512:
   metadata.gz: !binary |-
-    MDBhM2E0YmQyNjMzM2Y2MGE5OTBiOTA4YmI2Y2NiYTI1MjYxZmMwOWEyMjlk
-    MzQ4NTk0N2FiMDA3NWQ1N2Y0YzJkZGRkZWUyZDRhZDEzODAwOWRiNDRmMDI3
-    ZTVhMTY2ZDkwMDg3YTAxODQ5NWY5MzcwZGM2N2QyZjQ0MDJlYWM=
+    ODQzMzc5MzRiZDZjZDAyM2QxZWQyMThjNTUyZmNlZWJhOGFiNTJiODAyYWJi
+    YjExZmZiNGMzMDM5ZDRjMmRjYTMxMTNhZGU0ZWNkODMxMzVjZTQ3YWY2MTk5
+    MjYxM2MwNDU5YzM2OWU1MGVjZjc5NTgwYWVjOTdmZTEzNjQ5MGM=
   data.tar.gz: !binary |-
-    MTA1ZmRkMGYzM2VkMWExMDIwMDVjZDhkZWFhOGI1YzYxMGNjNzViNzQxNzdk
-    YjIzYWU0ZmIyYzZjNTRlYTkwMTY0YTAxMDUwMWU1N2Q5MWFhNDgwNTM3OGNl
-    ODJmODA4MDZiMjhlOWRmOTY2M2IxMDFhYzdiYzgxMTNhOGRlYzU=
+    NTBhZWM0NDM2ODNiY2ZjNTA0YjYxYWE3MTBlYWUwZmM3NjgxOGZhNmNlZDlk
+    ZGEwOWE1ZDM4ZjU1N2FjYTQ2ZTNlMjllOGE5ODlhMTJjNjA5ZGFhYjFlODdj
+    ZDBjM2Y1ZTVmODdiYTk0YjdkMGViMGE1ZDA4ZjQ0NzdhZWUxODE=

data/Gemfile

@@ -1,11 +1,3 @@
 source "http://rubygems.org"
 
-gem "sinatra"
-gem "json"
-# gem "thin"
-
-group :development do
-  # gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0"
-  # gem "jeweler", "~> 2.0.1"
-end
+gemspec

data/Gemfile.lock

@@ -1,20 +1,65 @@
+PATH
+  remote: .
+  specs:
+    rest-ftp-daemon (0.22)
+      grape
+      json
+
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.9)
+    grape (0.8.0)
+      activesupport
+      builder
+      hashie (>= 2.1.0)
+      multi_json (>= 1.3.2)
+      multi_xml (>= 0.5.2)
+      rack (>= 1.3.0)
+      rack-accept
+      rack-mount
+      virtus (>= 1.0.0)
+    hashie (3.2.0)
+    i18n (0.6.11)
+    ice_nine (0.11.0)
     json (1.8.1)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
     rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rake (10.3.2)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    virtus (1.0.3)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  json
-  sinatra
+  bundler (~> 1.6)
+  rake
+  rest-ftp-daemon!

data/README.md

@@ -14,12 +14,13 @@ As of today, its main features are :
 Installation
 ------------------------------------------------------------------------------------
 
-This project is available as a rubygem, requires on ruby >= 1.9 and rubygems installed.
+This project is available as a rubygem, requires on ruby >= 1.9.3 and rubygems installed.
 
 Get and install the gem from rubygems.org:
 
 ```
-gem install rest-ftp-daemon
+# apt-get install ruby2.1 rubygems
+gem install rest-ftp-daemon --no-ri --no-rdoc
 ```
 
 Start the daemon:
@@ -40,11 +41,11 @@ For now, daemon logs to ```APP_LOGTO``` defined in ```lib/config.rb```
 Usage examples
 ------------------------------------------------------------------------------------
 
-Start a job to transfer a file named "file.ova" to a local FTP server
+Start a job to transfer a file named "file.iso" to a local FTP server
 
 ```
 curl -H "Content-Type: application/json" -X POST -D /dev/stdout -d \
-'{"source":"~/file.ova","target":"ftp://anonymous@localhost/incoming/dest2.ova"}' "http://localhost:3000/jobs"
+'{"source":"~/file.iso","target":"ftp://anonymous@localhost/incoming/dest2.iso"}' "http://localhost:3000/jobs"
 ```
 
 Start a job to transfer a file named "file.dmg" to a local FTP server

data/bin/rest-ftp-daemon

@@ -6,17 +6,18 @@ require 'thin'
 # Initialize some local constants
 APP_ROOT = File.dirname(__FILE__) + '/../'
 APP_NAME = 'rest-ftp-daemon'
-APP_VER = File.read "#{APP_ROOT}/VERSION"
+
 APP_STARTED = Time.now
 APP_DEFAULT_PORT = 3000
 APP_LOGTO = "/tmp/#{APP_NAME}.log"
 
 # Prepare thin
-rackup_file = File.expand_path "#{APP_ROOT}/lib/config.ru"
+rackup_file = File.expand_path "#{APP_ROOT}/config.ru"
 argv = ARGV
 argv << ["-R", rackup_file] unless ARGV.include?("-R")
 argv << ["-p", APP_DEFAULT_PORT.to_s] unless ARGV.include?("-p")
 argv << ["-e", "production"] unless ARGV.include?("-e")
-argv << ["--stats", "/stats"] unless ARGV.include?("--stats")
+argv << ["--daemonize"] unless ARGV.include?("-R")
+#argv << ["--stats", "/stats"] unless ARGV.include?("--stats")
 
 Thin::Runner.new(argv.flatten).run!

data/config.ru

@@ -0,0 +1,6 @@
+# Load gem files
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+require 'rest-ftp-daemon'
+
+# Start REST FTP Daemon
+run RestFtpDaemon::API

data/lib/rest-ftp-daemon.rb

@@ -1,309 +1,10 @@
-# module RestFtpDaemon
-
-  class RestFtpDaemon < Sinatra::Base
-
-    # General config
-    configure :development, :production do
-
-      # Create new thread group
-      @@workers = ThreadGroup.new
-
-      # Logging configuration
-      #use Rack::CommonLogger, logger
-
-      # Some other configuration
-      disable :sessions
-      disable :logging
-    end
-
-    # Server initialization
-    def initialize
-      # Setup logger
-      @logger = Logger.new(APP_LOGTO, 'daily')
-      #@logger = Logger.new
-      #@logger.level = Logger::INFO
-
-      # Other stuff
-      @@last_worker_id = 0
-      @@hostname = `hostname`.chomp
-
-      super
-    end
-
-    # Server global status
-    get "/" do
-      # Debug query
-      info "GET /"
-
-      # Build response
-      content_type :json
-      JSON.pretty_generate get_status
-    end
-
-    # List jobs
-    get "/jobs" do
-      # Debug query
-      info "GET /jobs"
-
-      # Build response
-      content_type :json
-      JSON.pretty_generate get_jobs
-    end
-
-    # Get job info
-    get "/jobs/:id" do
-      # Debug query
-      info "GET /jobs/#{params[:id]}"
-
-      # Find this process by name
-      found = find_job params[:id]
-
-      # Build response
-      error 404 and return if found.nil?
-      content_type :json
-      JSON.pretty_generate found
-    end
-
-    # Delete jobs
-    delete "/jobs/:id" do
-      # Debug query
-      info "DELETE /jobs/#{params[:name]}"
-
-      # Find and kill this job
-      found = delete_job params[:id]
-
-      # Build response
-      error 404 and return if found.nil?
-      content_type :json
-      JSON.pretty_generate found
-    end
-
-    # Spawn a new thread for this new job
-    post '/jobs' do
-      # Extract payload
-      request.body.rewind
-      payload = JSON.parse request.body.read
-
-      # Debug query
-      info "POST /jobs: #{payload.to_json}"
-
-      # Spawn a thread for this job
-      result = new_job payload
-
-      # Build response
-      content_type :json
-      JSON.pretty_generate result
-    end
-
-    protected
-
-    def process_job
-      # Init
-      info "process_job: starting"
-      job = Thread.current.job
-      job_status :started
-      transferred = 0
-
-      # Check source
-      job_source = File.expand_path(job["source"])
-      if !(File.exists? job_source)
-        job_error ERR_JOB_SOURCE_NOTFOUND, :ERR_JOB_SOURCE_NOTFOUND
-        return
-      end
-      info "process_job: job_source: #{job_source}"
-      source_size = File.size job_source
-      job_set :source_size, source_size
-
-      # Check target
-      job_target = job["target"]
-      target = URI(job_target) rescue nil
-      if job_target.nil? || target.nil?
-        job_error ERR_JOB_TARGET_UNPARSEABLE, :ERR_JOB_TARGET_UNPARSEABLE
-        return
-      end
-      info "process_job: job_target: #{job_target}"
-
-      # Split URI
-      target_path = File.dirname target.path
-      target_name = File.basename target.path
-      info "ftp_transfer: job_target.host [#{target.host}]"
-      info "ftp_transfer: target_path [#{target_path}]"
-      info "ftp_transfer: target_name [#{target_name}]"
-
-      # Prepare FTP transfer
-      ftp = Net::FTP.new(target.host)
-      ftp.passive = true
-      ftp.login
-      ftp.chdir(target_path)
-
-
-      # Check if target file is found
-      info "source: checking target file"
-      job_status :checking_target
-      job_error ERR_BUSY, :checking_target
-
-      results = ftp.list(target_name)
-      info "ftp.list: #{results}"
-      unless results.count.zero?
-        job_error ERR_JOB_TARGET_PRESENT, :ERR_JOB_TARGET_PRESENT
-        info "target: existing: ERR_JOB_TARGET_PRESENT"
-        ftp.close
-        return
-      end
-
-
-       # Do transfer
-      info "source: starting stransfer"
-      #Thread.current[:status] = :transferring
-      job_status :uploading
-      job_error ERR_BUSY, :uploading
-
-      begin
-        ftp.putbinaryfile(job_source, target_name, TRANSFER_CHUNK_SIZE) do |block|
-          # Update thread info
-          percent = (100.0 * transferred / source_size).round(1)
-          job_set :progress, percent
-          job_set :transferred, transferred
-          info "transferring [#{percent} %] of [#{target_name}]"
-
-          # Update counters
-          transferred += TRANSFER_CHUNK_SIZE
-        end
-
-      rescue Net::FTPPermError
-        #job_status :failed
-        job_error ERR_JOB_PERMISSION, :ERR_JOB_PERMISSION
-        info "source: FAILED: PERMISSIONS ERROR"
-
-      else
-        #job_status :finished
-        job_error ERR_OK, :finished
-        info "source: finished stransfer"
-      end
-
-      # Close FTP connexion
-      ftp.close
-    end
-
-    def get_status
-      info "> get_status"
-      {
-      app_name: APP_NAME,
-      hostname: @@hostname,
-      version: APP_VER,
-      started: APP_STARTED,
-      uptime: (Time.now - APP_STARTED).round(1),
-      jobs_count: @@workers.list.count,
-      }
-    end
-
-    def get_jobs
-      info "> get_jobs"
-
-      # Collect info's
-      @@workers.list.map { |thread| thread.job }
-    end
-
-    def delete_job id
-      info "> delete_job(#{id})"
-
-      # Find jobs with this id
-      jobs = jobs_with_id id
-
-      # Kill them
-      jobs.each{ |thread| Thread.kill(thread) }
-
-      # Return the first one
-      return nil if jobs.empty?
-      jobs.first.job
-    end
-
-    def find_job id
-      info "> find_job(#{id})"
-
-      # Find jobs with this id
-      jobs = jobs_with_id id
-
-      # Return the first one
-      return nil if jobs.empty?
-      jobs.first.job
-    end
-
-    def jobs_with_id id
-      info "> find_jobs_by_id(#{id})"
-      @@workers.list.select{ |thread| thread[:id].to_s == id.to_s }
-    end
-
-    def new_job context = {}
-      info "new_job"
-
-      # Generate name
-      @@last_worker_id +=1
-      host = @@hostname.split('.')[0]
-      worker_id = @@last_worker_id
-      worker_name = "#{host}-#{Process.pid.to_s}-#{worker_id}"
-      info "new_job: creating thread [#{worker_name}]"
-
-      # Parse parameters
-      job_source = context["source"]
-      job_target = context["target"]
-      return { code: ERR_REQ_SOURCE_MISSING, errmsg: :ERR_REQ_SOURCE_MISSING} if job_source.nil?
-      return { code: ERR_REQ_TARGET_MISSING, errmsg: :ERR_REQ_TARGET_MISSING} if job_target.nil?
-
-      # Parse dest URI
-      target = URI(job_target)
-      info target.scheme
-      return { code: ERR_REQ_TARGET_SCHEME, errmsg: :ERR_REQ_TARGET_SCHEME} unless target.scheme == "ftp"
-
-      # Create thread
-      job = Thread.new(worker_id, worker_name, job) do
-        # Tnitialize thread
-        Thread.abort_on_exception = true
-        job_status :initializing
-        job_error ERR_OK
-
-        # Initialize job info
-        Thread.current[:job] = {}
-        Thread.current[:job].merge! context if context.is_a? Enumerable
-        Thread.current[:id] = worker_id
-        job_set :worker_name, worker_name
-        job_set :created, Time.now
-
-        # Do the job
-        info "new_job: thread running"
-        process_job
-
-        # Sleep a few seconds before dying
-        job_status :graceful_ending
-        sleep THREAD_SLEEP_BEFORE_DIE
-        job_status :ended
-        info "new_job: thread finished"
-      end
-
-      # Keep thread in thread group
-      info "new_job: attaching thread [#{worker_name}] to group"
-      @@workers.add job
-
-      return { code: 0, errmsg: 'success', worker_id: worker_id, context: context }
-    end
-
-    def info msg=""
-      @logger.info msg
-    end
-
-    def job_error error, errmsg = nil
-      job_set :error, error
-      job_set :errmsg, errmsg
-    end
-    def job_status status
-      job_set :status, status
-    end
-
-    def job_set attribute, value, thread = Thread.current
-      thread[:job][attribute] = value if thread[:job].is_a? Enumerable
-    end
-
-
-  end
-
-# end
+# Global libs
+require 'json'
+require 'grape'
+require 'net/ftp'
+
+# My libs
+require 'rest-ftp-daemon/config'
+require 'rest-ftp-daemon/exceptions'
+require 'rest-ftp-daemon/job'
+require 'rest-ftp-daemon/server'

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

@@ -0,0 +1,8 @@
+module RestFtpDaemon
+  # Global config
+  VERSION = "0.30.1"
+
+  # Transfer config
+  TRANSFER_CHUNK_SIZE = 100000
+  THREAD_SLEEP_BEFORE_DIE = 30
+end

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

@@ -0,0 +1,21 @@
+module RestFtpDaemon
+
+  class RestFtpDaemonException < StandardError; end
+
+  class DummyException < RestFtpDaemonException; end
+
+  class RequestSourceMissing     < RestFtpDaemonException; end
+  class RequestSourceNotFound    < RestFtpDaemonException; end
+  class RequestTargetMissing     < RestFtpDaemonException; end
+  class RequestTargetScheme      < RestFtpDaemonException; end
+
+  class JobPrerequisitesNotMet   < RestFtpDaemonException; end
+
+  class JobNotFound              < RestFtpDaemonException; end
+  class JobSourceMissing         < RestFtpDaemonException; end
+  class JobSourceNotFound        < RestFtpDaemonException; end
+  class JobTargetMissing         < RestFtpDaemonException; end
+  class JobTargetUnparseable     < RestFtpDaemonException; end
+  class JobTargetPermission      < RestFtpDaemonException; end
+
+end

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

@@ -0,0 +1,173 @@
+module RestFtpDaemon
+  class Job
+
+    def initialize(id, params={})
+      # Grab params
+      @params = params
+      @target = nil
+      @source = nil
+
+      # Init context
+      set :id, id
+      set :started_at, Time.now
+      set :status, :initialized
+    end
+
+    def id
+      @params[:id]
+    end
+
+    def process
+      # Init
+      "process [#{@id}] starting"
+      set :status, :starting
+      set :error, 0
+
+      begin
+        # Validate job and params
+        prepare
+
+        # Process
+        transfer
+
+      rescue Net::FTPPermError
+        set :status, :failed
+        set :error, exception.class
+
+      rescue RestFtpDaemonException => exception
+        set :status, :failed
+        set :error, exception.class
+
+      # rescue Exception => exception
+      #   set :status, :crashed
+      #   set :error, exception.class
+
+      else
+        set :status, :finished
+        set :error, 0
+      end
+
+    end
+
+    def describe
+      # Update realtime info
+      w = wandering_time
+      set :wandering, w.round(2) unless w.nil?
+
+      # Update realtime info
+      u = up_time
+      set :uptime, u.round(2) unless u.nil?
+
+      # Return the whole structure
+      @params
+    end
+
+    def wander time
+      @wander_for = time
+      @wander_started = Time.now
+      sleep time
+    end
+
+    def status text
+      @status = text
+    end
+
+  protected
+
+    def up_time
+      return if @params[:started_at].nil?
+      Time.now - @params[:started_at]
+    end
+
+    def wandering_time
+      return if @wander_started.nil? || @wander_for.nil?
+      @wander_for.to_f - (Time.now - @wander_started)
+    end
+
+    def exception_handler(actor, reason)
+      set :status, :crashed
+      set :error, reason
+    end
+
+    def set attribute, value
+      return unless @params.is_a? Enumerable
+      @params[:updated_at] = Time.now
+      @params[attribute] = value
+    end
+
+    def prepare
+      # Init
+      set :status, :preparing
+
+      # Check source
+      raise JobSourceMissing unless @params["source"]
+      @source = File.expand_path(@params["source"])
+      set :debug_source, @source
+      raise JobSourceNotFound unless File.exists? @source
+
+      # Check target
+      raise JobTargetMissing unless @params["target"]
+      @target = URI(@params["target"]) rescue nil
+      set :debug_target, @target.inspect
+      raise JobTargetUnparseable if @target.nil?
+    end
+
+    def transfer_fake
+      # Init
+      set :status, :faking
+
+      # Work
+      (0..9).each do |i|
+        set :faking, i
+        sleep 0.5
+      end
+    end
+
+    def transfer
+      # Init
+      transferred = 0
+
+      # Ensure @source and @target are there
+      set :status, :checking_source
+      raise JobPrerequisitesNotMet unless @source
+      raise JobPrerequisitesNotMet unless @source
+      target_path = File.dirname @target.path
+      target_name = File.basename @target.path
+
+      # Read source file size
+      source_size = File.size @source
+      set :file_size, source_size
+
+      # Prepare FTP transfer
+      set :status, :checking_target
+      ftp = Net::FTP.new(@target.host)
+      ftp.passive = true
+      ftp.login
+      ftp.chdir(target_path)
+
+      # Check for target file presence
+      results = ftp.list(target_name)
+      #info "ftp.list: #{results}"
+      unless results.count.zero?
+        ftp.close
+        raise JobTargetPermission
+      end
+
+      # Do transfer
+      set :status, :uploading
+      ftp.putbinaryfile(@source, target_name, TRANSFER_CHUNK_SIZE) do |block|
+        # Update counters
+        transferred += block.bytesize
+
+        # Update job info
+        percent = (100.0 * transferred / source_size).round(1)
+        set :file_progress, percent
+        set :file_sent, transferred
+      end
+
+      # Close FTP connexion
+      ftp.close
+    end
+
+  end
+end

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

@@ -0,0 +1,237 @@
+module RestFtpDaemon
+
+  class API < Grape::API
+    version 'v1', using: :header, vendor: 'ftven'
+    format :json
+
+
+    ######################################################################
+    ####### INIT
+    ######################################################################
+    def initialize
+      # Setup logger
+      @@logger = Logger.new(APP_LOGTO, 'daily')
+      # @@queue = Queue.new
+
+      # Create new thread group
+      @@threads = ThreadGroup.new
+
+      # Other stuff
+      @@last_worker_id = 0
+      super
+    end
+
+    ######################################################################
+    ####### HELPERS
+    ######################################################################
+    helpers do
+      def api_error exception
+        {
+        :error => exception.class,
+        :errmsg => exception.message,
+        :backtrace => exception.backtrace.first,
+        #:backtrace => exception.backtrace,
+        }
+      end
+
+      def info msg=""
+        @@logger.info msg
+      end
+
+      def threads_with_id job_id
+        @@threads.list.select do |thread|
+          next unless thread[:job].is_a? Job
+          thread[:job].id == job_id
+        end
+      end
+
+      def job_describe job_id
+        # Find threads with tihs id
+        threads = threads_with_id job_id
+        raise RestFtpDaemon::JobNotFound if threads.empty?
+
+        # Find first job with tihs id
+        job = threads.first[:job]
+        raise RestFtpDaemon::JobNotFound unless job.is_a? Job
+        description = job.describe
+
+        # Return job description
+        description
+      end
+
+      def job_delete job_id
+        # Find threads with tihs id
+        threads = threads_with_id job_id
+        raise RestFtpDaemon::JobNotFound if threads.empty?
+
+        # Get description just before terminating the job
+        job = threads.first[:job]
+        raise RestFtpDaemon::JobNotFound unless job.is_a? Job
+        description = job.describe
+
+        # Kill those threads
+        threads.each do |t|
+          Thread.kill(t)
+        end
+
+        # Return job description
+        description
+      end
+
+      def job_list
+        @@threads.list.map do |thread|
+          next unless thread[:job].is_a? Job
+          thread[:job].describe
+        end
+      end
+
+    end
+
+
+    ######################################################################
+    ####### API DEFINITION
+    ######################################################################
+
+    # Spawn a new thread for this new job
+    # post '/push' do
+    #   @@queue << rand(999)
+    # end
+
+    # Server global status
+    get '/' do
+      info "GET /"
+
+      status 200
+      {
+        app_name: APP_NAME,
+        hostname: `hostname`.chomp,
+        version: RestFtpDaemon::VERSION,
+        started: APP_STARTED,
+        uptime: (Time.now - APP_STARTED).round(1),
+      }
+    end
+
+    # Server test
+    get '/test' do
+      info "GET /tests"
+      begin
+        raise RestFtpDaemon::DummyException
+      rescue RestFtpDaemon::RestFtpDaemonException => exception
+        status 501
+        api_error exception
+      rescue Exception => exception
+        status 501
+        api_error exception
+      else
+        status 200
+        {}
+      end
+    end
+
+    # List jobs
+    get "/jobs" do
+      info "GET /jobs"
+      begin
+        response = job_list
+      rescue RestFtpDaemonException => exception
+        status 501
+        api_error exception
+      rescue Exception => exception
+        status 501
+        api_error exception
+      else
+        status 200
+        response
+      end
+    end
+
+    # Get job info
+    get "/jobs/:id" do
+      info "GET /jobs/#{params[:id]}"
+      begin
+        response = job_describe params[:id].to_i
+      rescue RestFtpDaemon::JobNotFound => exception
+        status 404
+        api_error exception
+      rescue RestFtpDaemonException => exception
+        status 500
+        api_error exception
+      rescue Exception => exception
+        status 501
+        api_error exception
+      else
+        status 200
+        response
+      end
+    end
+
+    # Delete jobs
+    delete "/jobs/:id" do
+     info "DELETE /jobs/#{params[:name]}"
+      begin
+        response = job_delete params[:id].to_i
+      rescue RestFtpDaemon::JobNotFound => exception
+        status 404
+        api_error exception
+      rescue RestFtpDaemonException => exception
+        status 500
+        api_error exception
+      rescue Exception => exception
+        status 501
+        api_error exception
+      else
+        status 200
+        response
+      end
+    end
+
+    # Spawn a new thread for this new job
+    post '/jobs' do
+      info "POST /jobs: #{request.body.read}"
+      begin
+        # Extract params
+        request.body.rewind
+        params = JSON.parse request.body.read
+
+        # Create a new job
+        job_id = @@last_worker_id += 1
+        job = Job.new(job_id, params)
+
+        # Put it inside a thread
+        th = Thread.new(job) do |thread|
+          # Tnitialize thread
+          Thread.abort_on_exception = true
+          Thread.current[:job] = job
+
+          # Do the job
+          job.process
+
+          # Wait for a few seconds before cleaning up the job
+          job.wander RestFtpDaemon::THREAD_SLEEP_BEFORE_DIE
+        end
+
+        # Stack it to the pool
+        #@@queue << job
+        @@threads.add th
+
+        # And start it asynchronously
+        #job.future.process
+
+      rescue JSON::ParserError => exception
+        status 406
+        api_error exception
+      rescue RestFtpDaemonException => exception
+        status 412
+        api_error exception
+      rescue Exception => exception
+        status 501
+        api_error exception
+      else
+        status 201
+        job.describe
+      end
+    end
+
+  end
+
+end

data/rest-ftp-daemon.gemspec

@@ -1,12 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version.rb'
+require 'rest-ftp-daemon/config'
 
 Gem::Specification.new do |spec|
   spec.name = "rest-ftp-daemon"
-  spec.version = "0.20.0"
-  spec.date = "2014-08-14"
+  spec.date = Time.now.strftime("%Y-%m-%d")
   spec.authors = ["Bruno MEDICI"]
   spec.email = "rest-ftp-daemon@bmconseil.com"
   spec.description = "This is a pretty simple FTP client daemon, controlled through a RESTfull API"
@@ -15,38 +14,17 @@ Gem::Specification.new do |spec|
   spec.licenses = ["MIT"]
 
   spec.files         = `git ls-files -z`.split("\x0")
-  #spec.executables = ["rest-ftp-daemon"]
-  #spec.executables = `git ls-files -- bin/*`.split('\n').map{ |f| File.basename(f) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.version       = RestFtpDaemon::VERSION
 
-
-  spec.required_ruby_version = '>= 1.9'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 
-
-  # spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  # spec.files = [
-  #   "Gemfile",
-  #   "Gemfile.lock",
-  #   "LICENSE.txt",
-  #   "README.md",
-  #   "Rakefile",
-  #   "VERSION",
-  #   "bin/rest-ftp-daemon",
-  #   "lib/config.rb",
-  #   "lib/config.ru",
-  #   "lib/errors.rb",
-  #   "lib/extend_threads.rb",
-  #   "lib/rest-ftp-daemon.rb",
-  #   "rest-ftp-daemon.gemspec",
-  #   "test/helper.rb",
-  #   "test/test_rest-ftp-daemon.rb"
-  # ]
-  # spec.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  # spec.rubygems_version = "2.4.1"
+  spec.add_runtime_dependency "thin"
+  spec.add_runtime_dependency "grape"
+  spec.add_runtime_dependency "json"
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.30.1
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  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
+  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: json
+  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'
 description: This is a pretty simple FTP client daemon, controlled through a RESTfull
   API
 email: rest-ftp-daemon@bmconseil.com
@@ -52,14 +94,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - bin/rest-ftp-daemon
-- lib/config.rb
-- lib/config.ru
-- lib/errors.rb
-- lib/extend_threads.rb
+- config.ru
 - lib/rest-ftp-daemon.rb
-- lib/version.rb
+- lib/rest-ftp-daemon/config.rb
+- lib/rest-ftp-daemon/exceptions.rb
+- lib/rest-ftp-daemon/job.rb
+- lib/rest-ftp-daemon/server.rb
 - rest-ftp-daemon.gemspec
 - test/helper.rb
 - test/test_rest-ftp-daemon.rb
@@ -75,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='

data/VERSION

@@ -1 +0,0 @@
-0.9.0

data/lib/config.rb

@@ -1,3 +0,0 @@
-# Transfer configuration
-TRANSFER_CHUNK_SIZE = 100000
-THREAD_SLEEP_BEFORE_DIE = 120

data/lib/config.ru

@@ -1,12 +0,0 @@
-# Main libs
-require 'sinatra'
-require 'sinatra/base'
-require 'net/ftp'
-require 'json'
-
-# My local libs
-Dir[APP_ROOT+"/lib/*.rb"].each {|file| require File.expand_path file }
-#Dir[APP_ROOT+"/lib/*/*.rb"].each {|file| require File.expand_path file }
-
-# Start application
-run RestFtpDaemon

data/lib/errors.rb

@@ -1,12 +0,0 @@
-ERR_OK                            = 0
-ERR_BUSY                          = -1
-
-ERR_REQ_SOURCE_MISSING            = 11
-ERR_REQ_TARGET_MISSING            = 12
-ERR_REQ_TARGET_SCHEME             = 13
-
-ERR_JOB_SOURCE_NOTFOUND            = 21
-ERR_JOB_TARGET_UNPARSEABLE         = 22
-ERR_JOB_PERMISSION                 = 24
-ERR_JOB_TARGET_PRESENT             = 25
-

data/lib/extend_threads.rb

@@ -1,14 +0,0 @@
-class Thread
-
-  def job
-    # Basic fields
-    job = self[:job]
-
-    # Calculated fields
-    job[:id] = self[:id]
-    job[:runtime] = (Time.now - job[:created]).round(1)
-
-    return job
-  end
-
-end

data/lib/version.rb

@@ -1,3 +0,0 @@
-# module RestFtpDaemon
-  VERSION = "0.20"
-# end