backupper 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bcd9c73d5e46de14f981d0fc742f5142c9f66d5c4553ebe19face5c98d95626
-  data.tar.gz: '0708bc10f83d92061a9c16febaf56319b5bba9eed397529f7ce0bc00ec1e7bcc'
+  metadata.gz: 8e8f2f1eea2243c93d2422f759c84abd17ea9638a820da4482df1a49daf62219
+  data.tar.gz: cdeb04aa6d21fcfdba7a43d212b98ef40b2377763051d04159c05245390a16e7
 SHA512:
-  metadata.gz: 77c91c30b33c1ea38a07537027e021f6be9ecd91878858701caaf452321d1a8244551360327f6e80d412996833cf69402021eb5d07b693fb6af4f1ed3491b79f
-  data.tar.gz: c56d8476dd7b7eea3f4fcc307a1311020630b132a564159759d763d0ea8b3ac180c2582c9c7f808a424ff6e32c57436974fa79eca1d2e8a4588adb24eca0d516
+  metadata.gz: 901632efffd97dc884cac2413776ff753eda34a099643c285d9a3f5d18afb5a71e1b00d18dde2538ee5d6534e15a00ac75f8a5e62c283b35f1e46e9d52099528
+  data.tar.gz: e7bd2227208c09b53f1330200301259f1858a0a53ac155950d5811e89a7cea7da776032d9550ed8968ff1c310fa32a495d3c22dac16fa1c0b0479f1515967195

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    backupper (0.7.0)
+    backupper (0.7.1)
       mail (~> 2.9)
       sshkit (~> 1.25)
 

data/README.md

@@ -38,6 +38,7 @@ db1:
   db_username: db_user                         # database username
   db_password: db_Pa$$w0rD                     # database password
   dump_options: '--single-transaction --quick' # dump command extra options (shell-style quoted or YAML array)
+  tmp_dir: '/var/tmp'                          # remote directory where the dump is staged before the download (default: /tmp)
 
 db2:
   disabled: false
@@ -99,7 +100,7 @@ Inside `command` you never deal with shell escaping: every accessor already retu
 
 `command` must return a single command string (it is run with `set -o pipefail`, so chaining with `|` and `&&` is fine) and must write the dump to `outfile`. `working_dir` is created before the command runs; both `working_dir` and `outfile` are removed from the server after the download. If two adapters register the same name, the last one loaded wins, so a custom adapter can also replace a built-in one.
 
-⚠️ Upgrading from 0.6: custom adapters written as `DumpCommand` module methods no longer work; port each method to a `Backupper::Adapter` subclass as shown above. Also, `mydumper` archives now store the dump under its full remote path (`tmp/<key>__<database>/...`) instead of a top-level `<key>__<database>/` directory.
+⚠️ Upgrading from 0.6: custom adapters written as `DumpCommand` module methods no longer work; port each method to a `Backupper::Adapter` subclass as shown above. Also, `mydumper` archives no longer contain a top-level `<key>__<database>/` directory: the dump files are at the root of the tar, so extract into a dedicated directory (`tar -xf backup.tar -C restore-dir`).
 
 ## Contributing
 

data/lib/backupper/adapters/mydumper.rb

@@ -12,7 +12,7 @@ class Backupper
         params << "--user #{username}"
         params << "--password #{password}" if password
         params << dump_options if dump_options
-        return "mydumper --database #{database} #{params.join(' ')} --outputdir #{working_dir} && tar -cf #{outfile} #{working_dir}"
+        return "mydumper --database #{database} #{params.join(' ')} --outputdir #{working_dir} && tar -cf #{outfile} -C #{working_dir} ."
       end
     end
   end

data/lib/backupper/backupper.rb

@@ -60,7 +60,8 @@ class Backupper
           dump_options: o['dump_options'],
           sudo:         o['sudo'],
           outdir:       o['outdir'],
-          extra_copy:   o['extra_copy']
+          extra_copy:   o['extra_copy'],
+          tmp_dir:      o['tmp_dir']
         )
       rescue SSHKit::Runner::ExecuteError, ArgumentError, NotImplementedError => e
         error(k, e.to_s)
@@ -72,14 +73,15 @@ class Backupper
 
   private
 
-    def do_and_download_dump(key:, adapter: 'mysql', url:, password: nil, database:, db_username: 'root', db_password: nil, dump_options: nil, sudo: false, outdir:, extra_copy: nil)
+    def do_and_download_dump(key:, adapter: 'mysql', url:, password: nil, database:, db_username: 'root', db_password: nil, dump_options: nil, sudo: false, outdir:, extra_copy: nil, tmp_dir: nil)
       t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       adapter = Adapter.find(adapter).new(
         database: database,
         username: db_username,
         password: db_password,
         dump_options: dump_options,
-        basename: "#{key}__#{database}"
+        basename: "#{key}__#{database}",
+        tmp_dir: tmp_dir || '/tmp'
       )
       dump_name = "#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}__#{adapter.filename}"
       path = File.join(outdir, dump_name)

data/lib/backupper/version.rb

@@ -1,3 +1,3 @@
 class Backupper
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backupper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - pioz
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Tool to backup databases
 test_files: []