rest-ftp-daemon 0.250.5 → 0.300.1

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ require "pathname"
 require "http"
 require "pry"
 
-require_relative "support/request_helpers"
 require_relative "../lib/rest-ftp-daemon/constants"
+require_relative "support/request_helpers"
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.250.5
+  version: 0.300.1
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chamber
+  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: haml
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +295,7 @@ files:
 - Rakefile
 - bin/rest-ftp-daemon
 - config.ru
+- defaults.yml
 - lib/rest-ftp-daemon.rb
 - lib/rest-ftp-daemon/api/config.rb
 - lib/rest-ftp-daemon/api/dashboard.rb
@@ -296,9 +311,9 @@ files:
 - lib/rest-ftp-daemon/helpers.rb
 - lib/rest-ftp-daemon/job.rb
 - lib/rest-ftp-daemon/job_queue.rb
-- lib/rest-ftp-daemon/logger.rb
-- lib/rest-ftp-daemon/logger_helper.rb
+- lib/rest-ftp-daemon/launcher.rb
 - lib/rest-ftp-daemon/logger_pool.rb
+- lib/rest-ftp-daemon/metrics.rb
 - lib/rest-ftp-daemon/notification.rb
 - lib/rest-ftp-daemon/paginate.rb
 - lib/rest-ftp-daemon/patch_haml.rb
@@ -306,7 +321,6 @@ files:
 - lib/rest-ftp-daemon/remote.rb
 - lib/rest-ftp-daemon/remote_ftp.rb
 - lib/rest-ftp-daemon/remote_sftp.rb
-- lib/rest-ftp-daemon/settings.rb
 - lib/rest-ftp-daemon/static/css/bootstrap.css
 - lib/rest-ftp-daemon/static/css/main.css
 - lib/rest-ftp-daemon/uri.rb
@@ -323,8 +337,12 @@ files:
 - lib/rest-ftp-daemon/worker_conchita.rb
 - lib/rest-ftp-daemon/worker_job.rb
 - lib/rest-ftp-daemon/worker_pool.rb
+- lib/rest-ftp-daemon/worker_reporter.rb
+- lib/shared/conf.rb
+- lib/shared/logger_formatter.rb
+- lib/shared/logger_helper.rb
 - rest-ftp-daemon.gemspec
-- rest-ftp-daemon.yml.sample
+- rest-ftp-daemon.sample.yml
 - spec/rest-ftp-daemon/features/dashboard_spec.rb
 - spec/rest-ftp-daemon/features/debug_spec.rb
 - spec/rest-ftp-daemon/features/jobs_spec.rb

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

@@ -1,57 +0,0 @@
-require "logger"
-
-class Logger
-
-  def info_with_id message, context = {}
-    # Ensure context is a hash of options and init
-    context = {} unless context.is_a? Hash
-    context[:level] ||= Logger::DEBUG
-
-    # Build prefixes depending on this context
-    prefix1 = build_prefix(context)
-    prefix2 = build_prefix + "   | "
-
-    lines = context[:lines]
-
-    if lines.is_a? Hash
-      output = build_from_hash prefix2, lines
-    elsif lines.is_a? Array
-      output = build_from_array prefix2, lines
-    else
-      output = []
-    end
-
-    # Prepend plain message to output
-    output.unshift prefix1 + message.force_encoding(Encoding::UTF_8)
-
-    # Send all this to logger
-    add context[:level], output
-  end
-
-  def build_prefix context = {}
-    LOG_FORMAT_MESSAGE % [
-      context[:wid].to_s,
-      context[:jid].to_s,
-      context[:id].to_s,
-      context[:level].to_i + 1,
-    ]
-  end
-
-  protected
-
-  def build_from_array prefix, lines
-    lines.map do |value|
-      #text = value.to_s.strip[0..LOG_TRIM_LINE]
-      text = value.to_s[0..LOG_TRIM_LINE]
-      "#{prefix}#{text}"
-    end
-  end
-
-  def build_from_hash prefix, lines
-    lines.map do |name, value|
-      text = value.to_s.strip[0..LOG_TRIM_LINE]
-      "#{prefix}#{name}: #{text}"
-    end
-  end
-
-end

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

@@ -1,36 +0,0 @@
-require "logger"
-
-module RestFtpDaemon
-  module LoggerHelper
-
-  protected
-
-    def log_info message, lines = []
-      log message, lines, Logger::INFO
-    end
-
-    def log_error message, lines = []
-      log message, lines, Logger::ERROR
-    end
-
-    def log_debug message, lines = []
-      log message, lines, Logger::DEBUG
-    end
-
-    def log_context
-      {}
-    end
-
-  private
-
-    def log message, lines, level
-      context = log_context || {}
-      logger.info_with_id message, context.merge({
-        from: self.class.to_s,
-        lines: lines,
-        level: level,
-        })
-    end
-
-  end
-end

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

@@ -1,57 +0,0 @@
-require "settingslogic"
-
-# Configuration class
-class Settings < Settingslogic
-  # Read configuration
-  namespace APP_ENV
-  source File.exist?(APP_CONF) ? APP_CONF : Hash.new
-  suppress_errors true
-
-  # Direct access to any depth
-  def at *path
-    path.reduce(Settings) { |m, key| m && m[key.to_s] }
-  end
-
-  # Dump whole settings set to readable YAML
-  def dump
-    to_hash.to_yaml(indent: 4, useheader: true, useversion: false )
-  end
-
-  def newrelic_enabled?
-    Settings.at(:newrelic)
-  end
-
-  def init_defaults
-    # Init host if missing
-    Settings["host"] ||= `hostname`.to_s.chomp.split(".").first
-
-    # Init PID file name if missing
-    Settings["pidfile"] ||= "/tmp/#{APP_NICK}-#{Settings['host']}-#{Settings['port']}.pid"
-
-    # Init NEWRELIC env
-    if Settings.newrelic_enabled?
-      # Enable module
-      ENV["NEWRELIC_AGENT_ENABLED"] = "true"
-      ENV["NEW_RELIC_MONITOR_MODE"] = "true"
-
-      # License
-      ENV["NEW_RELIC_LICENSE_KEY"] = Settings.at(:newrelic, :licence)
-
-      # Appname
-      platform = Settings.newrelic[:platform] || Settings["host"]
-      Settings.newrelic[:app_name] ||= "#{APP_NICK}-#{platform}-#{Settings.namespace}"
-      ENV["NEW_RELIC_APP_NAME"] = Settings.newrelic[:app_name]
-
-      # Logfile
-      ENV["NEW_RELIC_LOG"] = Settings.at(:logs, :newrelic)
-    else
-      ENV["NEWRELIC_AGENT_ENABLED"] = "false"
-    end
-
-  end
-
-  def overwrite options
-    Settings.merge!(options) if options.is_a? Enumerable
-  end
-
-end