phusion-backup 1.0.1 → 1.0.2

data/bin/phusion-backup

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 # encoding: binary
+require 'rubygems'
+gem 'activesupport', '~> 2.3.0'
 require 'etc'
 require 'optparse'
+require 'active_support'
 
 module PhusionBackup
 
@@ -48,6 +51,9 @@ end
 
 class Core
 	ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
+	MIN_BACKUPS_TO_KEEP = 5
+	MAX_BACKUP_AGE = 3.months
+	MAX_BACKUP_AGE_STR = "3 months"
 	
 	include TUI
 	
@@ -126,12 +132,51 @@ class Core
 			end
 		end
 		
-		if timestamps.size > 5
-			puts "<b>Deleting all but the most recent 5 backups...</b>"
+		puts "<b>Checking whether any old backups need to be deleted...</b>"
+		if timestamps.size > MIN_BACKUPS_TO_KEEP
+			nbackups = timestamps.size
+			ndelete = 0
+			
 			timestamps.sort! { |a, b| b <=> a }
-			sh!("rdiff-backup", "--remove-older-than",
-				timestamps[4].to_s, "--force",
-				"#{server.dir}/data")
+			cleanable_timestamps = timestamps.dup
+			MIN_BACKUPS_TO_KEEP.times do
+				cleanable_timestamps.pop
+			end
+			cleanable_timestamps.each do |timestamp|
+				if timestamp < MAX_BACKUP_AGE.ago.to_i
+					ndelete += 1
+				end
+			end
+			
+			if ndelete == 0
+				puts "Nothing deleted because although there are more than " +
+					"#{MIN_BACKUPS_TO_KEEP} backups (namely #{nbackups}), " +
+					"none of them are older than #{MAX_BACKUP_AGE_STR}."
+			else
+				puts "<yellow>Deleting backups older than #{MAX_BACKUP_AGE_STR}, excluding " +
+					"the #{MIN_BACKUPS_TO_KEEP} most recent backups.</yellow>"
+				timestamps.each do |timestamp|
+					if timestamp < MAX_BACKUP_AGE.ago.to_i
+						action = "Delete"
+					else
+						action = "Keep"
+					end
+					time = Time.at(timestamp)
+					relative_time = distance_of_time_in_words(Time.now, time, true)
+					printf " * %s %-30s %s\n",
+						time,
+						"(#{relative_time} ago)",
+						action
+				end
+				puts
+				sh!("rdiff-backup", "--remove-older-than",
+					MAX_BACKUP_AGE.ago.to_i.to_s, "--force",
+					"#{server.dir}/data")
+			end
+		else
+			puts "No old backups need to be deleted. Only #{timestamps.size} backups " +
+				"have been made so far. For phusion-backup to consider deleting " +
+				"old backups, more than #{MIN_BACKUPS_TO_KEEP} backups must exist."
 		end
 	end
 
@@ -188,6 +233,36 @@ private
 		end
 		return filename
 	end
+	
+	def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
+		from_time = from_time.to_time if from_time.respond_to?(:to_time)
+		to_time = to_time.to_time if to_time.respond_to?(:to_time)
+		distance_in_minutes = (((to_time - from_time).abs)/60).round
+		distance_in_seconds = ((to_time - from_time).abs).round
+
+		case distance_in_minutes
+		when 0..1
+			return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
+			case distance_in_seconds
+			when 0..4   then 'less than 5 seconds'
+			when 5..9   then 'less than 10 seconds'
+			when 10..19 then 'less than 20 seconds'
+			when 20..39 then 'half a minute'
+			when 40..59 then 'less than a minute'
+			else             '1 minute'
+			end
+
+		when 2..44           then "#{distance_in_minutes} minutes"
+		when 45..89          then 'about 1 hour'
+		when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
+		when 1440..2879      then '1 day'
+		when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
+		when 43200..86399    then 'about 1 month'
+		when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
+		when 525600..1051199 then 'about 1 year'
+		else                      "over #{(distance_in_minutes / 525600).round} years"
+		end
+	end
 end
 
 class App

data/phusion-backup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "phusion-backup"
-	s.version = "1.0.1"
+	s.version = "1.0.2"
 	s.authors = ["Hongli Lai"]
 	s.date = "2011-03-30"
 	s.description = "Simple backup tool utilizing rdiff-backup."
@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
 	s.rdoc_options = ["--charset=UTF-8"]
 	s.executables = ["phusion-backup"]
 	s.require_paths = ["lib"]
+	s.add_dependency 'activesupport', '~> 2.3.0'
 end
 

data/resources/default-files.txt

@@ -14,17 +14,26 @@
 /etc/service
 
 # Backup all home directories, excluding non-critical things like caches.
+- /root/.gem
+- /root/.bundle
+- /root/.*/bundle
 /root
 - /home/*/.gem
 - /home/*/.bundle
 - /home/*/.*/bundle
+- /home/*/.passenger/native_support
++ /home/*/.passenger/standalone/config
+- /home/*/.passenger/standalone
 /home
 
 # Backup all Capistrano-deployed web applications, excluding non-critical things like caches.
 - /u/*/*/shared/cached-copy
 - /u/*/*/shared/bundle
+- /u/*/*/shared/log
+- /u/*/*/shared/pids
 - /u/*/*/releases/*/.git
 - /u/*/*/releases/*/vendor/bundle
+- /u/*/*/releases/*/tmp
 - /u/*/**/*.log
 /u
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phusion-backup
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Hongli Lai
@@ -17,8 +17,23 @@ cert_chain: []
 
 date: 2011-03-30 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :runtime
+  version_requirements: *id001
 description: Simple backup tool utilizing rdiff-backup.
 email: hongli@phusion.nl
 executables: