photocopier 1.2.0 → 1.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3b9cc3cc86c153ef1c704c256048043f9f21a8
-  data.tar.gz: 306c1a3a7cf48f236f2e8ace351f07b66e5d76b7
+  metadata.gz: c7c9e146b3e1470970f2f95815ef0bac16517ee2
+  data.tar.gz: b9a43d8c3b696e6b755f8888d6286ad8512bdceb
 SHA512:
-  metadata.gz: fd735bbe44ad3c88e03e55a45bcd8bc0424939e4c26fd34625e4a367548ab72acfd647129b0d56260ba07afd8928f97887b00e7b3a8d26c545ca93c39962b12d
-  data.tar.gz: 532d2583c6eb1a0fb225a3ef7b6b12ca3e1fb242e9bb6f72fcedffe4f4c7e92b28ff2918bf144a5134262443a4e9a8b703d42c91d1059478a569bbe62a73c282
+  metadata.gz: 30e977409752782228a0b4dd73d496b5308236a4770c752efe46b3b88ec2785bbce9f808e1ac06ae9fece98719d9a263874ef1ad9d42471ec092a32be29d6cd6
+  data.tar.gz: 66c2b1d04a8715715262875d8c317eaff2a3d2b638a95083a08afff4af826b30d4e4a3aaf177197c07c69556be6af5cdf00fff0dfaabe17a74d4fecb5d39d126

data/lib/photocopier/ftp/session.rb

@@ -0,0 +1,46 @@
+module Photocopier
+  class FTP
+    class Session
+      def initialize(options)
+        @scheme = options[:scheme]
+
+        if sftp?
+          @session = Net::SFTP.start(options[:host], options[:user], password: options[:password])
+        else
+          @session = Net::FTP.open(options[:host], options[:user], options[:password])
+          @session.passive = options[:passive] if options.key?(:passive)
+        end
+      end
+
+      def get(remote, local)
+        if sftp?
+          @session.download!(remote, local)
+        else
+          @session.get(remote, local)
+        end
+      end
+
+      def put_file(local, remote)
+        if sftp?
+          @session.upload!(local, remote)
+        else
+          @session.put(local, remote)
+        end
+      end
+
+      def delete(remote)
+        if sftp?
+          @session.remove!(remote)
+        else
+          @session.delete(remote)
+        end
+      end
+
+      private
+
+      def sftp?
+        @scheme == 'sftp'
+      end
+    end
+  end
+end

data/lib/photocopier/ftp.rb

@@ -13,7 +13,7 @@ module Photocopier
     end
 
     def put_file(file_path, remote_path)
-      session.put file_path, remote_path
+      session.put_file file_path, remote_path
     end
 
     def delete(remote_path)
@@ -32,11 +32,7 @@ module Photocopier
     private
 
     def session
-      if @session.nil?
-        @session = Net::FTP.open(options[:host], options[:user], options[:password])
-        @session.passive = options[:passive] if options.has_key?(:passive)
-      end
-      @session
+      @session ||= Session.new(options)
     end
 
     def lftp(local, remote, reverse, exclude)

data/lib/photocopier/version.rb

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

data/lib/photocopier.rb

@@ -2,6 +2,7 @@ require 'tempfile'
 require 'logger'
 require 'fileutils'
 require 'net/ftp'
+require 'net/sftp'
 require 'net/ssh'
 require 'net/ssh/gateway'
 require 'net/scp'
@@ -13,3 +14,4 @@ require "active_support/core_ext"
 require 'photocopier/adapter'
 require "photocopier/ssh"
 require "photocopier/ftp"
+require "photocopier/ftp/session"

data/photocopier.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", '~> 5.1', '>= 5.1.1'
   spec.add_dependency "net-scp", "~> 1.2", ">= 1.2.1"
+  spec.add_dependency "net-sftp", "~> 2.1.2"
   spec.add_dependency "net-ssh", "~> 4.1"
   spec.add_dependency "net-ssh-gateway", "~> 2.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.pre
 platform: ruby
 authors:
 - Stefano Verna
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +217,7 @@ files:
 - lib/photocopier.rb
 - lib/photocopier/adapter.rb
 - lib/photocopier/ftp.rb
+- lib/photocopier/ftp/session.rb
 - lib/photocopier/ssh.rb
 - lib/photocopier/version.rb
 - photocopier.gemspec
@@ -221,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11