backup_client 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0b6151dbd77af62a934cdd9eb2b1a88ef4960c9449221642736be215b56f68
-  data.tar.gz: 03c7fec17e8153665a58626d645972833df4f7e224c013b0d2dc90f12df302b0
+  metadata.gz: 9751b1230fda523c9219bac0be687234d1c2a1a8130e365730a89292839b925c
+  data.tar.gz: e4a0397dcff58ecfa17a49c69439df02817bd9807b0c0ef998510e0f9ba57dc2
 SHA512:
-  metadata.gz: aa3b3a2b512b9e6fdac8faba1d59d59a33cafba5b144d1c0eab13722abd491383f1e0cce666f61df34c088e774b73d02a581030a75da3dc30396692a51933a08
-  data.tar.gz: a1776157690e81e9dfaacf5a624e5b699db6441b93ff359160cab3cd2c4bf50892aa3837ede343b3eb274d30239b9cc4873ff7066f59e0a97cb82eac79ed74e2
+  metadata.gz: 74213ec236a3bef9a34a5c8cd8cfc0f469acbe60c1acc2ce9dd1f756ea09d23bc6196ac2c144e73b6af1842c6679d320f179fa5339aeacb57ef841a56a80af40
+  data.tar.gz: a96dd3ba2d6e8a8c99ece3cf459586f739f99674ed5d1f77a9b831cc9280f6aa3d0838150d243d3726e3cd61e45b442edfc30589af440efb9a044145c58fe19c

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.1"
+  VERSION = "0.1.3"
 
   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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Alex
@@ -66,7 +66,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- backup_client-0.1.0.gem
 - lib/backup_client.rb
 - lib/backup_client/components/ftp/commands/create_folder.rb
 - lib/backup_client/components/ftp/commands/file_upload.rb