pxcbackup 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fad7cc2f34cb4b40039125ce85ccef409914a53
-  data.tar.gz: 63404f369242c5b9f402dbe7e2b08bc534778c3f
+  metadata.gz: 4919b371225d61db6d40812129a705252c3df03b
+  data.tar.gz: b4a720f44e75ae89f902ea2f795c98c8e88d5074
 SHA512:
-  metadata.gz: 215382dea8914c3ec1d89e07727dcbbbf01434299dc4fb60e464153ac8fa52c7de909c83e578031fe8f4596b6d74b14ca56fd8a3300bae29315dba0db01b2ddc
-  data.tar.gz: dd937751742df0aec5e88549e457a911faa458722350414e9f70c2dfcb70e3644ad3b46f69be572bad37afdc72297ddecfef1d75fda4333008bf4dd6e36b4133
+  metadata.gz: 2f9daa68cdaeac728543a34133843e26c28bcb98f9f1581e992de4545df87bd1c89d5c659400194335a302c484f547c35561b2685591cb05ed374a300bfa596b
+  data.tar.gz: 022bccdaf48c27937246ef113f9bd9d478c48ee580a6ea111dd7b40ec13c88860de8aa94de8f052604fbb066cc825ff66b99fdc7083d4a6d3af92950a76aa51e

data/lib/pxcbackup/application.rb

@@ -34,7 +34,7 @@ module PXCBackup
         backupper.list_backups
       when 'restore'
         time = @arguments.any? ? Time.parse(@arguments.first) : Time.now
-        backupper.restore_backup(time, !!@options[:skip_confirmation])
+        backupper.restore_backup(time, @options)
       end
     end
 
@@ -44,17 +44,13 @@ module PXCBackup
         opt.banner = "Usage: #{$0} COMMAND [OPTIONS]"
         opt.separator ''
         opt.separator 'Commands'
-        opt.separator '     create             create a new backup'
-        opt.separator '     help               show this help'
-        opt.separator '     list               list available backups'
-        opt.separator '     restore [time]     restore to a point in time'
+        opt.separator '    create             create a new backup'
+        opt.separator '    help               show this help'
+        opt.separator '    list               list available backups'
+        opt.separator '    restore [time]     restore to a point in time'
         opt.separator ''
         opt.separator 'Options'
 
-        opt.on('--no-color', 'disable color output') do |color_output|
-          @options[:no_color] = true
-        end
-
         opt.on('-c', '--config', '=CONFIG_FILE', 'config file to use instead of ~/.pxcbackup') do |config_file|
           @options[:config] = config_file
         end
@@ -75,6 +71,10 @@ module PXCBackup
           @options[:local] = true
         end
 
+        opt.on('--no-color', 'disable color output') do
+          @options[:no_color] = true
+        end
+
         opt.on('-r', '--remote', '=REMOTE_URI', 'remote URI to sync backups to, e.g. s3://my-aws-bucket/') do |remote|
           @options[:remote] = remote
         end

data/lib/pxcbackup/backupper.rb

@@ -95,7 +95,11 @@ module PXCBackup
       end
     end
 
-    def restore_backup(time, skip_confirmation = false)
+    def restore_backup(time, options = {})
+      skip_confirmation = options[:skip_confirmation] || false
+      mysql_start_command = options[:mysql_start_command] || "#{@which.service.shellescape} mysql start"
+      mysql_stop_command = options[:mysql_stop_command] || "#{@which.service.shellescape} mysql stop"
+
       incremental_backups = []
       all_backups.reverse_each do |backup|
         incremental_backups.unshift(backup) if backup.time <= time
@@ -206,7 +210,7 @@ module PXCBackup
         end
 
         Logger.action 'Stopping MySQL server' do
-          Command.run("#{@which.service.shellescape} mysql stop")
+          Command.run(mysql_stop_command)
         end
 
         stat = File.stat(mysql_datadir)
@@ -228,13 +232,16 @@ module PXCBackup
         end
 
         if @local_repo
-          Logger.action "Removing last backup info" do
-            File.delete(File.join(@local_repo.path, 'xtrabackup_checkpoints'))
+          xtrabackup_checkpoints_file = File.join(@local_repo.path, 'xtrabackup_checkpoints')
+          if File.file?(xtrabackup_checkpoints_file)
+            Logger.action "Removing last backup info" do
+              File.delete(xtrabackup_checkpoints_file)
+            end
           end
         end
 
         Logger.action 'Starting MySQL server' do
-          Command.run("#{@which.service.shellescape} mysql start")
+          Command.run(mysql_start_command)
         end
       end
     end
@@ -342,6 +349,9 @@ module PXCBackup
           Command.run(command)
         end
 
+        xtrabackup_binary_file = File.join(dir, 'xtrabackup_binary')
+        File.delete(xtrabackup_binary_file) if File.file?(xtrabackup_binary_file)
+
         info = read_backup_info(File.join(dir, 'xtrabackup_checkpoints'))
         info[:compress] = Dir.glob(File.join(dir, '**', '*.qp')).any?
 

data/lib/pxcbackup/path_resolver.rb

@@ -10,7 +10,7 @@ module PXCBackup
     def method_missing(name, *arguments)
       unless @paths[name]
         @paths[name] = @options["#{name.to_s}_path".to_sym] || `which #{name.to_s.shellescape}`.strip
-        raise "cannot find path for #{name.to_s}" unless File.file?(@paths[name])
+        raise "cannot find path for '#{name.to_s}'" unless File.file?(@paths[name])
       end
       @paths[name]
     end

data/lib/pxcbackup/version.rb

@@ -1,3 +1,3 @@
 module PXCBackup
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxcbackup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Robbert Klarenbeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies: []
 description: Backup tool for Percona XtraDB Cluster
 email: robbertkl@renbeek.nl