backup 3.0.8 → 3.0.9

data/Gemfile.lock

@@ -17,10 +17,10 @@ GEM
       rack (< 2, >= 1.1.0)
     faraday_middleware (0.3.2)
       faraday (~> 0.5.4)
-    fog (0.6.0)
+    fog (0.7.0)
       builder
       excon (>= 0.5.5)
-      formatador (>= 0.0.16)
+      formatador (>= 0.1.1)
       json
       mime-types
       net-ssh (>= 2.0.23)
@@ -88,7 +88,7 @@ PLATFORMS
 
 DEPENDENCIES
   dropbox (~> 1.2.3)
-  fog (~> 0.6.0)
+  fog (~> 0.7.0)
   fuubar
   infinity_test
   mail (~> 2.2.15)

data/README.md

@@ -165,14 +165,14 @@ Below you see a sample configuration file you could create for Backup 3. Just re
         s3.keep               = 20
       end
 
-      sync_with RSync do |rsync|
-        rsync.ip       = "123.45.678.90"
-        rsync.username = "my_username"
-        rsync.path     = "~/backups/"
-        rsync.mirror   = true
-        rsync.compress = true
-
-        rsync.directories do |directory|
+      sync_with S3 do |s3|
+        s3.access_key_id     = "my_access_key_id"
+        s3.secret_access_key = "my_secret_access_key"
+        s3.bucket            = "my-bucket"
+        s3.path              = "/backups"
+        s3.mirror            = true
+
+        s3.directories do |directory|
           directory.add "/var/apps/my_app/public/videos"
           directory.add "/var/apps/my_app/public/music"
         end
@@ -192,13 +192,13 @@ Below you see a sample configuration file you could create for Backup 3. Just re
 
 ### Explanation for the above example
 
-First it dumps all the tables inside the MySQL database "my_sample_mysql_db", except for the "logs" table. It also dumps the MongoDB database "my_sample_mongo_db", but only the collections "users", "events" and "posts". After that it'll create a "user_avatars.tar" archive with all the uploaded avatars of the users. After that it'll create a "logs.tar" archive with the "production.log", "newrelic_agent.log" and "other.log" logs. After that it'll compress the backup file using Gzip (with the mode set to "best", rather than "fast" for best compression). After that it'll encrypt the whole backup file (everything included: databases, archives) using "OpenSSL". Now the Backup can only be extracted when you know the password to decrypt it ("my_secret_password" in this case). Then it'll store the backup file to Amazon S3 in to 'my_bucket/backups'. Next, we're going to use the RSync Syncer to create a mirror of the `/var/apps/my_app/public/videos` and `/var/apps/my_app/public/music` directories on a remote server. (This will not package, compress, encrypt - but will directly sync these directories "as is" to the desired location). Finally, it'll notify me by email if the backup raises an error/exception during the process, indicating that something went wrong. However, it does not notify me by email when successful backups occur because I set `mail.on_success` to `false`. It'll also notify me by Twitter when failed backups occur, but also when successful ones occur because I set the `tweet.on_success` to `true`.
+First it dumps all the tables inside the MySQL database "my_sample_mysql_db", except for the "logs" table. It also dumps the MongoDB database "my_sample_mongo_db", but only the collections "users", "events" and "posts". After that it'll create a "user_avatars.tar" archive with all the uploaded avatars of the users. After that it'll create a "logs.tar" archive with the "production.log", "newrelic_agent.log" and "other.log" logs. After that it'll compress the backup file using Gzip (with the mode set to "best", rather than "fast" for best compression). After that it'll encrypt the whole backup file (everything included: databases, archives) using "OpenSSL". Now the Backup can only be extracted when you know the password to decrypt it ("my_secret_password" in this case). Then it'll store the backup file to Amazon S3 in to 'my_bucket/backups'. Next, we're going to use the S3 Syncer to create a mirror of the `/var/apps/my_app/public/videos` and `/var/apps/my_app/public/music` directories on Amazon S3. (This will not package, compress, encrypt - but will directly sync the specified directories "as is" to your S3 bucket). Finally, it'll notify me by email if the backup raises an error/exception during the process, indicating that something went wrong. However, it does not notify me by email when successful backups occur because I set `mail.on_success` to `false`. It'll also notify me by Twitter when failed backups occur, but also when successful ones occur because I set the `tweet.on_success` to `true`.
 
 ### Things to note
 
 The __keep__ option I passed in to the S3 storage location enables "Backup Cycling". In this case, after the 21st backup file gets pushed, it'll exceed the 20 backup limit, and remove the oldest backup from the S3 bucket.
 
-The __RSync__ Syncer ( `sync_with` ) is a different kind of __Storage__ method. As mentioned above, it does not follow the same procedure as the __Storage__ ( `store_with` ) method. A Storage method stores the final result of a copied/organized/packaged/compressed/encrypted file to the desired remote location. A Syncer directly syncs the specified directories and **completely bypasses** the copied/organized/packaged/compressed/encrypted process. This is especially good for backing up directories containing gigabytes of data, such as images, music, videos, and similar large formats. Also, rather than transferring the whole directory every time, it'll only transfer files in all these directories that have been modified or new ones that have been added, and it only transfers the bytes of the modified files that changed, and **not** the full file, thus, saving huge amounts of bandwidth, cpu load, time and possibly money.
+The __S3__ Syncer ( `sync_with` ) is a different kind of __Storage__ method. As mentioned above, it does not follow the same procedure as the __Storage__ ( `store_with` ) method. A Storage method stores the final result of a copied/organized/packaged/compressed/encrypted file to the desired remote location. A Syncer directly syncs the specified directories and **completely bypasses** the copy/organize/package/compress/encrypt process. This is especially good for backing up directories containing gigabytes of data, such as images, music, videos, and similar large formats. Also, rather than transferring the whole directory every time, it'll only transfer files in all these directories that have been modified or added, thus, saving huge amounts of bandwidth, cpu load and time. You're also not bound to the 5GB per file restriction like the **Storage** method, unless you actually have files in these directories that are >= 5GB, which often is unlikely. Even if the whole directory (and sub-directories) are > 5GB (split over multiple files), it shouldn't be a problem as long as you don't have any *single* file that is 5GB in size. Also, in the above example you see `s3.mirror = true`, this tells the S3 Syncer to keep a "mirror" of the local directories in the S3 bucket. This means that if you delete a file locally, the next time it syncs, it'll also delete the file from the S3 bucket, keeping the local filesystem 1:1 with the S3 bucket.
 
 The __Mail__ notifier. I have not provided the SMTP options to use my Gmail account to notify myself when exceptions are raised during the process. So this won't work, check out the wiki on how to configure this. I left it out in this example.
 

data/bin/backup

@@ -160,21 +160,17 @@ class BackupCLI < Thor
 
     temp_file << "end\n\n"
     temp_file.close
-    if options[:path]
-      FileUtils.mkdir_p(options[:path])
-      overwrite?(File.join(Backup::PATH, 'config.rb'))
-      File.open(File.join(options[:path], 'config.rb'), 'w') do |file|
-        file.write( File.read(temp_file.path) )
-        puts "Generated configuration file in '#{File.join(options[:path], 'config.rb')}'"
-      end
-    else
-      FileUtils.mkdir_p(Backup::PATH)
-      overwrite?(File.join(Backup::PATH, 'config.rb'))
-      File.open(File.join(Backup::PATH, 'config.rb'), 'w') do |file|
+
+    path   = options[:path] || Backup::PATH
+    config = File.join(path, 'config.rb')
+
+    if overwrite?(config)
+      FileUtils.mkdir_p(path)
+      File.open(config, 'w') do |file|
         file.write( File.read(temp_file.path) )
-        puts "Generated configuration file in '#{File.join(Backup::PATH, 'config.rb')}'"
+        puts "Generated configuration file in '#{ config }'"
       end
-    end
+    end    
     temp_file.unlink
   end
 
@@ -252,8 +248,9 @@ private
   # Helper method for asking the user if he/she wants to overwrite the file
   def overwrite?(path)
     if File.exist?(path)
-      exit if no? "A configuration file already exists in #{ path }. Do you want to overwrite? [y/n]"
+      return yes? "A configuration file already exists in #{ path }. Do you want to overwrite? [y/n]"
     end
+    true
   end
 
 end

data/lib/backup/dependency.rb

@@ -18,7 +18,7 @@ module Backup
       {
         'fog' => {
           :require => 'fog',
-          :version => '~> 0.6.0',
+          :version => '~> 0.7.0',
           :for     => 'Amazon S3, Rackspace Cloud Files (S3, CloudFiles Storages)'
         },
 

data/lib/backup/version.rb

@@ -13,7 +13,7 @@ module Backup
     #  Defines the minor version
     # PATCH:
     #  Defines the patch version
-    MAJOR, MINOR, PATCH = 3, 0, 8
+    MAJOR, MINOR, PATCH = 3, 0, 9
 
     ##
     # Returns the major version ( big release based off of multiple minor releases )

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 8
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +01:00
+date: 2011-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
         version: 0.14.6
   type: :runtime
   version_requirements: *id001
@@ -192,18 +182,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []