backup-agent 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f6b0d08ef1de7d44100c07d70c771e814c97f0
-  data.tar.gz: 07dbe4c7ac9ab53a7b6c16a4d4306245ac7084fc
+  metadata.gz: be2dcc5ee70e3711b9dfd5e905776d023f2e28d3
+  data.tar.gz: ac8b7d26bd2dceb1aea1f0536ee6c7f6d11956bc
 SHA512:
-  metadata.gz: 12bdc01e7554ff09f023a79dd1c2b437ac6857a131cae31672bf8a9ddd4392c5c8bd4a990b1b1df09b338b9f54610926fe84aa2cf7ee24ad014ee015d7f09d88
-  data.tar.gz: fd97c71c2ae652e56f25f24f568791c9eeebd02f7e9060373897e1ebd771a31179bfc6cc19ceb534539d29d3fca24c1c5fe2977a32a617df0292964dd01f1880
+  metadata.gz: f9d4afa1c3752e3caf77422e07ba7b12a6e4e542841890e753e9cb11522ac344c638075d25255125ad57cbf40f0f1fdab47e050f2961d578a672bee415217eb5
+  data.tar.gz: 77a42e5999e6136bb30d6a94248130d70db236156559622ef120eacab0054504a1afdc3ef7a9e8268148da92dfd4a377ddcb1d128e057de95489d0ee5d1b2b79

data/README.md

@@ -1,16 +1,20 @@
 ```ruby
-BackupAgent.configure_s3 do
+require 'backup-agent'
+
+storage_config = Backup::S3Config.new do
   set :access_key_id, 'xxx'
   set :secret_access_key, 'yyy'
   set :region, 'eu-central-1'
 end
 
-BackupAgent.perform_backup do
-  set :s3_bucket, 'my-backups'
+storage = Backup::S3Storage.new(storage_config, bucket: 'my-backups')
+
+Backup.perform storage do
+  set :mysql_host, 'xxx.yyy.xxx.yyy'
 end
 ```
 
 ## Gemfile
 ```ruby
-gem 'backup-agent', github: 'yivo/backup-agent'
-```
+gem 'backup-agent'
+```

data/backup-agent.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'backup-agent'
-  s.version         = '1.0.4'
+  s.version         = '1.0.5'
   s.authors         = ['Yaroslav Konoplov']
   s.email           = ['yaroslav@inbox.com']
   s.summary         = 'Easy AWS S3 backup'
@@ -18,4 +18,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-sdk'
   s.add_dependency 'confo-config', '>= 1.0.0'
   s.add_dependency 'activesupport', '>= 3.2.0'
-end
+end

data/lib/backup-agent/performer.rb

@@ -23,9 +23,9 @@ module Backup
 
     def backup_directories
       config.get(:directories).each do |name, dir|
-        dir_filename  = "#{name}.tar.gz"
+        dir_filename  = "#{name}.tar.xz"
         dir_fileparam = Shellwords.escape(dir_filename)
-        cmd = "cd #{dir} && /usr/bin/env tar -czf #{tmp_path}/#{dir_fileparam} ."
+        cmd = "cd #{dir} && /usr/bin/env XZ_OPT=-9 tar -cJvf #{tmp_path}/#{dir_fileparam} ."
         puts "Exec #{cmd}"
         system(cmd)
         storage.upload("#{@timestamp}/#{dir_filename}", "#{tmp_path}/#{dir_filename}")
@@ -36,13 +36,13 @@ module Backup
       config.get(:files).each do |name, files|
         begin
           files_tmp_path   = File.join(tmp_path, "#{name}-tmp")
-          file_bunch_name  = "#{name}.tar.gz"
+          file_bunch_name  = "#{name}.tar.xz"
           file_bunch_param = Shellwords.escape(file_bunch_name)
 
           FileUtils.mkdir_p(files_tmp_path)
           FileUtils.cp(files.select { |el| File.exists?(el) }, files_tmp_path)
 
-          cmd = "cd #{files_tmp_path} && /usr/bin/env tar -czf #{tmp_path}/#{file_bunch_param} ."
+          cmd = "cd #{files_tmp_path} && /usr/bin/env XZ_OPT=-9 tar -cJvf #{tmp_path}/#{file_bunch_param} ."
           system(cmd)
 
           storage.upload("#{@timestamp}/#{file_bunch_name}", "#{tmp_path}/#{file_bunch_name}")
@@ -54,13 +54,13 @@ module Backup
 
     def backup_mysql
       config.get(:mysql_databases).each do |db|
-        db_filename  = "MySQL Database #{db}.gz"
+        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(' ')} #{db}"
-        gzip = with_env "gzip -5 -c > #{tmp_path}/#{db_fileparam}"
+        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"
 
-        puts "Exec #{dump} | #{gzip}"
-        system "#{dump} | #{gzip}"
+        puts "Exec #{dump} | #{xz} > #{tmp_path}/#{db_fileparam} "
+        system "#{dump} | #{xz} > #{tmp_path}/#{db_fileparam}"
 
         storage.upload("#{@timestamp}/#{db_filename}", "#{tmp_path}/#{db_filename}")
       end
@@ -71,11 +71,11 @@ module Backup
       FileUtils.mkdir_p(mongo_dump_dir)
 
       config.get(:mongo_databases).each do |db|
-        db_filename  = "Mongo Database #{db}.tar.gz"
+        db_filename  = "Mongo Database #{db}.tar.xz"
         db_fileparam = Shellwords.escape(db_filename)
         dump = with_env "mongodump #{config.get(:mongo_connect)} -d #{db} -o #{mongo_dump_dir}"
         cd   = "cd #{mongo_dump_dir}/#{db}"
-        tar  = with_env "tar -czf #{tmp_path}/#{db_fileparam} ."
+        tar  = with_env "XZ_OPT=-9 tar -cJvf #{tmp_path}/#{db_fileparam} ."
 
         puts "Exec #{dump} && #{cd} && #{tar}"
         system "#{dump} && #{cd} && #{tar}"
@@ -109,4 +109,4 @@ module Backup
       "/usr/bin/env #{cmd}"
     end
   end
-end
+end

data/lib/backup-agent/task.rb

@@ -11,18 +11,31 @@ module Backup
       end
 
       set :mysqldump_options, %w(
-        --single-transaction
+        --add-drop-database
         --add-drop-table
         --add-locks
+        --allow-keywords
+        --comments
+        --complete-insert
         --create-options
-        --disable-keys
+        --debug-check
+        --debug-info
         --extended-insert
-        --quick)
+        --flush-privileges
+        --insert-ignore
+        --lock-tables
+        --quick
+        --quote-names
+        --set-charset
+        --dump-date
+        --secure-auth
+        --tz-utc
+        --disable-keys )
 
       set :mysql_connect, -> do
         pass       = get(:mysql_password)
         pass_param = pass && !pass.empty? ? "-p#{pass}" : ''
-        "-u #{get(:mysql_user)} #{pass_param} -h #{get(:mysql_host)}"
+        "--user #{get(:mysql_user)} --password=#{pass_param} --host=#{get(:mysql_host)}"
       end
 
       set :mongo_databases, -> do
@@ -50,4 +63,4 @@ module Backup
       super
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easy AWS S3 backup