backupit 0.1.3 → 0.2.0

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "wosmvp@gmail.com"
     gem.homepage = "http://github.com/jinzhu/backupit"
     gem.authors = ["Jinzhu"]
+    gem.add_dependency ['mail']
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/backupit.gemspec

@@ -1,61 +1,61 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{backupit}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jinzhu"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2011-06-28}
   s.default_executable = %q{backup}
   s.description = %q{A tool to backup your servers}
   s.email = %q{wosmvp@gmail.com}
   s.executables = ["backup"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "backupit.gemspec",
-     "bin/backup",
-     "lib/backup.rb",
-     "lib/backup/attribute.rb",
-     "lib/backup/configuration/base.rb",
-     "lib/backup/configuration/mysql.rb",
-     "lib/backup/configuration/server.rb",
-     "lib/backup/configuration/storage.rb",
-     "lib/backup/server.rb",
-     "lib/backup/storage.rb",
-     "test/helper.rb",
-     "test/test_backupit.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "backupit.gemspec",
+    "bin/backup",
+    "lib/backup.rb",
+    "lib/backup/attribute.rb",
+    "lib/backup/configuration/base.rb",
+    "lib/backup/configuration/mysql.rb",
+    "lib/backup/configuration/server.rb",
+    "lib/backup/configuration/storage.rb",
+    "lib/backup/server.rb",
+    "lib/backup/storage.rb",
+    "test/helper.rb",
+    "test/test_backupit.rb"
   ]
   s.homepage = %q{http://github.com/jinzhu/backupit}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{A tool to backup your servers}
   s.test_files = [
     "test/helper.rb",
-     "test/test_backupit.rb"
+    "test/test_backupit.rb"
   ]
 
   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
+      s.add_runtime_dependency(%q<mail>, [">= 0"])
     else
+      s.add_dependency(%q<mail>, [">= 0"])
     end
   else
+    s.add_dependency(%q<mail>, [">= 0"])
   end
 end
 

data/lib/backup.rb

@@ -1,4 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+gem 'mail'
+require 'mail'
 require 'backup/attribute'
 require 'backup/configuration/base'
 require 'backup/server'
@@ -29,5 +31,12 @@ module Backup
       puts shell.red
       @@options[:pretend] ? true : system(shell)
     end
+
+    def self.email(options)
+      puts "sending email to #{options[:to]}"
+      unless @@options[:pretend]
+        Mail.new(options).deliver!
+      end
+    end
   end
 end

data/lib/backup/configuration/server.rb

@@ -2,8 +2,7 @@ module Backup
   module Configuration
     class Server
       extend Backup::Attribute
-
-      generate_attributes :host, :rsync, :port
+      generate_attributes :host, :rsync, :port, :email
 
       def mysql(name=nil,&block)
         @mysqls ||= {}

data/lib/backup/configuration/storage.rb

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

data/lib/backup/storage.rb

@@ -15,19 +15,19 @@ module Backup
       @server_config = @server.config
       @backup_path   = "#{config.path}/#{@server.name}"
 
-      @ssh_host      = "'#{@server_config.host}'"
-      @scp_host      = @server_config.port ? "-P#{@server_config.port} #{@ssh_host}" : @ssh_host
-      @rsync_host    = @server_config.port ? " -e 'ssh -p#{@server_config.port}' #{@ssh_host}" : @ssh_host
-      @ssh_host      = "'-p#{@server_config.port}' #{@ssh_host}" if @server_config.port
-
+      @ssh_host      = "-p#{@server_config.port || 22} #{@server_config.host}"
+      @scp_host      = "-P#{@server_config.port || 22} #{@server_config.host}"
+      @rsync_host    = "-e 'ssh -p#{@server_config.port || 22}' #{@server_config.host}"
 
       backup_rsync
       backup_mysql
+      notice_changes
       commit_changes
     end
 
     def backup_rsync
       target_path = File.join(@backup_path, "rsync")
+
       FileUtils.mkdir_p target_path
 
       @server_config.rsync.to_a.map do |path|
@@ -56,6 +56,20 @@ module Backup
       end
     end
 
+    def notice_changes
+      Dir.chdir(@backup_path) do
+        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
+                          ) if @server_config.email
+      end
+    end
+
     def commit_changes
       Dir.chdir(@backup_path) do
         Backup::Main.run("git init") unless system("git status")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backupit
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +08:00
+date: 2011-06-28 00:00:00 +08:00
 default_executable: backup
-dependencies: []
-
+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"
+  type: :runtime
+  version_requirements: *id001
 description: A tool to backup your servers
 email: wosmvp@gmail.com
 executables: 
@@ -30,7 +43,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -52,8 +64,8 @@ homepage: http://github.com/jinzhu/backupit
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -77,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A tool to backup your servers

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC