backup_client 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca93b07426446a09cf19dd82587bbf72b1df00618afdafdcc4db2a0b0a906b6c
-  data.tar.gz: 50149a90698419ce11d9a48f10079f3496b0c361e9d47cbc4c726a01460e2d0d
+  metadata.gz: 17c4846983f4c6c919e4fc99cee2c09c73b0fc8b4751044dbab1e398a31959d6
+  data.tar.gz: 3d05e48d90120577dd1dea1f9aef93e3da3aeb4916ba5cdc27f52ae1fbc227d2
 SHA512:
-  metadata.gz: a097ca672592be2be280ff45b2fb7267c620c94a17e213f889f8c02088224c4ba913d8160d42fd06651aefa4c346d78484777cc7d0112676be292344077d11e9
-  data.tar.gz: 55c54c32e0129b947cae352f7f07f90102e5599e1e0923f1ebd0e3c493ff44b65964d341684524c1690f1f2e5aaad329119b68c91a945fb2b6fc1253e7fda9d5
+  metadata.gz: f20ee4026845c8c60b0b7bee5082c94cde10cc66c4e9cf441440c1a333dfe86b28ea5bcdc9ed929a5f184ca1ef8be90738727badb89a6f5f97ae0881fdeb6b8d
+  data.tar.gz: fa1bf216acec804d25f47d83bc45e99c026ef86db235e34fa56b544b182836419d8ad19e4f6f185a52c2a00ae23438c3787cf34e687403f3a0a3bf7fbba10257

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

@@ -8,24 +8,25 @@ module BackupClient
           include ::BackupClient::Helpers::LogHelper
           include ::BackupClient::Helpers::FtpHelper
 
-          def initialize(ftp_client, file, destination_folder)
-            @ftp_client = ftp_client
-            @file = file
-            @destination_folder = destination_folder
+          def initialize(ftp_client, local_file_path, remote_folder_path)
+            @ftp_client         = ftp_client
+            @local_file_path    = local_file_path
+            @remote_folder_path = remote_folder_path
           end
 
           def call
-            File.open(file, "rb") do |file_handle|
-              remote_file_path = destination_folder + "/" + File.basename(file)
-              remote_file_path = remote_file_path.gsub(%r{//+}, "/")
-              ftp_client.putbinaryfile(file_handle, remote_file_path)
-              log("Uploaded file #{file} → #{remote_file_path}")
+            remote_file_path = [remote_folder_path, local_file_path].join("/").gsub("//", "/")
+
+            File.open(local_file_path, "rb") do |file|
+              ftp_client.putbinaryfile(file, remote_file_path)
             end
+
+            log "Uploaded file #{local_file_path} → #{remote_file_path}"
           end
 
           private
 
-          attr_reader :ftp_client, :file, :destination_folder
+          attr_reader :ftp_client, :local_file_path, :remote_folder_path
         end
       end
     end

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

@@ -31,16 +31,26 @@ module BackupClient
 
           def ftp_processing
             source_paths.each do |path|
-              if File.file?(path)
-                upload_file_ftp(path, destination_path)
-              elsif File.directory?(path)
-                upload_dir_ftp(path, destination_path)
+              folder = to_unix_path(path)
+
+              if File.file?(folder)
+                upload_file_ftp(folder, destination_path)
+              elsif File.directory?(folder)
+                upload_dir_ftp(folder, destination_path)
               else
-                log "Invalid path: #{path}"
+                log "Invalid path: #{folder}"
               end
             end
           end
 
+          def to_unix_path(path)
+            if Regexp.new('^[A-Za-z]:\\\\') =~ path
+              path.sub(/^[A-Za-z]:\\/, '/').gsub('\\', '/')
+            else
+              path
+            end
+          end
+
           def ftp_client
             @ftp_client ||=
               begin

data/lib/backup_client/components/tasks/commands/processor.rb

@@ -18,15 +18,15 @@ module BackupClient
           def call
             log("Processing task #{task["name"]}")
 
-            task["providers"].each do |provider_name|
-              provider = fetch_provider(provider_name)
+            task["providers"].each do |task_provider|
+              provider = fetch_provider(task_provider)
               next if provider.nil?
 
-              log("Processing provider #{provider_name}")
+              log("Processing provider #{task_provider['name']}#{task_provider['type']}")
 
               processing_task_for_provider(provider)
-            # rescue StandardError => e
-            #   log("Unexpected error: #{e}, #{provider["type"].upcase}: #{provider["name"].upcase}")
+              # rescue StandardError => e
+              #   log(" Unexpected error: #{e}, #{provider["type"].upcase}: #{provider["name"].upcase}")
             end
           end
 
@@ -47,7 +47,7 @@ module BackupClient
 
           def upload_to_ftp(provider, source_paths, use_timestamp)
             ::BackupClient::Components::Ftp::Commands::Upload
-              .new(source_paths, provider, timestamp: Time.now).call
+              .new(provider, source_paths, use_timestamp: use_timestamp, timestamp: Time.now).call
           end
 
           def copy_to_local(provider, local_paths, use_timestamp)
@@ -68,8 +68,10 @@ module BackupClient
             end
           end
 
-          def fetch_provider(provider_name)
-            providers[provider_name]
+          def fetch_provider(task_provider)
+            providers.find do |provider|
+              task_provider['name'] == provider['name'] && task_provider['type'] == provider['type']
+            end
           end
         end
       end

data/lib/backup_client.rb

@@ -17,7 +17,7 @@ Dir.glob("components/**/*.rb").sort.each do |file|
 end
 
 module BackupClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 
   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.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Alex
@@ -66,8 +66,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- backup_client-0.1.0.gem
-- backup_client-0.1.1.gem
 - lib/backup_client.rb
 - lib/backup_client/components/ftp/commands/create_folder.rb
 - lib/backup_client/components/ftp/commands/file_upload.rb