backup 2.1.0 → 2.1.1

data/README.rdoc

@@ -6,7 +6,7 @@ Backup is a Ruby Gem, written specifically for Ruby on Rails applications. This
 MySQL database (soon PostgreSQL and possibly more) and Archives (any files or folders) to "Amazon S3" or "any remotely accessible server using SCP".
 Backup handles: Compression, Archiving, Encryption and Backup Cleaning.
 
-== Backup just updated to version 2.0.0(+)!
+== Backup just updated to version 2.1.0!
 
 This was a major update (read below) and a lot of stuff has changed since version 1.x.x!
 Notable changes:
@@ -19,18 +19,18 @@ Notable changes:
 * Can now configure an unlimited amount of customizable backup settings and run them each "individually"!
 * HIGHLY IMPROVED USABILITY!
 
-== HAVING TROUBLE WITH VERSION "2.0.0"?
+== TO ANYONE RUNNING BACKUP VERSION 2.0.0! PLEASE READ!
 
-I have encountered and issue with Backup version "2.0.0" after the release. This issue has been addressed and patched to both version 2.0.0 as well as version 2.1.0. This involved the use of the SQLite3 database, which is no longer utilized by Backup. So for people that are going to install Backup version 2.0.0 (or later) right now, this issue no longer applies. However, for users that installed Backup 2.0.0 pretty early after the release, this might cause problems.
+I would like to ask you to install the latest version of Backup, as 2.0.0 has some issues.
+A few things that were left unchanged in 2.0.0 have been changed in 2.1.0 and I have updated the Wiki page "Getting Started"
+based on the 2.1.0 release to get everyone up and running!
 
-==== If you are running Backup version "2.0.0", please run the following to ensure you have a "good" install.
+==== If you have Backup version 2.0.0 installed, please do the following:
 
   sudo gem uninstall backup -v 2.0.0
   sudo gem install backup
 
-This will obviously uninstall your currently installed backup version 2.0.0 and install the latest version of Backup.
-Do this and you're set! My apologies for the initial hassle! ;)
-
+And have a quick read through the "Getting Started" Wiki page to see how simple the Backup setup is since 2.1.0!
 
 === Refer to the Getting Started page to get up and running incredibly fast with "Backup 2"!
 http://wiki.github.com/meskyanichi/backup/getting-started

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/backup.gemspec

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

data/generators/backup/templates/migrations/create_backup_tables.rb

@@ -1,24 +1,17 @@
 class CreateBackupTables < ActiveRecord::Migration
   def self.up
-    create_table :backup_s3 do |t|
-      t.string :trigger
-      t.string :adapter
-      t.string :filename
-      t.string :bucket
-      t.timestamps
-    end
-    
-    create_table :backup_scp do |t|
+    create_table :backup do |t|
+      t.string :storage
       t.string :trigger
       t.string :adapter
       t.string :filename
       t.string :path
+      t.string :bucket
       t.timestamps          
     end
   end
 
   def self.down
-    drop_table :backup_s3
-    drop_table :backup_scp
+    drop_table :backup
   end
 end

data/generators/backup/templates/tasks/backup.rake

@@ -9,8 +9,8 @@ namespace :backup do
   task :truncate => :environment do
     backup = Backup::Setup.new(ENV['trigger'], @backup_procedures)
     case backup.procedure.storage_name.to_sym
-      when :s3  then Backup::Record::S3.destroy_all(:trigger => ENV['trigger'])
-      when :scp then Backup::Record::SCP.destroy_all(:trigger => ENV['trigger'])
+      when :s3  then Backup::Record::S3.destroy_all(:trigger => ENV['trigger'], :storage => 's3')
+      when :scp then Backup::Record::SCP.destroy_all(:trigger => ENV['trigger'], :storage => 'scp')
     end
   end
   

data/lib/backup/record/s3.rb

@@ -1,20 +1,18 @@
 module Backup
   module Record
     class S3 < ActiveRecord::Base
-        
-      # Establishes a connection with the SQLite3
-      # local database to avoid conflict with users
-      # Production database.
-      # establish_connection(
-      #  :adapter  => "sqlite3",
-      #  :database => "db/backup.sqlite3",
-      #  :pool     => 5,
-      #  :timeout  => 5000 )
-      
-      set_table_name 'backup_s3'
       
-      # Scopes
-      default_scope :order => 'created_at desc'
+      if connection.table_exists?('backup')
+        set_table_name 'backup'
+        default_scope \
+          :order => 'created_at desc',
+          :conditions => {:storage => 's3'}
+      else
+        set_table_name 'backup_s3'
+        attr_accessor :storage
+        default_scope \
+          :order => 'created_at desc'
+      end
       
       # Callbacks
       after_save :clean_backups
@@ -26,8 +24,9 @@ module Backup
       # Sets the S3 values
       def load_adapter(adapter)
         self.adapter_config = adapter
+        self.storage        = 's3'
         self.trigger        = adapter.procedure.trigger
-        self.adapter        = adapter.procedure.adapter_name
+        self.adapter        = adapter.procedure.adapter_name.to_s
         self.filename       = adapter.final_file
         self.bucket         = adapter.procedure.get_storage_configuration.attributes['bucket']
         self.keep_backups   = adapter.procedure.attributes['keep_backups']

data/lib/backup/record/scp.rb

@@ -1,20 +1,18 @@
 module Backup
   module Record
     class SCP < ActiveRecord::Base
-        
-      # Establishes a connection with the SQLite3
-      # local database to avoid conflict with users
-      # Production database.
-      # establish_connection(
-      #  :adapter  => "sqlite3",
-      #  :database => "db/backup.sqlite3",
-      #  :pool     => 5,
-      #  :timeout  => 5000 )
-      
-      set_table_name 'backup_scp'
       
-      # Scopes
-      default_scope :order => 'created_at desc'
+      if connection.table_exists?('backup')
+        set_table_name 'backup'
+        default_scope \
+          :order => 'created_at desc',
+          :conditions => {:storage => 'scp'}
+      else
+        set_table_name 'backup_scp'
+        attr_accessor :storage
+        default_scope \
+          :order => 'created_at desc'
+      end
       
       # Callbacks
       after_save :clean_backups
@@ -26,8 +24,9 @@ module Backup
       # Sets the SCP values
       def load_adapter(adapter)
         self.adapter_config = adapter
+        self.storage        = 'scp'
         self.trigger        = adapter.procedure.trigger
-        self.adapter        = adapter.procedure.adapter_name
+        self.adapter        = adapter.procedure.adapter_name.to_s
         self.filename       = adapter.final_file
         self.keep_backups   = adapter.procedure.attributes['keep_backups']
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Michael van Rooijen