backup_client 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60adb5a917ae815d6f2ae6c9e59b8d077b18aa346c7be3d0aad9953c18e53440
-  data.tar.gz: fbdd5342683a9d55b717e361b7b9ad3b03b9286fff773a02f3ea8a8ff37fa3cf
+  metadata.gz: '0651526124518960c41e1cc65399c502d52f5ca9645a8381b830ce28c078e8c3'
+  data.tar.gz: 64f61c2e7ac0bf04b0cbce7b7de81a663f3938be43ba8edbee57929f7160af08
 SHA512:
-  metadata.gz: 48b25cda2ad9c3e9b167f944a1d9a4d79257e55836daf77690bf8534bc432adaf49926c7ee9ae21244da1cd425a9c55386f559b2ff43c0bfb2ffc12e188e2661
-  data.tar.gz: 3933a18ca3b19a0feba261fb50ac1a391fbe997681fa11c4ef39da2d74f3f06bf4f539674bfacb66e4ced12a7d298f22ebbac8d642fcd5b56cbc642db0146bab
+  metadata.gz: a7347bf5559842ecc70aa532311d0f3f6248987dcbbd9900ec4531272804af757477fc1ede0d937b69cf73df741566c7818155a520ba3cdd84a71f7d211708cc
+  data.tar.gz: 0ccbd4caac3f6055c64dde899f253750d240d73c0a3004b912e8f8dd39f8052a703eceedc613383abf51b67d9652d706a9a1404e7356ee7b239377ae2d70b9b5

data/lib/backup_client/components/ftp/commands/file_upload.rb

@@ -15,7 +15,7 @@ module BackupClient
           end
 
           def call
-            remote_file_path = [remote_folder_path, local_file_path].join("/").gsub("//", "/")
+            remote_file_path = [remote_folder_path, to_unix_path(local_file_path)].join("/").gsub("//", "/")
 
             File.open(local_file_path, "rb") do |file|
               ftp_client.putbinaryfile(file, remote_file_path)

data/lib/backup_client/components/ftp/commands/folder_upload.rb

@@ -15,7 +15,7 @@ module BackupClient
           end
 
           def call
-            current_destination_folder = destination_folder + local_path
+            current_destination_folder = destination_folder + to_unix_path(local_path)
             ftp_mkdir_p(current_destination_folder)
             Dir.glob("#{local_path.gsub('\\', '/')}/**/*", File::FNM_DOTMATCH).each do |path|
               basename = File.basename(path)

data/lib/backup_client/helpers/ftp_helper.rb

@@ -4,11 +4,7 @@ module BackupClient
   module Helpers
     module FtpHelper
       def to_unix_path(path)
-        if Regexp.new('^[A-Za-z]:\\\\') =~ path
-          path.sub(/^[A-Za-z]:\\/, '/').gsub('\\', '/')
-        else
-          path
-        end
+        "/#{path.sub(/^[A-Za-z]:[\\\/]/, '')}".last.gsub("\\", "/").gsub(/\/+/, '/')
       end
 
       def ftp_chdir(ftp_client, path)
@@ -22,11 +18,15 @@ module BackupClient
       end
 
       def upload_dir_ftp(local_folder, destination_folder)
-        ::BackupClient::Components::Ftp::Commands::FolderUpload.new(ftp_client, local_folder, destination_folder).call
+        ::BackupClient::Components::Ftp::Commands::FolderUpload.new(
+          ftp_client, local_folder.gsub('//', '/'), destination_folder
+        ).call
       end
 
       def upload_file_ftp(local_file_path, remote_folder_path)
-        ::BackupClient::Components::Ftp::Commands::FileUpload.new(ftp_client, local_file_path, remote_folder_path).call
+        ::BackupClient::Components::Ftp::Commands::FileUpload.new(
+          ftp_client, local_file_path.gsub('//', '/'), remote_folder_path
+        ).call
       end
 
       def ftp_dir_exists?(ftp_client, path)

data/lib/backup_client.rb

@@ -17,7 +17,7 @@ Dir.glob("components/**/*.rb").sort.each do |file|
 end
 
 module BackupClient
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 
   class Processor
     include ::BackupClient::Helpers::LogHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup_client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Alex
@@ -66,7 +66,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- backup_client-0.1.5.gem
 - lib/backup_client.rb
 - lib/backup_client/components/ftp/commands/create_folder.rb
 - lib/backup_client/components/ftp/commands/file_upload.rb