backup 2.4.0 → 2.4.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+UPDATE
+=== 2.4.1 ======================================
+
+	Dropbox storage added.
+
+
 BIG UPDATE
 === 2.4.0 =======================================
   

data/README.md

@@ -2,7 +2,7 @@
 
 ## A Backup Ruby Gem
 
-__Backup__ is a Ruby Gem written for __Unix__ and __Ruby on Rails (2 and 3)__ 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.
+__Backup__ is a Ruby Gem written for __Unix__ and __Ruby on Rails (2 and 3)__ 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, Dropbox Web Service, 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.
 
 ## Written for Environments
 
@@ -15,6 +15,17 @@ __Backup__ is a Ruby Gem written for __Unix__ and __Ruby on Rails (2 and 3)__ en
 * [Meskyanichi - Michael van Rooijen](http://github.com/meskyanichi)
 * [Fernandoluizao - Fernando Migliorini Luizão](http://github.com/fernandoluizao)
 
+### 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)
+* [Dmitriy Novotochinov](http://github.com/trybeee)
+
+
 ## Backup's Current Capabilities
 
 ### Storage Methods
@@ -23,12 +34,14 @@ __Backup__ is a Ruby Gem written for __Unix__ and __Ruby on Rails (2 and 3)__ en
 * Rackspace Cloud Files
 * Remote Server (Available Protocols: SCP, SFTP, FTP)
 * Local server (Example Locations: Another Hard Drive, Network path)
+* Dropbox (you should get your API key and secret at developers.dropbox.com)
 
 ### Adapters
 
 * MySQL
 * PostgreSQL
 * SQLite
+* MongoDB
 * Archive (Any files and/or folders)
 * Custom (Anything you can produce using the command line)
 
@@ -63,6 +76,7 @@ Simply fill in the email configuration block and set "notify" to true inside the
       storage :s3 do
         access_key_id     'access_key_id'
         secret_access_key 'secret_access_key'
+        # host            's3-ap-southeast-1.amazonaws.com' #the s3 host.  Defaults to s3.amazonaws.com
         bucket            '/bucket/backups/mysql/'
         use_ssl           true
       end
@@ -168,13 +182,4 @@ Send us a message! Fork the project!
 [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))__
+__Michael van Rooijen | Final Creation. ([http://michaelvanrooijen.com](http://michaelvanrooijen.com))__

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.4.1

data/generators/backup/templates/backup.rb

@@ -21,12 +21,13 @@
 #  - Custom
 #
 # STORAGE METHODS
-#  - S3     (Amazon)
-#  - CF     (Rackspace Cloud Files)
-#  - SCP    (Remote Server)
-#  - FTP    (Remote Server)
-#  - SFTP   (Remote Server)
-#  - LOCAL  (Local Server)
+#  - S3      (Amazon)
+#  - CF      (Rackspace Cloud Files)
+#  - Dropbox (Dropbox Web Service)
+#  - SCP     (Remote Server)
+#  - FTP     (Remote Server)
+#  - SFTP    (Remote Server)
+#  - LOCAL   (Local Server)
 #
 # GLOBAL OPTIONS
 #  - Keep Backups (keep_backups)
@@ -227,3 +228,26 @@ backup 'sqlite-backup-local' do
   notify false
   
 end
+
+
+# Initialize with
+# rake backup:run trigger='postgresql-backup-dropbox'
+backup 'postgresql-backup-dropbox' do
+  
+  adapter :postgresql do
+    user      'devmen'
+    database  'domowoi_test'
+  end
+  
+  storage :dropbox do
+    api_key           'your_api_key'
+    secret_access_key 'your_api_secret'
+    username          'user@example.org'
+    password          'super_s3cret'
+    path              'backups'
+  end
+
+  keep_backups :all
+  encrypt_with_password false
+  notify false
+end

data/lib/backup.rb

@@ -54,6 +54,7 @@ module Backup
   module Adapters
     autoload :Base,       'backup/adapters/base'
     autoload :MySQL,      'backup/adapters/mysql'
+    autoload :MongoDB,     'backup/adapters/mongo_db'
     autoload :SQLite,     'backup/adapters/sqlite'
     autoload :PostgreSQL, 'backup/adapters/postgresql'
     autoload :Archive,    'backup/adapters/archive'
@@ -68,6 +69,7 @@ module Backup
     autoload :FTP,        'backup/storage/ftp'
     autoload :SFTP,       'backup/storage/sftp'
     autoload :Local,      'backup/storage/local'
+    autoload :Dropbox,    'backup/storage/dropbox'
   end
 
   module Record
@@ -78,6 +80,7 @@ module Backup
     autoload :FTP,        'backup/record/ftp'
     autoload :SFTP,       'backup/record/sftp'
     autoload :Local,      'backup/record/local'
+    autoload :Dropbox,    'backup/record/dropbox'
   end
 
   class Setup
@@ -95,6 +98,7 @@ module Backup
     # Initializes one of the few adapters and start the backup process
     def initialize_adapter
       case procedure.adapter_name.to_sym
+        when :mongo       then Backup::Adapters::MongoDB.new    trigger, procedure
         when :mysql       then Backup::Adapters::MySQL.new      trigger, procedure
         when :sqlite      then Backup::Adapters::SQLite.new     trigger, procedure
         when :postgresql  then Backup::Adapters::PostgreSQL.new trigger, procedure

data/lib/backup/adapters/base.rb

@@ -48,9 +48,11 @@ module Backup
         begin
           create_tmp_folder
           load_settings # if respond_to?(:load_settings)
+          handle_before_backup
           perform
           encrypt
           store
+          handle_after_backup
           record
           notify
         ensure
@@ -60,16 +62,37 @@ module Backup
       
       # Creates the temporary folder for the specified adapter
       def create_tmp_folder
-        run "mkdir -p #{tmp_path}"
+        #need to create with universal privlages as some backup tasks might create this path under sudo
+        run "mkdir -m 0777 -p #{tmp_path.sub(/\/[^\/]+$/, '')}"  #this is the parent to the tmp_path
+        run "mkdir -m 0777 -p #{tmp_path}"                       #the temp path dir
       end
       
       # TODO make methods in derived classes public? respond_to cannot identify private methods
       def load_settings
       end
+      
+      def skip_backup(msg)
+        log "Terminating backup early because: #{msg}"
+        exit 1
+      end
 
       # Removes the files inside the temporary folder
       def remove_tmp_files
-        run "rm #{File.join(tmp_path, '*')}"
+        run "rm -r #{File.join(tmp_path)}" if File.exists?(tmp_path) #just in case there isn't one because the process was skipped
+      end
+      
+      def handle_before_backup
+        return unless self.procedure.before_backup_block
+        log system_messages[:before_backup_hook]
+        #run it through this instance so the block is run as a part of this adapter...which means it has access to all sorts of sutff
+        self.instance_eval &self.procedure.before_backup_block
+      end
+      
+      def handle_after_backup
+        return unless self.procedure.after_backup_block
+        log system_messages[:after_backup_hook]
+        #run it through this instance so the block is run as a part of this adapter...which means it has access to all sorts of sutff
+        self.instance_eval &self.procedure.after_backup_block
       end
 
       # Encrypts the archive file
@@ -92,7 +115,7 @@ module Backup
           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>
+          # which will be wrapped in '<' and '>' like <someone_famous@me.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)
@@ -128,6 +151,10 @@ module Backup
           :encrypting_w_pass  => "Encrypting backup with password..",
           :encrypting_w_key   => "Encrypting backup with gpg public key..",
           :mysqldump          => "Creating MySQL dump..",
+          :mongo_dump         => "Creating MongoDB dump..",
+          :mongo_copy         => "Creating MongoDB disk level copy..",
+          :before_backup_hook => "Running before backup hook..",
+          :after_backup_hook  => "Running after backup hook..",
           :pgdump             => "Creating PostgreSQL dump..",
           :sqlite             => "Copying and compressing SQLite database..",
           :commands           => "Executing commands.." }

data/lib/backup/adapters/mongo_db.rb

@@ -0,0 +1,139 @@
+module Backup
+  module Adapters
+    class MongoDB < Backup::Adapters::Base
+      require 'json'
+      
+      attr_accessor :user, :password, :database, :collections, :host, :port, :additional_options, :backup_method
+      
+      private
+      
+        BACKUP_METHOD_OPTIONS = [:mongodump, :disk_copy]
+
+        # Dumps and Compresses the Mongodump file 
+        def perform
+          tmp_mongo_dir = "mongodump-#{Time.now.strftime("%Y%m%d%H%M%S")}"
+          tmp_dump_dir = File.join(tmp_path, tmp_mongo_dir)
+
+          case self.backup_method.to_sym
+          when :mongodump
+            #this is the default options            
+            # PROS:
+            #   * non-locking
+            #   * much smaller archive sizes
+            #   * can specifically target different databases or collections to dump
+            #   * de-fragements the datastore
+            #   * don't need to run under sudo
+            #   * simple logic
+            # CONS:
+            #   * a bit longer to restore as you have to do an import
+            #   * does not include indexes or other meta data
+            log system_messages[:mongo_dump]
+            exit 1 unless run "#{mongodump} #{mongodump_options} #{collections_to_include} -o #{tmp_dump_dir} #{additional_options} > /dev/null 2>&1"
+          when :disk_copy
+            #this is a bit more complicated AND potentially a lot riskier:            
+            # PROS:
+            #   * byte level copy, so it includes all the indexes, meta data, etc
+            #   * fast recovery; you just copy the files into place and startup mongo
+            # CONS:
+            #   * locks the database, so ONLY use against a slave instance
+            #   * copies everything; cannot specify a collection or a database
+            #   * will probably need to run under sudo as the mongodb db_path file is probably under a different owner.  
+            #     If you do run under sudo, you will probably need to run rake RAILS_ENV=... if you aren't already
+            #   * the logic is a bit brittle...                  
+            log system_messages[:mongo_copy]
+
+            cmd = "#{mongo} #{mongo_disk_copy_options} --quiet --eval 'printjson(db.isMaster());' admin"
+            output = JSON.parse(run(cmd, :exit_on_failure => true))
+            if output['ismaster']
+              puts "You cannot run in disk_copy mode against a master instance.  This mode will lock the database.  Please use :mongodump instead."
+              exit 1
+            end
+            
+            begin
+              cmd = "#{mongo} #{mongo_disk_copy_options} --quiet --eval 'db.runCommand({fsync : 1, lock : 1}); printjson(db.runCommand({getCmdLineOpts:1}));' admin"
+              output = JSON.parse(run(cmd, :exit_on_failure => true))
+
+              #lets go find the dbpath.  it is either going to be in the argv just returned OR we are going to have to parse through the mongo config file
+              cmd = "mongo --quiet --eval 'printjson(db.runCommand({getCmdLineOpts:1}));' admin"
+              output = JSON.parse(run(cmd, :exit_on_failure => true))
+              #see if --dbpath was passed in
+              db_path = output['argv'][output['argv'].index('--dbpath') + 1] if output['argv'].index('--dbpath')            
+              #see if --config is passed in, and if so, lets parse it
+              db_path ||= $1 if output['argv'].index('--config') && File.read(output['argv'][output['argv'].index('--config') + 1]) =~ /dbpath\s*=\s*([^\s]*)/  
+              db_path ||= "/data/db/" #mongo's default path
+              run "cp -rp #{db_path} #{tmp_dump_dir}"              
+            ensure
+              #attempting to unlock
+              cmd = "#{mongo} #{mongo_disk_copy_options} --quiet --eval 'printjson(db.currentOp());' admin"
+              output = JSON.parse(run(cmd, :exit_on_failure => true))
+              (output['fsyncLock'] || 1).to_i.times do
+                run "#{mongo} #{mongo_disk_copy_options} --quiet --eval 'db.$cmd.sys.unlock.findOne();' admin"
+              end
+            end
+          else
+            puts "you did not enter a valid backup_method option.  Your choices are: #{BACKUP_METHOD_OPTIONS.join(', ')}"
+            exit 1
+          end          
+            
+          log system_messages[:compressing]
+          run "tar -cz -C #{tmp_path} -f #{File.join(tmp_path, compressed_file)} #{tmp_mongo_dir}"
+        end
+
+        def mongodump
+          cmd = run("which mongodump").chomp
+          cmd = 'mongodump' if cmd.empty?
+          cmd
+        end
+        
+        def mongo
+          cmd = run("which mongo").chomp
+          cmd = 'mongo' if cmd.empty?
+          cmd          
+        end
+        
+        def performed_file_extension
+          ".tar"
+        end
+
+        # Loads the initial settings
+        def load_settings
+          %w(user password database collections additional_options backup_method).each do |attribute|
+            send(:"#{attribute}=", procedure.get_adapter_configuration.attributes[attribute])
+          end
+          
+          %w(host port).each do |attribute|
+            send(:"#{attribute}=", procedure.get_adapter_configuration.get_options.attributes[attribute])
+          end
+          
+          self.backup_method ||= :mongodump
+        end
+        
+        # Returns a list of options in Mongodump syntax
+        def mongodump_options
+          options = String.new
+          options += " --username='#{user}' "     unless user.blank?
+          options += " --password='#{password}' " unless password.blank?
+          options += " --host='#{host}' "         unless host.blank?
+          options += " --port='#{port}' "         unless port.blank?
+          options += " --db='#{database}' "       unless database.blank?
+          options
+        end
+        
+        def mongo_disk_copy_options
+          options = String.new
+          options += " --username='#{user}' "     unless user.blank?
+          options += " --password='#{password}' " unless password.blank?
+          options += " --host='#{host}' "         unless host.blank?
+          options += " --port='#{port}' "         unless port.blank?
+          options          
+        end
+                
+        # Returns a list of collections to include in Mongodump syntax
+        def collections_to_include
+          return "" unless collections
+          "--collection #{[*collections].join(" ")}"
+        end
+                
+    end
+  end
+end

data/lib/backup/command_helper.rb

@@ -1,7 +1,10 @@
 module Backup
   module CommandHelper
-    def run(command)
-      Kernel.system command
+    def run(command, opts={})
+      opts[:exit_on_failure] ||= false
+      output = `#{command}`
+      exit 1 if opts[:exit_on_failure] && !$?.success?
+      output
     end
  
     def log(command)

data/lib/backup/configuration/adapter.rb

@@ -2,7 +2,7 @@ module Backup
   module Configuration
     class Adapter
       extend Backup::Configuration::Attributes
-      generate_attributes %w(files exclude user password database tables skip_tables commands additional_options)
+      generate_attributes %w(files exclude user password database tables skip_tables commands additional_options backup_method)
 
       def initialize
         @options = Backup::Configuration::AdapterOptions.new

data/lib/backup/configuration/base.rb

@@ -4,7 +4,7 @@ module Backup
       extend Backup::Configuration::Attributes
       generate_attributes %w(encrypt_with_password encrypt_with_gpg_public_key keep_backups notify)
       
-      attr_accessor :trigger, :storage_name, :adapter_name
+      attr_accessor :trigger, :storage_name, :adapter_name, :before_backup_block, :after_backup_block
 
       def initialize(trigger)
         @trigger = trigger
@@ -22,6 +22,14 @@ module Backup
         @storage_configuration.instance_eval &block
       end
 
+      def before_backup(&block)
+        @before_backup_block = block
+      end
+
+      def after_backup(&block)
+        @after_backup_block = block
+      end
+
       def storage_class
         case @storage_name.to_sym
           when :cloudfiles then Backup::Storage::CloudFiles
@@ -30,6 +38,7 @@ module Backup
           when :ftp        then Backup::Storage::FTP
           when :sftp       then Backup::Storage::SFTP
           when :local      then Backup::Storage::Local
+          when :dropbox    then Backup::Storage::Dropbox
         end
       end
 
@@ -41,6 +50,7 @@ module Backup
           when :ftp        then Backup::Record::FTP
           when :sftp       then Backup::Record::SFTP
           when :local      then Backup::Record::Local
+          when :dropbox    then Backup::Record::Dropbox
         end        
       end
 

data/lib/backup/configuration/storage.rb

@@ -2,7 +2,7 @@ module Backup
   module Configuration
     class Storage
       extend Backup::Configuration::Attributes
-      generate_attributes %w(ip user password path access_key_id secret_access_key use_ssl bucket username api_key container)
+      generate_attributes %w(ip user password path access_key_id secret_access_key host use_ssl bucket username api_key container)
     end
   end
 end

data/lib/backup/connection/dropbox.rb

@@ -0,0 +1,62 @@
+require 'dropbox'
+
+module Backup
+  module Connection
+    class Dropbox
+
+      attr_accessor :adapter, :procedure, :final_file, :tmp_path, :api_key, :secret_access_key, :username, :password, :path
+
+      def initialize(adapter=false)
+        if adapter
+          self.adapter            = adapter
+          self.procedure          = adapter.procedure
+          self.final_file         = adapter.final_file
+          self.tmp_path           = adapter.tmp_path.gsub('\ ', ' ')
+
+          load_storage_configuration_attributes
+        end
+      end
+
+      def static_initialize(procedure)
+        self.procedure = procedure
+        load_storage_configuration_attributes(true)
+      end
+
+      def session
+        @session ||= ::Dropbox::Session.new(api_key, secret_access_key)
+        unless @session.authorized?
+          @session.authorizing_user = username
+          @session.authorizing_password = password
+          @session.authorize!
+        end
+
+        @session
+      end
+
+      def connect
+        session
+      end
+
+      def path
+        @path || "backups"
+      end
+
+      def store
+        path_to_file = File.join(tmp_path, final_file)
+        session.upload(path_to_file, path, :mode => :dropbox)
+      end
+
+      private
+
+      def load_storage_configuration_attributes(static=false)
+        %w(api_key secret_access_key username password path).each do |attribute|
+          if static
+            send("#{attribute}=", procedure.get_storage_configuration.attributes[attribute])
+          else
+            send("#{attribute}=", adapter.procedure.get_storage_configuration.attributes[attribute])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/backup/connection/s3.rb

@@ -1,10 +1,13 @@
-require 's3'
+require "fog"
 
 module Backup
   module Connection
     class S3
+      include Backup::CommandHelper
       
-      attr_accessor :adapter, :procedure, :access_key_id, :secret_access_key, :s3_bucket, :use_ssl, :final_file, :tmp_path
+      MAX_S3_FILE_SIZE = 5368709120 - 1
+      
+      attr_accessor :adapter, :procedure, :access_key_id, :secret_access_key, :host, :s3_bucket, :use_ssl, :final_file, :tmp_path
       
       # Initializes the S3 connection, setting the values using the S3 adapter
       def initialize(adapter = false)
@@ -24,48 +27,48 @@ module Backup
       end
       
       # Establishes a connection with Amazon S3 using the credentials provided by the user
-      def connect
-        service
-      end
-
-      # Wrapper for the Service object
-      def service
-        ::S3::Service.new(:access_key_id => access_key_id,
-                          :secret_access_key => secret_access_key,
-                          :use_ssl => use_ssl)
-      end
-
-      # Wrapper for the Bucket object
-      def bucket
-        begin
-          # Find existing bucket:
-          bucket = service.buckets.find(s3_bucket)
-        rescue ::S3::Error::NoSuchBucket => e
-          # Apparently the bucket doesn't exist yet, so create a new one:
-          bucket = service.buckets.build(s3_bucket)
-          bucket.save
-        end
-        bucket.retrieve
+      def connection
+        @_connection ||= Fog::AWS::Storage.new(
+          :aws_access_key_id => access_key_id,
+          :aws_secret_access_key => secret_access_key
+        )
       end
 
       # Initializes the file transfer to Amazon S3
       # This can only run after a connection has been made using the #connect method 
       def store
-        object = bucket.objects.build(final_file)
-        object.content = open(File.join(tmp_path, final_file))
-        object.save
+        #TODO: need to add logic like this to restore: `cat /mnt/backups/part.xx >>restore.tgz`
+        tmp_file_path = File.join(tmp_path, final_file)
+        store_files = []
+        if File.stat(File.join(tmp_path, final_file)).size >= MAX_S3_FILE_SIZE
+          #we need to split!
+          `split -b #{MAX_S3_FILE_SIZE}  #{tmp_file_path} #{tmp_file_path}.`
+          store_files += `ls  #{tmp_file_path}.*`.split
+          log("Splitting '#{final_file}' into #{store_files.length} parts as it is too large for s3.")
+        else
+          store_files << tmp_file_path
+        end
+
+        #lets make sure it exists
+        self.connection.put_bucket(s3_bucket)
+        
+        store_files.each do |tmp_file|
+          file_name = File.basename(tmp_file)
+          log("Saving '#{file_name}' to s3 bucket '#{s3_bucket}'")
+          self.connection.put_object(s3_bucket, file_name, open(tmp_file))
+        end
       end
 
       # Destroys file from a bucket on Amazon S3
       def destroy(file, bucket_as_string)
-        object = bucket.objects.find(file)
-        object.destroy
+        self.connection.put_bucket(s3_bucket)
+        connection.delete_object(s3_bucket, file)
       end
 
       private
 
         def load_storage_configuration_attributes(static = false)          
-          %w(access_key_id secret_access_key use_ssl).each do |attribute|
+          %w(access_key_id secret_access_key use_ssl host).each do |attribute|
             if static
               send("#{attribute}=", procedure.get_storage_configuration.attributes[attribute])
             else

data/lib/backup/record/dropbox.rb

@@ -0,0 +1,27 @@
+require 'backup/connection/dropbox'
+
+module Backup
+  module Record
+    class Dropbox < Backup::Record::Base
+      def load_specific_settings(adapter)
+      end
+
+      private
+
+      def self.destroy_backups(procedure, backups)
+        dropbox = Backup::Connection::Dropbox.new
+        dropbox.static_initialize(procedure)
+        session = dropbox.session
+        backups.each do |backup|
+          puts "\nDestroying backup \"#{backup.filename}\"."
+          path_to_file = File.join(dropbox.path, backup.filename)
+          begin
+            session.delete(path_to_file, :mode => :dropbox)
+          rescue ::Dropbox::FileNotFoundError => e
+            puts "\n Backup with name '#{backup.filename}' was not found in '#{dropbox.path}'"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/backup/record/s3.rb

@@ -13,7 +13,6 @@ module Backup
         def self.destroy_backups(procedure, backups)
           s3 = Backup::Connection::S3.new
           s3.static_initialize(procedure)
-          s3.connect
           backups.each do |backup|
             puts "\nDestroying backup \"#{backup.filename}\" from bucket \"#{backup.bucket}\"."
             s3.destroy(backup.filename, backup.bucket)

data/lib/backup/storage/dropbox.rb

@@ -0,0 +1,12 @@
+require 'backup/connection/dropbox'
+
+module Backup
+  module Storage
+    class Dropbox < Base
+      def initialize(adapter)
+        dropbox = Backup::Connection::Dropbox.new(adapter)
+        dropbox.store
+      end
+    end
+  end
+end

data/lib/backup/storage/s3.rb

@@ -7,8 +7,6 @@ module Backup
       # 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/generators/backup/templates/backup.rb

@@ -17,6 +17,7 @@
 #  - MySQL
 #  - PostgreSQL
 #  - SQLite
+#  - MongoDB
 #  - Archive
 #  - Custom
 #
@@ -74,35 +75,41 @@
 
 
 # Initialize with:
-#   rake backup:run trigger='mysql-backup-s3'
-backup 'mysql-backup-s3' do
-  
-  adapter :mysql do
-    user        'user'
-    password    'password'
-    database    'database'
-  
-    # skip_tables ['table1', 'table2', 'table3']
-    # 
-    # options do
-    #   host    '123.45.678.90'
-    #   port    '80'
-    #   socket  '/tmp/socket.sock'
-    # end
-    # additional_options '--single-transaction  --quick'
+#   rake backup:run trigger='mongo-backup-s3'
+backup 'mongo-backup-s3' do
+  
+  adapter :mongo do
+    database "your_mongo_database"
+    #There are two ways to backup mongo:
+    # * :mongodump (DEFAULT) fairly fast, non-blocking, creates smaller bson files, need to import to recover
+    # * :disk_copy locks the database (use a slave!!!), does a disk-level copy, and then unlocks.  fast, blocking, large archives, but very fast to recover
+    backup_method :mongodump #default
+    database :my_mongo_collection
+    options do
+      # host mongo.mysite.com
+      # port 27018  #perhaps you have a slave instance
+      # username user
+      # password secret
+    end
   end
   
   storage :s3 do
     access_key_id     'access_key_id'
     secret_access_key 'secret_access_key'
+    # host              's3-ap-southeast-1.amazonaws.com' #the s3 location.  Defaults to us-east-1
     bucket            '/bucket/backups/mysql/'
     use_ssl           true
   end
   
   keep_backups 25
-  encrypt_with_password 'password'
-  notify false
-  
+  encrypt_with_gpg_public_key <<-KEY
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (Darwin)
+
+public key goes here
+-----END PGP PUBLIC KEY BLOCK-----
+  KEY
+  notify false  
 end
 
 # Initialize with:

data/setup/backup.rb

@@ -21,12 +21,13 @@
 #  - Custom
 #
 # STORAGE METHODS
-#  - S3     (Amazon)
-#  - CF     (Rackspace Cloud Files)
-#  - SCP    (Remote Server)
-#  - FTP    (Remote Server)
-#  - SFTP   (Remote Server)
-#  - LOCAL  (Local Server)
+#  - S3      (Amazon)
+#  - CF      (Rackspace Cloud Files)
+#  - Dropbox (Dropbox Web Service)
+#  - SCP     (Remote Server)
+#  - FTP     (Remote Server)
+#  - SFTP    (Remote Server)
+#  - LOCAL   (Local Server)
 #
 # GLOBAL OPTIONS
 #  - Keep Backups (keep_backups)
@@ -228,4 +229,27 @@ backup 'sqlite-backup-local' do
   encrypt_with_password false
   notify false
   
-end
+end
+
+
+# Initialize with
+# sudo backup --run postgresql-backup-dropbox
+backup 'postgresql-backup-dropbox' do
+  
+  adapter :postgresql do
+    user      'devmen'
+    database  'domowoi_test'
+  end
+  
+  storage :dropbox do
+    api_key           'your_api_key'
+    secret_access_key 'your_api_secret'
+    username          'user@example.org'
+    password          'super_s3cret'
+    path              'backups'
+  end
+
+  keep_backups :all
+  encrypt_with_password false
+  notify false
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -15,29 +15,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: s3
+  name: fog
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 25
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 5
+        version: 0.3.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 15
         version: 2.0.15
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: net-scp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +81,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: net-sftp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +97,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +113,11 @@ dependencies:
         - 5
         version: 2.3.5
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +129,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hirb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +145,11 @@ dependencies:
         - 9
         version: 0.2.9
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: pony
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,11 +160,11 @@ dependencies:
         - 5
         version: "0.5"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: cloudfiles
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,13 +176,29 @@ dependencies:
         - 7
         version: 1.4.7
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: dropbox
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id011
 description: |-
   Backup is a Ruby Gem written for Unix and Ruby on Rails (2 and 3) 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.
+    Dropbox Web Service, 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
@@ -182,6 +214,7 @@ files:
 - lib/backup/adapters/archive.rb
 - lib/backup/adapters/base.rb
 - lib/backup/adapters/custom.rb
+- lib/backup/adapters/mongo_db.rb
 - lib/backup/adapters/mysql.rb
 - lib/backup/adapters/postgresql.rb
 - lib/backup/adapters/sqlite.rb
@@ -195,6 +228,7 @@ files:
 - lib/backup/configuration/smtp.rb
 - lib/backup/configuration/storage.rb
 - lib/backup/connection/cloudfiles.rb
+- lib/backup/connection/dropbox.rb
 - lib/backup/connection/s3.rb
 - lib/backup/environment/base.rb
 - lib/backup/environment/rails_configuration.rb
@@ -203,6 +237,7 @@ files:
 - lib/backup/mail/mail.txt
 - lib/backup/record/base.rb
 - lib/backup/record/cloudfiles.rb
+- lib/backup/record/dropbox.rb
 - lib/backup/record/ftp.rb
 - lib/backup/record/local.rb
 - lib/backup/record/s3.rb
@@ -210,6 +245,7 @@ files:
 - lib/backup/record/sftp.rb
 - lib/backup/storage/base.rb
 - lib/backup/storage/cloudfiles.rb
+- lib/backup/storage/dropbox.rb
 - lib/backup/storage/ftp.rb
 - lib/backup/storage/local.rb
 - lib/backup/storage/s3.rb