backup 2.2.0 → 2.2.1

data/.document

@@ -1,5 +1,5 @@
-README.rdoc
+README.textile
 lib/**/*.rb
 bin/*
 features/**/*.feature
-LICENSE
+LICENSE

data/README.textile

@@ -4,6 +4,7 @@ h2. A Backup Ruby Gem for Rails
 
 Backup is a Ruby Gem, written specifically for Ruby on Rails applications. This gem offers a quick and easy way to configure and run backups of your
 MySQL/PostgreSQL databases *(and practically even any other database you can dump through the command line)*. It can also make backups of your *archives* (any files or folders).
+
 All backups can be transferred to either *"Amazon S3"* or "any remotely accessible server using the *SCP, SFTP or FTP* transfer methods".
 
 *Backup handles: Compression, Archiving, Encryption and Backup Cleaning.*
@@ -47,9 +48,9 @@ What the Custom Adapter does is it allows you to input one or more *commands* to
 *A few bug fixes*
 
 * Issue where two backup settings would conflict if they were using the same Adapter at the same second! (which can happens when running cronjobs!)
-* The temporary files will now be nicely name spaced by "trigger" so no conflict "can" occur
-* When an exception is raised during the backup process, the temporary files will not be removed. This will be fixed as of 2.2.0 as well.
-* And some other minor patches will be applied.
+* The temporary files will now be nicely name spaced by "trigger" so no conflict between two different triggers can occur
+* When an exception is raised during the backup process, the temporary files would not be removed. This is now fixed.
+* And some other minor patches have been applied.
 
 *Updated the Wiki based on this release.*
 
@@ -57,6 +58,10 @@ h3. Get Backup 2.2.x+ now!
 
 bc. sudo gem install backup
 
+And get up and running with Backup 2.2.x+ by reading the *Getting Started* Wiki Page!
+
+"http://wiki.github.com/meskyanichi/backup/getting-started":http://wiki.github.com/meskyanichi/backup/getting-started
+
 
 h2. (Current) Backup's Capabilities
 
@@ -116,6 +121,7 @@ bc. backup 'mysql-backup-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 'password'
@@ -148,6 +154,21 @@ bc. rake backup:run trigger="backup-mysql"
 
 bc. rake backup:run trigger="backup-assets"
 
+h3. Additional Options for MySQL and PostgreSQL
+
+You can pass additional options/flags into the MySQL and PostgreSQL adapters via additional_options. For example:
+
+bc. backup 'mysql-backup-s3' do
+  adapter :mysql do
+    user      'user'
+    password  'password'
+    database  'database'
+    additional_options '--single-transaction'
+  end
+  .
+  .
+end
+
 etc. etc. etc. etc. etc. etc...
 
 
@@ -161,6 +182,11 @@ h3. Getting started
 "http://wiki.github.com/meskyanichi/backup/getting-started":http://wiki.github.com/meskyanichi/backup/getting-started
 
 
+h3. Production Mode (important)
+
+"http://wiki.github.com/meskyanichi/backup/production-mode":http://wiki.github.com/meskyanichi/backup/production-mode
+
+
 h3. Backup Configuration File (All Adapters, Storage Methods and Options)
 
 "http://wiki.github.com/meskyanichi/backup/configuration-file":http://wiki.github.com/meskyanichi/backup/configuration-file
@@ -221,6 +247,13 @@ 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
+
+
 h3. Copyright
 
 Copyright (c) 2009 Michael van Rooijen | Final Creation. ("http://final-creation.com":http://final-creation.com) See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/backup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backup}
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael van Rooijen"]
-  s.date = %q{2009-12-03}
+  s.date = %q{2009-12-06}
   s.description = %q{
                         Backup is a Ruby Gem, written specifically for Ruby on Rails applications. This gem offers a quick and easy way to configure and run backups of your
                         MySQL/PostgreSQL databases (and practically even any other database you can dump through the command line). It can also make backups of your archives (any files or folders).

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

@@ -66,6 +66,7 @@ backup 'mysql-backup-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

data/lib/backup/adapters/mysql.rb

@@ -2,7 +2,7 @@ module Backup
   module Adapters
     class MySQL < Backup::Adapters::Base
       
-      attr_accessor :dumped_file, :compressed_file, :encrypted_file, :user, :password, :database, :skip_tables, :host, :port, :socket
+      attr_accessor :dumped_file, :compressed_file, :encrypted_file, :user, :password, :database, :skip_tables, :host, :port, :socket, :additional_options
       
       # Initializes the Backup Process
       # 
@@ -34,7 +34,7 @@ module Backup
         
         # Dumps and Compresses the MySQL file 
         def mysqldump
-          %x{ mysqldump  -u #{user}  --password='#{password}' #{options} #{database} #{tables_to_skip} | gzip -f --best > #{File.join(tmp_path, compressed_file)} }
+          %x{ mysqldump -u #{user} --password='#{password}' #{options} #{additional_options} #{database} #{tables_to_skip} | gzip -f --best > #{File.join(tmp_path, compressed_file)} }
         end
         
         # Encrypts the MySQL file
@@ -49,7 +49,7 @@ module Backup
         def load_settings
           self.trigger  = procedure.trigger
           
-          %w(user password database skip_tables).each do |attribute|
+          %w(user password database skip_tables additional_options).each do |attribute|
             send(:"#{attribute}=", procedure.get_adapter_configuration.attributes[attribute])
           end
           

data/lib/backup/adapters/postgresql.rb

@@ -2,7 +2,7 @@ module Backup
   module Adapters
     class PostgreSQL < Backup::Adapters::Base
 
-      attr_accessor :dumped_file, :compressed_file, :encrypted_file, :user, :password, :database, :skip_tables, :host, :port, :socket
+      attr_accessor :dumped_file, :compressed_file, :encrypted_file, :user, :password, :database, :skip_tables, :host, :port, :socket, :additional_options
       
       # Initializes the Backup Process
       # 
@@ -34,7 +34,7 @@ module Backup
         
         # Dumps and Compresses the PostgreSQL file 
         def pg_dump
-           %x{ pg_dump  -U #{user} #{options} #{tables_to_skip} #{database} | gzip -f --best > #{File.join(tmp_path, compressed_file)} }
+           %x{ pg_dump -U #{user} #{options} #{additional_options} #{tables_to_skip} #{database} | gzip -f --best > #{File.join(tmp_path, compressed_file)} }
         end
         
         # Encrypts the PostgreSQL file
@@ -49,7 +49,7 @@ module Backup
         def load_settings
           self.trigger  = procedure.trigger
           
-          %w(user password database skip_tables).each do |attribute|
+          %w(user password database skip_tables additional_options).each do |attribute|
             send(:"#{attribute}=", procedure.get_adapter_configuration.attributes[attribute])
           end
           

data/lib/backup/configuration/adapter.rb

@@ -4,7 +4,7 @@ module Backup
       
       attr_accessor :attributes 
       
-      %w(files user password database skip_tables commands).each do |method|
+      %w(files user password database skip_tables commands additional_options).each do |method|
         define_method method do |value|
           attributes[method] = value
         end

data/lib/backup/configuration/storage.rb

@@ -3,7 +3,7 @@ module Backup
     class Storage
       attr_accessor :attributes 
 
-      %w(ip user password path access_key_id secret_access_key bucket).each do |method|
+      %w(ip user password path access_key_id secret_access_key use_ssl bucket).each do |method|
         define_method method do |value|
           attributes[method] = value
         end

data/lib/backup/connection/s3.rb

@@ -2,7 +2,7 @@ module Backup
   module Connection
     class S3
       
-      attr_accessor :adapter, :access_key_id, :secret_access_key, :s3_bucket, :final_file, :tmp_path
+      attr_accessor :adapter, :access_key_id, :secret_access_key, :s3_bucket, :use_ssl, :final_file, :tmp_path
       
       # Initializes the S3 connection, setting the values using the S3 adapter
       def initialize(adapter = false)
@@ -12,6 +12,7 @@ module Backup
           self.access_key_id      = adapter.procedure.get_storage_configuration.attributes['access_key_id']
           self.secret_access_key  = adapter.procedure.get_storage_configuration.attributes['secret_access_key']
           self.s3_bucket          = adapter.procedure.get_storage_configuration.attributes['bucket']
+          self.use_ssl            = adapter.procedure.get_storage_configuration.attributes['use_ssl']
         end
       end
       
@@ -20,13 +21,15 @@ module Backup
         self.access_key_id      = procedure.get_storage_configuration.attributes['access_key_id']
         self.secret_access_key  = procedure.get_storage_configuration.attributes['secret_access_key']
         self.s3_bucket          = procedure.get_storage_configuration.attributes['bucket']
+        self.use_ssl            = procedure.get_storage_configuration.attributes['use_ssl']
       end
       
       # Establishes a connection with Amazon S3 using the credentials provided by the user
       def connect
         AWS::S3::Base.establish_connection!(
           :access_key_id     => access_key_id,
-          :secret_access_key => secret_access_key
+          :secret_access_key => secret_access_key,
+          :use_ssl           => use_ssl
         )
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 +01:00
+date: 2009-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency