Merge branch 'develop'

backup · Apr 22, 2012 · bca9ab8 · bca9ab8
2 parents e9ee30c + f3fc6dc
commit bca9ab8
Show file tree

Hide file tree

Showing 196 changed files with 7,202 additions and 5,315 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,29 +2,25 @@ PATH
   remote: .
   specs:
     backup (3.0.23)
-      POpen4 (~> 0.1.4)
+      open4 (~> 1.3.0)
       thor (~> 0.14.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    POpen4 (0.1.4)
-      Platform (>= 0.4.0)
-      open4
-    Platform (0.4.0)
-    activesupport (3.1.3)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.2.7)
     builder (3.0.0)
-    crack (0.1.8)
     diff-lcs (1.1.3)
-    dropbox-sdk (1.1)
+    dropbox-sdk (1.2)
       json
-    excon (0.9.4)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    excon (0.9.6)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     ffi (1.0.11)
     fog (1.1.2)
       builder
@@ -37,56 +33,58 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
-    fuubar (0.0.6)
+    fuubar (1.0.0)
       rspec (~> 2.0)
-      rspec-instafail (~> 0.1.8)
+      rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
     growl (1.0.3)
-    guard (0.10.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-rspec (0.6.0)
       guard (>= 0.10.0)
     hipchat (0.4.1)
       httparty
-    httparty (0.7.8)
-      crack (= 0.1.8)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     i18n (0.6.0)
-    json (1.5.4)
-    libnotify (0.7.1)
-    mail (2.4.1)
+    json (1.6.5)
+    libnotify (0.7.2)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.17.2)
-    mocha (0.10.0)
+    mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
-    multipart-post (1.1.4)
+    multi_xml (0.4.2)
+    multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.4)
-    nokogiri (1.5.0)
+    net-ssh (2.3.0)
+    nokogiri (1.5.2)
     open4 (1.3.0)
-    parallel (0.5.12)
+    parallel (0.5.16)
     polyglot (0.3.3)
     prowler (1.3.1)
-    rack (1.4.0)
-    rb-fsevent (0.4.3.1)
+    rack (1.4.1)
+    rb-fsevent (0.9.0)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.9)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-instafail (0.2.2)
+    rspec-mocks (2.9.0)
     ruby-hmac (0.4.0)
     ruby-progressbar (0.0.10)
     simple_oauth (0.1.5)
@@ -95,7 +93,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (2.0.2)
+    twitter (2.1.1)
       activesupport (>= 2.3.9, < 4)
       faraday (~> 0.7)
       multi_json (~> 1.0)
@@ -106,21 +104,20 @@ PLATFORMS
 
 DEPENDENCIES
   backup!
-  dropbox-sdk (~> 1.1.0)
-  fog (>= 0.11.0)
+  dropbox-sdk (~> 1.2.0)
+  fog (~> 1.1.0)
   fuubar
   growl
   guard
   guard-rspec
   hipchat (~> 0.4.1)
-  httparty (~> 0.7.4)
-  json (~> 1.5.1)
+  httparty (~> 0.8.1)
   libnotify
-  mail (>= 2.4.0)
+  mail (~> 2.4.0)
   mocha
   net-scp (~> 1.0.4)
   net-sftp (~> 2.0.5)
-  net-ssh (~> 2.1.4)
+  net-ssh (~> 2.3.0)
   parallel (~> 0.5.12)
   prowler (>= 1.3.1)
   rb-fsevent

diff --git a/Guardfile b/Guardfile
@@ -12,10 +12,13 @@
 guard "rspec",
   :version => 2,
   :rvm     => ["1.9.3", "1.9.2", "1.8.7"],
-  :bundler => true,
-  :cli     => "--color --format Fuubar" do
+  :cli     => "--color --format Fuubar",
+  :notification   => false,
+  :all_after_pass => false,
+  :all_on_start   => false do
 
+  watch("lib/backup.rb")            { "spec" }
+  watch("spec/spec_helper.rb")      { "spec" }
+  watch(%r{^lib/backup/(.+)\.rb}) {|m| "spec/#{ m[1] }_spec.rb" }
   watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})     { "spec" }
-  watch("spec/spec_helper.rb") { "spec" }
 end
diff --git a/README.md b/README.md
@@ -69,20 +69,22 @@ Below you find a list of components that Backup currently supports. If you'd lik
   - Dropbox Web Service
   - Remote Servers *(Only Protocols: FTP, SFTP, SCP)*
   - Local Storage
+
+[Cycling Wiki Page](https://github.com/meskyanichi/backup/wiki/Cycling)
+
 - **Backup Splitting, applies to:**
   - Amazon Simple Storage Service (S3)
   - Rackspace Cloud Files (Mosso)
   - Ninefold Cloud Storage
   - Dropbox Web Service
   - Remote Servers *(Only Protocols: FTP, SFTP, SCP)*
   - Local Storage
-- **Incremental Backups, applies to:**
-  - Remote Servers *(Only Protocols: RSync)*
-
-[Cycling Wiki Page](https://github.com/meskyanichi/backup/wiki/Cycling)
 
 [Splitter Wiki Page](https://github.com/meskyanichi/backup/wiki/Splitter)
 
+- **Incremental Backups, applies to:**
+  - Remote Servers *(Only Protocols: RSync)*
+
 ### Syncers
 
 - RSync (Push, Pull and Local)
@@ -128,7 +130,8 @@ Below you find a list of components that Backup currently supports. If you'd lik
 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.
+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.
 
 ``` rb
 Backup::Model.new(:sample_backup, 'A sample backup configuration') do
@@ -193,7 +196,7 @@ Backup::Model.new(:sample_backup, 'A sample backup configuration') do
     s3.keep               = 20
   end
 
-  sync_with S3 do |s3|
+  sync_with Cloud::S3 do |s3|
     s3.access_key_id     = "my_access_key_id"
     s3.secret_access_key = "my_secret_access_key"
     s3.bucket            = "my-bucket"
@@ -252,7 +255,7 @@ of `-aa`, `-ab` and `-ac`. These files will then be individually transfered. Thi
 Amazon S3, Rackspace Cloud Files, or other 3rd party storage services which limit you to "5GB per file" uploads. So with
 this, the backup file size is no longer a constraint.
 
-Additionally we have also defined a **S3 Syncer** ( `sync_with S3` ), which does not follow the above process of
+Additionally we have also defined a **S3 Syncer** ( `sync_with Cloud::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

diff --git a/backup.gemspec b/backup.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
 
   ##
   # Gem dependencies
-  gem.add_dependency 'thor',   ['~> 0.14.6']
-  gem.add_dependency 'POpen4', ['~> 0.1.4']
+  gem.add_dependency 'thor',  ['~> 0.14.6']
+  gem.add_dependency 'open4', ['~> 1.3.0']
 
 end