backup 2.3.2.pre3 → 2.3.2

data/CHANGELOG

@@ -1,12 +1,41 @@
-=== 2.?.? ====================================
+UPDATE
+=== 2.3.2 =======================================
+  
+  - Only load 'pony' and 'optparse' when they need to be utilized.
+  - Only uses 'sudo' if BACKUP_PATH is not writable by current user.
+  - With Cloud Files storage, it will automatically create the bucket if it does not yet exist.
+  - Backup's logger will now display the current time when logging. Now also indicates what S3 bucket it
+    is being backed up to, as well as what the filename is.
+  - Backup now supports GPG public key encryption which is a new and more safe way to encrypt your data.
+  
+  
+MINOR UPDATE
+=== 2.3.2.pre3 ==================================
+
+  - Added support for Rackspace Cloud Files. Backups can now also be stored in Rackspace Cloud Files.
+
+
+MINOR UPDATE
+=== 2.3.2.pre2 ==================================
+
+  - Added support for Amazon S3 EEUU and European buckets.
+
+
+BIG UPDATE
+=== 2.3.2.pre ==================================
 
   - Added Storage Method: Local
   - Added Adapter: SQLite
   - exclude option added for Archive Adapter
   - Internal cleanup
   - Will try to automatically determine the path to mysqldump and pg_dump utilities
+  - Option to specify which tables to include for the backup
+  - The ability to specify a custom backup (unix environment) installation folder with ENV['BACKUP_PATH']
+  - Fixed dependency issue with SQLite3 Ruby Driver (must be 1.2.5)
+  - Removed Jeweler from Backup, the Gemspec should be manually updated from now on.
   - Added spec/tests
 
+
 MINOR UPDATE
 === 2.3.1 ======================================
 

data/LICENSE

@@ -1,4 +1,15 @@
-Copyright (c) 2009 Michael van Rooijen - Final Creation (http://final-creation.com)
+Copyright (c) 2009 Michael van Rooijen - Final Creation (http://michaelvanrooijen.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -6,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,174 @@
+# Backup
+
+## A Backup Ruby Gem
+
+Backup is a Ruby Gem written for Unix and Rails environments. It can be used both with and without the Ruby on Rails framework! This gem offers a quick and simple solution to backing up databases such as MySQL/PostgreSQL/SQLite and Files/Folders. All backups can be transferred to Amazon S3, Rackspace Cloud Files, any remote server you have access to (using either SCP, SFTP or regular FTP), or a Local server. Backup handles Compression, Archiving, Encryption, Backup Cleaning (Cycling) and supports Email Notifications.
+
+## Authors/Maintainers
+
+* [Meskyanichi - Michael van Rooijen](http://github.com/meskyanichi)
+* [Fernandoluizao - Fernando Migliorini Luizão](http://github.com/fernandoluizao)
+
+## Backup's Current Capabilities
+
+### Storage Methods
+
+* Amazon S3
+* Rackspace Cloud Files
+* Remote Server (Available Protocols: SCP, SFTP, FTP)
+* Local server (Example Locations: Another Hard Drive, Network path)
+
+### Adapters
+
+* MySQL
+* PostgreSQL
+* SQLite
+* Archive (Any files and/or folders)
+* Custom (Anything you can produce using the command line)
+
+### Archiving
+
+Handles archiving for the __Archive__ and __Custom__ adapters.
+
+### Encryption
+
+Handles encryption of __all__ backups for __any__ adapter.
+To decrypt a "Backup encrypted file" you can use Backup's built-in utility command:
+
+    sudo backup --decrypt /path/to/encrypted/file.enc
+
+### Backup Cleaning
+
+With Backup you can very easily specify how many backups you would like to have stored (per backup procedure!) on your Amazon S3, Remote or Local server. When the limit you specify gets exceeded, the oldest backup will automatically be cleaned up.
+
+### Email Notifications
+
+You will be able to specify whether you would like to be notified by email when a backup successfully been stored.
+Simply fill in the email configuration block and set "notify" to true inside the backup procedure you would like to be notified of.
+
+### Quick Example of a Single Backup Setting/Procedure inside the Backup Configuration File
+
+    backup 'mysql-backup-s3' do
+      adapter :mysql do
+        user      'user'
+        password  'password'
+        database  'database'
+      end
+      storage :s3 do
+        access_key_id     'access_key_id'
+        secret_access_key 'secret_access_key'
+        bucket            '/bucket/backups/mysql/'
+        use_ssl           true
+      end
+      keep_backups 25
+      encrypt_with_password 'my_password'
+      notify true
+    end
+  
+Everything above should be pretty straightforward, so now, using the __trigger__ we specified between
+the `backup` and `do` you can execute this backup procedure like so:
+
+__Rails Environment__
+
+    rake backup:run trigger=mysql-backup-s3
+
+__Unix Environment__
+
+    sudo backup --run mysql-backup-s3
+
+That's it. This was a simple example of how it works.
+
+## Interested in trying out Backup?
+
+### Getting started with Backup for the *Unix Environment*
+
+[http://wiki.github.com/meskyanichi/backup/getting-started-unix](http://wiki.github.com/meskyanichi/backup/getting-started-unix)
+
+
+### Getting started with Backup for the *Rails Environment*
+
+[http://wiki.github.com/meskyanichi/backup/getting-started-ruby-on-rails](http://wiki.github.com/meskyanichi/backup/getting-started-ruby-on-rails)
+
+
+### Production Mode __RAILS_ENV___
+
+[http://wiki.github.com/meskyanichi/backup/production-mode](http://wiki.github.com/meskyanichi/backup/production-mode)
+
+
+### Encrypting and Decrypting
+
+[http://wiki.github.com/meskyanichi/backup/encrypting-and-decrypting](http://wiki.github.com/meskyanichi/backup/encrypting-and-decrypting)
+
+
+### Backup Configuration File (All Adapters, Storage Methods, Mail Settings and Options)
+
+[http://wiki.github.com/meskyanichi/backup/configuration-file](http://wiki.github.com/meskyanichi/backup/configuration-file)
+
+
+### Unix Utility Commands and Rails Rake Tasks
+
+[http://wiki.github.com/meskyanichi/backup/utility-commands](http://wiki.github.com/meskyanichi/backup/utility-commands)
+
+[http://wiki.github.com/meskyanichi/backup/rake-tasks](http://wiki.github.com/meskyanichi/backup/rake-tasks)
+
+
+### Automatic Backups
+
+[http://wiki.github.com/meskyanichi/backup/automatic-backups](http://wiki.github.com/meskyanichi/backup/automatic-backups)
+
+
+### Capistrano Recipes
+
+[http://wiki.github.com/meskyanichi/backup/capistrano-recipes](http://wiki.github.com/meskyanichi/backup/capistrano-recipes)
+
+
+### Capistrano, Whenever!
+
+[http://wiki.github.com/meskyanichi/backup/capistrano-whenever](http://wiki.github.com/meskyanichi/backup/capistrano-whenever)
+
+
+### Understanding "The Backup Database"
+
+[http://wiki.github.com/meskyanichi/backup/the-backup-database](http://wiki.github.com/meskyanichi/backup/the-backup-database)
+
+
+### Trouble Shooting
+
+[http://wiki.github.com/meskyanichi/backup/troubleshooting](http://wiki.github.com/meskyanichi/backup/troubleshooting)
+
+
+### Requirements
+
+[http://wiki.github.com/meskyanichi/backup/requirements](http://wiki.github.com/meskyanichi/backup/requirements)
+
+
+### Resources
+
+[http://wiki.github.com/meskyanichi/backup/resources](http://wiki.github.com/meskyanichi/backup/resources)
+
+
+### Requests
+
+If anyone has any requests, please send us a message or post it in the [issue log](http://github.com/meskyanichi/backup/issues)!
+
+
+### Suggestions?
+
+Send us a message! Fork the project!
+
+
+### Found a Bug?
+
+[Report it](http://github.com/meskyanichi/backup/issues)
+
+
+### Contributors
+
+* [dtrueman](http://github.com/dtrueman)
+* [Nathan L Smith](http://github.com/smith)
+* [Francesc Esplugas](http://github.com/fesplugas)
+* [wakiki](http://github.com/wakiki)
+* [Dan Hixon](http://github.com/danhixon)
+* [Adam Greene](http://github.com/skippy)
+
+__Michael van Rooijen | Final Creation. ([http://michaelvanrooijen.com](http://michaelvanrooijen.com))__

data/VERSION

@@ -1 +1 @@
-2.3.2.pre2
+2.3.2

data/bin/backup

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'backup'
 
 include Backup::Environment::Unix::Commands
@@ -21,15 +22,7 @@ optparse = OptionParser.new do |opts|
     confirm_configuration_file_existence
     puts "Finding backup records with trigger: #{trigger}."
     backup = Backup::Setup.new(trigger, @backup_procedures)
-    records = Array.new
-    case backup.procedure.storage_name.to_sym
-      when :cloudfiles then records = Backup::Record::CloudFiles.all :conditions => {:trigger => trigger}
-      when :s3         then records = Backup::Record::S3.all         :conditions => {:trigger => trigger}
-      when :scp        then records = Backup::Record::SCP.all        :conditions => {:trigger => trigger}
-      when :ftp        then records = Backup::Record::FTP.all        :conditions => {:trigger => trigger}
-      when :sftp       then records = Backup::Record::SFTP.all       :conditions => {:trigger => trigger}
-      when :local      then records = Backup::Record::Local.all      :conditions => {:trigger => trigger}
-    end
+    records = backup.procedure.record_class.all( :conditions => {:trigger => trigger} )
 
     if options[:table]
       puts Hirb::Helpers::AutoTable.render(records)
@@ -49,14 +42,7 @@ optparse = OptionParser.new do |opts|
     confirm_configuration_file_existence
     puts "Destroying backup records with trigger: #{trigger}."
     backup = Backup::Setup.new(trigger, @backup_procedures)
-    case backup.procedure.storage_name.to_sym
-      when :cloudfiles then Backup::Record::CloudFiles.destroy_all_backups backup.procedure,  trigger
-      when :s3         then Backup::Record::S3.destroy_all_backups         backup.procedure,  trigger
-      when :scp        then Backup::Record::SCP.destroy_all_backups        backup.procedure,  trigger
-      when :ftp        then Backup::Record::FTP.destroy_all_backups        backup.procedure,  trigger
-      when :sftp       then Backup::Record::SFTP.destroy_all_backups       backup.procedure,  trigger
-      when :local      then Backup::Record::Local.destroy_all_backups      backup.procedure,  trigger
-    end
+    backup.procedure.record_class.destroy_all_backups( backup.procedure, trigger )
   end
   
   opts.on('--truncate-all', "Truncates all backup records") do
@@ -69,14 +55,7 @@ optparse = OptionParser.new do |opts|
     puts "Destroying all backup records."
     backup = Backup::Setup.new(false, @backup_procedures)
     backup.procedures.each do |backup_procedure|
-      case backup_procedure.storage_name.to_sym
-        when :cloudfiles then Backup::Record::CloudFiles.destroy_all_backups backup_procedure,  backup_procedure.trigger
-        when :s3         then Backup::Record::S3.destroy_all_backups         backup_procedure,  backup_procedure.trigger
-        when :scp        then Backup::Record::SCP.destroy_all_backups        backup_procedure,  backup_procedure.trigger
-        when :ftp        then Backup::Record::FTP.destroy_all_backups        backup_procedure,  backup_procedure.trigger
-        when :sftp       then Backup::Record::SFTP.destroy_all_backups       backup_procedure,  backup_procedure.trigger
-        when :local then Backup::Record::Local.destroy_all_backups           backup.procedure,  backup_procedure.trigger
-      end
+      backup_procedure.record_class.destroy_all_backups( backup_procedure, backup_procedure.trigger )
     end
   end
 

data/generators/backup/templates/config/backup.rb

@@ -22,6 +22,7 @@
 #
 # STORAGE METHODS
 #  - S3     (Amazon)
+#  - CF     (Rackspace Cloud Files)
 #  - SCP    (Remote Server)
 #  - FTP    (Remote Server)
 #  - SFTP   (Remote Server)
@@ -103,6 +104,22 @@ backup 'mysql-backup-s3' do
   
 end
 
+# Initialize with:
+#   rake backup:run trigger='mysql-backup-cloudfiles'
+backup 'mysql-backup-cloudfiles' do
+
+  adapter :mysql do
+    user        'user'
+    password    'password'
+    database    'database'
+  end
+
+  storage :cloudfiles do
+    username  'username'
+    api_key   'api_key'
+    container 'mysql_backup'
+  end
+end
 
 # Initialize with:
 #   rake backup:run trigger='postgresql-backup-s3'
@@ -199,4 +216,4 @@ backup 'sqlite-backup-local' do
   encrypt_with_password false
   notify false
   
-end
+end

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

@@ -10,14 +10,7 @@ namespace :backup do
   task :find => :environment do
     puts "Finding backup records with trigger: #{ENV['trigger']}."
     backup = Backup::Setup.new(ENV['trigger'], @backup_procedures)
-    records = Array.new
-    case backup.procedure.storage_name.to_sym
-      when :s3    then records = Backup::Record::S3.all    :conditions => {:trigger => ENV['trigger']}
-      when :scp   then records = Backup::Record::SCP.all   :conditions => {:trigger => ENV['trigger']}
-      when :ftp   then records = Backup::Record::FTP.all   :conditions => {:trigger => ENV['trigger']}
-      when :sftp  then records = Backup::Record::SFTP.all  :conditions => {:trigger => ENV['trigger']}
-      when :local then records = Backup::Record::Local.all :conditions => {:trigger => ENV['trigger']}
-    end
+    records = backup.procedure.record_class.all( :conditions => {:trigger => ENV['trigger']} )
     
     if ENV['table'].eql?("true")
       puts Hirb::Helpers::AutoTable.render(records)
@@ -44,13 +37,7 @@ namespace :backup do
   task :destroy => :environment do
     puts "Destroying backup records with trigger: #{ENV['trigger']}."
     backup = Backup::Setup.new(ENV['trigger'], @backup_procedures)
-    case backup.procedure.storage_name.to_sym
-      when :s3    then Backup::Record::S3.destroy_all_backups    backup.procedure,  ENV['trigger']
-      when :scp   then Backup::Record::SCP.destroy_all_backups   backup.procedure,  ENV['trigger']
-      when :ftp   then Backup::Record::FTP.destroy_all_backups   backup.procedure,  ENV['trigger']
-      when :sftp  then Backup::Record::SFTP.destroy_all_backups  backup.procedure,  ENV['trigger']
-      when :local then Backup::Record::Local.destroy_all_backups backup.procedure,  ENV['trigger']
-    end
+    backup.procedure.record_class.destroy_all_backups( backup.procedure, ENV['trigger'] )
   end
   
   desc "Destroys all records for the specified \"trigger\", including the physical files on s3 or the remote server."
@@ -58,13 +45,7 @@ namespace :backup do
     puts "Destroying all backup records."
     backup = Backup::Setup.new(false, @backup_procedures)
     backup.procedures.each do |backup_procedure|
-      case backup_procedure.storage_name.to_sym
-        when :s3    then Backup::Record::S3.destroy_all_backups     backup_procedure,  backup_procedure.trigger
-        when :scp   then Backup::Record::SCP.destroy_all_backups    backup_procedure,  backup_procedure.trigger
-        when :ftp   then Backup::Record::FTP.destroy_all_backups    backup_procedure,  backup_procedure.trigger
-        when :sftp  then Backup::Record::SFTP.destroy_all_backups   backup_procedure,  backup_procedure.trigger
-        when :local then Backup::Record::Local.destroy_all_backups  backup_procedure,  backup_procedure.trigger
-      end
+      backup_procedure.record_class.destroy_all_backups( backup_procedure, backup_procedure.trigger )
     end
   end
   

data/lib/backup.rb

@@ -51,6 +51,7 @@ module Backup
   end
 
   module Storage
+    autoload :Base,       'backup/storage/base'
     autoload :CloudFiles, 'backup/storage/cloudfiles'
     autoload :S3,         'backup/storage/s3'
     autoload :SCP,        'backup/storage/scp'

data/lib/backup/adapters/base.rb

@@ -4,7 +4,7 @@ module Backup
 
       include Backup::CommandHelper
       
-      attr_accessor :procedure, :timestamp, :options, :tmp_path, :encrypt_with_password, :keep_backups, :trigger
+      attr_accessor :procedure, :timestamp, :options, :tmp_path, :encrypt_with_password, :encrypt_with_gpg_public_key, :keep_backups, :trigger
 
       # IMPORTANT
       # final_file must have the value of the final filename result
@@ -12,7 +12,9 @@ module Backup
       #   myfile.gz
       #
       # and if a file afterwards gets encrypted, the file will look like:
-      #   myfile.gz.enc
+      #   myfile.gz.enc (with a password)
+      #   myfile.gz.gpg (with a gpg public key)
+      #
       #
       # It is important that, whatever the final filename of the file will be, that :final_file will contain it.
       attr_accessor :performed_file, :compressed_file, :encrypted_file, :final_file
@@ -31,16 +33,16 @@ module Backup
       # 
       # Wrapped inside of begin/ensure/end block to ensure the deletion of any files in the tmp directory
       def initialize(trigger, procedure)
-        self.trigger                = trigger
-        self.procedure              = procedure
-        self.timestamp              = Time.now.strftime("%Y%m%d%H%M%S")
-        self.tmp_path               = File.join(BACKUP_PATH.gsub(' ', '\ '), 'tmp', 'backup', trigger)
-        self.encrypt_with_password  = procedure.attributes['encrypt_with_password']
-        self.keep_backups           = procedure.attributes['keep_backups']
+        self.trigger                     = trigger
+        self.procedure                   = procedure
+        self.timestamp                   = Time.now.strftime("%Y%m%d%H%M%S")
+        self.tmp_path                    = File.join(BACKUP_PATH.gsub(' ', '\ '), 'tmp', 'backup', trigger)
+        self.encrypt_with_password       = procedure.attributes['encrypt_with_password']
+        self.encrypt_with_gpg_public_key = procedure.attributes['encrypt_with_gpg_public_key']
+        self.keep_backups                = procedure.attributes['keep_backups']
 
         self.performed_file   = "#{timestamp}.#{trigger.gsub(' ', '-')}#{performed_file_extension}"
         self.compressed_file  = "#{performed_file}.gz"
-        self.encrypted_file   = "#{compressed_file}.enc"
         self.final_file       = compressed_file
 
         begin
@@ -72,11 +74,33 @@ module Backup
 
       # Encrypts the archive file
       def encrypt
-        if encrypt_with_password.is_a?(String)
-          log system_messages[:encrypting]
+        if encrypt_with_gpg_public_key.is_a?(String) && encrypt_with_password.is_a?(String)
+          puts "both 'encrypt_with_gpg_public_key' and 'encrypt_with_password' are set.  Please choose one or the other.  Exiting."
+          exit 1
+        end
+        
+        if encrypt_with_gpg_public_key.is_a?(String)
+          if `which gpg` == ''
+            puts "Encrypting with a GPG public key requires that gpg be in your public path.  gpg was not found.  Exiting"
+            exit 1
+          end
+          log system_messages[:encrypting_w_key]
+          self.encrypted_file   = "#{self.final_file}.gpg"
+
+          # tmp_file = Tempfile.new('backup.pub'){ |tmp_file| tmp_file << encrypt_with_gpg_public_key }
+          tmp_file = Tempfile.new('backup.pub')
+          tmp_file << encrypt_with_gpg_public_key
+          tmp_file.close       
+          # that will either say the key was added OR that it wasn't needed, but either way we need to parse for the uid
+          # which will be wrapped in '<' and '>' like <sweetspot-backup2007@6bar8.com>
+          encryptionKeyId = `gpg --import #{tmp_file.path} 2>&1`.match(/<(.+)>/)[1] 
+          run "gpg -e --trust-model always -o #{File.join(tmp_path, encrypted_file)} -r '#{encryptionKeyId}' #{File.join(tmp_path, compressed_file)}"
+        elsif encrypt_with_password.is_a?(String)
+          log system_messages[:encrypting_w_pass]
+          self.encrypted_file   = "#{self.final_file}.enc"
           run "openssl enc -des-cbc -in #{File.join(tmp_path, compressed_file)} -out #{File.join(tmp_path, encrypted_file)} -k #{encrypt_with_password}"
-          self.final_file = encrypted_file
         end
+        self.final_file = encrypted_file
       end
       
       # Initializes the storing process
@@ -99,13 +123,14 @@ module Backup
       end
       
       def system_messages
-        { :compressing  => "Compressing backup..",
-          :archiving    => "Archiving backup..",
-          :encrypting   => "Encrypting backup..",
-          :mysqldump    => "Creating MySQL dump..",
-          :pgdump       => "Creating PostgreSQL dump..",
-          :sqlite       => "Copying and compressing SQLite database..",
-          :commands     => "Executing commands.." }
+        { :compressing        => "Compressing backup..",
+          :archiving          => "Archiving backup..",
+          :encrypting_w_pass  => "Encrypting backup with password..",
+          :encrypting_w_key   => "Encrypting backup with gpg public key..",
+          :mysqldump          => "Creating MySQL dump..",
+          :pgdump             => "Creating PostgreSQL dump..",
+          :sqlite             => "Copying and compressing SQLite database..",
+          :commands           => "Executing commands.." }
       end
       
     end

data/lib/backup/command_helper.rb

@@ -5,7 +5,7 @@ module Backup
     end
  
     def log(command)
-      puts "Backup => #{command}"
+      puts "Backup (#{Time.now.strftime("%Y-%m-%d %H:%M:%S %Z")}) => #{command}"
     end
   end
 end

data/lib/backup/configuration/base.rb

@@ -2,7 +2,7 @@ module Backup
   module Configuration
     class Base
       extend Backup::Configuration::Attributes
-      generate_attributes %w(encrypt_with_password keep_backups notify)
+      generate_attributes %w(encrypt_with_password encrypt_with_gpg_public_key keep_backups notify)
       
       attr_accessor :trigger, :storage_name, :adapter_name
 
@@ -22,28 +22,36 @@ module Backup
         @storage_configuration.instance_eval &block
       end
 
-      # Initializes the storing process depending on the store settings
-      def initialize_storage(adapter)
+      def storage_class
         case @storage_name.to_sym
-          when :cloudfiles then Backup::Storage::CloudFiles.new(adapter)
-          when :s3         then Backup::Storage::S3.new(adapter)
-          when :scp        then Backup::Storage::SCP.new(adapter)
-          when :ftp        then Backup::Storage::FTP.new(adapter)
-          when :sftp       then Backup::Storage::SFTP.new(adapter)
-          when :local      then Backup::Storage::Local.new(adapter)
+          when :cloudfiles then Backup::Storage::CloudFiles
+          when :s3         then Backup::Storage::S3
+          when :scp        then Backup::Storage::SCP
+          when :ftp        then Backup::Storage::FTP
+          when :sftp       then Backup::Storage::SFTP
+          when :local      then Backup::Storage::Local
         end
       end
 
-      def initialize_record
+      def record_class
         case @storage_name.to_sym
-          when :cloudfiles then Backup::Record::CloudFiles.new
-          when :s3         then Backup::Record::S3.new
-          when :scp        then Backup::Record::SCP.new
-          when :ftp        then Backup::Record::FTP.new
-          when :sftp       then Backup::Record::SFTP.new
-          when :local      then Backup::Record::Local.new
+          when :cloudfiles then Backup::Record::CloudFiles
+          when :s3         then Backup::Record::S3
+          when :scp        then Backup::Record::SCP
+          when :ftp        then Backup::Record::FTP
+          when :sftp       then Backup::Record::SFTP
+          when :local      then Backup::Record::Local
         end        
       end
+
+      # Initializes the storing process depending on the store settings
+      def initialize_storage(adapter)
+        storage_class.new(adapter)
+      end
+
+      def initialize_record
+        record_class.new
+      end
   
       def get_adapter_configuration
         @adapter_configuration

data/lib/backup/connection/s3.rb

@@ -37,7 +37,9 @@ module Backup
 
       # Wrapper for the Bucket object
       def bucket
-        service.buckets.find(s3_bucket)
+        bucket = service.buckets.build(s3_bucket)
+        bucket.save
+        bucket.retrieve
       end
 
       # Initializes the file transfer to Amazon S3

data/lib/backup/environment/unix.rb

@@ -3,7 +3,6 @@ module Backup
     module Unix
       
       require 'active_record'
-      require 'optparse'
       
       # Sets BACKUP_PATH
       BACKUP_PATH = ENV['BACKUP_PATH'] || "/opt/backup"
@@ -21,9 +20,9 @@ module Backup
         def setup
           unless File.directory?(BACKUP_PATH)
             puts "Installing Backup in #{BACKUP_PATH}.."
-            %x{ sudo mkdir -p #{File.join(BACKUP_PATH, 'config')} }
-            %x{ sudo cp #{File.join(File.dirname(__FILE__), '..', '..', '..', 'setup', 'backup.sqlite3')} #{BACKUP_PATH} }
-            %x{ sudo cp #{File.join(File.dirname(__FILE__), '..', '..', '..', 'setup', 'backup.rb')} #{File.join(BACKUP_PATH, 'config')} }
+            %x{ #{sudo} mkdir -p #{File.join(BACKUP_PATH, 'config')} }
+            %x{ #{sudo} cp #{File.join(File.dirname(__FILE__), '..', '..', '..', 'setup', 'backup.sqlite3')} #{BACKUP_PATH} }
+            %x{ #{sudo} cp #{File.join(File.dirname(__FILE__), '..', '..', '..', 'setup', 'backup.rb')} #{File.join(BACKUP_PATH, 'config')} }
             puts <<-MESSAGE
               
   ==============================================================
@@ -72,7 +71,7 @@ module Backup
 
         def remove
           puts "Removing Backup..\n"
-          %x{ sudo rm -rf #{BACKUP_PATH} }
+          %x{ #{sudo} rm -rf #{BACKUP_PATH} }
         end
       end
       
@@ -86,9 +85,25 @@ module Backup
             exit
           end
         end
-        
+
+        def sudo
+          if writable?(BACKUP_PATH)
+            ""
+          else
+            "sudo"
+          end
+        end
+
+        private
+        def writable?(f)
+          unless File.exists?(f)
+            writable?(File.dirname(f))
+          else
+            File.writable?(f)
+          end
+        end
       end
     
     end
   end
-end
+end

data/lib/backup/mail/base.rb

@@ -1,5 +1,3 @@
-require 'pony'
-
 module Backup
   module Mail
     class Base
@@ -34,6 +32,8 @@ module Backup
       # Requires the Backup Object
       def self.notify!(backup)
         if self.setup? and backup.procedure.attributes['notify'].eql?(true)
+          require 'pony'
+
           @backup = backup
           self.parse_body
           Pony.mail({
@@ -67,6 +67,7 @@ module Backup
       end
       
       def self.gsub_content(lines)
+        container = @backup.procedure.get_storage_configuration.attributes['container']
         bucket  = @backup.procedure.get_storage_configuration.attributes['bucket']
         path    = @backup.procedure.get_storage_configuration.attributes['path']
         ip      = @backup.procedure.get_storage_configuration.attributes['ip']
@@ -78,9 +79,10 @@ module Backup
           line.gsub!(':year',      Time.now.strftime("%Y"))
           line.gsub!(':time',      Time.now.strftime("%r"))
           line.gsub!(':adapter',   @backup.procedure.adapter_name.to_s)
-          line.gsub!(':location',  bucket || path)
+          line.gsub!(':location',  container || bucket || path)
           line.gsub!(':backup',    @backup.final_file)
           case @backup.procedure.storage_name.to_sym
+            when :cloudfiles        then line.gsub!(':remote', "on Rackspace Cloudfiles")
             when :s3                then line.gsub!(':remote', "on Amazon S3")
             when :local             then line.gsub!(':remote', "on the local server")
             when :scp, :sftp, :ftp  then line.gsub!(':remote', "on the remote server (#{ip})")

data/lib/backup/storage/base.rb

@@ -0,0 +1,10 @@
+module Backup
+  module Storage
+    class Base
+      include Backup::CommandHelper
+
+    end
+  end
+end
+
+

data/lib/backup/storage/cloudfiles.rb

@@ -2,7 +2,7 @@ require 'backup/connection/cloudfiles'
 
 module Backup
   module Storage
-    class CloudFiles
+    class CloudFiles < Base
 
       # Stores the backup file on the remote server using Rackspace Cloud Files
       def initialize(adapter)

data/lib/backup/storage/ftp.rb

@@ -2,7 +2,7 @@ require 'net/ftp'
 
 module Backup
   module Storage
-    class FTP
+    class FTP < Backup::Storage::Base
       
       attr_accessor :user, :password, :ip, :path, :tmp_path, :final_file
       

data/lib/backup/storage/local.rb

@@ -1,8 +1,6 @@
 module Backup
   module Storage
-    class Local
-      
-      include Backup::CommandHelper
+    class Local < Base
       
       # Store on same machine, preferentially in a different hard drive or in 
       # a mounted network path (NFS, Samba, etc)

data/lib/backup/storage/s3.rb

@@ -2,12 +2,13 @@ require 'backup/connection/s3'
 
 module Backup
   module Storage
-    class S3
+    class S3 < Base
       
       # Stores the backup file on the remote server using S3
       def initialize(adapter)
         s3 = Backup::Connection::S3.new(adapter)
         s3.connect
+        log("Saving '#{s3.final_file}' to s3 bucket '#{s3.s3_bucket}'")
         s3.store
       end
       

data/lib/backup/storage/scp.rb

@@ -2,7 +2,7 @@ require 'net/scp'
 
 module Backup
   module Storage
-    class SCP
+    class SCP < Base
       
       attr_accessor :user, :password, :ip, :path, :tmp_path, :final_file
       

data/lib/backup/storage/sftp.rb

@@ -2,7 +2,7 @@ require 'net/sftp'
 
 module Backup
   module Storage
-    class SFTP
+    class SFTP < Base
       
       attr_accessor :user, :password, :ip, :path, :tmp_path, :final_file
       

data/setup/backup.rb

@@ -22,6 +22,7 @@
 #
 # STORAGE METHODS
 #  - S3     (Amazon)
+#  - CF     (Rackspace Cloud Files)
 #  - SCP    (Remote Server)
 #  - FTP    (Remote Server)
 #  - SFTP   (Remote Server)
@@ -104,6 +105,33 @@ backup 'mysql-backup-s3' do
 end
 
 
+# Initialize with:
+#  sudo backup --run mysql-backup-cloudfiles
+backup 'mysql-backup-cloudfiles' do
+
+  adapter :mysql do
+    user        'user'
+    password    'password'
+    database    'database'
+  end
+
+  storage :cloudfiles do
+    username  'username'
+    api_key   'api_key'
+    container 'mysql_backup'
+  end
+  
+  encrypt_with_gpg_public_key <<-KEY
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (Darwin)
+
+Your very long public key goes here
+-----END PGP PUBLIC KEY BLOCK-----
+KEY
+  
+end
+
+
 # Initialize with:
 #  sudo backup --run postgresql-backup-s3
 backup 'postgresql-backup-scp' do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  hash: -1876988210
-  prerelease: true
+  hash: 7
+  prerelease: false
   segments: 
   - 2
   - 3
   - 2
-  - pre3
-  version: 2.3.2.pre3
+  version: 2.3.2
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +02:00
+date: 2010-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +104,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -163,11 +162,11 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 description: |-
-  Backup is a Ruby Gem written for Unix and Rails environments. It can be used both with and without the
-    Ruby on Rails framework! This gem offers a quick and simple solution to backing up databases such as
-    MySQL/PostgreSQL and Files/Folders. All backups can be transferred to Amazon S3 or any remote server you
-    have access to, using either SCP, SFTP or regular FTP. Backup handles Compression, Archiving, Encryption
-    and Backup Cleaning (Cycling).
+  Backup is a Ruby Gem written for Unix and Rails environments. It can be used both with
+    and without the Ruby on Rails framework! This gem offers a quick and simple solution to backing up databases
+    such as MySQL/PostgreSQL/SQLite and Files/Folders. All backups can be transferred to Amazon S3, Rackspace Cloud Files,
+    any remote server you have access to (using either SCP, SFTP or regular FTP), or a Local server. Backup handles
+    Compression, Archiving, Encryption (OpenSSL or GPG), Backup Cleaning (Cycling) and supports Email Notifications.
 email: meskyanichi@gmail.com
 executables: 
 - backup
@@ -176,7 +175,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.textile
+- README.md
 - CHANGELOG
 - LICENSE
 - VERSION
@@ -209,6 +208,7 @@ files:
 - lib/backup/record/s3.rb
 - lib/backup/record/scp.rb
 - lib/backup/record/sftp.rb
+- lib/backup/storage/base.rb
 - lib/backup/storage/cloudfiles.rb
 - lib/backup/storage/ftp.rb
 - lib/backup/storage/local.rb
@@ -246,14 +246,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/README.textile

@@ -1,175 +0,0 @@
-h1. Backup
-
-h2. A Backup Ruby Gem
-
-Backup is a Ruby Gem written for Unix and Rails environments. It can be used both with and without the Ruby on Rails framework! This gem offers a quick and simple solution to backing up databases such as MySQL/PostgreSQL and Files/Folders. All backups can be transferred to Amazon S3 or any remote server you have access to, using either SCP, SFTP or regular FTP. Backup handles Compression, Archiving, Encryption, Backup Cleaning (Cycling) and supports Email Notifications.
-
-h2. Authors/Maintainers
-
-* "Meskyanichi - Michael van Rooijen":http://github.com/meskyanichi
-* "Fernandoluizao - Fernando Migliorini Luizão":http://github.com/fernandoluizao
-
-
-h2. Backup's Current Capabilities
-
-h3. Storage Methods
-
-* Amazon S3
-* Remote Server (Available Protocols: SCP, SFTP, FTP)
-* Local server (Example Locations: Another Hard Drive, Network path) *(coming in the next gem release)*
-
-h3. Adapters
-
-* MySQL
-* SQLite *(in the next gem release)*
-* PostgreSQL
-* Archive (Any files and/or folders)
-* Custom (Anything you can produce using the command line)
-
-h3. Archiving
-
-Handles archiving for the *Archive* and *Custom* adapters.
-
-h3. Encryption
-
-Handles encryption of *all* backups for *any* adapter.
-To decrypt a "Backup encrypted file" you can use Backup's built-in utility command:
-
-bc. sudo backup --decrypt /path/to/encrypted/file.enc
-
-h3. Backup Cleaning
-
-With Backup you can very easily specify how many backups you would like to have stored (per backup procedure!) on your Amazon S3, Remote or Local server. When the limit you specify gets exceeded, the oldest backup will automatically be cleaned up.
-
-h3. Email Notifications
-
-You will be able to specify whether you would like to be notified by email when a backup successfully been stored.
-Simply fill in the email configuration block and set "notify" to true inside the backup procedure you would like to be notified of.
-
-h3. Quick Example of a Single Backup Setting/Procedure inside the Backup Configuration File
-
-bc. backup 'mysql-backup-s3' do
-  adapter :mysql do
-    user      'user'
-    password  'password'
-    database  'database'
-  end
-  storage :s3 do
-    access_key_id     'access_key_id'
-    secret_access_key 'secret_access_key'
-    bucket            '/bucket/backups/mysql/'
-    use_ssl           true
-  end
-  keep_backups 25
-  encrypt_with_password 'my_password'
-  notify true
-end
-  
-Everything above should be pretty straightforward, so now, using the "trigger" we specified between
-the *backup* and *do* you can execute this backup procedure like so:
-
-*Rails Environment*
-
-bc. rake backup:run trigger=mysql-backup-s3
-
-*Unix Environment*
-
-bc. sudo backup --run mysql-backup-s3
-
-That's it. This was a simple example of how it works.
-
-
-h2. Interested in trying out Backup?
-
-
-h3. Getting started with Backup for the *Unix Environment*
-
-"http://wiki.github.com/meskyanichi/backup/getting-started-unix":http://wiki.github.com/meskyanichi/backup/getting-started-unix
-
-
-h3. Getting started with Backup for the *Rails Environment*
-
-"http://wiki.github.com/meskyanichi/backup/getting-started-ruby-on-rails":http://wiki.github.com/meskyanichi/backup/getting-started-ruby-on-rails
-
-
-h3. Production Mode *RAILS_ENV*
-
-"http://wiki.github.com/meskyanichi/backup/production-mode":http://wiki.github.com/meskyanichi/backup/production-mode
-
-
-h3. Encrypting and Decrypting
-
-"http://wiki.github.com/meskyanichi/backup/encrypting-and-decrypting":http://wiki.github.com/meskyanichi/backup/encrypting-and-decrypting
-
-
-h3. Backup Configuration File (All Adapters, Storage Methods, Mail Settings and Options)
-
-"http://wiki.github.com/meskyanichi/backup/configuration-file":http://wiki.github.com/meskyanichi/backup/configuration-file
-
-
-h3. Unix Utility Commands and Rails Rake Tasks
-
-"http://wiki.github.com/meskyanichi/backup/utility-commands":http://wiki.github.com/meskyanichi/backup/utility-commands
-
-"http://wiki.github.com/meskyanichi/backup/rake-tasks":http://wiki.github.com/meskyanichi/backup/rake-tasks
-
-
-h3. Automatic Backups
-
-"http://wiki.github.com/meskyanichi/backup/automatic-backups":http://wiki.github.com/meskyanichi/backup/automatic-backups
-
-
-h3. Capistrano Recipes
-
-"http://wiki.github.com/meskyanichi/backup/capistrano-recipes":http://wiki.github.com/meskyanichi/backup/capistrano-recipes
-
-
-h3. Capistrano, Whenever!
-
-"http://wiki.github.com/meskyanichi/backup/capistrano-whenever":http://wiki.github.com/meskyanichi/backup/capistrano-whenever
-
-
-h3. Understanding "The Backup Database"
-
-"http://wiki.github.com/meskyanichi/backup/the-backup-database":http://wiki.github.com/meskyanichi/backup/the-backup-database
-
-
-h3. Trouble Shooting
-
-"http://wiki.github.com/meskyanichi/backup/troubleshooting":http://wiki.github.com/meskyanichi/backup/troubleshooting
-
-
-h3. Requirements
-
-"http://wiki.github.com/meskyanichi/backup/requirements":http://wiki.github.com/meskyanichi/backup/requirements
-
-
-h3. Resources
-
-"http://wiki.github.com/meskyanichi/backup/resources":http://wiki.github.com/meskyanichi/backup/resources
-
-
-h3. Requests
-
-If anyone has any requests, please send us a message or post it on the issues page!
-
-
-h3. Suggestions?
-
-Send us a message! Fork the project!
-
-
-h3. Found a Bug?
-
-"http://github.com/meskyanichi/backup/issues":http://github.com/meskyanichi/backup/issues
-
-
-h3. Contributors
-
-List of people that forked and added stuff!
-
-* "dtrueman":http://github.com/dtrueman
-
-
-
-_Michael van Rooijen | Final Creation. ("http://final-creation.com":http://final-creation.com)_