backupit 0.2.2 → 0.3.0

data/README.md

@@ -7,6 +7,8 @@
 
     storage :file do
       path '/opt/backup/'
+      mysql_check true
+      mysql_config({:host=>"localhost",:user=>"root",:password=>"test",:databases=>"checkdb"})
     end
 
     server 'delonghi' do
@@ -21,6 +23,7 @@
         options   '-h 192.168.1.100'
         databases ['delonghi-staging', 'delonghi-production']
         tables    ['users','products'] # this would overwrite databases! `man mysqldump` for more help.
+        check true
       end
     end
 
@@ -31,6 +34,7 @@
         user      'root'
         password  'mytopsecret'
         databases 'ot_staging'
+        check false
       end
     end
 
@@ -39,6 +43,8 @@
        only backup server 'delonghi'  (pretend to run)
     2, backup -f /opt/backup/backup.rb
        backup all servers
+    3, in storage , mysql_check(true | false) and mysql_config to check the backup can be restored
+    4, in every mysql role, check mean to check the backup or not
 
 ## Note on Patches/Pull Requests
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/backupit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backupit}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jinzhu"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-10-03}
   s.default_executable = %q{backup}
   s.description = %q{A tool to backup your servers}
   s.email = %q{wosmvp@gmail.com}
@@ -39,13 +39,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/jinzhu/backupit}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A tool to backup your servers}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mail>, [">= 0"])
     else
       s.add_dependency(%q<mail>, [">= 0"])

data/lib/backup/configuration/base.rb

@@ -28,6 +28,18 @@ module Backup
 
         @servers
       end
+
+      def check(name=nil,&block)
+        @check ||= {}
+
+        if block
+          name ||= "check_#{@check.keys.size}"
+          @check[name] = Backup::Configuration::Check.new 
+          @check[name].instance_eval &block
+        end
+
+        @check
+      end
     end
   end
 end

data/lib/backup/configuration/mysql.rb

@@ -2,7 +2,7 @@ module Backup
   module Configuration
     class Mysql
       extend Backup::Attribute
-      generate_attributes :user, :password, :options, :databases, :tables
+      generate_attributes :user, :password, :options, :databases, :tables, :check
     end
   end
 end

data/lib/backup/configuration/storage.rb

@@ -2,7 +2,7 @@ module Backup
   module Configuration
     class Storage
       extend Backup::Attribute
-      generate_attributes :path, :smtp
+      generate_attributes :path, :smtp, :mysql_config, :mysql_check
     end
   end
 end

data/lib/backup/storage.rb

@@ -3,7 +3,7 @@ require 'tempfile'
 module Backup
   class Storage
     extend Backup::Attribute
-    attr_accessor :name, :config, :changes
+    attr_accessor :name, :config, :changes, :subject_prefix
 
     def initialize(name, config)
       self.name   = name
@@ -24,7 +24,7 @@ module Backup
       backup_rsync
       backup_mysql
       commit_changes
-      notice_changes
+      send_mail(changes.join("\n"))
     end
 
     def backup_rsync
@@ -35,7 +35,7 @@ module Backup
       @server_config.rsync.to_a.map do |path|
         remote_path = path.is_a?(Hash) ? path.first[0] : path
         target_name = File.basename(path.is_a?(Hash) ? path.first[1] : path)
-        self.changes << Backup::Main.run("rsync -ravk #{@rsync_host}:#{remote_path.sub(/\/?$/,'/')} '#{File.join(target_path, target_name)}'")
+        run_with_changes("rsync -ravk #{@rsync_host}:#{remote_path.sub(/\/?$/,'/')} '#{File.join(target_path, target_name)}'")
       end
     end
 
@@ -52,32 +52,48 @@ module Backup
         mysql_config += " #{mysql.options}" if mysql.options
 
         tmpfile = Tempfile.new('mysql.sql')
-        (self.changes << Backup::Main.run("ssh #{@ssh_host} 'mysqldump #{mysql_config} > #{tmpfile.path}'")) &&
-        (self.changes << Backup::Main.run("scp #{@scp_host}:#{tmpfile.path} '#{target_path}/#{key}.sql'")) &&
-        (self.changes << Backup::Main.run("ssh #{@ssh_host} 'rm #{tmpfile.path}'"))
+        run_with_changes("ssh #{@ssh_host} 'mysqldump #{mysql_config} > #{tmpfile.path}'") &&
+        run_with_changes("scp #{@scp_host}:#{tmpfile.path} '#{target_path}/#{key}.sql'") &&
+        run_with_changes("ssh #{@ssh_host} 'rm #{tmpfile.path}'"))
+
+        check_backuped_mysql(target_path, key) if config.mysql_check and (mysql.check || mysql.check.nil?)
       end
     end
 
-    def notice_changes
+    def check_backuped_mysql(target_path, key)
+      self.changes << "DBCheck running -- checking #{target_path}/#{key}.sql #{Time.now}"
+      status = run_with_changes("mysql -h#{config.mysql_config[:host]} -u#{config.mysql_config[:user]} #{config.mysql_config[:databases]} < #{target_path}/#{key}.sql") ? "SUCCESSFUL" : "FAILURE"
+      self.changes << "DBCheck finished #{status} -- #{Time.now}"
+    end
+
+    def commit_changes
+      Dir.chdir(@backup_path) do
+        run_with_changes("git init") unless system("git status")
+        run_with_changes("git add .")
+        run_with_changes("git commit -am '#{Time.now.strftime("%Y-%m-%d %H:%M")}'")
+      end
+    end
+
+    def run_with_changes(shell)
+      self.changes << "== #{shell}"
+      result = Backup::Main.run(shell)
+      self.subject_prefix = "[ERROR]" unless result
+      self.changes << result
+      result
+    end
+
+    def send_mail(message)
       Dir.chdir(@backup_path) do
         smtp_config = config.smtp
         Mail.defaults { delivery_method :smtp, smtp_config } if smtp_config
 
         Backup::Main.email(:from => @server_config.email,
                            :to => @server_config.email,
-                           :subject => "#{@server.name} backed up at #{Time.now}",
-                           :body => changes.join("\n"),
+                           :subject => "#{self.subject_prefix} #{@server.name} backed up at #{Time.now}",
+                           :body => message,
                            :charset => 'utf-8', :content_type => 'text/plain; charset=utf-8'
                           ) if @server_config.email
       end
     end
-
-    def commit_changes
-      Dir.chdir(@backup_path) do
-        (self.changes << Backup::Main.run("git init")) unless system("git status")
-        self.changes << Backup::Main.run("git add .")
-        self.changes << Backup::Main.run("git commit -am '#{Time.now.strftime("%Y-%m-%d %H:%M")}'")
-      end
-    end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: backupit
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +08:00
+date: 2011-10-03 00:00:00 +08:00
 default_executable: backup
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mail
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,27 +66,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A tool to backup your servers