rest-ftp-daemon 0.423.3 → 0.424.0

data/lib/rest-ftp-daemon/static/swagger/css/print.css

@@ -508,7 +508,7 @@
   clear: both;
 }
 .swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
+  width: 200px;
   height: 100px;
   border: 1px solid #aaa;
 }
@@ -534,7 +534,7 @@
   font-weight: bold!important;
 }
 .swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
+  width: 200px;
   border: 1px solid #aaa;
 }
 .swagger-section .swagger-ui-wrap h1 {

data/lib/rest-ftp-daemon/static/swagger/css/screen.css

@@ -508,7 +508,7 @@
   clear: both;
 }
 .swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
+  width: 200px;
   height: 100px;
   border: 1px solid #aaa;
 }
@@ -534,7 +534,7 @@
   font-weight: bold!important;
 }
 .swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
+  width: 200px;
   border: 1px solid #aaa;
 }
 .swagger-section .swagger-ui-wrap h1 {

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

@@ -25,8 +25,9 @@
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-info Features
-    = 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"
+    = dashboard_feature :reload, Conf[:allow_reload], "ACTIVE (config is hot-reloadable)",  "changes at startup only"
+    = dashboard_feature :newrelic, Conf.feature?(:newrelic), "ACTIVE (license found)",  "disabled"
+    = dashboard_feature :rollbar, Conf.feature?(:rollbar), "ACTIVE (token found)",  "disabled"
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-info IP

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

@@ -30,18 +30,18 @@
       %thead
         %tr
           %th ID
+          %th T
           %th pool
+          %th queued
           %th label
-          %th type
           %th
           %th source
           %th
           %th target
-          %th queued
           %th.error status
           %th{"min-width" => 120} detail
           %th.text-right size
-          %th.text-right bitrate
+          %th.text-right rate
           %th{title: "Worker ID"} W
           %th{title: "Priority"} P
           %th{title: "Runs count"} R

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

@@ -19,15 +19,18 @@
     - trclass = "warning"
 
   %tr{class: trclass.to_s}
+
     %td
       %a{href: dashboard_job_url(job)}
         %b= job.id
 
+    %td= job_type job
+
     %td= job.pool
 
-    %td= job.label
+    %td= datetime_short(job.queued_at)
 
-    %td= job_type job
+    %td= job.label
 
     %td.text-right= location_label job.source_uri
     %td= token_highlight job.source
@@ -35,8 +38,6 @@
     %td.text-right= location_label job.target_uri
     %td= token_highlight job.target
 
-    %td= datetime_short(job.queued_at)
-
     %td
       %span.push-status
         = job.status

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

@@ -10,7 +10,7 @@ module RestFtpDaemon
       config_section :reporter
 
       # Other configuration options
-      @report_newrelic = Conf.newrelic_enabled?
+      @report_newrelic = Conf.feature?(:newrelic)
 
       # Check that everything is OK
       return "invalid timer"      unless @config[:timer].to_i > 0
@@ -35,7 +35,7 @@ module RestFtpDaemon
 
     def do_metrics
       # What metrics to report?
-      report_newrelic = Conf.newrelic_enabled?
+      report_newrelic = Conf.feature?(:newrelic)
 
       # Get common metrics and dump them to logs
       log_debug "begin metrics sample"

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.423.3"
+  spec.version                    = "0.424.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -14,7 +14,6 @@ Gem::Specification.new do |spec|
   spec.licenses                   = ["MIT"]
   spec.date                       = Time.now.strftime("%Y-%m-%d")
 
-
   # List files and executables
   spec.files                      = `git ls-files -z`.
                                       split("\x0").
@@ -23,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.require_paths              = ["lib"]
   spec.required_ruby_version      = ">= 2.2.2"
 
-
   # Development dependencies
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
@@ -33,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "http"
 
   # Runtime dependencies
-  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.4"
+  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.8"
   spec.add_runtime_dependency     "json", "~> 1.8"
   spec.add_runtime_dependency     "thin", "~> 1.7"
   spec.add_runtime_dependency     "activesupport", "~> 4.2"
@@ -44,20 +42,19 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     "grape-swagger-entity"
   spec.add_runtime_dependency     "grape-swagger-representable"
 
-  spec.add_runtime_dependency     "settingslogic"
   spec.add_runtime_dependency     "rest-client", "~> 1.8"
   spec.add_runtime_dependency     "api-auth"
   spec.add_runtime_dependency     "haml"
   spec.add_runtime_dependency     "facter"
   spec.add_runtime_dependency     "sys-cpu"
   spec.add_runtime_dependency     "get_process_mem"
-  spec.add_runtime_dependency     "newrelic_rpm"
 
+  spec.add_runtime_dependency     "newrelic_rpm"
+  spec.add_runtime_dependency     "rollbar"
 
   spec.add_runtime_dependency     "net-sftp"
   spec.add_runtime_dependency     "double-bag-ftps"
   spec.add_runtime_dependency     "aws-sdk-resources", '~> 2'
-
   spec.add_runtime_dependency     "streamio-ffmpeg"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.423.3
+  version: 0.424.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-07 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.4
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: settingslogic
-  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: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +318,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rollbar
+  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: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +396,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -412,9 +413,6 @@ files:
 - lib/rest-ftp-daemon/api/config.rb
 - lib/rest-ftp-daemon/api/dashboard.rb
 - lib/rest-ftp-daemon/api/debug.rb
-- lib/rest-ftp-daemon/api/entities/job.rb
-- lib/rest-ftp-daemon/api/entities/location.rb
-- lib/rest-ftp-daemon/api/entities/options.rb
 - lib/rest-ftp-daemon/api/jobs.rb
 - lib/rest-ftp-daemon/api/root-real.rb
 - lib/rest-ftp-daemon/api/root-test.rb
@@ -422,10 +420,14 @@ files:
 - lib/rest-ftp-daemon/api/status.rb
 - lib/rest-ftp-daemon/constants.rb
 - lib/rest-ftp-daemon/counters.rb
+- lib/rest-ftp-daemon/entities/job.rb
+- lib/rest-ftp-daemon/entities/location.rb
+- lib/rest-ftp-daemon/entities/options.rb
 - lib/rest-ftp-daemon/exceptions.rb
 - lib/rest-ftp-daemon/helpers/api.rb
 - lib/rest-ftp-daemon/helpers/common.rb
 - lib/rest-ftp-daemon/helpers/views.rb
+- lib/rest-ftp-daemon/initialize.rb
 - lib/rest-ftp-daemon/job.rb
 - lib/rest-ftp-daemon/job_queue.rb
 - lib/rest-ftp-daemon/jobs/dummy.rb
@@ -437,10 +439,10 @@ files:
 - lib/rest-ftp-daemon/metrics.rb
 - lib/rest-ftp-daemon/notification.rb
 - lib/rest-ftp-daemon/paginate.rb
-- lib/rest-ftp-daemon/remote.rb
-- lib/rest-ftp-daemon/remote_ftp.rb
-- lib/rest-ftp-daemon/remote_s3.rb
-- lib/rest-ftp-daemon/remote_sftp.rb
+- lib/rest-ftp-daemon/remote/base.rb
+- lib/rest-ftp-daemon/remote/ftp.rb
+- lib/rest-ftp-daemon/remote/s3.rb
+- lib/rest-ftp-daemon/remote/sftp.rb
 - lib/rest-ftp-daemon/static/config.json
 - lib/rest-ftp-daemon/static/css/bootstrap.min.css
 - lib/rest-ftp-daemon/static/css/bootstrap.old.css
@@ -452,6 +454,7 @@ files:
 - lib/rest-ftp-daemon/static/fonts/glyphicons-halflings-regular.woff2
 - lib/rest-ftp-daemon/static/images/feature_newrelic.png
 - lib/rest-ftp-daemon/static/images/feature_reload.png
+- lib/rest-ftp-daemon/static/images/feature_rollbar.png
 - lib/rest-ftp-daemon/static/swagger.html
 - lib/rest-ftp-daemon/static/swagger/css/print.css
 - lib/rest-ftp-daemon/static/swagger/css/reset.css

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

@@ -1,74 +0,0 @@
-# Handles transfers for Job class
-module RestFtpDaemon
-  class Remote
-    include BmcDaemonLib::LoggerHelper
-
-    # Class options
-    attr_reader :logger
-    attr_reader :log_prefix
-    attr_accessor :job
-
-    # Delegate set_info info to Job
-    delegate :set_info, to: :job
-
-    def initialize target, log_prefix, debug = false, ftpes = false
-      # Init
-      @target = target
-      @ftpes = ftpes
-      @debug = !!debug
-
-      # Build and empty job to protect set_info delegation
-      @job = Job.new(nil, {})
-
-      # Logger
-      @log_prefix = log_prefix || {}
-      @logger = BmcDaemonLib::LoggerPool.instance.get :transfer
-
-      # Annnounce object
-      log_info "Remote.initialize debug[#{debug}] target[#{target.path}] "
-
-      # Prepare real object
-      prepare
-    end
-
-    def prepare
-    end
-
-    def connect
-      # Debug mode ?
-      return unless @debug
-      puts
-      puts "-------------------- SESSION STARTING -------------------------"
-      puts "class\t #{myname}"
-      puts "host\t #{@target.host}"
-      puts "user\t #{@target.user}"
-      puts "port\t #{@target.port}"
-      puts "---------------------------------------------------------------"
-    end
-
-    def chdir_or_create directory, mkdir = false
-    end
-
-    def remove! target
-    end
-
-    def close
-      # Debug mode ?
-      return unless @debug
-      puts "-------------------- SESSION CLOSING --------------------------"
-    end
-
-  private
-
-    def extract_parent path
-      return unless path.is_a? String
-      m = path.match(/^(.*)\/([^\/]+)\/?$/)
-      return m[1], m[2] unless m.nil?
-    end
-
-    def myname
-      self.class.to_s
-    end
-
-  end
-end

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

@@ -1,142 +0,0 @@
-require "net/ftp"
-require "double_bag_ftps"
-
-# Handle FTP and FTPeS transfers for Remote class
-module RestFtpDaemon
-  class RemoteFTP < Remote
-
-    # Class options
-    attr_reader :ftp
-
-    def prepare
-      # Create FTP object
-      if @ftpes
-        prepare_ftpes
-      else
-        prepare_ftp
-      end
-      @ftp.passive = true
-      @ftp.debug_mode = @debug
-
-      # Config
-      @chunk_size = DEFAULT_FTP_CHUNK.to_i * 1024
-
-      # Announce object
-      log_debug "RemoteFTP.prepare chunk_size:#{@chunk_size}"
-    end
-
-    def connect
-      super
-
-      # Connect remote server
-      @ftp.connect @target.host, @target.port
-      @ftp.login @target.user, @target.password
-    end
-
-    def present? target
-      size = @ftp.size target.path
-      log_debug "RemoteFTP.present? [#{target.name}]"
-
-    rescue Net::FTPPermError
-      return false
-    else
-      return size
-    end
-
-    def remove! target
-      @ftp.delete target.path
-    rescue Net::FTPPermError
-      log_debug "RemoteFTP.remove! [#{target.name}] not found"
-    else
-      log_debug "RemoteFTP.remove! [#{target.name}] removed"
-    end
-
-    def mkdir directory
-      log_debug "RemoteFTP.mkdir [#{directory}]"
-      @ftp.mkdir directory
-
-    rescue StandardError => ex
-      raise TargetPermissionError, ex.message
-    end
-
-    def chdir_or_create directory, mkdir = false
-      # Init, extract my parent name and my own name
-      log_debug "RemoteFTP.chdir_or_create mkdir[#{mkdir}] dir[#{directory}]"
-      parent, current = extract_parent(directory)
-
-      #dirname, _current = extract_parent(directory)
-
-
-      # Access this directory
-      begin
-        @ftp.chdir "/#{directory}"
-
-      rescue Net::FTPPermError => _e
-        # If not allowed to create path, that's over, we're stuck
-        return false unless mkdir
-        chdir_or_create parent, mkdir
-
-        # Now I was able to chdir into my parent, create the current directory
-        mkdir current
-
-        # Finally retry the chdir
-        retry
-      else
-        return true
-      end
-    end
-
-    def upload source, target, use_temp_name = false, &callback
-      # Push init
-      raise RestFtpDaemon::AssertionFailed, "upload/ftp" if @ftp.nil?
-
-      # Temp file if needed
-      dest = target.clone
-      if use_temp_name
-        dest.generate_temp_name!
-      end
-
-      # Move to the directory
-      log_debug "RemoteFTP.upload chdir [#{dest.dir}]"
-      @ftp.chdir "/#{dest.dir}"
-
-      # Do the transfer
-      log_debug "RemoteFTP.upload putbinaryfile [#{dest.name}]"
-      @ftp.putbinaryfile source.path, dest.name, @chunk_size do |data|
-        # Update job status after this block transfer
-        yield data.bytesize, dest.name
-      end
-
-      # Move the file back to its original name
-      if use_temp_name
-        log_debug "RemoteFTP.upload rename [#{dest.name}] > [#{target.name}]"
-        @ftp.rename dest.name, target.name
-      end
-    end
-
-    def close
-      # Close init
-      super
-
-      # Close FTP connexion and free up memory
-      @ftp.close
-    end
-
-    def connected?
-      !@ftp.welcome.nil?
-    end
-
-  private
-
-    def prepare_ftp
-      @ftp = Net::FTP.new
-    end
-
-    def prepare_ftpes
-      @ftp = DoubleBagFTPS.new
-      @ftp.ssl_context = DoubleBagFTPS.create_ssl_context(verify_mode: OpenSSL::SSL::VERIFY_NONE)
-      @ftp.ftps_mode = DoubleBagFTPS::EXPLICIT
-    end
-
-  end
-end