backupit 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/backup.rb

@@ -29,7 +29,13 @@ module Backup
 
     def self.run(shell)
       puts shell.red
-      @@options[:pretend] ? true : system(shell)
+      if @@options[:pretend]
+        true
+      else
+        results = `#{shell}`
+        return false if $?.to_i > 0
+        results
+      end
     end
 
     def self.email(options)

data/lib/backup/storage.rb

@@ -3,7 +3,7 @@ require 'tempfile'
 module Backup
   class Storage
     extend Backup::Attribute
-    attr_accessor :name, :config
+    attr_accessor :name, :config, :changes
 
     def initialize(name, config)
       self.name   = name
@@ -19,10 +19,12 @@ module Backup
       @scp_host      = "-P#{@server_config.port || 22} #{@server_config.host}"
       @rsync_host    = "-e 'ssh -p#{@server_config.port || 22}' #{@server_config.host}"
 
+      self.changes   = []
+
       backup_rsync
       backup_mysql
-      notice_changes
       commit_changes
+      notice_changes
     end
 
     def backup_rsync
@@ -33,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)
-        Backup::Main.run "rsync -ravk #{@rsync_host}:#{remote_path.sub(/\/?$/,'/')} '#{File.join(target_path, target_name)}'"
+        self.changes << Backup::Main.run "rsync -ravk #{@rsync_host}:#{remote_path.sub(/\/?$/,'/')} '#{File.join(target_path, target_name)}'"
       end
     end
 
@@ -50,9 +52,9 @@ module Backup
         mysql_config += " #{mysql.options}" if mysql.options
 
         tmpfile = Tempfile.new('mysql.sql')
-        Backup::Main.run("ssh #{@ssh_host} 'mysqldump #{mysql_config} > #{tmpfile.path}'") &&
-        Backup::Main.run("scp #{@scp_host}:#{tmpfile.path} '#{target_path}/#{key}.sql'") &&
-        Backup::Main.run("ssh #{@ssh_host} 'rm #{tmpfile.path}'")
+        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}'")
       end
     end
 
@@ -61,20 +63,20 @@ module Backup
         smtp_config = config.smtp
         Mail.defaults { delivery_method :smtp, smtp_config } if smtp_config
 
-        changes = `git diff`
         Backup::Main.email(:from => @server_config.email,
                            :to => @server_config.email,
-                           :subject => "#{@server.name} backed up at #{Time.now}, changes: #{changes.split("\n").size}",
-                           :body => changes
+                           :subject => "#{@server.name} backed up at #{Time.now}",
+                           :body => changes.join("\n"),
+                           :charset => 'utf-8', :content_type => 'text/plain; charset=utf-8'
                           ) if @server_config.email
       end
     end
 
     def commit_changes
       Dir.chdir(@backup_path) do
-        Backup::Main.run("git init") unless system("git status")
-        Backup::Main.run("git add .")
-        Backup::Main.run("git commit -am '#{Time.now.strftime("%Y-%m-%d %H:%M")}'")
+        (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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backupit
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +08:00
+date: 2011-07-11 00:00:00 +08:00
 default_executable: backup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,10 +89,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A tool to backup your servers
-test_files: 
-- test/helper.rb
-- test/test_backupit.rb
+test_files: []
+