rest-ftp-daemon 0.306.4 → 0.400.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d15b2a4f1323d3b3ff66469ae5355fb791d650c
-  data.tar.gz: 21d956bad2aff427c072a155888625b3ec4d47c5
+  metadata.gz: 0ddc0fb0b76fb6590512af92bcff70b63b03d770
+  data.tar.gz: e43a27f7cc877d49bc965493aedd7a97cad1ff3a
 SHA512:
-  metadata.gz: 2d5574f7d1fdab3fbba01799a82e31e40bb4ba80c50bcd5ae5b1512186559c4f0cad9344622bd6a8d8bee3a0843d528b30eaa265194c70788b394d941a52fd60
-  data.tar.gz: 8b1197ca349561e3d1f7c667a170360b7ec74a84d8aeaf408a1f9d088cf3cef6389862a59fc8283754e5af8d48cdc715adc8314ad653bbb611abdc60f42f561c
+  metadata.gz: 0b39316f2dc7892f5b77fb27a6e7f9b46df8dbb43be7382218ca25d49681114be8d4e5b99ef8e59e341d18da62302322b1431bb789a8dbc11b15bdbdf241f53e
+  data.tar.gz: b2a2e0a9c4f1a1737ce42e8e767c8ae3ffa19dfa30e12b63ebde9fd9492aa4f835436ed797c2fd93557392f5122a0f6a62255da738bd759faf57efa34ea9515a

data/.rubocop.yml

@@ -412,7 +412,7 @@ Style/FormatString:
 
 # Built-in global variables are allowed by default.
 Style/GlobalVars:
-  AllowedVariables: ["$queue", "$pool"]
+  AllowedVariables: ["$pool"]
 
 # `MinBodyLength` defines the number of lines of the a body of an if / unless
 # needs to have to trigger this cop

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.306.4)
+    rest-ftp-daemon (0.400.0)
       activesupport (~> 4.2)
       api-auth
-      bmc-daemon-lib (~> 0.3.1)
+      bmc-daemon-lib (~> 0.3.3)
       double-bag-ftps
       facter
       get_process_mem
@@ -38,7 +38,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bmc-daemon-lib (0.3.2)
+    bmc-daemon-lib (0.3.3)
       chamber (~> 2.9)
     builder (3.2.2)
     chamber (2.9.0)

data/config.ru

@@ -4,16 +4,6 @@ load_path_libs = File.expand_path "lib", File.dirname(__FILE__)
 $LOAD_PATH.unshift(load_path_libs) unless $LOAD_PATH.include?(load_path_libs)
 require "rest-ftp-daemon"
 
-# Create global queue
-$queue = RestFtpDaemon::JobQueue.new
-
-# Create global counters
-$counters = RestFtpDaemon::Counters.new
-
-# Initialize workers
-$pool = RestFtpDaemon::WorkerPool.new
-$pool.start!
-
 # Rack authent
 unless Conf[:adminpwd].nil?
   use Rack::Auth::Basic, "Restricted Area" do |username, password|
@@ -30,5 +20,9 @@ unless Conf.app_env == "production"
   # use Rack::MiniProfiler
 end
 
-# Launch the main daemon
+
+# Initialize workers
+RestFtpDaemon::WorkerPool.instance.start_em_all
+
+# Launch the API
 run RestFtpDaemon::API::Root

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

@@ -33,11 +33,11 @@ module RestFtpDaemon
           @page = params["page"].to_i
 
           # Get jobs for this view, order jobs by their weights
-          jobs_with_status = $queue.jobs_with_status(filter).reverse
+          jobs_with_status = RestFtpDaemon::JobQueue.instance.jobs_with_status(filter).reverse
 
           # Provide queue only if no filtering set
           if filter.empty?
-            @jobs_queued = $queue.jobs_queued
+            @jobs_queued = RestFtpDaemon::JobQueue.instance.jobs_queued
           else
             @jobs_queued = []
           end

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

@@ -14,7 +14,7 @@ module RestFtpDaemon
         def debug_encodings
           # Encodings
           encodings = {}
-          jobs = $queue.jobs
+          jobs = RestFtpDaemon::JobQueue.instance.jobs
 
           jobs.each do |job|
             # here = out[job.id] = {}

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

@@ -13,7 +13,7 @@ module RestFtpDaemon
         begin
           # Get job to display
           raise RestFtpDaemon::JobNotFound if params[:id].nil?
-          job = $queue.find_by_id(params[:id]) || $queue.find_by_id(params[:id], true)
+          job = RestFtpDaemon::JobQueue.instance.find_by_id(params[:id]) || RestFtpDaemon::JobQueue.instance.find_by_id(params[:id], true)
           raise RestFtpDaemon::JobNotFound if job.nil?
 
         rescue RestFtpDaemon::JobNotFound => exception
@@ -35,7 +35,7 @@ module RestFtpDaemon
       get "/" do
         begin
           # Get jobs to display
-          jobs = $queue.jobs
+          jobs = RestFtpDaemon::JobQueue.instance.jobs
 
         rescue StandardError => exception
           log_error "Exception: #{exception.message}"
@@ -73,14 +73,14 @@ module RestFtpDaemon
         # log_debug params.to_json
         begin
           # Create a new job
-          job_id = $queue.generate_id
+          job_id = RestFtpDaemon::JobQueue.instance.generate_id
           job = Job.new(job_id, params)
 
           # And push it to the queue
-          $queue.push job
+          RestFtpDaemon::JobQueue.instance.push job
 
           # Increment a counter
-          $counters.increment :jobs, :received
+          RestFtpDaemon::Counters.instance.increment :jobs, :received
 
         rescue JSON::ParserError => exception
           log_error "JSON::ParserError: #{exception.message}"

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

@@ -44,19 +44,8 @@ module RestFtpDaemon
       ### INITIALIZATION
       def initialize
         super
-
-        # Check that Queue and Pool are available
-        unless $pool.is_a? RestFtpDaemon::WorkerPool
-          log_error "Metrics.sample: invalid WorkerPool"
-          raise RestFtpDaemon::MissingPool
-        end
-        unless $queue.is_a? RestFtpDaemon::JobQueue
-          log_error "Metrics.sample: invalid JobQueue"
-          raise RestFtpDaemon::MissingQueue
-        end
       end
 
-
       ### ENDPOINTS
       get "/" do
         redirect dashboard_url()

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

@@ -10,18 +10,8 @@ module RestFtpDaemon
       get "/" do
         status 200
 
-        # Check that Queue and Pool are available
-        unless true
-          log_error "Status API: invalid WorkerPool"
-          return status 501
-        end
-        unless $queue.is_a? RestFtpDaemon::JobQueue
-          log_error "Status API: invalid JobQueue"
-          return status 501
-        end
-
         # Get counters
-        counters = $counters.stats.dup
+        counters = RestFtpDaemon::Counters.instance.stats
 
         # Amend counters with legacy attributes
         if counters[:jobs].is_a? Hash
@@ -38,13 +28,13 @@ module RestFtpDaemon
           version: Conf.app_ver,
           started: Conf.app_started,
           hostname: `hostname`.to_s.chomp,
-          jobs_count: $queue.jobs_count,
+          jobs_count: RestFtpDaemon::JobQueue.instance.jobs_count,
 
           metrics: Metrics.sample,
 
           counters: counters,
 
-          workers: $pool.worker_variables,
+          workers: RestFtpDaemon::WorkerPool.instance.worker_variables,
 
           }
       end

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

@@ -1,31 +1,36 @@
-# Queue that stores all the Jobs waiting to be processed or fully processed
+require 'singleton'
 
+# Queue that stores all the Jobs waiting to be processed or fully processed
 module RestFtpDaemon
   class Counters
-
-    # Class options
-    attr_reader :stats
+    include Singleton
 
     def initialize
+      # Initialize values
       @stats = {}
-      @mutex_stats = Mutex.new
+
+      # Create mutex
+      @mutex = Mutex.new
+
+
+      set :system, :started_at, Time.now
     end
 
     def set group, name, value
-      @mutex_stats.synchronize do
+      @mutex.synchronize do
         @stats[group] ||= {}
         @stats[group][name] = value
       end
     end
 
     def get group, name
-      @mutex_stats.synchronize do
+      @mutex.synchronize do
         @stats[group][name] if @stats[group].is_a? Hash
       end
     end
 
     def add group, name, value
-      @mutex_stats.synchronize do
+      @mutex.synchronize do
         @stats[group] ||= {}
         @stats[group][name] ||= 0
         @stats[group][name] += value
@@ -36,5 +41,9 @@ module RestFtpDaemon
       add group, name, 1
     end
 
+    def stats
+      return @stats.dup
+    end
+
   end
 end

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

@@ -4,7 +4,6 @@ module RestFtpDaemon
 
   class DummyException            < RestFtpDaemonException; end
 
-  class MissingQueue              < RestFtpDaemonException; end
   class MissingPool               < RestFtpDaemonException; end
   class InvalidWorkerNumber       < RestFtpDaemonException; end
 

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

@@ -1,6 +1,24 @@
 module RestFtpDaemon
   module ViewsHelper
 
+    def dashboard_feature name, enabled, message_on = "enabled", message_of = "disabled"
+      # Build classes
+      class_status = enabled ? 'enabled' : 'disabled'
+      classes = "btn btn-default feature-#{class_status}"
+
+      # Build title
+      title_status = enabled ? message_on : message_of
+      title = "#{name}: #{title_status}"
+
+      return sprintf(
+        '<div class="%s" title="%s"><img src="/images/feature_%s.png" height="14" alt="%s"/></div>',
+        classes,
+        title,
+        name,
+        title
+        )
+    end
+
     def dashboard_job_url job
       "#{MOUNT_JOBS}/#{job.id}" if job.respond_to? :id
     end

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

@@ -491,8 +491,8 @@ module RestFtpDaemon
       @finished_at = Time.now
 
       # Update counters
-      $counters.increment :jobs, :finished
-      $counters.add :data, :transferred, @transfer_total
+      RestFtpDaemon::Counters.instance.increment :jobs, :finished
+      RestFtpDaemon::Counters.instance.add :data, :transferred, @transfer_total
     end
 
     def remote_push source, target
@@ -658,8 +658,8 @@ module RestFtpDaemon
       end
 
       # Increment counter for this error
-      $counters.increment :errors, error
-      $counters.increment :jobs, :failed
+      RestFtpDaemon::Counters.instance.increment :errors, error
+      RestFtpDaemon::Counters.instance.increment :jobs, :failed
 
       # Prepare notification if signal given
       return unless event

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

@@ -1,7 +1,10 @@
-module RestFtpDaemon
+require 'singleton'
 
-  # Queue that stores all the Jobs waiting to be processed or fully processed
+# Queue that stores all the Jobs waiting to be processed or fully processed
+module RestFtpDaemon
   class JobQueue
+    include Singleton
+
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     include CommonHelpers
@@ -11,23 +14,23 @@ module RestFtpDaemon
     attr_reader :jobs
 
     def initialize
-      # Instance variables
+      # Initialize values
       @queues = {}
       @waitings = {}
       @jobs = []
+      @last_id = 0
 
       @queues.taint          # enable tainted communication
       @waitings.taint
       taint
 
-      # Global mutex for the queue
+      # Create mutex
       @mutex = Mutex.new
 
       # Logger
       @logger = BmcDaemonLib::LoggerPool.instance.get :queue
 
       # Identifiers generator
-      @last_id = 0
       @prefix = identifier JOB_IDENT_LEN
       log_info "JobQueue initialized (prefix: #{@prefix})"
     end

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

@@ -2,10 +2,6 @@ module RestFtpDaemon
   class Metrics
 
     def self.sample
-      # Check validity of globals
-      return unless $pool.is_a? RestFtpDaemon::WorkerPool
-      return unless $queue.is_a? RestFtpDaemon::JobQueue
-
       # Prepare external deps
       mem = GetProcessMem.new
 
@@ -16,10 +12,10 @@ module RestFtpDaemon
           memory:           mem.bytes.to_i,
           threads:          Thread.list.count,
           },
-        jobs_by_status:     $queue.jobs_by_status,
-        rate_by_pool:       $queue.rate_by(:pool),
-        rate_by_targethost: $queue.rate_by(:targethost),
-        queued_by_pool:     $queue.queued_by_pool,
+        jobs_by_status:     RestFtpDaemon::JobQueue.instance.jobs_by_status,
+        rate_by_pool:       RestFtpDaemon::JobQueue.instance.rate_by(:pool),
+        rate_by_targethost: RestFtpDaemon::JobQueue.instance.rate_by(:targethost),
+        queued_by_pool:     RestFtpDaemon::JobQueue.instance.queued_by_pool,
         workers_by_status:  self.workers_count_by_status,
         }
     end
@@ -31,13 +27,7 @@ module RestFtpDaemon
         # Init
         counts = {}
 
-        # Check validity of globals
-        unless $pool.is_a? RestFtpDaemon::WorkerPool
-          log_error "Metrics.workers_count_by_status: invalid WorkerPool"
-          return counts
-        end
-
-        $pool.worker_variables.group_by do |wid, vars|
+        RestFtpDaemon::WorkerPool.instance.worker_variables.group_by do |wid, vars|
           vars[:status]
         end.each do |status, workers|
           counts[status] = workers.count

data/lib/rest-ftp-daemon/views/dashboard_counters.haml

@@ -11,7 +11,7 @@
 
   %tbody
 
-    - $counters.stats.each do |group, values|
+    - RestFtpDaemon::Counters.instance.stats.each do |group, values|
       - if values.is_a? Enumerable
         - values.each do |name, value|
           %tr

data/lib/rest-ftp-daemon/views/dashboard_footer.haml

@@ -1,7 +1,5 @@
 -# coding: utf-8
 - info_procs = (Facter.value :processorcount).to_i
-- newrelic_class = Conf.newrelic_enabled? ? 'feature-enabled' : 'feature-disabled'
-- reload_class = Conf[:allow_reload] ? 'feature-enabled' : 'feature-disabled'
 
 .footer-signature.pull-left
 
@@ -11,23 +9,21 @@
 
   ·
   %a{href: "http://github.com/bmedici/rest-ftp-daemon/"} GitHub
+
   ·
   %a{href: "http://refactorcop.com/bmedici/rest-ftp-daemon/"} RefactorCop
 
 
 .footer-indicators.pull-right
 
+  .btn-group.btn-group-sm
+    .btn.btn-default.btn-info Host
+    .btn.btn-default= Conf.host
+
   .btn-group.btn-group-sm
     .btn.btn-default.btn-info Features
-    .btn.btn-default{class: newrelic_class}
-      %img{src: "/images/logo_newrelic.png", height: "14", title: "NewRelic"}
-    .btn.btn-default{class: reload_class}
-      %img{src: "/images/reload.png", height: "14", title: "Configuration is hot-reloadable (allow_relaod)"}
-
-  - if Conf.host
-    .btn-group.btn-group-sm
-      .btn.btn-default.btn-info Host
-      .btn.btn-default= Conf.host
+    = dashboard_feature :reload, Conf[:allow_reload], "configuration is hot-reloadable",  "configuration changes at startup only"
+    = dashboard_feature :newrelic, Conf.newrelic_enabled?, "active (license found)",  "disabled"
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-info IP

data/lib/rest-ftp-daemon/views/dashboard_header.haml

@@ -2,8 +2,8 @@
 - info_procs = (Facter.value :processorcount).to_i
 - info_load = Sys::CPU.load_avg.first.to_f
 - info_norm = info_procs.zero? ? "N/A" : (100 * info_load / info_procs).round(1)
-- info_trans = $counters.get :data, :transferred
-- info_processed = $counters.get :jobs, :processed
+- info_trans = RestFtpDaemon::Counters.instance.get :data, :transferred
+- info_processed = RestFtpDaemon::Counters.instance.get :jobs, :processed
 - mem = GetProcessMem.new
 
 

data/lib/rest-ftp-daemon/views/dashboard_jobs.haml

@@ -1,6 +1,6 @@
 -# coding: utf-8
-- jobs_by_status = $queue.jobs_by_status
-- counts_all = $queue.jobs_count
+- jobs_by_status = RestFtpDaemon::JobQueue.instance.jobs_by_status
+- counts_all = RestFtpDaemon::JobQueue.instance.jobs_count
 - jobs = @paginate.subset
 
 .btn-group.btn-group-xs.filters

data/lib/rest-ftp-daemon/views/dashboard_rates.haml

@@ -7,7 +7,7 @@
 
 
 - groups.each do |group_by, group_title|
-  - rates_by_status = $queue.rate_by(group_by)
+  - rates_by_status = RestFtpDaemon::JobQueue.instance.rate_by(group_by)
 
   %table.table.table-striped.table-hover.table-condensed
 

data/lib/rest-ftp-daemon/views/dashboard_workers.haml

@@ -1,8 +1,5 @@
 -# coding: utf-8
-
-- unless $pool.is_a? RestFtpDaemon::WorkerPool
-  - log_error "Dashboard: invalid WorkerPool"
-- variables = $pool.worker_variables
+- variables = RestFtpDaemon::WorkerPool.instance.worker_variables
 
 %h2 Worker status
 
@@ -19,7 +16,7 @@
   %tbody
     - variables.each do |wid, vars|
       - status = vars[:status]
-      - alive = $pool.worker_alive? wid
+      - alive = RestFtpDaemon::WorkerPool.instance.worker_alive? wid
       - trclass = WORKER_STYLES[status]
 
       - unless alive

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

@@ -1,7 +1,10 @@
-module RestFtpDaemon
+require 'singleton'
 
-  # Handles a pool of Worker objects
+# Handles a pool of Worker objects
+module RestFtpDaemon
   class WorkerPool
+    include Singleton
+
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
@@ -22,7 +25,7 @@ module RestFtpDaemon
       @seqno = 0
     end
 
-    def start!
+    def start_em_all
       # Read configuration or initialize with empty hash
       pools = Conf.at[:pools]
       pools = {} unless pools.is_a? Hash
@@ -50,7 +53,6 @@ module RestFtpDaemon
       log_error "EXCEPTION: #{ex.message}", ex.backtrace
     end
 
-
     def worker_variables
       vars = {}
       @workers.collect do |wid, worker|

data/lib/rest-ftp-daemon/workers/conchita.rb

@@ -25,9 +25,9 @@ module RestFtpDaemon
       worker_status WORKER_STATUS_CLEANING
 
       # Cleanup queues according to configured max-age
-      $queue.expire JOB_STATUS_FINISHED,  maxage(JOB_STATUS_FINISHED),  @config[:debug]
-      $queue.expire JOB_STATUS_FAILED,    maxage(JOB_STATUS_FAILED),    @config[:debug]
-      $queue.expire JOB_STATUS_QUEUED,    maxage(JOB_STATUS_QUEUED),    @config[:debug]
+      RestFtpDaemon::JobQueue.instance.expire JOB_STATUS_FINISHED,  maxage(JOB_STATUS_FINISHED),  @config[:debug]
+      RestFtpDaemon::JobQueue.instance.expire JOB_STATUS_FAILED,    maxage(JOB_STATUS_FAILED),    @config[:debug]
+      RestFtpDaemon::JobQueue.instance.expire JOB_STATUS_QUEUED,    maxage(JOB_STATUS_QUEUED),    @config[:debug]
 
       # Force garbage collector
       GC.start if @config["garbage_collector"]

data/lib/rest-ftp-daemon/workers/reporter.rb

@@ -14,8 +14,6 @@ module RestFtpDaemon
 
       # Check that everything is OK
       return "invalid timer"      unless @config[:timer].to_i > 0
-      # return "invalid WorkerPool" unless $pool.is_a? RestFtpDaemon::WorkerPool
-      # return "invalid JobQueue"   unless $queue.is_a? RestFtpDaemon::JobQueue
       return false
     end
 

data/lib/rest-ftp-daemon/workers/transfer.rb

@@ -32,7 +32,7 @@ module RestFtpDaemon
     def worker_process
       # Wait for a job to be available in the queue
       worker_status WORKER_STATUS_WAITING
-      job = $queue.pop @pool
+      job = RestFtpDaemon::JobQueue.instance.pop @pool
 
       # Work on this job
       work_on_job(job)
@@ -64,7 +64,7 @@ module RestFtpDaemon
         log_info "retrying job: requeued after delay"
 
         # Now, requeue this job
-        $queue.requeue job
+        RestFtpDaemon::JobQueue.instance.requeue job
       end
     end
 
@@ -83,7 +83,7 @@ module RestFtpDaemon
       worker_status WORKER_STATUS_FINISHED, job
 
       # Increment total processed jobs count
-      $counters.increment :jobs, :processed
+      RestFtpDaemon::Counters.instance.increment :jobs, :processed
 
     rescue RestFtpDaemon::JobTimeout => ex
       log_error "JOB TIMED OUT", ex.backtrace

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.306.4"
+  spec.version                    = "0.400.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
                                       reject{ |f| f =~ /^dashboard.+\.png/ }
   spec.executables                = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths              = ["lib"]
-  spec.required_ruby_version      = ">= 2.2"
+  spec.required_ruby_version      = ">= 2.2.2"
 
 
   # Development dependencies
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "http"
 
   # Runtime dependencies
-  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.1"
+  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.3"
   spec.add_runtime_dependency     "json", "~> 1.8"
   spec.add_runtime_dependency     "thin", "~> 1.7"
   spec.add_runtime_dependency     "activesupport", "~> 4.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.306.4
+  version: 0.400.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -364,10 +364,8 @@ files:
 - lib/rest-ftp-daemon/remote_sftp.rb
 - lib/rest-ftp-daemon/static/css/bootstrap.css
 - lib/rest-ftp-daemon/static/css/main.css
-- lib/rest-ftp-daemon/static/images/logo_newrelic.fw.png
-- lib/rest-ftp-daemon/static/images/logo_newrelic.png
-- lib/rest-ftp-daemon/static/images/logo_newrelic_full.png
-- lib/rest-ftp-daemon/static/images/reload.png
+- lib/rest-ftp-daemon/static/images/feature_newrelic.png
+- lib/rest-ftp-daemon/static/images/feature_reload.png
 - lib/rest-ftp-daemon/uri.rb
 - lib/rest-ftp-daemon/views/dashboard.haml
 - lib/rest-ftp-daemon/views/dashboard_counters.haml
@@ -404,7 +402,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="