backup-remote 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34a3a0fa7801434d9451ca9e328afdc09ff3d22
-  data.tar.gz: d3b35356d2bca06636de49be0eee14ffcb621e73
+  metadata.gz: c1856e1f2cc32e862113171f5795fc98bd8bb9b3
+  data.tar.gz: 2ebf39b7e07c93277ebbe1d3881feb462d221306
 SHA512:
-  metadata.gz: 5ef67d3cf1b5b005269644149ace6be149f4a2cfa3d7a9488fbfa373e49d4517224db6c53d9a8631f3f31e6b0cfe750547f20e48f17e3dae06699bc8a6e8273e
-  data.tar.gz: fd3763f76c453a57c8164c2f7e2c3eeeeecca815e93c136ebd212b6fc664159e0b1e465967b8dae4515a7f0ebc6641608573242a9080add8f80e481e62dc0cd1
+  metadata.gz: 6fb154ae61155636a143ae4cde53a7921d039daaec0ced5326a3ff5ba6f6e6c630682ce8d8acd7f16b57ae508f6ea71a9df294db09ba3b48ffc61beecd53e4fe
+  data.tar.gz: 353db081fe46b1792c7f3ccae5eb67a641d835156f470f3f67d041d396410b223ae435c90abea44f99cc6b3309a25a4ba2157bfc2aac7fe627adaa40c29ef743

data/README.md

@@ -71,6 +71,7 @@ Options for SSH connection:
 * server_ssh_user - user name to connect by SSH
 * server_ssh_password - not used if server_ssh-key is provided
 * server_ssh_key - (optional) - path to ssh key
+* temp_dir_path - (optional) - specify temporary directory path where backup files will be downloaded. By default, it is '/tmp'
 
 
 

data/lib/backup/remote/command.rb

@@ -59,23 +59,43 @@ module Backup
   end
 
 
-      def ssh_download_file(hostname, ssh_user, ssh_pass, remote_filename, dest_filename)
-        host = SSHKit::Host.new("#{ssh_user}@#{hostname}")
-        host.password = ssh_pass
-
-        on host do |host|
-          download! remote_filename, dest_filename
-        end
-
-        #
-        return {res: 1, output: ""}
-
-      rescue => e
-        {
-            res: 0,
-            error: e.message
-        }
-      end
+
+  def ssh_download_file(hostname, ssh_user, ssh_pass, remote_filename, dest_filename)
+    return ssh_download_file_sshkit(hostname, ssh_user, ssh_pass, remote_filename, dest_filename)
+    #return ssh_download_file_scp(hostname, ssh_user, ssh_pass, remote_filename, dest_filename)
+  end
+
+  def ssh_download_file_scp(hostname, ssh_user, ssh_pass, remote_filename, dest_filename)
+    Net::SCP.download!(hostname, ssh_user, remote_filename, dest_filename, :ssh => { :password => ssh_pass })
+
+    #
+    return {res: 1, output: ""}
+
+  rescue => e
+    {
+        res: 0,
+        error: e.message
+    }
+  end
+
+  # !! NOT work on big files > 4Gb
+  def ssh_download_file_sshkit(hostname, ssh_user, ssh_pass, remote_filename, dest_filename)
+    host = SSHKit::Host.new("#{ssh_user}@#{hostname}")
+    host.password = ssh_pass
+
+    on host do |host|
+      download! remote_filename, dest_filename
+    end
+
+    #
+    return {res: 1, output: ""}
+
+  rescue => e
+    {
+        res: 0,
+        error: e.message
+    }
+  end
 
   def ssh_upload_file(hostname, ssh_user, ssh_pass, source_file, dest_file, handler=nil)
     host = SSHKit::Host.new("#{ssh_user}@#{hostname}")

data/lib/backup/remote_data.rb

@@ -24,6 +24,7 @@ module Backup
     attr_accessor :server_path
     attr_accessor :server_command
     attr_accessor :script
+    attr_accessor :temp_dir_path
 
 
 
@@ -49,6 +50,7 @@ module Backup
       self.server_path = @options[:server_path]
       self.server_command = @options[:server_command]
       self.script = @options[:script]
+      self.temp_dir_path = @options[:temp_dir_path] || '/tmp'
     end
 
     def perform!
@@ -64,99 +66,110 @@ module Backup
       remote = Backup::Remote::Command.new
 
 
-      Dir.mktmpdir do |temp_dir|
-        temp_local_file = File.join("#{temp_dir}", File.basename(server_path))
+      remote_archive_file = server_path
 
-        remote_archive_file = server_path
+      # generate backup on remote server
+      remote_script = script
 
-        # generate backup on remote server
-        remote_script = script
+      if remote_script && remote_script!=""
+        # use script
+        # upload script
 
-        if remote_script && remote_script!=""
-          # use script
-          # upload script
+        local_script_path = File.join(Config.root_path, remote_script)
 
-          puts "config root: #{Config.root_path}"
-          puts "config: #{Config.inspect}"
+        f_remote = Tempfile.new('backup')
+        remote_script_path = f_remote.path+"."+File.extname(local_script_path)
 
-          local_script_path = File.join(Config.root_path, remote_script)
+        Logger.info "upload script #{local_script_path} --> #{remote_script_path}"
 
-          f_remote = Tempfile.new('backup')
-          remote_script_path = f_remote.path+"."+File.extname(local_script_path)
+        remote.ssh_upload_file(server_host, server_ssh_user, server_ssh_password, local_script_path, remote_script_path)
 
-          #puts "upload script #{local_script_path} --> #{remote_script_path}"
-          remote.ssh_upload_file(server_host, server_ssh_user, server_ssh_password, local_script_path, remote_script_path)
+        cmd_remote = "chmod +x #{remote_script_path} && sh #{remote_script_path}"
+        res_generate = remote.run_ssh_cmd(
+            server_host, server_ssh_user, server_ssh_password,
+            cmd_remote)
 
-          cmd_remote = "chmod +x #{remote_script_path} && sh #{remote_script_path}"
-          res_generate = remote.run_ssh_cmd(
-              server_host, server_ssh_user, server_ssh_password,
-              cmd_remote)
+        # delete temp script
+        cmd_delete = "rm -rf #{remote_script_path}"
+        res_delete = remote.run_ssh_cmd(server_host, server_ssh_user, server_ssh_password, cmd_delete)
 
-          # delete temp script
-          cmd_delete = "rm -rf #{remote_script_path}"
-          res_delete = remote.run_ssh_cmd(server_host, server_ssh_user, server_ssh_password, cmd_delete)
+      else
+        # use command
+        cmd_remote = server_command
+        res_generate = remote.run_ssh_cmd(
+            server_host, server_ssh_user, server_ssh_password,
+            cmd_remote)
+      end
 
-        else
-          # use command
-          cmd_remote = server_command
-          res_generate = remote.run_ssh_cmd(
-              server_host, server_ssh_user, server_ssh_password,
-              cmd_remote)
-        end
+      if res_generate[:res]==0
+        raise 'Cannot create backup on server'
+      end
 
-        if res_generate[:res]==0
-          raise 'Cannot create backup on server'
-        end
 
-        # download backup
-        #puts "download from #{remote_archive_file} to #{temp_local_file}"
-        res_download = remote.ssh_download_file(
-            server_host, server_ssh_user, server_ssh_password,
-            remote_archive_file, temp_local_file)
 
-        if res_download[:res]==0
-          raise 'Cannot download file from server'
-        end
+      #Dir.mktmpdir do |temp_dir|
 
-        # delete archive on server
-        res_delete = remote.run_ssh_cmd(
-            server_host, server_ssh_user, server_ssh_password,
-            "rm #{remote_archive_file}")
+      #temp_local_file = File.join("#{temp_dir}", File.basename(server_path))
+
+      temp_local_file = File.join("#{temp_dir_path}/#{Time.now.to_i}#{rand(1000)}/", File.basename(server_path))
+
+      #path = File.expand_path "#{Dir.tmpdir}/#{Time.now.to_i}#{rand(1000)}/"
+      FileUtils.mkdir_p File.dirname(temp_local_file)
+
+      # download backup
+      Logger.info "download from #{remote_archive_file} to #{temp_local_file}"
 
+      res_download = remote.ssh_download_file(
+          server_host, server_ssh_user, server_ssh_password,
+          remote_archive_file, temp_local_file)
 
-        # process archive locally
+      if res_download[:res]==0
+        raise 'Cannot download file from server'
+      end
+
+      # delete archive on server
+      res_delete = remote.run_ssh_cmd(
+          server_host, server_ssh_user, server_ssh_password,
+          "rm #{remote_archive_file}")
 
-        pipeline = Pipeline.new
 
-        #temp_tar_root= tar_root
-        temp_tar_root= temp_dir
-        pipeline.add(
-            "#{ tar_command } #{ tar_options } -cPf - -C #{temp_tar_root } #{ File.basename(temp_local_file) }",
-            tar_success_codes
-        )
+      # process archive locally
 
-        extension = 'tar'
-        @model.compressor.compress_with do |command, ext|
-          pipeline << command
-          extension << ext
-        end if @model.compressor
+      pipeline = Pipeline.new
 
-        pipeline << "#{ utility(:cat) } > '#{ File.join(path, "#{ name }.#{ extension }") }'"
+      #temp_tar_root= tar_root
+      temp_tar_root= temp_dir_path
+      pipeline.add(
+          "#{ tar_command } #{ tar_options } -cPf - -C #{temp_tar_root } #{ File.basename(temp_local_file) }",
+          tar_success_codes
+      )
 
-        #puts "commands: #{pipeline.commands}"
-        #exit
+      extension = 'tar'
+      @model.compressor.compress_with do |command, ext|
+        pipeline << command
+        extension << ext
+      end if @model.compressor
 
-        pipeline.run
+      pipeline << "#{ utility(:cat) } > '#{ File.join(path, "#{ name }.#{ extension }") }'"
 
+      #puts "commands: #{pipeline.commands}"
+      #exit
 
-        if pipeline.success?
-          Logger.info "Archive '#{ name }' Complete!"
-        else
-          raise Error, "Failed to Create Archive '#{ name }'\n" +
-              pipeline.error_messages
-        end
+      pipeline.run
 
+
+      if pipeline.success?
+        Logger.info "Archive '#{ name }' Complete!"
+      else
+        raise Error, "Failed to Create Archive '#{ name }'\n" +
+            pipeline.error_messages
       end
+
+      if File.exists?(temp_local_file)
+        FileUtils.rm_rf(temp_local_file)
+        FileUtils.rm_rf(File.dirname(temp_local_file))
+      end
+
     end
 
     private
@@ -235,6 +248,10 @@ module Backup
         @options[:server_path] = val
       end
 
+      def temp_dir_path=(val = true)
+        @options[:temp_dir_path] = val
+      end
+
       ###
       def use_sudo(val = true)
         @options[:sudo] = val

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backup
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Max Ivak, Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList