backup-remote 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2fc3569f37e204350b31fc06bf5edde0f15a89e
-  data.tar.gz: dd9db17395b314a876850f35aecc9bea56ea5c0d
+  metadata.gz: 1dc51aa59099a0bf9406f503155f31630759586e
+  data.tar.gz: cea4e466d787dad9e31bb7d34ebef3972f141295
 SHA512:
-  metadata.gz: 7e6bdac05bd47da6f855508e369576f59011058ea55cccad9b856b0514158786730a6207d1f0be31371c9fd7055913c1a8d7e5688c0fce0f74fdecec050b8a99
-  data.tar.gz: a40f18efe432ad1e45297e04549070435a6d487e55bc673e44fdb00ca3cf17a143c031bdbf95bf0c1a780f0140d0d7e48e58b9233ff7f515b4f5f87093456609
+  metadata.gz: 246ae877464476b31e954cd8e0a0ef37e5ca737fd43094579427f095153364bf334b0e663d3692ed757b0044d5b2b12e46cfcbbfff320e59c8a4b98801b259ec
+  data.tar.gz: 3d97561e03e95b86a46c7491bd54518f271d6895586a3f966c284855e2e7de6da1bb06b85e8a87715fc2ee9449573db737814236a712226661f2b19f8b1295a3

data/README.md

@@ -98,9 +98,6 @@ end
     
 ```
 
-Options:
-* server_command - command to create archive file
-
 
 # Databases
 
@@ -110,7 +107,7 @@ Options:
 * RemoteMySQL
 
 
-### RemoteMySQL
+### Remote MySQL Database
 
 ```
 Model.new(:my_backup, 'My Backup') do
@@ -137,7 +134,7 @@ end
 
 * Run custom command on the remote server to create a backup archive
 
-* Specify command to run to generate archive file on the remote server
+* Specify command (or script) to run to generate archive file on the remote server
 
 * This command should create an archive file with filename specified in server_path option.
 
@@ -152,12 +149,13 @@ Model.new(:my_server_data_backup, 'Backup data') do
     
     
     archive.command = "--any command to generate backup archive file--"
+    archive.script = "--path to script to copy to server and run--" 
+    archive.server_path = "/path/to/backup.tar.gz"
+
+    # example:
+    # archive.command = "/tmp/backup.txt"
     # archive.command = "echo '1' > /tmp/backup.txt"
     
-    archive.server_path = "/path/to/archive.tar.gz"
-    # archive.command = "/tmp/backup.txt"
-
-
     
   end
   
@@ -167,8 +165,12 @@ end
     
 ```
 
+Options:
+
+* command - command to run to generate backup on server. Not used if script is specified.
+* script - path to script file to upload and run on server to generate backup. Script is stored locally nad is uploaded to server.
+
+
+
 
-# Backup gem
-[Installation]:  http://backup.github.io/backup/v4/installation
-[Release Notes]: http://backup.github.io/backup/v4/release-notes
-[Documentation]: http://backup.github.io/backup/v4
+### Examples

data/lib/backup/remote_archive.rb

@@ -185,14 +185,9 @@ module Backup
       paths.each {|path| tmpfile.puts path }
       tmpfile.close
 
-      puts "tmpfile #{tmpfile.path}"
-
-      puts "content: #{File.read(tmpfile.path)}"
       #yield "-T '#{ tmpfile.path }'"
       yield "#{ tmpfile.path }"
     ensure
-
-      puts "delete file #{tmpfile.path}"
       tmpfile.delete
     end
 
@@ -203,12 +198,7 @@ module Backup
     end
 
     def prepare_path(path)
-
-      res = options[:root] ? path : File.expand_path(path)
-
-      puts "path #{path} ===> #{res}"
-
-      res
+      options[:root] ? path : File.expand_path(path)
     end
 
     def tar_options

data/lib/backup/remote_data.rb

@@ -23,6 +23,7 @@ module Backup
     attr_accessor :server_ssh_key
     attr_accessor :server_path
     attr_accessor :server_command
+    attr_accessor :script
 
 
 
@@ -47,6 +48,7 @@ module Backup
       self.server_ssh_password = @options[:server_ssh_password]
       self.server_path = @options[:server_path]
       self.server_command = @options[:server_command]
+      self.script = @options[:script]
     end
 
     def perform!
@@ -64,22 +66,46 @@ module Backup
 
       Dir.mktmpdir do |temp_dir|
         temp_local_file = File.join("#{temp_dir}", File.basename(server_path))
-        #temp_local_file = File.join(path, File.basename(server_path))
-        #temp_local_file = Tempfile.new("").path+"."+File.extname(server_path)
 
         remote_archive_file = server_path
 
         # generate backup on remote server
-        cmd_remote = server_command
-        res_generate = remote.run_ssh_cmd(
-            server_host, server_ssh_user, server_ssh_password,
-            cmd_remote)
+        remote_script = script
+
+        if remote_script && remote_script!=""
+          # use script
+          # upload script
+          local_script_path = File.join(Config.root_path, remote_script)
+
+          f_remote = Tempfile.new('backup')
+          remote_script_path = f_remote.path+"."+File.extname(local_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)
+
+          # 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
 
         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)
@@ -149,14 +175,10 @@ module Backup
       paths.each {|path| tmpfile.puts path }
       tmpfile.close
 
-      puts "tmpfile #{tmpfile.path}"
-
-      puts "content: #{File.read(tmpfile.path)}"
       #yield "-T '#{ tmpfile.path }'"
       yield "#{ tmpfile.path }"
     ensure
 
-      puts "delete file #{tmpfile.path}"
       tmpfile.delete
     end
 
@@ -167,12 +189,7 @@ module Backup
     end
 
     def prepare_path(path)
-
-      res = options[:root] ? path : File.expand_path(path)
-
-      puts "path #{path} ===> #{res}"
-
-      res
+      options[:root] ? path : File.expand_path(path)
     end
 
     def tar_options
@@ -207,6 +224,9 @@ module Backup
       def server_command=(val = true)
         @options[:server_command] = val
       end
+      def script=(val = true)
+        @options[:script] = val
+      end
       def server_path=(val = true)
         @options[:server_path] = val
       end

data/lib/backup/version.rb

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

metadata

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