backup 1.2.0 → 1.2.1

data/README.rdoc

@@ -85,6 +85,11 @@ http://wiki.github.com/meskyanichi/backup/requirements
 http://wiki.github.com/meskyanichi/backup/automatic-backups
 
 
+=== Capistrano Recipes
+
+http://wiki.github.com/meskyanichi/backup/capistrano-recipes
+
+
 === Resources
 
 http://wiki.github.com/meskyanichi/backup/resources

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/backup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backup}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["meskyanichi"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2009-10-09}
   s.description = %q{
                           “Backup” is a RubyGem, written for Ruby on Rails. It's main purpose is to Backup any
                           files to Amazon S3 or any remotely accessible server through SSH (SCP). It supports database

data/generators/backup_files/templates/db.rake

@@ -1,13 +1,6 @@
 namespace :backup do
   namespace :db do
     namespace :truncate do
-
-      desc 'Truncates all the Backup database records; Physical files WILL NOT be deleted.'
-      task :all => :environment do
-        puts "Truncating All!"
-        Backup::BackupRecord::S3.destroy_all
-        Backup::BackupRecord::SSH.destroy_all
-      end
       
       desc 'Truncates the S3 Backup database records; Physical files WILL NOT be deleted from S3.'
       task :s3 => :environment do
@@ -23,27 +16,47 @@ namespace :backup do
       
     end
 
-=begin
+
     namespace :destroy do
       
-      desc 'Destroys all Backup database records; Physical files WILL be deleted as well.'
-      task :all => :environment do
-        Backup::BackupRecord::S3.destroy_all_backups
-        Backup::BackupRecord::SSH.destroy_all_backups
-      end
-      
       desc 'Destroys S3 Backup database records; Physical files WILL be deleted as well.'
       task :s3 => :s3_config do
-        Backup::BackupRecord::S3.destroy_all_backups
+        puts "Removing all backups from S3.."
+        ['mysql', 'sqlite3', 'assets', 'custom'].each do |adapter|
+          if @config[adapter]
+            unless @config[adapter].is_a?(Array)
+              puts "\n\n-- Processing #{adapter} backups.. --"
+              Backup::BackupRecord::S3.destroy_all_backups(adapter, @config[adapter])
+            else
+              puts "\n\n-- Processing #{adapter} backups.. --"
+              @config[adapter].each do |config|
+                Backup::BackupRecord::S3.destroy_all_backups(adapter, config)  
+              end
+            end
+          end
+        end
+        puts "\n\nAll S3 backups destroyed!"
       end
       
       desc 'Destroys SSH Backup database records; Physical files WILL be deleted as well.'
       task :ssh => :ssh_config do
-        Backup::BackupRecord::SSH.destroy_all_backups
+        puts "Removing all backups from remote server through SSH.."
+        ['mysql', 'sqlite3', 'assets', 'custom'].each do |adapter|
+          if @config[adapter]
+            unless @config[adapter].is_a?(Array)
+              puts "\n\n-- Processing #{adapter} backups.. --"
+              Backup::BackupRecord::SSH.destroy_all_backups(adapter, @config[adapter])
+            else
+              puts "\n\n-- Processing #{adapter} backups.. --"
+              @config[adapter].each do |config|
+                Backup::BackupRecord::SSH.destroy_all_backups(adapter, config)  
+              end
+            end
+          end
+        end
+        puts "All backups from remote server destroyed!"
       end
       
     end
-=end
-
   end
 end

data/lib/backup/backup_record/s3.rb

@@ -32,16 +32,15 @@ module Backup
         self.adapter      = options[:adapter]
       end
       
-      def self.destroy_all_backups(options)
+      def self.destroy_all_backups(adapter, options)
         s3 = Backup::Connection::S3.new(options)
         s3.connect
-        backups = Backup::BackupRecord::S3.all
+        backups = Backup::BackupRecord::S3.all(:conditions => {:adapter => adapter})
         backups.each do |backup|
           puts "Destroying backup: #{backup.backup_file}.."
           s3.destroy(backup.backup_file, backup.bucket)
           backup.destroy
         end
-        puts "All S3 Backups Destroyed!"
       end
       
       private

data/lib/backup/backup_record/ssh.rb

@@ -34,6 +34,18 @@ module Backup
         self.user         = options[:ssh][:user]
       end
 
+      def self.destroy_all_backups(adapter, options)
+        backups = Backup::BackupRecord::SSH.all(:conditions => {:adapter => adapter})
+        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
+
       private
         
         # Destroys backups when the backup limit has been reached
@@ -52,7 +64,7 @@ module Backup
             if backups_to_destroy
               # Establish a connection with the remote server through SSH
               Net::SSH.start(ip, user) do |ssh|
-                # Loop through all backups that should be destroyed and remove them from S3.
+                # Loop through all backups that should be destroyed and remove them from remote server.
                 backups_to_destroy.each do |backup|
                   puts "Destroying old backup: #{backup.backup_file}.."
                   ssh.exec("rm #{File.join(backup.backup_path, backup.backup_file)}")

data/lib/backup/connection/s3.rb

@@ -3,6 +3,8 @@ module Backup
     class S3 < Backup::Connection::Base
       
       def initialize(options = {})
+        options.symbolize_keys!
+        options[:s3].symbolize_keys!
         super(options)
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - meskyanichi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +02:00
+date: 2009-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency