backup-agent 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db01b64b87205698b0d42f38377b53aba47b35b3
-  data.tar.gz: 18fc289eb9246b74f27812e5f6ad39dcd112c70d
+  metadata.gz: 820a15a09fd0413a06a73500bee8889cf9dba6a5
+  data.tar.gz: ad4d69b45552d4a52a462eec64e507e64c15873b
 SHA512:
-  metadata.gz: 3ea0401050f5160ad6a540188b91bcda069d37252a67500dbf1b7f22f14712170bdba6b8f697eb6299f1c3b454bd7289cab6d4e041001eb4ee5de896295d5f58
-  data.tar.gz: 9c10accd9407eee892134aa58f9bbe9e9092f9159a2986702ade0479d7960db55a4f245a04f64b3be7ff789174150a074637189e09c09a505de97da3f442ff12
+  metadata.gz: b311d7a0c1bf67cf4f25de10eaa271d3238e75bb350775c611523876fcb2795d79c229668c953b4cd9857418ab6bdf0d7fe62294d83e4d1c549ee8da45ef04b1
+  data.tar.gz: dd45244140b0445f76337991825a3bacfe660885acf52f2a70c86d8ea2a685abb7b7283a3a0508b42b1fc9b02f2e3032a4b5d578cdf20b9091940af26d11df21

data/backup-agent.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'backup-agent'
-  s.version         = '1.0.7'
+  s.version         = '1.0.8'
   s.authors         = ['Yaroslav Konoplov']
   s.email           = ['yaroslav@inbox.com']
   s.summary         = 'Easy AWS S3 backup'

data/lib/backup-agent/performer.rb

@@ -54,15 +54,13 @@ module Backup
 
     def backup_mysql
       config.get(:mysql_databases).each do |db|
-        db_filename  = "MySQL Database #{db}.xz"
-        db_fileparam = Shellwords.escape(db_filename)
-        dump = with_env "mysqldump #{config.get(:mysql_connect)} #{config.get(:mysqldump_options).join(' ')} --databases #{db}"
-        xz   = with_env "xz --compress --extreme -9 --keep --threads=0 --verbose --stdout"
+        dump_path = "#{tmp_path}/#{ shell_escape(db) }.sql"
+        dump_cmd  = "mysqldump #{config.get(:mysql_connect)} #{config.get(:mysqldump_options).join(' ')} --databases #{db}"
 
-        puts "Exec #{dump} | #{xz} > #{tmp_path}/#{db_fileparam} "
-        system "#{dump} | #{xz} > #{tmp_path}/#{db_fileparam}"
+        exec with_env("#{dump_cmd} > #{dump_path}")
+        exec with_env("xz --compress --extreme -9 --keep --threads=0 --verbose #{dump_path}")
 
-        storage.upload("#{@timestamp}/#{db_filename}", "#{tmp_path}/#{db_filename}")
+        storage.upload("#{@timestamp}/#{ shell_escape(db) }.sql.xz", "#{dump_path}.xz")
       end
     end
 
@@ -108,5 +106,14 @@ module Backup
     def with_env(cmd)
       "/usr/bin/env #{cmd}"
     end
+
+    def shell_escape(x)
+      Shellwords.escape(x)
+    end
+
+    def exec(cmd)
+      puts "Exec #{cmd}"
+      system cmd
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Yaroslav Konoplov