dreamback 0.0.1 → 0.0.2

data/README.md

@@ -2,6 +2,8 @@
 
 Dreamback is the easiest way to automate your backups on dreamhost. Dreamhost does not guarantee their backups of your users (though they've saved me with backups before), so it's best to run backups yourself.
 
+## This is alpha quality software. Please report issues if you have them.
+
 Using Dreamback is easy:
 
 1. Create a user on dreamhost to schedule your backups

data/bin/dreamback

@@ -1,3 +1,9 @@
 #!/usr/bin/env ruby
 
+# Set environment if these paths exist
+gems = File.expand_path("/etc/profile")
+if File.exists?(gems)
+  `. /etc/profile`
+end
+
 require 'dreamback'

data/lib/dreamback/backup.rb

@@ -76,23 +76,26 @@ module Dreamback
     # Sync to the backup server using link-dest to save space
     # @param [String] name of the most recent backup folder prior to starting this run to link against
     def self.rsync_backup(link_dir)
-      backup_server_user = Dreamback.settings[:backup_server_user]
-      backup_server = Dreamback.settings[:backup_server]
-      today = Time.now.strftime("%Y%m%d")
-      Dreamback.settings[:dreamhost_users].each do |dreamhost|
-        # User that we're going to back up
-        user = dreamhost[:user]
-        server = dreamhost[:server]
-        # rsync won't do remote<->remote syncing, so we stage everything here first
-        tmp_dir = File.expand_path("~/.dreamback_tmp")
-        Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir)
-        `rsync -e ssh -av --keep-dirlinks --copy-links #{user}@#{server}:~/ #{tmp_dir}/#{user}@#{server}`
-        # Now we can sync local to remote
-        # Only use link-dest if a previous folder to link to exists
-        link_dest = link_dir.nil? ? "" : "--link-dest=~#{BACKUP_FOLDER.gsub(".", "")}/#{link_dir}"
-        `rsync -e ssh -av --delete --copy-links --keep-dirlinks #{link_dest} #{tmp_dir}/ #{backup_server_user}@#{backup_server}:#{BACKUP_FOLDER}/dreamback.#{today}`
+      tmp_dir_path = "~/.dreamback_tmp"
+      begin
+        backup_server_user = Dreamback.settings[:backup_server_user]
+        backup_server = Dreamback.settings[:backup_server]
+        today = Time.now.strftime("%Y%m%d")
+        Dreamback.settings[:dreamhost_users].each do |dreamhost|
+          # User that we're going to back up
+          user = dreamhost[:user]
+          server = dreamhost[:server]
+          # rsync won't do remote<->remote syncing, so we stage everything here first
+          tmp_dir = File.expand_path(tmp_dir_path)
+          Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir)
+          `rsync -e ssh -av --keep-dirlinks --copy-links #{user}@#{server}:~/ #{tmp_dir}/#{user}@#{server}`
+          # Now we can sync local to remote. Only use link-dest if a previous folder to link to exists.
+          link_dest = link_dir.nil? ? "" : "--link-dest=~#{BACKUP_FOLDER.gsub(".", "")}/#{link_dir}"
+          `rsync -e ssh -av --delete --copy-links --keep-dirlinks #{link_dest} #{tmp_dir}/ #{backup_server_user}@#{backup_server}:#{BACKUP_FOLDER}/dreamback.#{today}`
+        end
+      ensure
         # Remove the staging directory
-        `rm -rf #{tmp_dir}`
+        `rm -rf #{File.expand_path(tmp_dir_path)}`
       end
     end
   end

data/lib/dreamback/version.rb

@@ -1,3 +1,3 @@
 module Dreamback
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dreamback
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Paul R Alexander
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 -07:00
+date: 2012-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency