rest-ftp-daemon 0.104.5 → 0.200

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f80c711efa90f45d67c8b2c7648b4a951b8da6b
-  data.tar.gz: 9dbda28ce22feaff2becdc4d0f211963569134f7
+  metadata.gz: 9e1fc48456791d2868a30a17e573aba066face90
+  data.tar.gz: 77471dd20a0e6fb263cff752821f8c0c9b156a27
 SHA512:
-  metadata.gz: 4bca8882c3ad0b481f7ce99e9588d6ceba5a6ab009b60f74bfbaea0bc40536e8789753527a3cfb89515bf53de4e8314c8b57bea65a8caafef38c3b116e867855
-  data.tar.gz: 3971446df3aa2b11007997dd9a78a094787c6ecf55e5f86102c1914c0eb48d72643ff9d3e1074a7a13fff39fa3ef70d76ccf2b8854c086d7d8ca484840438af9
+  metadata.gz: 79472b4ab9a4cea7c3a2437301fb6fd0b03a159b1ed2a1c384448b1a9c6e1ac41b9e192a072c7878cb39012fecb3a6011b89ff6d73076b1f92ebb9332170d1ff
+  data.tar.gz: a3b738c676e30f296b1e68e59298527f9b52e49e4e88268b32bf54fbedb8e551bc48b8e6389bc298b833b63cc85952d44e2d3886540e8bc7abbd0b8d6b904594

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.92)
+    rest-ftp-daemon (0.200)
       double-bag-ftps
       facter
       grape
@@ -17,11 +17,11 @@ GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -30,16 +30,16 @@ GEM
     builder (3.2.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    daemons (1.1.9)
+    daemons (1.2.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     double-bag-ftps (0.1.2)
     equalizer (0.0.9)
-    eventmachine (1.0.3)
-    facter (2.3.0)
+    eventmachine (1.0.7)
+    facter (2.4.1)
       CFPropertyList (~> 2.2.6)
-    ffi (1.9.6)
-    grape (0.9.0)
+    ffi (1.9.8)
+    grape (0.11.0)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -49,24 +49,24 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.4.4)
+    grape-entity (0.4.5)
       activesupport
       multi_json (>= 1.3.2)
-    haml (4.0.5)
+    haml (4.0.6)
       tilt
-    hashie (3.3.1)
-    i18n (0.6.11)
-    ice_nine (0.11.0)
-    json (1.8.1)
-    minitest (5.4.3)
-    multi_json (1.10.1)
+    hashie (3.4.0)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
+    json (1.8.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rake (10.4.0)
+    rake (10.4.2)
     settingslogic (2.0.9)
     sys-cpu (0.7.1)
       ffi (>= 1.0.0)
@@ -74,12 +74,14 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0)
       rack (~> 1.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (2.0.1)
-    timeout (0.0.0)
+    timeout (0.0.1)
+      timeout-extensions
+    timeout-extensions (0.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    virtus (1.0.3)
+    virtus (1.0.4)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)

data/bin/rest-ftp-daemon

@@ -11,13 +11,13 @@ rescue LoadError
   raise "EXITING: some of basic libs were not found: thin, optparse, socket, timeout"
 end
 
+
 # Load helpers and constants
 [:constants, :helpers].each do |lib|
   require File.expand_path("#{app_root}/lib/rest-ftp-daemon/#{lib.to_s}")
 end
-
 puts
-#puts "--- #{APP_NAME} #{APP_VER}"
+
 
 # Detect options from ARGV
 options = {}
@@ -33,75 +33,82 @@ parser = OptionParser.new do |opts|
   opts.on("-P", "--pid FILE", "File to store PID")                     { |file| options["pidfile"] = file }
   opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")  { |user| options["user"] = user }
   opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)"){ |group| options["group"] = group }
+
   opts.on_tail("-h", "--help", "Show this message")                    { puts opts; exit }
   opts.on_tail('-v', '--version', "Show version (#{APP_VER})")         { puts APP_VER; exit }
 end
+
+
+# Parse options and check compliance
 begin
   parser.order!(ARGV)
   command = ARGV.shift
-  unless ["start", "stop"].include? command
-    puts parser
-    exit 11
-  end
 rescue OptionParser::InvalidOption => e
-  puts "EXITING: option parser: #{e.message}"
-  exit 12
+  abort "EXITING: option parser: #{e.message}"
+else
+  abort parser.to_s unless ["start", "stop"].include? command
 end
 
+
 # Build configuration file path from options
 APP_CONF ||= File.expand_path "/etc/#{APP_NAME}.yml"
-unless File.exists? APP_CONF
-  puts "EXITING: cannot read configuration file: #{APP_CONF}"
-  exit 13
-end
+abort "EXITING: cannot read configuration file: #{APP_CONF}" unless File.exists? APP_CONF
+
 
-# Load helpers and config, and merge options from ARGV into settings
+# Load config, and merge options from ARGV into settings
 begin
   require File.expand_path("#{app_root}/lib/rest-ftp-daemon/config")
   Settings.merge!(options)
 rescue Psych::SyntaxError => e
-  puts "EXITING: config file syntax error: #{e.message}"
-  exit 16
+  abort "EXITING: config file syntax error: #{e.message}"
 end
 
 
-# Display compiled configuration
-puts "--- #{APP_NAME} #{APP_VER}"
-puts "Config file  \t #{APP_CONF}"
-puts "PID file     \t #{Settings.pidfile}"
-puts "Namespace    \t #{Settings.namespace}"
-puts "Network port \t #{Settings['port']}"
-puts "Daemonize    \t #{Settings['daemonize']}"
-puts "User:group   \t #{Settings['user']}:#{Settings['group']}"
-puts
-puts Settings.to_hash.to_yaml( :Indent => 4, :UseHeader => true, :UseVersion => false )
-puts
-
 # Validate network configuration
-if ["start"].include? command
-  if Settings['port'].nil?
-    puts "ABORTING: Network port is missing"
-    exit 14
-  elsif RestFtpDaemon::Helpers.local_port_used?(Settings['port'])
-    puts "ABORTING: Network port #{Settings['port']} is already in use"
-    exit 15
+if command == "start"
+  if !Settings.port
+    abort "ABORTING: Network port is missing"
+  elsif RestFtpDaemon::Helpers.local_port_used? Settings.port
+    abort "ABORTING: Network port #{Settings.port} is already in use"
   end
 end
 
-# Build final ARGV
+
+# ARGV: build final
 argv = []
 argv << ["-e", Settings.namespace]
-argv << ["-p", Settings["port"].to_s] unless Settings["port"].nil?
+argv << ["-p", Settings.port.to_s] if Settings.port
 argv << ["--pid", Settings.pidfile]
 argv << ["--tag", "'#{APP_NAME}/#{Settings.namespace}'"]
-argv << ["--log", Settings["logs"]["thin"].to_s] unless Settings["logs"]["thin"].nil? if Settings["logs"].is_a? Enumerable
-argv << ["--daemonize"] if [1, true].include? Settings["daemonize"]
-# User / group
-if Settings["user"] && Settings["group"]
-  argv << ["--user", Settings["user"]]
-  argv << ["--group", Settings["group"]]
+argv << ["--log", Settings.at(:logs, :thin)]
+argv << ["--daemonize"] if [1, true].include? Settings.daemonize
+
+
+# ARGV: logging
+if (logfile = Settings.at :logs, :thin)
+  argv << ["--log", logfile] if logfile
+end
+
+# ARGV: user and group
+if Settings.user && Settings.group
+  argv << ["--user", Settings.user]
+  argv << ["--group", Settings.group]
 end
-argv << command unless command.nil? rescue nil
+
+
+# ARGV: add command
+argv << command unless command.nil?
+
+# Display final configuration
+puts "--- #{APP_NAME} #{APP_VER}"
+puts "Config file  \t #{APP_CONF}"
+puts "PID file     \t #{Settings.pidfile}"
+puts "Daemonize    \t #{Settings.daemonize ? 'YES' : "no"}"
+puts "Namespace    \t #{Settings.namespace}"
+puts "Network port \t #{Settings.port}"
+puts "User:group   \t #{Settings.user}:#{Settings.group}" if Settings.users || Setting.group
+puts Settings.dump
+puts
 puts "--- Thin ARGV"
 puts argv.flatten.join(' ')
 puts

data/config.ru

@@ -5,7 +5,7 @@ require 'rest-ftp-daemon'
 
 # Create queue and worker pool
 $queue = RestFtpDaemon::JobQueue.new
-$pool = RestFtpDaemon::WorkerPool.new(Settings[:workers] || DEFAULT_WORKERS)
+$pool = RestFtpDaemon::WorkerPool.new(Settings.workers || APP_WORKERS)
 
 # Rack reloader
 unless Settings.namespace == "production"

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

@@ -35,7 +35,7 @@ module RestFtpDaemon
         case @only
         when nil
           @jobs_current = popped_jobs
-        when :queued
+        when JOB_STATUS_QUEUED
           @jobs_current = @jobs_queued
         else
           @jobs_current = $queue.popped_reverse_sorted_by_status @only

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

@@ -33,8 +33,8 @@ module RestFtpDaemon
 
       helpers do
 
-        def info message
-          Root.logger.info_with_id message
+        def info message, context = {}
+          Root.logger.info_with_id message, context
         end
 
         def api_error exception

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

@@ -17,4 +17,15 @@ class Settings < Settingslogic
     self["pidfile"] || "/tmp/#{APP_NAME}.port#{self['port'].to_s}.pid"
   end
 
+  # Direct access to any depth
+  def at *path
+    #put "Settings.nested: wrong path [#{path.inspect}]" unless path.is_a? Hash
+    path.reduce(Settings) {|m,key| m && m[key.to_s] }
+  end
+
+  # Dump whole settings set to readable YAML
+  def dump
+    self.to_hash.to_yaml( :Indent => 4, :UseHeader => true, :UseVersion => false )
+  end
+
 end

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

@@ -1,23 +1,34 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
-APP_VER = "0.104.5"
-
-# Some global constants
-IDENT_JOB_LEN = 4
-IDENT_NOTIF_LEN = 4
-IDENT_RANDOM_LEN = 8
-IDENT_TEMPFILE_LEN = 8
-DEFAULT_LOGS_PIPE_LEN = 12
+APP_VER = "0.200"
+
+
+# Logging
+DEFAULT_LOGS_PIPE_LEN = 10
 DEFAULT_LOGS_ID_LEN = 8
+DEFAULT_LOGS_TRIM_LINE = 80
+
+
+# Jobs identifiers length
+JOB_RANDOM_LEN = 8
+JOB_TEMPFILE_LEN = 8
+JOB_IDENT_LEN = 4
+
+
+# Jobs
+JOB_UPDATE_KB = 2048
+JOB_STATUS_UPLOADING = :uploading
+JOB_STATUS_FINISHED = :finished
+JOB_STATUS_QUEUED = :queued
+
+# Notifications
+NOTIFY_PREFIX = "rftpd"
+NOTIFY_USERAGENT = "#{APP_NAME} - #{APP_VER}"
+NOTIFY_IDENTIFIER_LEN = 4
 
-# Some defaults
-DEFAULT_CONNECT_TIMEOUT_SEC = 30
-DEFAULT_UPDATE_EVERY_KB = 2048
-DEFAULT_WORKERS = 1
 
-# Initialize markers
+# Initialize defaults
 APP_STARTED = Time.now
 APP_LIBS = File.dirname(__FILE__)
+APP_WORKERS = 1
 
-# Debugging
-DEBUG_FTP_COMMANDS = false

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

@@ -13,6 +13,7 @@ module RestFtpDaemon
   class JobAssertionFailed        < RestFtpDaemonException; end
   class JobMissingAttribute       < RestFtpDaemonException; end
   class JobSourceNotFound         < RestFtpDaemonException; end
+  class JobSourceNotReadable      < RestFtpDaemonException; end
   class JobTargetUnsupported      < RestFtpDaemonException; end
   class JobTargetUnparseable      < RestFtpDaemonException; end
   class JobTargetFileExists       < RestFtpDaemonException; end

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

@@ -20,7 +20,8 @@ module RestFtpDaemon
     end
 
     def self.text_or_empty text
-      return "Ø" if text.nil? || text.empty?
+      return "-" if text.nil? || text.empty?
+      # return "Ø" if text.nil? || text.empty?
       text
     end