rest-ftp-daemon 0.242.5 → 0.243

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99420738a087bcca94f2edc12c0db0e7666b6d84
-  data.tar.gz: 01d13c3a2165f7526c9c5ffb688bffe0cdfb65de
+  metadata.gz: 8289d36947f2e57440398bc166b4937a8d84455d
+  data.tar.gz: 9438a30f9e2bb7c6bca9e430fad8755de074c7af
 SHA512:
-  metadata.gz: ccfa3b6c24d2e500f841500944e8e429281d68e8440471c84e530ded779a8d6b339041a9b02c64d9ffcdcceb87f228ea9fe9e51ab9381f218080949b282aae4e
-  data.tar.gz: a17c9f7a94be0f7afb5f29dc84f3c24151e9262070be636bfa200f57a7aca3a47834d28be9b6a548968d6e50ddcbb3360f998f673da7ca2d50c8968168fecd6a
+  metadata.gz: 76c1d06af488c24dd36fe4a8ad78ce5670040fc4c5d6be5d69837479de7051a98ad82750fff8054af7a0defdc075d728dd9ab3385a456e3be9fb9798bdbb7e7e
+  data.tar.gz: 081de80b07433233ce8d9e0462d6b3d22ce6b98d30b3db494d9385bae995a95e4277460e3823f89f367ade4ed6173db8180e416281fe8effe3df77a7d604767c

data/.rubocop.yml

@@ -432,7 +432,7 @@ Style/HashSyntax:
   UseHashRocketsWithSymbolValues: false
 
 Style/IfUnlessModifier:
-  MaxLineLength: 120
+  MaxLineLength: 160
 
 Style/IndentationConsistency:
   # The difference between `rails` and `normal` is that the `rails` style

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.242.5)
+    rest-ftp-daemon (0.243)
       double-bag-ftps
       facter
       get_process_mem
@@ -19,7 +19,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -79,7 +79,7 @@ GEM
     ice_nine (0.11.1)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.2)
+    minitest (5.8.3)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     net-sftp (2.1.2)
@@ -100,19 +100,19 @@ GEM
       rack (>= 1.0.0)
     rainbow (2.0.0)
     rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     rubocop (0.32.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)

data/bin/rest-ftp-daemon

@@ -58,7 +58,7 @@ end
 # Load config, and merge options from ARGV into settings
 # FIXME: file configuration detection could reside in settings.rb
 APP_CONF ||= DEFAULT_CONFIG_PATH
-APP_ENV  ||= "production"
+APP_ENV ||= "production"
 abort "EXITING: cannot read configuration file: #{APP_CONF}" unless File.exist? APP_CONF
 begin
   # Import settings

data/config.ru

@@ -29,8 +29,8 @@ unless Settings.namespace == "production"
 end
 
 # Set up encodings
-# Encoding.default_internal = "utf-8"
-# Encoding.default_external = "utf-8"
+Encoding.default_internal = "utf-8"
+Encoding.default_external = "utf-8"
 
 # Launch the main daemon
 run RestFtpDaemon::API::Root

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

@@ -18,7 +18,9 @@ module RestFtpDaemon
 
         def render name, values={}
           template = File.read("#{APP_LIBS}/views/#{name}.haml")
-          haml_engine = Haml::Engine.new(template)
+
+          haml_engine = Haml::Engine.new(template, encoding: Encoding::UTF_8)
+              #:encoding => Encoding::ASCII_8BIT
           haml_engine.render(binding, values)
         end
       end

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

@@ -15,9 +15,9 @@ module RestFtpDaemon
         expose :wid, unless: lambda { |object, _options| object.wid.nil? }
 
         # expose :error
-        expose :error_utf8, :as => :error
-        expose :status_utf8, :as => :status
-        expose :target_method_utf8, :as => :target_method
+        expose :error_utf8, as: :error
+        expose :status_utf8, as: :status
+        expose :target_method_utf8, as: :target_method
 
         expose :queued_at
         expose :updated_at

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.242.5"
+APP_VER = "0.243"
 
 # Provide default config file information
 APP_LIB = File.expand_path File.dirname(__FILE__)
@@ -36,9 +36,15 @@ JOB_UPDATE_INTERVAL     = 1
 
 
 # Jobs and workers statuses
+JOB_STATUS_PREPARING    = :preparing
+JOB_STATUS_RUNNING      = :running
+JOB_STATUS_CHECKING_SRC = :checking_source
+JOB_STATUS_CONNECTING   = :remote_connect
+JOB_STATUS_CHDIR        = :remote_chdir
 JOB_STATUS_UPLOADING    = :uploading
 JOB_STATUS_RENAMING     = :renaming
 JOB_STATUS_PREPARED     = :prepared
+JOB_STATUS_DISCONNECTING= :remote_disconnect
 JOB_STATUS_FINISHED     = :finished
 JOB_STATUS_FAILED       = :failed
 JOB_STATUS_QUEUED       = :queued
@@ -57,7 +63,7 @@ LOG_PIPE_LEN            = 10
 LOG_COL_WID             = 8
 LOG_COL_JID             = JOB_IDENT_LEN + 3 + 2
 LOG_COL_ID              = 6
-LOG_TRIM_LINE           = 80
+LOG_TRIM_LINE           = 200
 LOG_DUMPS               = File.dirname(__FILE__) + "/../../log/"
 LOG_ROTATION            = "daily"
 LOG_FORMAT_TIME         = "%Y-%m-%d %H:%M:%S"

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

@@ -12,8 +12,8 @@ module RestFtpDaemon
       return "Ø" if number.nil? || number.to_f.zero?
 
       units = ["", "k", "M", "G", "T", "P" ]
-      index = ( Math.log( number ) / Math.log( 2 ) ).to_i / 10
-      converted = number.to_f / ( 1024 ** index )
+      index = ( Math.log(number) / Math.log(2) ).to_i / 10
+      converted = number.to_f / (1024 ** index)
 
       truncated = converted.round(decimals)
 
@@ -61,20 +61,18 @@ module RestFtpDaemon
     end
 
     def self.local_port_used? port
-      begin
-        Timeout.timeout(BIND_PORT_TIMEOUT) do
-          begin
-            TCPSocket.new(BIND_PORT_LOCALHOST, port).close
-            true
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-            false
-          rescue Errno::EADDRNOTAVAIL
-            "Settings.local_port_used: Errno::EADDRNOTAVAIL"
-          end
+      Timeout.timeout(BIND_PORT_TIMEOUT) do
+        begin
+          TCPSocket.new(BIND_PORT_LOCALHOST, port).close
+          true
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          false
+        rescue Errno::EADDRNOTAVAIL
+          "Settings.local_port_used: Errno::EADDRNOTAVAIL"
         end
-      rescue Timeout::Error
-        false
       end
+    rescue Timeout::Error
+      false
     end
 
     def self.job_method_label method

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

@@ -21,7 +21,6 @@ module RestFtpDaemon
     attr_reader :runs
     attr_reader :target_method
 
-
     attr_reader :queued_at
     attr_reader :updated_at
     attr_reader :started_at
@@ -93,7 +92,6 @@ module RestFtpDaemon
 
       # Prepare job
       begin
-        set_status :prepare
         prepare
 
       rescue RestFtpDaemon::JobMissingAttribute => exception
@@ -108,12 +106,12 @@ module RestFtpDaemon
       rescue RestFtpDaemon::JobTargetUnsupported => exception
         return oops :started, exception, :target_unsupported
 
-      rescue URI::InvalidURIError => exception
-        return oops :started, exception, :target_invalid
-
       rescue RestFtpDaemon::JobAssertionFailed => exception
         return oops :started, exception, :assertion_failed
 
+      rescue URI::InvalidURIError => exception
+        return oops :started, exception, :target_invalid
+
       else
         # Prepare done !
         set_status JOB_STATUS_PREPARED
@@ -123,8 +121,8 @@ module RestFtpDaemon
 
       # Process job
       begin
-        set_status :starting
-        transfer
+        #raise Net::FTPTempError, '451 Téléchargement avorté. Input/output error'.force_encoding("ASCII-8BIT")
+        start
 
       rescue SocketError => exception
         return oops :ended, exception, :conn_socket_error
@@ -174,6 +172,9 @@ module RestFtpDaemon
       rescue Errno::EINVAL => exception
         return oops :ended, exception, :invalid_argument, true
 
+      rescue Encoding::UndefinedConversionError => exception
+        return oops :ended, exception, :encoding_error, true
+
       rescue RestFtpDaemon::JobSourceNotFound => exception
         return oops :ended, exception, :source_not_found
 
@@ -284,7 +285,7 @@ module RestFtpDaemon
 
     def prepare
       # Update job status
-      set_status :prepare
+      set_status JOB_STATUS_PREPARING
       @runs += 1
 
       # Init
@@ -307,7 +308,6 @@ module RestFtpDaemon
       #puts "@target_path: #{@target_path.inspect}"
 
       # Prepare remote
-      set_status :remote_init
       #FIXME: use a "case" statement on @target_url.class
 
       if target_uri.is_a? URI::FTP
@@ -335,33 +335,34 @@ module RestFtpDaemon
       end
     end
 
-    def transfer
+    def run
       # Update job status
+      set_status JOB_STATUS_RUNNING
       @started_at = Time.now
 
       # Method assertions and init
-      raise RestFtpDaemon::JobAssertionFailed, "transfer/1" unless @source_path
-      raise RestFtpDaemon::JobAssertionFailed, "transfer/2" unless @target_path
+      raise RestFtpDaemon::JobAssertionFailed, "run/1" unless @source_path
+      raise RestFtpDaemon::JobAssertionFailed, "run/2" unless @target_path
       @transfer_sent = 0
       set_info :source_processed, 0
 
       # Guess source files from disk
-      set_status :checking_source
+      set_status JOB_STATUS_CHECKING_SRC
       sources = find_local @source_path
       set_info :source_count, sources.count
       set_info :source_files, sources.collect(&:full)
-      log_info "Job.transfer sources #{sources.collect(&:name)}"
+      log_info "Job.run sources #{sources.collect(&:name)}"
       raise RestFtpDaemon::JobSourceNotFound if sources.empty?
 
       # Guess target file name, and fail if present while we matched multiple sources
       raise RestFtpDaemon::JobTargetDirectoryError if @target_path.name && sources.count>1
 
       # Connect to remote server and login
-      set_status :remote_connect
+      set_status JOB_STATUS_CONNECTING
       @remote.connect
 
       # Prepare target path or build it if asked
-      set_status :remote_chdir
+      set_status JOB_STATUS_CHDIR
       @remote.chdir_or_create @target_path.dir, @mkdir
 
       # Compute total files size
@@ -394,8 +395,6 @@ module RestFtpDaemon
       finalize
     end
 
-
-
   private
 
     def log_context
@@ -422,7 +421,18 @@ module RestFtpDaemon
     def set_info attribute, value
       @mutex.synchronize do
         @infos || {}
-        @infos[attribute] = utf8_if_string value
+
+        # Force strings to UTF8
+        if value.is_a? Symbol
+          @infos[attribute] = value.to_s.force_encoding(Encoding::UTF_8)
+        elsif value.is_a? String
+          # @infos[attribute] = utf8(value)
+          @infos[attribute] = value.force_encoding(Encoding::UTF_8)
+        else
+          @infos[attribute] = value
+        end
+
+        # Mark the job as updated
         touch_job
       end
     end
@@ -432,27 +442,15 @@ module RestFtpDaemon
     end
 
     def set_error value
-      @error = value
+      @error = utf8(value.to_s)
       touch_job
     end
 
     def set_status value
-      @status = value
+      @status = utf8(value.to_s)
       touch_job
     end
 
-    # def set_status value
-    #   @mutex.synchronize do
-    #     @status = utf8_if_string value
-    #     touch_job
-    #   end
-    # end
-
-    def utf8_if_string value
-      return value unless (value.is_a? String) || (value.is_a? Symbol)
-      return utf8 value
-    end
-
     def flag_default name, default
       # build the flag instance var name
       variable = "@#{name}"
@@ -473,7 +471,7 @@ module RestFtpDaemon
       @remote = nil
 
       # Update job status
-      set_status :disconnecting
+      set_status JOB_STATUS_DISCONNECTING
       @finished_at = Time.now
 
       # Update counters
@@ -483,9 +481,9 @@ module RestFtpDaemon
 
     def remote_push source, target
       # Method assertions
-      raise RestFtpDaemon::JobAssertionFailed, "ftp_transfer/1" if @remote.nil?
-      raise RestFtpDaemon::JobAssertionFailed, "ftp_transfer/2" if source.nil?
-      raise RestFtpDaemon::JobAssertionFailed, "ftp_transfer/3" if target.nil?
+      raise RestFtpDaemon::JobAssertionFailed, "remote_push/1" if @remote.nil?
+      raise RestFtpDaemon::JobAssertionFailed, "remote_push/2" if source.nil?
+      raise RestFtpDaemon::JobAssertionFailed, "remote_push/3" if target.nil?
 
       # Use source filename if target path provided none (typically with multiple sources)
       log_info "Job.remote_push [#{source.name}]: [#{source.full}] > [#{target.full}]"
@@ -510,10 +508,9 @@ module RestFtpDaemon
       transfer_started_at = Time.now
       @progress_at = 0
       @notified_at = transfer_started_at
-      set_status JOB_STATUS_UPLOADING
 
       # Start the transfer, update job status after each block transfer
-      set_status :uploading
+      set_status JOB_STATUS_UPLOADING
       @remote.push source, target, tempname do |transferred, name|
         # Update transfer statistics
         progress transferred, name
@@ -578,7 +575,6 @@ module RestFtpDaemon
       end
     end
 
-
     def client_notify event, payload = {}
       # Skip if no URL given
       return unless @notify
@@ -655,7 +651,7 @@ module RestFtpDaemon
 
     if Settings.newrelic_enabled?
       add_transaction_tracer :prepare,        category: :task
-      add_transaction_tracer :transfer,       category: :task
+      add_transaction_tracer :run,            category: :task
       add_transaction_tracer :client_notify,  category: :task
       add_transaction_tracer :initialize,     category: :task
     end

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

@@ -25,7 +25,7 @@ class Logger
     end
 
     # Prepend plain message to output
-    output.unshift prefix1 + message
+    output.unshift prefix1 + message.force_encoding(Encoding::UTF_8)
 
     # Send all this to logger
     add context[:level], output

data/lib/rest-ftp-daemon/static/css/main.css

@@ -65,7 +65,7 @@ a.class {
 }
 
 .table-condensed tbody > tr > td {
-  padding: 3px 3px;
+  padding: 2px 3px;
   }
 
 #box-jobs .error {

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

@@ -38,7 +38,7 @@ module RestFtpDaemon
       if !job.error
         #log_info "job succeeded"
 
-      elsif !(on_errors.is_a?(Enumerable) && on_errors.include?(job.error.to_s))
+      elsif !(on_errors.is_a?(Enumerable) && on_errors.include?(job.error))
         log_error "not retrying: error not eligible"
 
       elsif max_age && (job.age >= max_age)
@@ -93,7 +93,7 @@ module RestFtpDaemon
       job.oops_you_stop_now ex unless job.nil?
 
     rescue StandardError => ex
-      log_error "JOB UNHANDLED EXCEPTION: #{ex.message}", ex.backtrace
+      log_error "JOB UNHANDLED EXCEPTION ex[#{ex.class}] #{ex.message}", ex.backtrace
       worker_status WORKER_STATUS_CRASHED
 
       # Inform the job

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.242.5
+  version: '0.243'
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler