rest-ftp-daemon 0.502.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573b07519ccc821dbdf7538ebe9ec88ea2708733
-  data.tar.gz: 5acfd25ef2fed2fa3b6f6528135dd63d9e0e3856
+  metadata.gz: a5e2703802ed5c64bd834898aa2e689a03e7db00
+  data.tar.gz: bd4dd0c7f81f402269e088c66d25fefa54b44da1
 SHA512:
-  metadata.gz: 89b157d7ad8a49171d7510199095b7f14890b4cc63c8e9d6e12b9a215975dd8cca10138e51e77f3aed792a21baaefbb9e81db2a57b50a1b007dbfa95f619a296
-  data.tar.gz: 8c87f9dda89e8f628936422abc34b8d05a56e55c2136f69939b412c36b5921ad4b328b8e1b258249d434fd8bd0c83ec7efdc9737545d1bc1480b60e7bb46f016
+  metadata.gz: 912d7b5bf50aef05ca5627d18602a5403bfb3fe6ee3ac6e2ff3d7d0da24cf8ed8bcd23a9deaf9f27338563ba8da1e7589632eaa6475c595c0c7b7f42b9fec19e
+  data.tar.gz: 68e8fdc3ad403729d459a497762032baf56e8634e6b198b7492f5343c897198b358a6f3736a0f7e5ac3cfc6db4d13ab47ad26f5a9bec4ce915376a0d6349ca3d

data/.dockerignore

@@ -0,0 +1,7 @@
+pkg/
+DOC/
+tmp/
+.bundle/
+.git/
+log/
+.idea/

data/Dockerfile

@@ -1,21 +1,32 @@
 # Docker headers
 FROM ruby:2.3.0-slim
 MAINTAINER Bruno MEDICI <rest-ftp-daemon@bmconseil.com>
+
+
+# Environment
 ENV LANG=C.UTF-8
+ENV INSTALL_PATH /app/
+ENV app /app/
 
 
 # Install packages, and first app gem for caching history only
 RUN apt-get update && apt-get install -y build-essential git --fix-missing --no-install-recommends
-RUN gem install rest-ftp-daemon -v 0.400.0 --no-rdoc --no-ri
+RUN gem install bundler --no-rdoc --no-ri
+
 
+# Change to INSTALL_PATH and install base packages
+WORKDIR                             $INSTALL_PATH
+ADD Gemfile                         $INSTALL_PATH
+ADD Gemfile.lock                    $INSTALL_PATH
+ADD rest-ftp-daemon.gemspec 		$INSTALL_PATH
+RUN bundle install --system --without="development test" -j4
 
-# Retry a gem install to get newer releases, if Gemfile.lock changed
-ADD Gemfile.lock /dev/null
-RUN gem install rest-ftp-daemon --no-rdoc --no-ri
-# RUN rest-ftp-daemon -v
+
+# Install app code
+RUN mkdir -p                        $INSTALL_PATH
+ADD . $INSTALL_PATH
 
 
 # App run
 EXPOSE 3000
-CMD ["/usr/local/bundle/bin/rest-ftp-daemon", "-p", "3000", "-d", "start"]
-
+CMD ["bin/rest-ftp-daemon", "-p", "3000", "-f", "start"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.502.2)
+    rest-ftp-daemon (1.0.1)
       activesupport (~> 4.2)
       api-auth
       aws-sdk-resources (~> 2)
@@ -38,17 +38,17 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     api-auth (2.0.1)
     ast (2.3.0)
-    aws-sdk-core (2.6.28)
+    aws-sdk-core (2.6.32)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.28)
-      aws-sdk-core (= 2.6.28)
+    aws-sdk-resources (2.6.32)
+      aws-sdk-core (= 2.6.32)
     aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bmc-daemon-lib (0.5.2)
+    bmc-daemon-lib (0.5.3)
       chamber (~> 2.9.1)
     builder (3.2.2)
     chamber (2.9.1)
@@ -85,7 +85,7 @@ GEM
     grape-entity (0.6.0)
       activesupport
       multi_json (>= 1.3.2)
-    grape-swagger (0.25.1)
+    grape-swagger (0.25.2)
       grape (>= 0.12.0)
     grape-swagger-entity (0.1.5)
       grape-entity
@@ -111,7 +111,7 @@ GEM
     json (1.8.3)
     method_source (0.8.2)
     mime-types (2.99.3)
-    minitest (5.9.1)
+    minitest (5.10.1)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     mustermann (0.4.0)
@@ -123,7 +123,7 @@ GEM
     net-ssh (3.2.0)
     netrc (0.11.0)
     newrelic_rpm (3.17.1.326)
-    parser (2.3.3.0)
+    parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -136,7 +136,7 @@ GEM
       rack (>= 0.4)
     rainbow (2.1.0)
     rake (11.3.0)
-    representable (3.0.1)
+    representable (3.0.2)
       declarative (~> 0.0.5)
       uber (>= 0.0.15, < 0.2.0)
     rest-client (1.8.0)
@@ -158,7 +158,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.45.0)
+    rubocop (0.46.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)

data/lib/rest-ftp-daemon.rb

@@ -15,12 +15,15 @@ require_relative "shared/patch_array"
 require_relative "shared/patch_haml"
 require_relative "shared/patch_file"
 
-# Project's libs
-require_relative "rest-ftp-daemon/constants"
-require_relative "rest-ftp-daemon/exceptions"
+# Helpers
 require_relative "rest-ftp-daemon/helpers/common"
 require_relative "rest-ftp-daemon/helpers/views"
 require_relative "rest-ftp-daemon/helpers/api"
+require_relative "rest-ftp-daemon/helpers/transfer"
+
+# Project's libs
+require_relative "rest-ftp-daemon/constants"
+require_relative "rest-ftp-daemon/exceptions"
 require_relative "rest-ftp-daemon/metrics"
 require_relative "rest-ftp-daemon/paginate"
 require_relative "rest-ftp-daemon/uri"

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

@@ -0,0 +1,122 @@
+module RestFtpDaemon
+  module TransferHelpers
+
+    def remote_upload source, target
+      # Method assertions
+      raise RestFtpDaemon::AssertionFailed, "remote_upload/remote" if @remote.nil?
+      raise RestFtpDaemon::AssertionFailed, "remote_upload/source" if source.nil?
+      raise RestFtpDaemon::AssertionFailed, "remote_upload/target" if target.nil?
+
+      # Use source filename if target path provided none (typically with multiple sources)
+      log_info "remote_upload temp[#{@tempfile}] source[#{source.path}] target[#{target.path}]"
+      set_info INFO_SOURCE_CURRENT, source.name
+
+      # Remove any existing version if present, or check if it's there
+      if @overwrite
+        @remote.remove! target
+      elsif (size = @remote.size_if_exists(target))  # won't be triggered when NIL or 0 is returned
+        log_debug "remote_upload file exists ! (#{format_bytes size, 'B'})"
+        raise RestFtpDaemon::TargetFileExists
+      end
+
+      # Start transfer
+      transfer_started_at = Time.now
+      @last_notify_at = transfer_started_at
+
+      # Start the transfer, update job status after each block transfer
+      set_status JOB_STATUS_UPLOADING
+      @remote.upload source, target, @tempfile do |transferred, name|
+        # Update transfer statistics
+        update_progress transferred, name
+      end
+
+      # Compute final bitrate
+      global_transfer_bitrate = get_bitrate @transfer_total, (Time.now - transfer_started_at)
+      set_info INFO_TRANFER_BITRATE, global_transfer_bitrate.round(0)
+
+      # Done
+      set_info INFO_SOURCE_CURRENT, nil
+    end
+
+    def update_progress transferred, name = ""
+      # Update counters
+      @transfer_sent += transferred
+      set_info INFO_TRANFER_SENT, @transfer_sent
+
+      # Update job info
+      percent0 = (100.0 * @transfer_sent / @transfer_total).round(0)
+      set_info INFO_TRANFER_PROGRESS, percent0
+
+      # Update bitrates
+      @current_bitrate = running_bitrate @transfer_sent
+      set_info INFO_TRANFER_BITRATE,  @current_bitrate.round(0)
+
+      # What's current time ?
+      now = Time.now
+
+      # Notify if requested
+      progress_notify now, percent0, name
+
+      # Touch my worker status
+      touch_job
+    end
+
+  private
+
+    def progress_notify now, percent0, name
+      # No delay provided ?
+      return if @config[:notify_after].nil?
+
+      # Still too early to notify again ?
+      how_long_ago = (now.to_f - @last_notify_at.to_f)
+      return unless how_long_ago > @config[:notify_after]
+
+      # # Update bitrates
+      # @current_bitrate = running_bitrate @transfer_sent
+      # set_info INFO_TRANFER_BITRATE,  @current_bitrate.round(0)
+
+      # Log progress
+      stack = [
+        "#{percent0} %",
+        format_bytes(@transfer_sent, "B"),
+        format_bytes(@current_bitrate.round(0), "bps")
+        ]
+      stack2 = stack.map { |txt| ("%#{LOG_PIPE_LEN.to_i}s" % txt) }.join("\t")
+      log_info "progress #{stack2} \t#{name}"
+
+      # Prepare and send notification
+      client_notify :progress, status: {
+        progress: percent0,
+        transfer_sent: @transfer_sent,
+        transfer_total: @transfer_total,
+        transfer_bitrate: @current_bitrate.round(0),
+        transfer_current: name,
+        }
+
+      # Remember when we last did it
+      @last_notify_at = now
+    end
+
+    def get_bitrate delta_data, delta_time
+      return nil if delta_time.nil? || delta_time.zero?
+      8 * delta_data.to_f.to_f / delta_time
+    end
+
+    def running_bitrate current_data
+      return if @last_time.nil?
+
+      # Compute deltas
+      @last_data ||= 0
+      delta_data = current_data - @last_data
+      delta_time = Time.now - @last_time
+
+      # Update counters
+      @last_time = Time.now
+      @last_data = current_data
+
+      # Return bitrate
+      get_bitrate delta_data, delta_time
+    end
+
+  end
+end

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

@@ -2,6 +2,7 @@
 
 module RestFtpDaemon
   class JobTransfer < Job
+    include TransferHelpers
 
   protected
 
@@ -111,126 +112,8 @@ module RestFtpDaemon
       RestFtpDaemon::Counters.instance.add :data, :transferred, @transfer_total
     end
 
-    def remote_upload source, target
-      # Method assertions
-      raise RestFtpDaemon::AssertionFailed, "remote_upload/remote" if @remote.nil?
-      raise RestFtpDaemon::AssertionFailed, "remote_upload/source" if source.nil?
-      raise RestFtpDaemon::AssertionFailed, "remote_upload/target" if target.nil?
-
-      # Use source filename if target path provided none (typically with multiple sources)
-      log_info "remote_upload temp[#{@tempfile}] source[#{source.path}] target[#{target.path}]"
-      set_info INFO_SOURCE_CURRENT, source.name
-
-      # Remove any existing version if present, or check if it's there
-      if @overwrite
-        @remote.remove! target
-      elsif (size = @remote.size_if_exists(target))  # won't be triggered when NIL or 0 is returned
-        log_debug "remote_upload file exists ! (#{format_bytes size, 'B'})"
-        raise RestFtpDaemon::TargetFileExists
-      end
-
-      # Start transfer
-      transfer_started_at = Time.now
-      @last_notify_at = transfer_started_at
-
-      # Start the transfer, update job status after each block transfer
-      set_status JOB_STATUS_UPLOADING
-      @remote.upload source, target, @tempfile do |transferred, name|
-        # Update transfer statistics
-        update_progress transferred, name
-      end
-
-      # Compute final bitrate
-      global_transfer_bitrate = get_bitrate @transfer_total, (Time.now - transfer_started_at)
-      set_info INFO_TRANFER_BITRATE, global_transfer_bitrate.round(0)
-
-      # Done
-      set_info INFO_SOURCE_CURRENT, nil
-    end
-
-    def update_progress transferred, name = ""
-      # Update counters
-      @transfer_sent += transferred
-      set_info INFO_TRANFER_SENT, @transfer_sent
-
-      # Update job info
-      percent0 = (100.0 * @transfer_sent / @transfer_total).round(0)
-      set_info INFO_TRANFER_PROGRESS, percent0
-
-      # Update bitrates
-      @current_bitrate = running_bitrate @transfer_sent
-      set_info INFO_TRANFER_BITRATE,  @current_bitrate.round(0)
-
-      # What's current time ?
-      now = Time.now
-
-      # Notify if requested
-      progress_notify now, percent0, name
-
-      # Touch my worker status
-      touch_job
-    end
-
-  private
-
-    def progress_notify now, percent0, name
-      # No delay provided ?
-      return if @config[:notify_after].nil?
-
-      # Still too early to notify again ?
-      how_long_ago = (now.to_f - @last_notify_at.to_f)
-      return unless how_long_ago > @config[:notify_after]
-
-      # # Update bitrates
-      # @current_bitrate = running_bitrate @transfer_sent
-      # set_info INFO_TRANFER_BITRATE,  @current_bitrate.round(0)
-
-      # Log progress
-      stack = [
-        "#{percent0} %",
-        format_bytes(@transfer_sent, "B"),
-        format_bytes(@current_bitrate.round(0), "bps")
-        ]
-      stack2 = stack.map { |txt| ("%#{LOG_PIPE_LEN.to_i}s" % txt) }.join("\t")
-      log_info "progress #{stack2} \t#{name}"
-
-      # Prepare and send notification
-      client_notify :progress, status: {
-        progress: percent0,
-        transfer_sent: @transfer_sent,
-        transfer_total: @transfer_total,
-        transfer_bitrate: @current_bitrate.round(0),
-        transfer_current: name,
-        }
-
-      # Remember when we last did it
-      @last_notify_at = now
-    end
-
-    def get_bitrate delta_data, delta_time
-      return nil if delta_time.nil? || delta_time.zero?
-      8 * delta_data.to_f.to_f / delta_time
-    end
-
-    def running_bitrate current_data
-      return if @last_time.nil?
-
-      # Compute deltas
-      @last_data ||= 0
-      delta_data = current_data - @last_data
-      delta_time = Time.now - @last_time
-
-      # Update counters
-      @last_time = Time.now
-      @last_data = current_data
-
-      # Return bitrate
-      get_bitrate delta_data, delta_time
-    end
-  end
-
   # NewRelic instrumentation
   # add_transaction_tracer :prepare,        category: :task
   # add_transaction_tracer :run,            category: :task
-
+  end
 end

data/lib/tasks/dockerize.rake

@@ -1,18 +1,19 @@
-DOCKER_REPO = "bmedici/rest-ftp-daemon"
+DOCKER_REPO = "bmconseil/rest-ftp-daemon"
 
 desc "Build docker image from latest tag"
 
 task :dockerize => [] do
   version     =  `git describe --tags`.strip
+  version 	  += "-dev"
 
   puts
   puts "* build [#{version}]"
+  # sh "docker build --build-arg GEM_VERSION=#{version} . -t '#{DOCKER_REPO}:#{version}' -t '#{DOCKER_REPO}:latest'"
   sh "docker build . -t '#{DOCKER_REPO}:#{version}' -t '#{DOCKER_REPO}:latest'"
 
   puts
-  puts "* push to: [#{DOCKER_REPO}]"
+  puts "* push to [#{DOCKER_REPO}]"
     sh "docker push #{DOCKER_REPO}:#{version}"
     sh "docker push #{DOCKER_REPO}:latest"
-
   puts
 end

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.502.2"
+  spec.version                    = "1.0.1"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.502.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -411,6 +411,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".dockerignore"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -439,6 +440,7 @@ files:
 - 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/transfer.rb
 - lib/rest-ftp-daemon/helpers/views.rb
 - lib/rest-ftp-daemon/initialize.rb
 - lib/rest-ftp-daemon/job.rb