backupit 0.3.0 → 0.3.1

data/Contributors

@@ -0,0 +1,2 @@
+SunFunJun  [http://github.com/sunfjun]
+FrankYue [http://github.com/frankyue]

data/README.md

@@ -8,7 +8,7 @@
     storage :file do
       path '/opt/backup/'
       mysql_check true
-      mysql_config({:host=>"localhost",:user=>"root",:password=>"test",:databases=>"checkdb"})
+      mysql_config({:host=>"localhost",:user=>"root",:password=>"test",:database=>"checkdb"})
     end
 
     server 'delonghi' do

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/backup/storage.rb

@@ -54,15 +54,22 @@ module Backup
         tmpfile = Tempfile.new('mysql.sql')
         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}'"))
+        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 check_backuped_mysql(target_path, key)
+      dbconfig = config.mysql_config
+
       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"
+
+      mysql_command = "mysql -h#{dbconfig[:host]} -u#{dbconfig[:user]} #{dbconfig[:password] ? "-p#{dbconfig[:password]}" : ""}"
+      system("#{mysql_command} -e 'drop database #{dbconfig[:database]};'")
+      system("#{mysql_command} -e 'create database #{dbconfig[:database]};'")
+
+      status = run_with_changes("#{mysql_command} #{dbconfig[:database]} < #{target_path}/#{key}.sql") ? "SUCCESSFUL" : "FAILURE"
       self.changes << "DBCheck finished #{status} -- #{Time.now}"
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jinzhu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 +08:00
+date: 2011-10-04 00:00:00 +08:00
 default_executable: backup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- Contributors
 - LICENSE
 - README.md
 - Rakefile