rest-ftp-daemon 0.230.0 → 0.230.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ab7d0648a235291fd5cd1f3c0682dc5296d8f7
-  data.tar.gz: cfa1db6e26b429e8228b11e65a127774fa270957
+  metadata.gz: a820370311bc6c810416430054b60eb9c2c7dde6
+  data.tar.gz: d5ffd7492d59c0d6d7367c967a2097f377b61da2
 SHA512:
-  metadata.gz: 10059f2656187713a533efa90dbc3100f6092194d97d11d7e95e4ffa9b1dc0ab6a4147f666496d8cf4acdc190526e7d4c828fc90803b0f1488d931fd02110cbb
-  data.tar.gz: a0d91e6e6d468c1c693e69b4b8fdfc3de62e70e41646543da9d2a5f3cc63f36599a8d7e5cfce151c8efdfb48d8d18221bc70b271b8fdc9cce71c6c991cee76e6
+  metadata.gz: 33588683ce35aa16a2df2a45ec9a1f0624b8d8d13f89a0aa4f9c0f1f48cdbaa30683d7c05193dc3566faa47a0ca1f1d124a1dc9a27e73abd044d296d30f1c74f
+  data.tar.gz: b4a782b02307ffeb32caf668668a61123a8bde05774b0b000cfa7589547b17705724db1337f3d5b85a55bd6fc131541901ce7f0a89a8015771fa1bf6ca989b05

data/Gemfile.lock

@@ -28,8 +28,8 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -87,7 +87,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     newrelic_rpm (3.12.1.298)
-    parser (2.3.0.pre.2)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
     pry (0.10.1)

data/README.md

@@ -291,6 +291,7 @@ So,
 About
 ------------------------------------------------------------------------------------
 
-Bruno MEDICI Consultant
+Thanks to https://github.com/berkshelf/berkshelf-api for parts and ideas used in this project
 
+Bruno MEDICI Consultant
 http://bmconseil.com/

data/lib/rest-ftp-daemon.rb

@@ -1,27 +1,13 @@
 # Global libs
 require "rubygems"
-require "settingslogic"
 require "json"
-require "grape"
-require "grape-entity"
-require "haml"
-require "facter"
 require "uri"
-require "securerandom"
 require "timeout"
-require "sys/cpu"
 require "syslog"
-require "net/ftp"
-require "net/sftp"
 require "net/http"
-require "double_bag_ftps"
 require "thread"
-require "securerandom"
 require "singleton"
-require "logger"
-
 require "newrelic_rpm"
-require "get_process_mem"
 
 
 # Project's libs

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

@@ -1,3 +1,8 @@
+require "grape"
+require "haml"
+require "sys/cpu"
+require "facter"
+
 module RestFtpDaemon
   module API
     class Dashbaord < Grape::API

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

@@ -1,3 +1,5 @@
+require "grape-entity"
+
 module RestFtpDaemon
   module API
     module Entities

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

@@ -1,3 +1,5 @@
+require "grape"
+
 module RestFtpDaemon
   module API
     class Jobs < Grape::API
@@ -92,6 +94,7 @@ module RestFtpDaemon
 
       post "/" do
         log_info "POST /jobs", params
+        log_debug params.to_json
 
         begin
 

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

@@ -1,3 +1,6 @@
+require "grape"
+require "get_process_mem"
+
 module RestFtpDaemon
   module API
     class Root < Grape::API
@@ -18,7 +21,6 @@ module RestFtpDaemon
       mount RestFtpDaemon::API::Dashbaord => "/"
 
 
-
 ####### INITIALIZATION
 
       def initialize

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.230.0"
+APP_VER = "0.230.1"
 
 
 # Jobs and workers

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

@@ -1,3 +1,5 @@
+require "securerandom"
+
 module RestFtpDaemon
   class Job
     include LoggerHelper

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

@@ -1,3 +1,5 @@
+require "logger"
+
 class Logger
 
   def info_with_id message, context = {}

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

@@ -1,3 +1,5 @@
+require "logger"
+
 module RestFtpDaemon
   module LoggerHelper
 
@@ -11,6 +13,10 @@ module RestFtpDaemon
       log message, lines, Logger::ERROR
     end
 
+    def log_debug message, lines = []
+      log message, lines, Logger::DEBUG
+    end
+
     def log_context
       {}
     end

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

@@ -1,3 +1,5 @@
+require "logger"
+
 module RestFtpDaemon
   class LoggerPool
     include Singleton

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

@@ -1,3 +1,6 @@
+require "net/ftp"
+require "double_bag_ftps"
+
 module RestFtpDaemon
   class RemoteFTP < Remote
     attr_reader :ftp

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

@@ -1,3 +1,5 @@
+require "net/sftp"
+
 module RestFtpDaemon
   class RemoteSFTP < Remote
     attr_reader :sftp
@@ -22,7 +24,7 @@ module RestFtpDaemon
       verbosity = @debug ? Logger::INFO : false
 
       # Connect remote server
-      @sftp = Net::SFTP.start(@url.host, @url.user, password: @url.password, verbose: verbosity)
+      @sftp = Net::SFTP.start(@url.host, @url.user, password: @url.password, verbose: verbosity, port: @url.port)
     end
 
     def present? target

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

@@ -1,3 +1,5 @@
+require "settingslogic"
+
 # Configuration class
 class Settings < Settingslogic
   # Read configuration
@@ -26,7 +28,7 @@ class Settings < Settingslogic
   end
 
   def newrelic_enabled?
-    Settings.at(:debug, :newrelic)
+    Settings.at(:newrelic)
   end
 
   def init_newrelic
@@ -38,10 +40,11 @@ class Settings < Settingslogic
     ENV["NEW_RELIC_MONITOR_MODE"] = "true"
 
     # License
-    ENV["NEW_RELIC_LICENSE_KEY"] = Settings.at(:debug, :newrelic)
+    ENV["NEW_RELIC_LICENSE_KEY"] = Settings.at(:newrelic, :licence)
 
     # Appname
-    ENV["NEW_RELIC_APP_NAME"] = "#{APP_NICK}-#{Settings.host}-#{APP_ENV}"
+    platform = Settings.at(:newrelic, :platform) || Settings["host"]
+    ENV["NEW_RELIC_APP_NAME"] = "#{APP_NICK}-#{platform}-#{APP_ENV}"
 
     # Logfile
     ENV["NEW_RELIC_LOG"] = Settings.at(:logs, :newrelic)

data/rest-ftp-daemon.yml.sample

@@ -5,7 +5,6 @@ defaults: &defaults
   user: rftpd
   group: rftpd
   #host: "myhost"
-  #appname: "replay"          # appname prefix used for NewRelic reporting
 
   transfer:
     notify_after_sec: 5       # wait at least X seconds between HTTP notifications
@@ -21,11 +20,14 @@ defaults: &defaults
     # clean_finished: 3600
     # clean_queued: 86400
 
+  newrelic:
+    licence: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    platform: devel             # nickname used for naming app
+
   debug:
     ftp: false
     sftp: false
     conchita: false
-    # newrelic: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
   logs:
     thin:    "/var/log/rftpd-environment-thin.log"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.230.0
+  version: 0.230.1
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler