backup 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/backup.gemspec

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

data/generators/backup_files/templates/config.rake

@@ -12,11 +12,13 @@ end
 namespace :backup do
 
   task :s3_config => :environment do
-    @config = generate_yaml('s3.yml')
+    @config   = generate_yaml('s3.yml')
+    @adapters = ['mysql', 'sqlite3', 'assets', 'custom']
   end
   
   task :ssh_config => :environment do
     @config = generate_yaml('ssh.yml')
+    @adapters = ['mysql', 'sqlite3', 'assets', 'custom']
   end
   
 end

data/generators/backup_files/templates/db.rake

@@ -22,15 +22,15 @@ namespace :backup do
       desc 'Destroys S3 Backup database records; Physical files WILL be deleted as well.'
       task :s3 => :s3_config do
         puts "Removing all backups from S3.."
-        ['mysql', 'sqlite3', 'assets', 'custom'].each do |adapter|
+        @adapters.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])
+              Backup::BackupRecord::S3.destroy_all_backups(adapter, @config[adapter], 0)
             else
               puts "\n\n-- Processing #{adapter} backups.. --"
-              @config[adapter].each do |config|
-                Backup::BackupRecord::S3.destroy_all_backups(adapter, config)  
+              @config[adapter].each_with_index do |config, index|
+                Backup::BackupRecord::S3.destroy_all_backups(adapter, config, index)  
               end
             end
           end
@@ -41,15 +41,15 @@ namespace :backup do
       desc 'Destroys SSH Backup database records; Physical files WILL be deleted as well.'
       task :ssh => :ssh_config do
         puts "Removing all backups from remote server through SSH.."
-        ['mysql', 'sqlite3', 'assets', 'custom'].each do |adapter|
+        @adapters.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])
+              Backup::BackupRecord::SSH.destroy_all_backups(adapter, @config[adapter], 0)
             else
               puts "\n\n-- Processing #{adapter} backups.. --"
-              @config[adapter].each do |config|
-                Backup::BackupRecord::SSH.destroy_all_backups(adapter, config)  
+              @config[adapter].each_with_index do |config, index|
+                Backup::BackupRecord::SSH.destroy_all_backups(adapter, config, index)  
               end
             end
           end

data/generators/backup_files/templates/s3.rake

@@ -14,6 +14,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Mysql.new({
           :adapter    => 'mysql',
+          :index      => 0,
           :mysql => {
             :user     => @config['mysql_config']['user'],
             :password => @config['mysql_config']['password'],
@@ -31,9 +32,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Mysql.new({
             :adapter    => 'mysql',
+            :index      => index,
             :mysql => {
               :user     => config['mysql_config']['user'],
               :password => config['mysql_config']['password'],
@@ -68,6 +70,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Sqlite3.new({
           :adapter      => 'sqlite3',
+          :index        => 0,
           :file         => @config['file'],
           :path         => @config['path'],
           :encrypt      => @config['encrypt'],
@@ -81,9 +84,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Sqlite3.new({
             :adapter      => 'sqlite3',
+            :index        => index,
             :file         => config['file'],
             :path         => config['path'],
             :encrypt      => config['encrypt'],
@@ -114,6 +118,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Assets.new({
           :adapter      => 'assets',
+          :index        => 0,
           :path         => @config['path'],
           :encrypt      => @config['encrypt'],
           :keep_backups => @config['keep_backups'],
@@ -126,9 +131,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Assets.new({
             :adapter      => 'assets',
+            :index        => index,
             :path         => config['path'],
             :encrypt      => config['encrypt'],
             :keep_backups => config['keep_backups'],
@@ -185,6 +191,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Custom.new({
           :adapter      => 'custom',
+          :index        => 0,
           :file         => @config['file'],
           :path         => @config['path'],
           :command      => @config['command'],
@@ -199,9 +206,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Custom.new({
             :adapter      => 'custom',
+            :index        => index,
             :file         => config['file'],
             :path         => config['path'],
             :command      => config['command'],

data/generators/backup_files/templates/ssh.rake

@@ -11,7 +11,8 @@ namespace :backup do
       @config = @config['mysql']
       unless @config.is_a?(Array)
         Backup::Adapter::Mysql.new({
-          :adapter => 'mysql',
+          :adapter  => 'mysql',
+          :index    => 0,
           :mysql => {
             :user     => @config['mysql_config']['user'],
             :password => @config['mysql_config']['password'],
@@ -29,9 +30,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Mysql.new({
             :adapter => 'mysql',
+            :index   => index,
             :mysql => {
               :user     => config['mysql_config']['user'],
               :password => config['mysql_config']['password'],
@@ -65,6 +67,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Sqlite3.new({
           :adapter      => 'sqlite3',
+          :index        => 0,
           :file         => @config['file'],
           :path         => @config['path'],
           :encrypt      => @config['encrypt'],
@@ -78,9 +81,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Sqlite3.new({
             :adapter      => 'sqlite3',
+            :index        => index,
             :file         => config['file'],
             :path         => config['path'],
             :encrypt      => config['encrypt'],
@@ -109,6 +113,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Assets.new({
           :adapter      => 'assets',
+          :index        => 0,
           :path         => @config['path'],
           :encrypt      => @config['encrypt'],
           :keep_backups => @config['keep_backups'],
@@ -121,9 +126,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Assets.new({
             :adapter      => 'assets',
+            :index        => index,
             :path         => config['path'],
             :encrypt      => config['encrypt'],
             :keep_backups => config['keep_backups'],
@@ -180,6 +186,7 @@ namespace :backup do
       unless @config.is_a?(Array)
         Backup::Adapter::Custom.new({
           :adapter      => 'custom',
+          :index        => 0,
           :file         => @config['file'],
           :path         => @config['path'],
           :command      => @config['command'],
@@ -194,9 +201,10 @@ namespace :backup do
           }
         }).run
       else
-        @config.each do |config|
+        @config.each_with_index do |config, index|
           Backup::Adapter::Custom.new({
             :adapter      => 'custom',
+            :index        => index,
             :file         => config['file'],
             :path         => config['path'],
             :command      => config['command'],

data/lib/backup/backup_record/s3.rb

@@ -30,12 +30,13 @@ module Backup
         self.bucket       = options[:s3][:bucket]
         self.keep_backups = options[:keep_backups]
         self.adapter      = options[:adapter]
+        self.index        = options[:index]
       end
       
-      def self.destroy_all_backups(adapter, options)
+      def self.destroy_all_backups(adapter, options, index)
         s3 = Backup::Connection::S3.new(options)
         s3.connect
-        backups = Backup::BackupRecord::S3.all(:conditions => {:adapter => adapter})
+        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)
@@ -50,7 +51,7 @@ module Backup
         # First all backups will be fetched. 
         def destroy_old_backups
           if keep_backups.is_a?(Integer)
-            backups = Backup::BackupRecord::S3.all(:conditions => {:adapter => adapter})
+            backups = Backup::BackupRecord::S3.all(:conditions => {:adapter => adapter, :index => index})
             backups_to_destroy = Array.new
             backups.each_with_index do |backup, index|
               if index >= keep_backups then

data/lib/backup/backup_record/ssh.rb

@@ -30,12 +30,13 @@ module Backup
         self.backup_path  = options[:ssh][:path]
         self.keep_backups = options[:keep_backups]
         self.adapter      = options[:adapter]
+        self.index        = options[:index]
         self.ip           = options[:ssh][:ip]
         self.user         = options[:ssh][:user]
       end
 
-      def self.destroy_all_backups(adapter, options)
-        backups = Backup::BackupRecord::SSH.all(:conditions => {:adapter => adapter})
+      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|
@@ -53,7 +54,7 @@ module Backup
         # First all backups will be fetched. 
         def destroy_old_backups
           if keep_backups.is_a?(Integer)
-            backups = Backup::BackupRecord::SSH.all(:conditions => {:adapter => adapter})
+            backups = Backup::BackupRecord::SSH.all(:conditions => {:adapter => adapter, :index => index})
             backups_to_destroy = Array.new
             backups.each_with_index do |backup, index|
               if index >= keep_backups then

metadata

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