backupit 0.0.1 → 0.0.2

data/README

@@ -6,8 +6,10 @@ storage :file do
 end
 
 server 'delonghi' do
-  command "delonghi@10.0.1.1 -p222"
-  rsync ['/home/www/app/shared/config', '/home/www/app/shared/attachments']
+  host "delonghi@10.0.1.1"
+  port "222"
+
+  rsync ['/home/www/app/shared/config',{'/home/staging/app/shared/config' => 'staging_config'}, '/home/www/app/shared/attachments']
 
   mysql 'delonghi' do
     user      'root'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/backupit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backupit}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jinzhu"]
@@ -46,8 +46,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A tool to backup your servers}
   s.test_files = [
-    "test/test_backupit.rb",
-     "test/helper.rb"
+    "test/helper.rb",
+     "test/test_backupit.rb"
   ]
 
   if s.respond_to? :specification_version then

data/bin/backup

@@ -8,7 +8,7 @@ rescue LoadError
 end
 
 require 'optparse'
-require 'lib/backup'
+require 'backup'
 
 options = {}
 

data/lib/backup/configuration/server.rb

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

data/lib/backup/storage.rb

@@ -15,6 +15,11 @@ 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
+
       backup_rsync
       backup_mysql
       commit_changes
@@ -25,33 +30,36 @@ module Backup
       FileUtils.mkdir_p target_path
 
       @server_config.rsync.to_a.map do |path|
-        Backup::Main.run "rsync -rav '#{@server_config.command}:#{path}' '#{target_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 -rav #{@rsync_host}:#{remote_path.sub(/\/?$/,'/')} '#{File.join(target_path, target_name)}'"
       end
     end
 
     def backup_mysql
-      target_path = File.join(@backup_path, "rsync")
+      target_path = File.join(@backup_path, "mysql")
       FileUtils.mkdir_p target_path
 
       @server_config.mysql.map do |key, mysql|
         mysql_config = ""
         mysql_config += " -u#{mysql.user}" if mysql.user
-        mysql_config += " -p#{mysql.user}" if mysql.password
+        mysql_config += " -p#{mysql.password}" if mysql.password
         mysql_config += " --databases #{mysql.databases.to_a.join(' ')}" if mysql.databases
         mysql_config += " --tables #{mysql.tables.to_a.join(' ')}" if mysql.tables
         mysql_config += " #{mysql.options}" if mysql.options
 
         tmpfile = Tempfile.new('mysql.sql')
-        Backup::Main.run("ssh '#{@server_config.command}' -c '$(which mysqldump) #{mysql_config} > #{tmpfile.path}'") &&
-        Backup::Main.run("scp '#{@server_config.command}:#{tmpfile.path}' '#{target_path}/#{key}.sql'") &&
-        Backup::Main.run("ssh '#{@server_config.command}' -c 'rm #{tmpfile.path}'")
+        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}'")
       end
     end
 
     def commit_changes
       Dir.chdir(@backup_path) do
-        Backup::Main.run("$(which git) add .")
-        Backup::Main.run("$(which git) commit -am '#{Time.now.strftime("%Y-%m-%d %H:%M")}'")
+        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")}'")
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backupit
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jinzhu
@@ -84,5 +84,5 @@ signing_key:
 specification_version: 3
 summary: A tool to backup your servers
 test_files: 
-- test/test_backupit.rb
 - test/helper.rb
+- test/test_backupit.rb