phusion-backup 1.0.0 → 1.0.1

data/bin/phusion-backup

@@ -63,7 +63,7 @@ class Core
 				next if hostname =~ /^\./
 				fullname = "#{dir}/#{hostname}"
 				if File.directory?(fullname)
-					results << Server.new(hostname, fullname)
+					results << Server.new(hostname, File.expand_path(fullname))
 				end
 			end
 		end
@@ -71,7 +71,8 @@ class Core
 	end
 	
 	def find_server(hostname_or_dir)
-		return servers.find { |s| s.hostname == hostname_or_dir || s.dir == hostname_or_dir }
+		fulldir = File.expand_path(hostname_or_dir)
+		return servers.find { |s| s.hostname == hostname_or_dir || s.dir == fulldir }
 	end
 	
 	def generate(dir)
@@ -94,15 +95,45 @@ class Core
 		filename = create_globbing_filelist(server)
 		begin
 			sh!('rdiff-backup',
-				'-v6',
+				'-v5',
+				'--print-statistics',
 				'--exclude-sockets',
 				'--include-globbing-filelist', filename,
 				"root@#{server.hostname}::/",
 				"#{server.dir}/data")
+			delete_old_backups(server)
 		ensure
 			File.unlink(filename)
 		end
 	end
+	
+	def delete_old_backups(server)
+		return if !File.exist?(server.dir)
+		command = "rdiff-backup --list-increments --parsable-output \"#{server.dir}/data\""
+		increments = `#{command}`
+		if $?.exitstatus != 0
+			puts_error "The command `#{command}` failed."
+			raise CommandError
+		end
+		
+		timestamps = []
+		increments.split("\n").each do |line|
+			if line =~ /^(\d+) directory$/
+				timestamps << $1.to_i
+			else
+				puts_error "The command `#{command}` returned an unrecognized output line: #{line.inspect}"
+				exit 1
+			end
+		end
+		
+		if timestamps.size > 5
+			puts "<b>Deleting all but the most recent 5 backups...</b>"
+			timestamps.sort! { |a, b| b <=> a }
+			sh!("rdiff-backup", "--remove-older-than",
+				timestamps[4].to_s, "--force",
+				"#{server.dir}/data")
+		end
+	end
 
 private
 	class CommandError < StandardError

data/phusion-backup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "phusion-backup"
-	s.version = "1.0.0"
+	s.version = "1.0.1"
 	s.authors = ["Hongli Lai"]
 	s.date = "2011-03-30"
 	s.description = "Simple backup tool utilizing rdiff-backup."

data/resources/default-install-script.txt

@@ -1,5 +1,6 @@
 # Standard, essential tools
 apt-get install bash-completion screen
+apt-get install rdiff-backup python-pylibacl-dbg python-pyxattr-dbg
 
 # Compiler toolchain
 apt-get install build-essential gdb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phusion-backup
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Hongli Lai