backup 3.0.16 → 3.0.18

data/.travis.yml

@@ -0,0 +1,10 @@
+script: "bundle exec rspec ./spec/"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+branches:
+  only:
+    - master
+    - develop

data/Gemfile.lock

@@ -1,34 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
-    addressable (2.2.4)
+    Platform (0.4.0)
+    addressable (2.2.6)
     builder (3.0.0)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    dropbox (1.2.3)
+    dropbox (1.3.0)
       json (>= 1.2.0)
-      mechanize (>= 1.0.0)
-      multipart-post (>= 1.0)
+      multipart-post (>= 1.1.0)
       oauth (>= 0.3.6)
-    excon (0.5.6)
-    faraday (0.5.7)
-      addressable (~> 2.2.4)
+    excon (0.6.6)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
-    faraday_middleware (0.3.2)
-      faraday (~> 0.5.4)
+      rack (>= 1.1.0, < 2)
+    faraday_middleware (0.7.0)
+      faraday (~> 0.7.3)
     ffi (1.0.9)
-    fog (0.7.0)
+    fog (0.11.0)
       builder
-      excon (>= 0.5.5)
-      formatador (>= 0.1.1)
-      json
+      excon (~> 0.6.5)
+      formatador (~> 0.2.0)
       mime-types
-      net-ssh (>= 2.0.23)
-      nokogiri (>= 1.4.4)
+      multi_json (~> 1.0.3)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.1.4)
+      nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.1.1)
+    formatador (0.2.1)
     fuubar (0.0.5)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
@@ -38,33 +38,34 @@ GEM
       thor (~> 0.14.6)
     guard-rspec (0.3.1)
       guard (>= 0.2.2)
-    hashie (1.0.0)
+    hashie (1.1.0)
     httparty (0.7.4)
       crack (= 0.1.8)
-    i18n (0.5.0)
-    json (1.5.1)
+    i18n (0.6.0)
+    json (1.5.4)
     libnotify (0.5.5)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mechanize (1.0.0)
-      nokogiri (>= 1.2.1)
     mime-types (1.16)
     mocha (0.9.12)
-    multi_json (0.0.5)
-    multi_xml (0.2.1)
-    multipart-post (1.1.0)
+    multi_json (1.0.3)
+    multi_xml (0.3.0)
+    multipart-post (1.1.3)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.3)
-    nokogiri (1.4.4)
-    oauth (0.4.4)
-    polyglot (0.3.1)
-    rack (1.2.2)
+    net-ssh (2.1.4)
+    nokogiri (1.5.0)
+    oauth (0.4.5)
+    open4 (1.1.0)
+    polyglot (0.3.2)
+    popen4 (0.1.2)
+      Platform (>= 0.4.0)
+      open4 (>= 0.4.0)
+    rack (1.3.2)
     rb-fsevent (0.4.0)
     rb-inotify (0.8.5)
       ffi (>= 0.5.0)
@@ -79,25 +80,26 @@ GEM
     rspec-mocks (2.5.0)
     ruby-hmac (0.4.0)
     ruby-progressbar (0.0.10)
-    simple_oauth (0.1.4)
+    simple_oauth (0.1.5)
     thor (0.14.6)
     timecop (0.3.5)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    twitter (1.1.2)
-      faraday (~> 0.5.4)
-      faraday_middleware (~> 0.3.1)
-      hashie (~> 1.0.0)
-      multi_json (~> 0.0.5)
-      multi_xml (~> 0.2.0)
-      simple_oauth (~> 0.1.3)
+    twitter (1.7.1)
+      faraday (~> 0.7.4)
+      faraday_middleware (~> 0.7.0)
+      hashie (~> 1.1.0)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.3.0)
+      simple_oauth (~> 0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dropbox (~> 1.2.3)
-  fog (~> 0.7.0)
+  dropbox (~> 1.3.0)
+  fog (>= 0.11.0)
   fuubar
   growl
   guard
@@ -105,13 +107,14 @@ DEPENDENCIES
   httparty (~> 0.7.4)
   json (~> 1.5.1)
   libnotify
-  mail (~> 2.2.15)
+  mail (~> 2.3.0)
   mocha
   net-scp (~> 1.0.4)
   net-sftp (~> 2.0.5)
-  net-ssh (~> 2.1.3)
+  net-ssh (~> 2.1.4)
+  popen4 (~> 0.1.2)
   rb-fsevent
   rb-inotify
   rspec
   timecop
-  twitter (~> 1.1.2)
+  twitter (>= 1.7.1)

data/Guardfile

@@ -7,10 +7,10 @@
 
 guard 'rspec',
   :version => 2,
-  :rvm     => ['1.9.2', '1.8.7', 'ree'],
+  :rvm     => ['1.9.3', '1.9.2', '1.8.7', 'ree'],
   :bundler => true,
-  :cli     => '--color --format Fuubar --fail-fast' do
-  
+  :cli     => '--color --format Fuubar' do
+
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { 'spec' }
   watch('spec/spec_helper.rb') { 'spec' }

data/README.md

@@ -3,6 +3,7 @@ Backup 3
 
 Backup is a RubyGem, written for Linux and Mac OSX, that allows you to easily perform backup operations on both your remote, as well as your local environment. It provides you with an elegant DSL in Ruby for modeling (configuring) your backups. Backup has built-in support for various databases, storage protocols/services, syncers, compressors, encryptors and notifiers which you can mix and match. It was built with modularity, extensibility and simplicity in mind.
 
+[![Build Status](https://secure.travis-ci.org/meskyanichi/backup.png)](http://travis-ci.org/meskyanichi/backup)
 
 Author
 ------
@@ -29,7 +30,7 @@ I recommend you read this README first, and refer to the [Wiki pages](https://gi
 What Backup 3 currently supports
 ================================
 
-Below you find a list of components that Backup currently supports. Each of these compontents is isolated, meaning that adding new databases, storage location / service, compressor, encryptor or notifier is easy to do.
+Below you find a list of components that Backup currently supports. If you'd like support for components other than the ones listed here, feel free to request them or to fork Backup and add them yourself. Backup is modular and easy to extend with new components.
 
 Database Support
 ----------------
@@ -54,7 +55,8 @@ Storage Locations and Services
 
 - Amazon Simple Storage Service (S3)
 - Rackspace Cloud Files (Mosso)
-- Dropbox
+- Ninefold Cloud Storage
+- Dropbox Web Service
 - Remote Servers *(Available Protocols: FTP, SFTP, SCP and RSync)*
 
 [Storage Wiki Page](https://github.com/meskyanichi/backup/wiki/Storages)
@@ -65,7 +67,8 @@ Storage Features
 - Backup Cycling, applies to:
   - Amazon Simple Storage Service (S3)
   - Rackspace Cloud Files (Mosso)
-  - Dropbox
+  - Ninefold Cloud Storage
+  - Dropbox Web Service
   - Remote Servers *(Only Protocols: FTP, SFTP, SCP)*
 - Incremental Backups, applies to:
   - Remote Servers *(Only Protocols: RSync)*
@@ -85,6 +88,7 @@ Compressors
 
 - Gzip
 - Bzip2
+- Lzma
 
 [Compressors Wiki Page](https://github.com/meskyanichi/backup/wiki/Compressors)
 
@@ -109,6 +113,7 @@ Notifiers
 Supported Ruby versions (Tested with RSpec)
 -------------------------------------------
 
+- Ruby 1.9.3-preview1
 - Ruby 1.9.2
 - Ruby 1.8.7
 - Ruby Enterprise Edition 1.8.7
@@ -119,87 +124,92 @@ A sample Backup configuration file
 
 This is a Backup configuration file. Check it out and read the explanation below. Backup has a [great wiki](https://github.com/meskyanichi/backup/wiki) which explains each component of Backup in detail.
 
-    Backup::Model.new(:sample_backup, 'A sample backup configuration') do
-
-      database MySQL do |database|
-        database.name               = 'my_sample_mysql_db'
-        database.username           = 'my_username'
-        database.password           = 'my_password'
-        database.skip_tables        = ['logs']
-        database.additional_options = ['--single-transaction', '--quick']
-      end
-
-      database MongoDB do |database|
-        database.name             = 'my_sample_mongo_db'
-        database.only_collections = ['users', 'events', 'posts']
-      end
-
-      archive :user_avatars do |archive|
-        archive.add '/var/apps/my_sample_app/public/avatars'
-      end
-
-      archive :logs do |archive|
-        archive.add '/var/apps/my_sample_app/logs/production.log'
-        archive.add '/var/apps/my_sample_app/logs/newrelic_agent.log'
-        archive.add '/var/apps/my_sample_app/logs/other.log'
-      end
-
-      encrypt_with OpenSSL do |encryption|
-        encryption.password = 'my_secret_password'
-      end
-
-      compress_with Gzip do |compression|
-        compression.best = true
-      end
-
-      store_with S3 do |s3|
-        s3.access_key_id      = 'my_access_key_id'
-        s3.secret_access_key  = 'my_secret_access_key'
-        s3.region             = 'us-east-1'
-        s3.bucket             = 'my_bucket/backups'
-        s3.keep               = 20
-      end
-
-      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
-      end
-
-      notify_by Mail do |mail|
-        mail.on_success = false
-        mail.on_failure = true
-      end
-
-      notify_by Twitter do |tweet|
-        tweet.on_success = true
-        tweet.on_failure = true
-      end
-
+``` rb
+Backup::Model.new(:sample_backup, 'A sample backup configuration') do
+
+  database MySQL do |database|
+    database.name               = 'my_sample_mysql_db'
+    database.username           = 'my_username'
+    database.password           = 'my_password'
+    database.skip_tables        = ['logs']
+    database.additional_options = ['--single-transaction', '--quick']
+  end
+
+  database MongoDB do |database|
+    database.name             = 'my_sample_mongo_db'
+    database.only_collections = ['users', 'events', 'posts']
+  end
+
+  archive :user_avatars do |archive|
+    archive.add '/var/apps/my_sample_app/public/avatars'
+  end
+
+  archive :logs do |archive|
+    archive.add     '/var/apps/my_sample_app/logs/production.log'
+    archive.add     '/var/apps/my_sample_app/logs/newrelic_agent.log'
+    archive.add     '/var/apps/my_sample_app/logs/other/'
+    archive.exclude '/var/apps/my_sample_app/logs/other/exclude-this.log'
+  end
+
+  encrypt_with OpenSSL do |encryption|
+    encryption.password = 'my_secret_password'
+  end
+
+  compress_with Gzip do |compression|
+    compression.best = true
+  end
+
+  store_with S3 do |s3|
+    s3.access_key_id      = 'my_access_key_id'
+    s3.secret_access_key  = 'my_secret_access_key'
+    s3.region             = 'us-east-1'
+    s3.bucket             = 'my_bucket/backups'
+    s3.keep               = 20
+  end
+
+  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
+  end
+
+  notify_by Mail do |mail|
+    mail.on_success = false
+    mail.on_failure = true
+  end
+
+  notify_by Twitter do |tweet|
+    tweet.on_success = true
+    tweet.on_failure = true
+  end
+
+end
+```
 
 ### Brief explanation for the above example configuration
 
 It will dump two databases (MySQL and MongoDB), it'll create two (.t)archives (user_avatars and logs). It'll package the two database and two archives together in a single (.t)archive. It'll run the Gzip compressor to compress that archive, and then it'll run the OpenSSL encryptor to encrypt the compressed archive. Then that encrypted archive will be stored to your Amazon S3 account. If all goes well, and no exceptions are raised, you'll be notified via the Twitter notifier that the backup succeeded. If there was an exception raised during the backup process, then you'd receive an email in your inbox containing detailed exception information, as well as receive a simple Twitter message that something went wrong.
 
-As you can see, you can freely mix and match **archives**, **databases**, **compressors**, **encryptors**, **storages** and **notifiers** for your backups. You could even specify 3 storage locations: Amazon S3, Rackspace Cloud Files and Dropbox, it'd then store your packaged backup to 3 separate locations for high redundancy. This also applies to encryptors, you could double encrypt your backup with OpenSSL followed by GPG if you wanted.
+As you can see, you can freely mix and match **archives**, **databases**, **compressors**, **encryptors**, **storages** and **notifiers** for your backups. You could even specify 4 storage locations if you wanted: Amazon S3, Rackspace Cloud Files, Ninefold and Dropbox, it'd then store your packaged backup to 4 separate locations for high redundancy. This also applies to compressors (like Gzip, Bzip2, Lzma) and encryptors, you could double encrypt your backup with OpenSSL followed by GPG if you wanted.
 
-Additionally we have also defined a **S3 Syncer** ( `sync_with S3` ), which does not follow the above process of archiving/compression/encryption, but instead will directly sync the whole `videos` and `music` folder structures from your machine to your Amazon S3 account. (very efficient and cost-effective since it will only transfer files that were changed!)
+Additionally we have also defined a **S3 Syncer** ( `sync_with S3` ), which does not follow the above process of archiving/compression/encryption, but instead will directly sync the whole `videos` and `music` folder structures from your machine to your Amazon S3 account. (very efficient and cost-effective since it will only transfer files that were added/changed. Additionally, since we flagged it to 'mirror', it'll also remove files from S3 that no longer exist). If you simply wanted to sync to a separate backup server that you own, you could also use the RSync syncer for even more efficient backups that only transfer the **bytes** of each file that changed.
 
-There are more **archives**, **databases**, **compressors**, **encryptors**, **storages** and **notifiers** than displayed in the example, all available components are listed at the top of this README, as well as in the [Wiki](https://github.com/meskyanichi/backup/wiki).
+There are more **archives**, **databases**, **compressors**, **encryptors**, **storages** and **notifiers** than displayed in the example, all available components are listed at the top of this README, as well as in the [Wiki](https://github.com/meskyanichi/backup/wiki) with more detailed information.
 
 ### Running the example
 
 Notice the `Backup::Model.new(:sample_backup, 'A sample backup configuration') do` at the top of the above example. The `:sample_backup` is called the **trigger**. This is used to identify the backup procedure/file and initialize it.
 
-    backup perform -t [--trigger] sample_backup
+``` sh
+backup perform -t [--trigger] sample_backup
+```
 
 Now it'll run the backup, it's as simple as that.
 
@@ -207,9 +217,11 @@ Now it'll run the backup, it's as simple as that.
 
 Since Backup is a simple command line utility, you should write a crontask to invoke it periodically. I recommend you use [Whenever](https://github.com/javan/whenever) to manage your crontab. It'll allow you to write to the crontab in pure Ruby, it provides an elegant DSL to do so, for example:
 
-    every 6.hours do
-      command "backup perform --trigger sample_backup"
-    end
+``` rb
+every 6.hours do
+  command "backup perform --trigger sample_backup"
+end
+```
 
 With this in place, run `whenever --update-crontab backup` to write this Ruby syntax to the crontab in cron-syntax. The operating system will now invoke `backup perform --trigger sample_backup` every 6 hours. Check out the Whenever project page for more information.
 
@@ -280,6 +292,46 @@ Contributors
     <td><a href="https://github.com/bgarret" target="_blank">Benoit Garret ( bgarret )</a></td>
     <td>Presently notifier</td>
   </tr>
+  <tr>
+    <td><a href="https://github.com/lleirborras" target="_blank">Lleïr Borràs Metje ( lleirborras )</a></td>
+    <td>Lzma Compressor</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/jof" target="_blank">Jonathan Lassoff ( jof )</a></td>
+    <td>Bugfixes and more secure GPG storage</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/mikz" target="_blank">Michal Cichra ( mikz )</a></td>
+    <td>Wildcard Triggers</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/trybeee" target="_blank">Dmitry Novotochinov ( trybeee )</a></td>
+    <td>Dropbox Storage</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/Emerson" target="_blank">Emerson Lackey ( Emerson )</a></td>
+    <td>Local RSync Storage</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/digilord" target="_blank">digilord</a></td>
+    <td>OpenSSL Verify Mode for Mail Notifier</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/stemps" target="_blank">stemps</a></td>
+    <td>FTP Passive Mode</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/dkowis" target="_blank">David Kowis ( dkowis )</a></td>
+    <td>Fixed PostgreSQL Password issues</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/jotto" target="_blank">Jonathan Otto ( jotto )</a></td>
+    <td>Allow for running PostgreSQL as another UNIX user</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/joaovitor" target="_blank">João Vitor ( joaovitor )</a></td>
+    <td>Changed default PostgreSQL example options to appropriate ones</td>
+  </tr>
 </table>
 
 
@@ -288,6 +340,7 @@ Want to contribute?
 
 - Fork/Clone the **develop** branch
 - Write RSpec tests, and test against:
+  - Ruby 1.9.3-preview1
   - Ruby 1.9.2
   - Ruby 1.8.7
   - Ruby Enterprise Edition 1.8.7
@@ -295,25 +348,27 @@ Want to contribute?
 
 I can't guarantee I'll pull every pull request. Also, I may accept your pull request and drastically change parts to improve readability/maintainability. Feel free to discuss about improvements, new functionality/features in the [issue log](https://github.com/meskyanichi/backup/issues) before contributing if you need/want more information.
 
-Easily run tests against all three Ruby versions
-------------------------------------------------
+Easily run tests against all four Ruby versions
+-----------------------------------------------
 
-Install [RVM](https://rvm.beginrescueend.com/) and use it to install Ruby 1.9.2, 1.8.7 and REE.
+Install [RVM](https://rvm.beginrescueend.com/) and use it to install Ruby 1.9.3, 1.9.2, 1.8.7 and REE.
 
-    rvm install 1.9.2 && rvm install 1.8.7 && rvm install ree
+    rvm get latest && rvm reload
+    rvm install 1.9.3 && rvm install 1.9.2 && rvm install 1.8.7 && rvm install ree
 
 Once these are installed, go ahead and install all the necessary dependencies.
 
     cd backup
+    rvm use 1.9.3 && gem install bundler && bundle install
     rvm use 1.9.2 && gem install bundler && bundle install
     rvm use 1.8.7 && gem install bundler && bundle install
     rvm use ree   && gem install bundler && bundle install
 
-The Backup gem uses [Guard](https://github.com/guard/guard) along with [Guard::RSpec](https://github.com/guard/guard-rspec) to quickly and easily test Backup's code against all three Rubies. If you've done the above, all you have to do is run:
+The Backup gem uses [Guard](https://github.com/guard/guard) along with [Guard::RSpec](https://github.com/guard/guard-rspec) to quickly and easily test Backup's code against all four Rubies. If you've done the above, all you have to do is run:
 
-    guard start
+    bundle exec guard
 
-from Backup's root and that's it. It'll now test against all three Rubies each time you adjust a file in the `lib` or `spec` directories.
+from Backup's root and that's it. It'll now test against all four Rubies each time you adjust a file in the `lib` or `spec` directories.
 
 
 Or contribute by writing blogs/tutorials