photocopier 1.3.0.pre → 1.3.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c9e146b3e1470970f2f95815ef0bac16517ee2
-  data.tar.gz: b9a43d8c3b696e6b755f8888d6286ad8512bdceb
+  metadata.gz: 8d09179ce249ba612eff1014e10d24e16e7bbb73
+  data.tar.gz: b631249fc13d03e650aa345bb4e134f4e30e384d
 SHA512:
-  metadata.gz: 30e977409752782228a0b4dd73d496b5308236a4770c752efe46b3b88ec2785bbce9f808e1ac06ae9fece98719d9a263874ef1ad9d42471ec092a32be29d6cd6
-  data.tar.gz: 66c2b1d04a8715715262875d8c317eaff2a3d2b638a95083a08afff4af826b30d4e4a3aaf177197c07c69556be6af5cdf00fff0dfaabe17a74d4fecb5d39d126
+  metadata.gz: efd9347e0a828d143332be5990b1c949053218470d7a97fc23f73cbf41a48db95baeb0a0a52249802aa89fe26cafcabf56008337d6d2f8138afe736dd7bf8b4f
+  data.tar.gz: b10c5a142ecafb3e3690efada776cdc4b9bb83c26bf3e9e0e1c76946e3ef2e31afd8594d63607b2ad120de09ba611ab3a011e2e90ec0575bbac3538cbeca49c3

data/lib/photocopier/ftp/session.rb

@@ -5,9 +5,19 @@ module Photocopier
         @scheme = options[:scheme]
 
         if sftp?
-          @session = Net::SFTP.start(options[:host], options[:user], password: options[:password])
+          @session = Net::SFTP.start(
+            options[:host],
+            options[:user],
+            password: options[:password],
+            port: options[:port] || 22
+          )
         else
-          @session = Net::FTP.open(options[:host], options[:user], options[:password])
+          @session = Net::FTP.open(
+            options[:host],
+            username: options[:user],
+            password: options[:password],
+            port: options[:port] || 21
+          )
           @session.passive = options[:passive] if options.key?(:passive)
         end
       end

data/lib/photocopier/ftp.rb

@@ -22,11 +22,11 @@ module Photocopier
 
     def get_directory(remote_path, local_path, exclude = [])
       FileUtils.mkdir_p(local_path)
-      lftp(local_path, remote_path, false, exclude)
+      lftp(local_path, remote_path, false, exclude, options[:port])
     end
 
     def put_directory(local_path, remote_path, exclude = [])
-      lftp(local_path, remote_path, true, exclude)
+      lftp(local_path, remote_path, true, exclude, options[:port])
     end
 
     private
@@ -35,20 +35,26 @@ module Photocopier
       @session ||= Session.new(options)
     end
 
-    def lftp(local, remote, reverse, exclude)
+    def lftp(local, remote, reverse, exclude, port = nil)
+      if port.nil? && options[:scheme] == 'sftp'
+        port = 22
+      elsif port.nil?
+        port = 21
+      end
+
       remote = Shellwords.escape(remote)
       local = Shellwords.escape(local)
       command = [
-          "set ftp:list-options -a",
-          "set cmd:fail-exit true",
-          "open #{remote_ftp_url}",
-          "find -d 1 #{remote} || mkdir -p #{remote}",
-          "lcd #{local}",
-          "cd #{remote}",
-          lftp_mirror_arguments(reverse, exclude)
+        "set ftp:list-options -a",
+        "set cmd:fail-exit true",
+        "open #{remote_ftp_url}",
+        "find -d 1 #{remote} || mkdir -p #{remote}",
+        "lcd #{local}",
+        "cd #{remote}",
+        lftp_mirror_arguments(reverse, exclude)
       ].join("; ")
 
-      run "lftp -c '#{command}'"
+      run "lftp -c '#{command}' -p #{port}"
     end
 
     def remote_ftp_url
@@ -64,7 +70,8 @@ module Photocopier
     end
 
     def lftp_mirror_arguments(reverse, exclude = [])
-      mirror = "mirror --delete --use-cache --verbose --no-perms --allow-suid --no-umask --parallel=5"
+      mirror = "mirror --delete --use-cache --verbose" \
+               " --no-perms --allow-suid --no-umask --parallel=5"
       mirror << " --reverse --dereference" if reverse
       exclude.each do |glob|
         mirror << " --exclude-glob #{glob}" # NOTE do not use Shellwords.escape here

data/lib/photocopier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_litterla: true
 
 module Photocopier
-  VERSION = "1.3.0.pre".freeze
+  VERSION = "1.3.0.pre2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre
+  version: 1.3.0.pre2
 platform: ruby
 authors:
 - Stefano Verna
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport