backup 1.2.2 → 1.3.0

data/README.rdoc

@@ -75,9 +75,9 @@ http://wiki.github.com/meskyanichi/backup/installation
 http://wiki.github.com/meskyanichi/backup/getting-started
 
 
-=== Requirements
+=== Rake Tasks
 
-http://wiki.github.com/meskyanichi/backup/requirements
+http://wiki.github.com/meskyanichi/backup/rake-tasks
 
 
 === Automatic Backups
@@ -90,6 +90,26 @@ http://wiki.github.com/meskyanichi/backup/automatic-backups
 http://wiki.github.com/meskyanichi/backup/capistrano-recipes
 
 
+=== Capistrano, Whenever!
+
+http://wiki.github.com/meskyanichi/backup/capistrano-whenever
+
+
+=== Understanding "The Backup Database"
+
+http://wiki.github.com/meskyanichi/backup/the-backup-database
+
+
+=== Trouble Shooting
+
+http://wiki.github.com/meskyanichi/backup/troubleshooting
+
+
+=== Requirements
+
+http://wiki.github.com/meskyanichi/backup/requirements
+
+
 === Resources
 
 http://wiki.github.com/meskyanichi/backup/resources

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.0

data/backup.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backup}
-  s.version = "1.2.2"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["meskyanichi"]

data/generators/backup_files/templates/db.rake

@@ -25,17 +25,17 @@ namespace :backup do
         @adapters.each do |adapter|
           if @config[adapter]
             unless @config[adapter].is_a?(Array)
-              puts "\n\n-- Processing #{adapter} backups.. --"
+              puts "\n\n-- Processing #{adapter} backups --"
               Backup::BackupRecord::S3.destroy_all_backups(adapter, @config[adapter], 0)
             else
-              puts "\n\n-- Processing #{adapter} backups.. --"
+              puts "\n\n-- Processing #{adapter} backups --"
               @config[adapter].each_with_index do |config, index|
                 Backup::BackupRecord::S3.destroy_all_backups(adapter, config, index)  
               end
             end
           end
         end
-        puts "\n\nAll S3 backups destroyed!"
+        puts "\n\nAll S3 backups destroyed!\n\n"
       end
       
       desc 'Destroys SSH Backup database records; Physical files WILL be deleted as well.'
@@ -44,17 +44,17 @@ namespace :backup do
         @adapters.each do |adapter|
           if @config[adapter]
             unless @config[adapter].is_a?(Array)
-              puts "\n\n-- Processing #{adapter} backups.. --"
+              puts "\n\n-- Processing #{adapter} backups --"
               Backup::BackupRecord::SSH.destroy_all_backups(adapter, @config[adapter], 0)
             else
-              puts "\n\n-- Processing #{adapter} backups.. --"
+              puts "\n\n-- Processing #{adapter} backups --"
               @config[adapter].each_with_index do |config, index|
                 Backup::BackupRecord::SSH.destroy_all_backups(adapter, config, index)  
               end
             end
           end
         end
-        puts "All backups from remote server destroyed!"
+        puts "\n\nAll backups from remote server destroyed!\n\n"
       end
       
     end

data/lib/backup/backup_record/s3.rb

@@ -33,14 +33,23 @@ module Backup
         self.index        = options[:index]
       end
       
+      # This will only be triggered by the rake task
+      # rake backup:db:destroy:s3
+      # 
+      # This will loop through all the configured adapters
+      # and destroy all "Backup" database records for the
+      # S3 table and delete all backed up files from the
+      # Amazon S3 server.
       def self.destroy_all_backups(adapter, options, index)
-        s3 = Backup::Connection::S3.new(options)
-        s3.connect
         backups = Backup::BackupRecord::S3.all(:conditions => {:adapter => adapter, :index => index})
-        backups.each do |backup|
-          puts "Destroying backup: #{backup.backup_file}.."
-          s3.destroy(backup.backup_file, backup.bucket)
-          backup.destroy
+        unless backups.empty?
+          s3 = Backup::Connection::S3.new(options)
+          s3.connect
+          backups.each do |backup|
+            puts "Destroying backup: #{backup.backup_file}.."
+            s3.destroy(backup.backup_file, backup.bucket)
+            backup.destroy
+          end
         end
       end
       

data/lib/backup/backup_record/ssh.rb

@@ -34,15 +34,24 @@ module Backup
         self.ip           = options[:ssh][:ip]
         self.user         = options[:ssh][:user]
       end
-
+      
+      # This will only be triggered by the rake task
+      # rake backup:db:destroy:ssh
+      # 
+      # This will loop through all the configured adapters
+      # and destroy all "Backup" database records for the
+      # SSH table and delete all backed up files from the
+      # remote server on which they are stored.
       def self.destroy_all_backups(adapter, options, index)
         backups = Backup::BackupRecord::SSH.all(:conditions => {:adapter => adapter, :index => index})
-        Net::SSH.start(options['ssh']['ip'], options['ssh']['user']) do |ssh|
-          # Loop through all backups that should be destroyed and remove them from remote server.
-          backups.each do |backup|
-            puts "Destroying old backup: #{backup.backup_file}.."
-            ssh.exec("rm #{File.join(backup.backup_path, backup.backup_file)}")
-            backup.destroy
+        unless backups.empty?
+          Net::SSH.start(options['ssh']['ip'], options['ssh']['user']) do |ssh|
+            # Loop through all backups that should be destroyed and remove them from remote server.
+            backups.each do |backup|
+              puts "Destroying old backup: #{backup.backup_file}.."
+              ssh.exec("rm #{File.join(backup.backup_path, backup.backup_file)}")
+              backup.destroy
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - meskyanichi