rest-ftp-daemon 0.2.0 → 0.5.0

data/Gemfile

@@ -5,8 +5,6 @@ gem "json"
 
 group :development do
   gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"
-  gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -11,7 +11,6 @@ GEM
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.1.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     git (1.2.7)
@@ -62,11 +61,6 @@ GEM
     shoulda-context (1.2.1)
     shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
-    simplecov (0.9.0)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -83,7 +77,5 @@ DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
   json
-  rdoc (~> 3.12)
   shoulda
-  simplecov
   sinatra

data/README.md

@@ -14,13 +14,15 @@ As of today, its main features are :
 
 This project requires ruby >= 1.9 and rubygems installed.
 
-Furthermore, gems are required to run it:
+Quickly install the gem from rubygems.org:
 
- ``` gem install sinatra ```
+ ``` gem install rest-ftp-daemon ```
 
-Starting the daemon:
+Start the daemon:
 
-``` thin start ```
+``` rest-ftp-daemon start ```
+
+For now, daemon logs to APP_LOGTO defined in lib/config.rb
 
 
 ## Basic usage ##

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.5.0

data/bin/rest-ftp-daemon

@@ -2,14 +2,18 @@
 
 # Libs and init
 require 'thin'
+
+# Initialize some local constants
 APP_ROOT = File.dirname(__FILE__) + '/../'
-DEFAULT_PORT = 3000
+APP_VER = File.read "#{APP_ROOT}/VERSION"
+APP_STARTED = Time.now
+APP_DEFAULT_PORT = 3000
 
 # Prepare thin
-rackup_file = File.expand_path "#{APP_ROOT}/lib/rest-ftp-daemon/config.ru"
+rackup_file = File.expand_path "#{APP_ROOT}/lib/config.ru"
 argv = ARGV
 argv << ["-R", rackup_file] unless ARGV.include?("-R")
-argv << ["-p", DEFAULT_PORT.to_s] unless ARGV.include?("-p")
+argv << ["-p", APP_DEFAULT_PORT.to_s] unless ARGV.include?("-p")
 argv << ["-e", "production"] unless ARGV.include?("-e")
 
 # Start thin

data/lib/config.rb

@@ -1,2 +1,7 @@
+# App configuration
+APP_NAME = 'rest-ftp-daemon'
+APP_LOGTO = "/tmp/#{APP_NAME}.log"
+
+# Transfer configuration
 TRANSFER_CHUNK_SIZE = 100000
 THREAD_SLEEP_BEFORE_DIE = 120

data/lib/{rest-ftp-daemon/config.ru → config.ru}

@@ -1,8 +1,6 @@
 # Main libs
 require 'sinatra'
 require 'sinatra/base'
-require "sinatra/json"
-require "sinatra/config_file"
 require 'net/ftp'
 require 'json'
 

data/lib/rest-ftp-daemon.rb

@@ -1,21 +1,20 @@
 class RestFtpDaemon < Sinatra::Base
-  helpers Sinatra::JSON
 
   # General config
   configure :development, :production do
 
     # Create new thread group
     @@threads = ThreadGroup.new
-    #set :dummy, true
-    # set :sessions, false
+
+    # Some other configuration
+    set :sessions, false
     # set :logging, true
-    # set :root, APP_ROOT + '/lib/'
   end
 
   # Server initialization
   def initialize
     # Setup logger
-    @logger = Logger.new(APP_ROOT + '/main.log','daily')
+    @logger = Logger.new(APP_LOGTO, 'daily')
     @logger.level = Logger::INFO
 
     # Other stuff
@@ -27,20 +26,30 @@ class RestFtpDaemon < Sinatra::Base
 
   # Server global status
   get "/" do
+    # Debug query
+    info "GET /"
+
+    # Build response
     content_type :json
-    json get_status
+    JSON.pretty_generate get_status
   end
 
   # List jobs
   get "/jobs" do
+    # Debug query
+    info "GET /jobs"
+
     # Build response
     content_type :json
-    json get_jobs
+    JSON.pretty_generate get_jobs
     #@@threads.count
   end
 
   # List jobs
   delete "/jobs/:name" do
+    # Debug query
+    info "DELETE /jobs/#{params[:name]}"
+
     # Kill this job
     ret = delete_job params[:name]
 
@@ -49,22 +58,24 @@ class RestFtpDaemon < Sinatra::Base
 
     # Build response
     content_type :json
-    json nil
+    JSON.pretty_generate nil
   end
 
   # Spawn a new thread for this new job
   post '/jobs' do
+    # Extract payload
     request.body.rewind
     payload = JSON.parse request.body.read
-    info "POST / with #{payload.to_json}"
 
-    # Spawn a thread
-    #config = {}
+    # Debug query
+    info "POST /jobs: #{payload.to_json}"
+
+    # Spawn a thread for this job
     result = new_job payload
 
     # Build response
     content_type :json
-    json result
+    JSON.pretty_generate result
   end
 
   protected
@@ -139,13 +150,21 @@ class RestFtpDaemon < Sinatra::Base
   end
 
   def get_status
+    info "> get_status"
+
     {
-    greeting: "REST FTP daemon: up and running",
+    app_name: APP_NAME,
+    hostname: @@hostname,
+    version: APP_VER,
+    started: APP_STARTED,
+    uptime: (Time.now - APP_STARTED).round(1),
     jobs_count: @@threads.list.count,
     }
   end
 
   def get_jobs
+    info "> get_jobs"
+
     output = []
     @@threads.list.each do |thread|
       output << {
@@ -160,6 +179,8 @@ class RestFtpDaemon < Sinatra::Base
 
 
   def delete_job name
+    info "> delete_job(#{name})"
+
     count = 0
     @@threads.list.collect do |thread|
       next unless thread[:name] == name
@@ -170,7 +191,7 @@ class RestFtpDaemon < Sinatra::Base
   end
 
   def new_job context = {}
-    info "new_job: creating thread"
+    info "new_job"
 
     # Generate name
     @@last_worker_id +=1
@@ -219,12 +240,8 @@ class RestFtpDaemon < Sinatra::Base
     return { code: 0, errmsg: 'success', name: name, context: context }
   end
 
-  def log level, msg=""
-    @logger.send(level.to_s, msg)
-  end
-
   def info msg=""
-    log :info, msg
+    @logger.send :info, msg
   end
 
   def job_status code, errmsg

data/rest-ftp-daemon.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "rest-ftp-daemon"
+  s.version = "0.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bruno"]
+  s.date = "2014-07-31"
+  s.description = "A fairly basic FTP client daemon, driven by RESTful webservice calls"
+  s.email = "rest-ftp-daemon@bmconseil.com"
+  s.executables = ["rest-ftp-daemon"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/rest-ftp-daemon",
+    "lib/config.rb",
+    "lib/config.ru",
+    "lib/errors.rb",
+    "lib/rest-ftp-daemon.rb",
+    "rest-ftp-daemon.gemspec",
+    "test/helper.rb",
+    "test/test_rest-ftp-daemon.rb"
+  ]
+  s.homepage = "http://github.com/bmedici/rest-ftp-daemon"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "RESTful FTP client daemon"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+    else
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    end
+  else
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,22 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A fairly basic FTP client daemon, driven by RESTful webservice calls
 email: rest-ftp-daemon@bmconseil.com
 executables:
@@ -140,9 +108,10 @@ files:
 - VERSION
 - bin/rest-ftp-daemon
 - lib/config.rb
+- lib/config.ru
 - lib/errors.rb
 - lib/rest-ftp-daemon.rb
-- lib/rest-ftp-daemon/config.ru
+- rest-ftp-daemon.gemspec
 - test/helper.rb
 - test/test_rest-ftp-daemon.rb
 homepage: http://github.com/bmedici/rest-ftp-daemon
@@ -160,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3830976928581563014
+      hash: 613480688316128454
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: