rest-ftp-daemon 0.70 → 0.72b

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDZkM2FiNjVjM2U0ZWYzOWFiOThhMGVjM2YzMjc2NzFmYWVkN2QyYQ==
+    YjI2MmE1NjJjY2NhZWViMGRlMGEzODYwNDFjZDMwYjViM2EwZWNiZQ==
   data.tar.gz: !binary |-
-    YmVlMjAzMjEzYjg3NTkzNDQzYmM3NTM5MmE3OGQxODM3MTcwOTEzNA==
+    ZDllYjExM2UwNzI1ZTk4OTFmZWRmMDZlZGQyNzU5Y2Q0NjEzNmFkOA==
 SHA512:
   metadata.gz: !binary |-
-    MjYxNGE4N2YwNTI4YzhkMmJiODczMTYyZWYyOTI5YmVhNWJhZDkzOWUwOTg2
-    YWI4MTBkZjM1ZWVhODgwZWViZGFkNzMyMjg3YWVjNWI1NjhiMGMwNWJhMmMy
-    ZGE5NTNmMzM1YmY3OGI4NzdlMjU3MjYyNzlhMThlOWFlZWE0NDg=
+    OTA1MGZiMDY5Yjc0ZmViZTg3ZGYxNTZmYjViYmFiYjcwMzliMGNhYjZjZmJl
+    OWI2MDNlYmY5YjcxMWZmNDQ4YzgzOWM0OTgxMmRlYjg0ZDkyYTY5Yjc5Y2Ix
+    N2M0OTY3ZjNiZWM2MzEzYTg3OTQ0ZWIyMmE0MTIyYzgyNjk5YWQ=
   data.tar.gz: !binary |-
-    NjUwOWNlZDRiOWY3Mjk0OTI5N2MwODA0NmY5YTYxZmRiMTViZWE3ZDNjZGZi
-    YmViNGQ0M2FlNTI4M2EzZTE1OTIzZmZiMmJkNTFiMzUyYzg0MjYxNDQ0N2Y2
-    NWI0M2YxOTUyNjM3N2MwODRkNDI0ZjBmZWRiZGU2ODM3OWQ3NzI=
+    ZTY1YmZmNmQyOWZiMjAzNmZkNTVlNDMwMWZkZTFkOTRiYmRiMjRkN2UwYjU4
+    NmY3N2FiZjJkYWVjNDFjMjAyMDQxMDEyOTMzNmQ3NjAwYTNjNDhhNWQxNjhl
+    YTA1NDJlNTI5YTllNDkxNzM5MWQyY2FiNDFiMGU0YmEyOTEwYzE=

data/README.md

@@ -76,9 +76,9 @@ Configuration priority is defined as follows (from most important to last resort
 * config file environment section
 * application internal defaults
 
-
 As a starting point, ``rest-ftp-daemon.yml.sample`` is an exemple config file that can be  copied into the expected location ``/etc/rest-ftp-daemon.yml``.
 
+Default administrator credentials are admin/admin. Please change the password in this configuration file before starting any kind of production.
 
 Logging
 ------------------------------------------------------------------------------------

data/bin/rest-ftp-daemon

@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 
-# Libs and init
+# Include libs and config file
 require "thin"
-
-# Include config file and build rack commandline
 app_root = File.expand_path(File.dirname(__FILE__) + '/../')
-require File.expand_path("lib/rest-ftp-daemon/config.rb")
+require File.expand_path("#{app_root}/lib/rest-ftp-daemon/config.rb")
 
 # Build rackup context
 settings_daemonize = [nil, true, 1, "1"].include?(Settings.daemonize)
@@ -14,11 +12,10 @@ argv << ["-e", "development"] unless ARGV.include?("-e")
 argv << ["-p", Settings[:port].to_s] unless ARGV.include?("-p") || Settings[:port].nil?
 argv << ["-l", Settings[:logs][:thin]] unless ARGV.include?("-l") unless Settings[:logs][:thin].nil? unless Settings[:logs].nil?
 argv << ["--daemonize"] if settings_daemonize unless (ARGV.include?("-d") || ARGV.include?("--daemonize"))
-argv << ["-R", File.expand_path("config.ru")] unless ARGV.include?("-R")
+argv << ["-R", File.expand_path("#{app_root}/config.ru")] unless ARGV.include?("-R")
 
 # Display compiled configuration
 puts "---"
-puts "Daemon name \t #{Settings.app_name}"
 puts "Version     \t #{Settings.app_ver}"
 puts "Environment \t #{Settings.namespace}"
 puts "Config file \t #{Settings.source}"

data/config.ru

@@ -10,14 +10,15 @@ $pool = RestFtpDaemon::WorkerPool.new(Settings.workers.to_i)
 # Rack middleware
 # use Rack::Etag           # Add an ETag
 # use Rack::Reloader,   0
-# Rack::Auth::Basic
-# use Rack::Auth::Basic, "Restricted Area" do |username, password|
-#   [username, password] == ['admin', 'admin']
-# end
+unless Settings.adminpwd.nil?
+  use Rack::Auth::Basic, "Restricted Area" do |username, password|
+    [username, password] == ['admin', Settings.adminpwd]
+  end
+end
 #use Rack::Deflator      # Compress
 
 # Serve static assets
-use Rack::Static, :urls => ["/css", "/images"], :root => "lib/#{Settings.app_name}/static/"
+use Rack::Static, :urls => ["/css", "/images"], :root => "#{Settings.app_lib}/static/"
 
 # Launch the main daemon
 run Rack::Cascade.new [RestFtpDaemon::API::Root]

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

@@ -46,7 +46,7 @@ module RestFtpDaemon
 
         helpers do
           def format_nice_bytes( number )
-            return "Ø" if number.nil? || number.zero?
+            return "Ø" if number.nil? || number.zero?
             index = ( Math.log( number ) / Math.log( 2 ) ).to_i / 10
             converted = number.to_i / ( 1024 ** index )
             "#{converted} #{SIZE_UNITS[index]}"
@@ -62,7 +62,7 @@ module RestFtpDaemon
           end
 
           def render name, values={}
-            template = File.read("lib/#{Settings.app_name}/views/#{name.to_s}.haml")
+            template = File.read("#{Settings.app_lib}/views/#{name.to_s}.haml")
             haml_engine = Haml::Engine.new(template)
             haml_engine.render(binding, values)
           end

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

@@ -15,10 +15,12 @@ class Settings < Settingslogic
   # Some constants
   self[:dev] = APP_DEV
   self[:app_name] = APP_NAME
-  self[:app_ver] = "0.70"
+  self[:app_lib] = File.expand_path File.dirname(__FILE__)
+  self[:app_ver] = "0.72b"
   self[:app_started] = Time.now
+  self[:default_trim_progname] = "18"
 
   # Some defaults
-  self[:app_trim_progname] = "18"
-  self[:app_chunk_size] = "1000000"
+  self[:default_chunk_size] = "1000000"
+  self[:default_notify_size] = "10000000"
 end

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

@@ -280,7 +280,8 @@ module RestFtpDaemon
       # Do transfer
       info "Job.transfer uploading"
       set :status, :uploading
-      chunk_size = Settings.transfer.chunk_size || Settings[:app_chunk_size]
+      chunk_size = Settings.transfer.chunk_size || Settings[:default_chunk_size]
+      notify_size = Settings.transfer.chunk_size || Settings[:default_notify_size]
       ftp.putbinaryfile(@source_path, target_name, chunk_size) do |block|
         # Update counters
         transferred += block.bytesize

data/rest-ftp-daemon.yml.sample

@@ -2,9 +2,11 @@ defaults: &defaults
   daemonize: 1
   port: 3200
   workers: 1
+  adminpwd: "admin"
 
   transfer:
     chunk_size: 100000
+    notify_size: 10000000
 
   logs:
     thin:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: '0.70'
+  version: 0.72b
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -203,9 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1