Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 9e0c2cb + 16ae7de commit 479f3f6512c4d1291a77a1635d90264af7634b87 Michael van Rooijen committed Dec 22, 2011
Showing with 6,546 additions and 2,257 deletions.
  1. +4 −0 .gitignore
  2. +9 −8 Gemfile
  3. +19 −1 Gemfile.lock
  4. +13 −9 Guardfile
  5. +93 −31 README.md
  6. +3 −3 backup.gemspec
  7. +6 −283 bin/backup
  8. +101 −72 lib/backup.rb
  9. +21 −9 lib/backup/archive.rb
  10. +22 −0 lib/backup/binder.rb
  11. +36 −0 lib/backup/cleaner.rb
  12. +0 −110 lib/backup/cli.rb
  13. +103 −0 lib/backup/cli/helpers.rb
  14. +308 −0 lib/backup/cli/utility.rb
  15. +2 −2 lib/backup/compressor/base.rb
  16. +76 −0 lib/backup/compressor/pbzip2.rb
  17. +28 −0 lib/backup/configuration/compressor/pbzip2.rb
  18. +25 −0 lib/backup/configuration/database/riak.rb
  19. +6 −0 lib/backup/configuration/encryptor/open_ssl.rb
  20. +5 −18 lib/backup/configuration/helpers.rb
  21. +13 −0 lib/backup/configuration/notifier/base.rb
  22. +41 −0 lib/backup/configuration/notifier/hipchat.rb
  23. +38 −0 lib/backup/configuration/notifier/mail.rb
  24. +23 −0 lib/backup/configuration/notifier/prowl.rb
  25. +4 −0 lib/backup/configuration/storage/cloudfiles.rb
  26. +8 −4 lib/backup/configuration/storage/dropbox.rb
  27. +10 −2 lib/backup/database/base.rb
  28. +16 −19 lib/backup/database/mongodb.rb
  29. +2 −2 lib/backup/database/mysql.rb
  30. +2 −2 lib/backup/database/postgresql.rb
  31. +15 −7 lib/backup/database/redis.rb
  32. +45 −0 lib/backup/database/riak.rb
  33. +21 −7 lib/backup/dependency.rb
  34. +1 −1 lib/backup/encryptor/base.rb
  35. +20 −5 lib/backup/encryptor/open_ssl.rb
  36. +124 −0 lib/backup/errors.rb
  37. +0 −8 lib/backup/exception/command_failed.rb
  38. +0 −8 lib/backup/exception/command_not_found.rb
  39. +11 −3 lib/backup/finder.rb
  40. +121 −82 lib/backup/logger.rb
  41. +103 −44 lib/backup/model.rb
  42. +50 −0 lib/backup/notifier/base.rb
  43. +0 −32 lib/backup/notifier/binder.rb
  44. +32 −52 lib/backup/notifier/campfire.rb
  45. +99 −0 lib/backup/notifier/hipchat.rb
  46. +100 −61 lib/backup/notifier/mail.rb
  47. +31 −40 lib/backup/notifier/presently.rb
  48. +73 −0 lib/backup/notifier/prowl.rb
  49. +0 −33 lib/backup/notifier/templates/notify_failure.erb
  50. +0 −16 lib/backup/notifier/templates/notify_success.erb
  51. +29 −39 lib/backup/notifier/twitter.rb
  52. +25 −0 lib/backup/packager.rb
  53. +62 −0 lib/backup/splitter.rb
  54. +178 −18 lib/backup/storage/base.rb
  55. +34 −28 lib/backup/storage/cloudfiles.rb
  56. +64 −67 lib/backup/storage/dropbox.rb
  57. +48 −40 lib/backup/storage/ftp.rb
  58. +33 −28 lib/backup/storage/local.rb
  59. +40 −26 lib/backup/storage/ninefold.rb
  60. +8 −6 lib/backup/storage/object.rb
  61. +61 −51 lib/backup/storage/rsync.rb
  62. +29 −27 lib/backup/storage/s3.rb
  63. +56 −36 lib/backup/storage/scp.rb
  64. +49 −33 lib/backup/storage/sftp.rb
  65. +1 −1 lib/backup/syncer/base.rb
  66. +1 −1 lib/backup/syncer/rsync.rb
  67. +46 −0 lib/backup/template.rb
  68. +1 −1 lib/backup/version.rb
  69. +0 −7 lib/templates/archive
  70. +0 −8 lib/templates/encryptor/openssl
  71. +0 −15 lib/templates/readme
  72. +0 −11 lib/templates/storage/cloudfiles
  73. +0 −7 lib/templates/storage/local
  74. +0 −11 lib/templates/storage/rsync
  75. +0 −11 lib/templates/storage/scp
  76. +0 −11 lib/templates/storage/sftp
  77. +34 −9 spec/archive_spec.rb
  78. +1 −1 spec/backup_spec.rb
  79. +35 −0 spec/cli/helpers_spec.rb
  80. +38 −0 spec/cli/utility_spec.rb
  81. +1 −1 spec/compressor/bzip2_spec.rb
  82. +1 −1 spec/compressor/gzip_spec.rb
  83. +1 −1 spec/compressor/lzma_spec.rb
  84. +63 −0 spec/compressor/pbzip2_spec.rb
  85. +1 −1 spec/configuration/base_spec.rb
  86. +1 −1 spec/configuration/compressor/bzip2_spec.rb
  87. +1 −1 spec/configuration/compressor/gzip_spec.rb
  88. +1 −1 spec/configuration/compressor/lzma_spec.rb
  89. +1 −1 spec/configuration/database/base_spec.rb
  90. +1 −1 spec/configuration/database/mongodb_spec.rb
  91. +1 −1 spec/configuration/database/mysql_spec.rb
  92. +1 −1 spec/configuration/database/postgresql_spec.rb
  93. +1 −1 spec/configuration/database/redis_spec.rb
  94. +31 −0 spec/configuration/database/riak_spec.rb
  95. +1 −1 spec/configuration/encryptor/gpg_spec.rb
  96. +4 −1 spec/configuration/encryptor/open_ssl_spec.rb
  97. +1 −1 spec/configuration/notifier/campfire_spec.rb
  98. +43 −0 spec/configuration/notifier/hipchat_spec.rb
  99. +34 −22 spec/configuration/notifier/mail_spec.rb
  100. +1 −1 spec/configuration/notifier/presently_spec.rb
  101. +28 −0 spec/configuration/notifier/prowl_spec.rb
  102. +1 −1 spec/configuration/notifier/twitter_spec.rb
  103. +19 −16 spec/configuration/storage/cloudfiles_spec.rb
  104. +1 −1 spec/configuration/storage/dropbox_spec.rb
  105. +1 −1 spec/configuration/storage/ftp_spec.rb
  106. +1 −1 spec/configuration/storage/local_spec.rb
  107. +1 −1 spec/configuration/storage/ninefold_spec.rb
  108. +1 −1 spec/configuration/storage/rsync_spec.rb
  109. +1 −1 spec/configuration/storage/s3_spec.rb
  110. +1 −1 spec/configuration/storage/scp_spec.rb
  111. +1 −1 spec/configuration/storage/sftp_spec.rb
  112. +1 −1 spec/configuration/syncer/rsync_spec.rb
  113. +1 −1 spec/configuration/syncer/s3_spec.rb
  114. +10 −1 spec/database/base_spec.rb
  115. +34 −7 spec/database/mongodb_spec.rb
  116. +8 −7 spec/database/mysql_spec.rb
  117. +8 −7 spec/database/postgresql_spec.rb
  118. +39 −9 spec/database/redis_spec.rb
  119. +50 −0 spec/database/riak_spec.rb
  120. +1 −1 spec/encryptor/gpg_spec.rb
  121. +77 −20 spec/encryptor/open_ssl_spec.rb
  122. +306 −0 spec/errors_spec.rb
  123. +91 −0 spec/finder_spec.rb
  124. +254 −33 spec/logger_spec.rb
  125. +120 −15 spec/model_spec.rb
  126. +127 −52 spec/notifier/campfire_spec.rb
  127. +193 −0 spec/notifier/hipchat_spec.rb
  128. +290 −74 spec/notifier/mail_spec.rb
  129. +290 −73 spec/notifier/presently_spec.rb
  130. +149 −0 spec/notifier/prowl_spec.rb
  131. +106 −41 spec/notifier/twitter_spec.rb
  132. +8 −2 spec/spec_helper.rb
  133. +71 −0 spec/splitter_spec.rb
  134. +280 −19 spec/storage/base_spec.rb
  135. +38 −22 spec/storage/cloudfiles_spec.rb
  136. +17 −13 spec/storage/dropbox_spec.rb
  137. +145 −55 spec/storage/ftp_spec.rb
  138. +6 −6 spec/storage/local_spec.rb
  139. +70 −29 spec/storage/ninefold_spec.rb
  140. +44 −44 spec/storage/object_spec.rb
  141. +186 −63 spec/storage/rsync_spec.rb
  142. +23 −24 spec/storage/s3_spec.rb
  143. +116 −41 spec/storage/scp_spec.rb
  144. +124 −46 spec/storage/sftp_spec.rb
  145. +3 −3 spec/syncer/rsync_spec.rb
  146. +1 −1 spec/syncer/s3_spec.rb
  147. +1 −1 spec/version_spec.rb
  148. +13 −0 templates/cli/utility/archive
  149. +1 −1 {lib/templates → templates/cli/utility}/compressor/bzip2
  150. +1 −1 {lib/templates → templates/cli/utility}/compressor/gzip
  151. 0 {lib/templates → templates/cli/utility}/compressor/lzma
  152. +7 −0 templates/cli/utility/compressor/pbzip2
  153. +31 −0 templates/cli/utility/config
  154. +1 −1 {lib/templates → templates/cli/utility}/database/mongodb
  155. +1 −1 {lib/templates → templates/cli/utility}/database/mysql
  156. +1 −1 {lib/templates → templates/cli/utility}/database/postgresql
  157. +1 −1 {lib/templates → templates/cli/utility}/database/redis
  158. +8 −0 templates/cli/utility/database/riak
  159. +1 −1 {lib/templates → templates/cli/utility}/encryptor/gpg
  160. +9 −0 templates/cli/utility/encryptor/openssl
  161. +23 −0 templates/cli/utility/model.erb
  162. +2 −1 {lib/templates → templates/cli/utility}/notifier/campfire
  163. +15 −0 templates/cli/utility/notifier/hipchat
  164. +6 −1 {lib/templates → templates/cli/utility}/notifier/mail
  165. +1 −0 {lib/templates → templates/cli/utility}/notifier/presently
  166. +11 −0 templates/cli/utility/notifier/prowl
  167. +2 −1 {lib/templates → templates/cli/utility}/notifier/twitter
  168. +7 −0 templates/cli/utility/splitter
  169. +12 −0 templates/cli/utility/storage/cloudfiles
  170. +1 −1 {lib/templates → templates/cli/utility}/storage/dropbox
  171. 0 {lib/templates → templates/cli/utility}/storage/ftp
  172. +7 −0 templates/cli/utility/storage/local
  173. +1 −1 {lib/templates → templates/cli/utility}/storage/ninefold
  174. +11 −0 templates/cli/utility/storage/rsync
  175. +0 −2 {lib/templates → templates/cli/utility}/storage/s3
  176. +11 −0 templates/cli/utility/storage/scp
  177. +11 −0 templates/cli/utility/storage/sftp
  178. +1 −1 {lib/templates → templates/cli/utility}/syncer/rsync
  179. +1 −1 {lib/templates → templates/cli/utility}/syncer/s3
  180. +11 −0 templates/general/links
  181. +2 −0 templates/general/version.erb
  182. +9 −0 templates/notifier/mail/failure.erb
  183. +7 −0 templates/notifier/mail/success.erb
  184. +9 −0 templates/notifier/mail/warning.erb
  185. +6 −0 templates/storage/dropbox/authorization_url.erb
  186. +4 −0 templates/storage/dropbox/authorized.erb
  187. +10 −0 templates/storage/dropbox/cache_file_written.erb
View
@@ -1,3 +1,7 @@
.DS_Store
*.gem
.rvmrc
+.bundle/
+vendor/bundle
+*.swp
+*.swo
View
@@ -1,20 +1,21 @@
-##
+# encoding: utf-8
+
# RubyGems Source
source 'http://rubygems.org'
-##
+# Include gem dependencies from the gemspec for development purposes
+gemspec
+
# Load Backup::Dependency
-%w[cli dependency].each do |path|
- require File.expand_path("../lib/backup/#{path}", __FILE__)
+["cli/helpers", "dependency"].each do |library|
+ require File.expand_path("../lib/backup/#{library}", __FILE__)
end
-##
# Dynamically define the dependencies specified in Backup::Dependency.all
Backup::Dependency.all.each do |name, gemspec|
gem(name, gemspec[:version])
end
-##
# Define gems to be used in the 'test' environment
group :test do
gem 'rspec'
@@ -24,8 +25,8 @@ group :test do
gem 'guard'
gem 'guard-rspec'
- gem 'rb-fsevent' # guard notifications for osx
+ gem 'rb-fsevent' # guard notifications for osx
gem 'growl' # $ brew install growlnotify
gem 'rb-inotify' # guard notifications for linux
gem 'libnotify' # $ apt-get install ???
-end
+end
View
@@ -1,6 +1,17 @@
+PATH
+ remote: .
+ specs:
+ backup (3.0.19)
+ POpen4 (~> 0.1.4)
+ thor (~> 0.14.6)
+
GEM
remote: http://rubygems.org/
specs:
+ POpen4 (0.1.4)
+ Platform (>= 0.4.0)
+ open4
+ Platform (0.4.0)
addressable (2.2.6)
builder (3.0.0)
crack (0.1.8)
@@ -38,6 +49,8 @@ GEM
guard-rspec (0.3.1)
guard (>= 0.2.2)
hashie (1.1.0)
+ hipchat (0.4.1)
+ httparty
httparty (0.7.4)
crack (= 0.1.8)
i18n (0.6.0)
@@ -59,7 +72,9 @@ GEM
net-ssh (2.1.4)
nokogiri (1.5.0)
oauth (0.4.5)
+ open4 (1.2.0)
polyglot (0.3.2)
+ prowler (1.3.1)
rack (1.3.2)
rb-fsevent (0.4.0)
rb-inotify (0.8.5)
@@ -93,20 +108,23 @@ PLATFORMS
ruby
DEPENDENCIES
+ backup!
dropbox (~> 1.3.0)
fog (>= 0.11.0)
fuubar
growl
guard
guard-rspec
+ hipchat (~> 0.4.1)
httparty (~> 0.7.4)
json (~> 1.5.1)
libnotify
- mail (~> 2.3.0)
+ mail (>= 2.2.15)
mocha
net-scp (~> 1.0.4)
net-sftp (~> 2.0.5)
net-ssh (~> 2.1.4)
+ prowler (>= 1.3.1)
rb-fsevent
rb-inotify
rspec
View
@@ -1,17 +1,21 @@
-##
-# To run the test suite against all 3 rubies: 1.9.2, 1.8.7 and REE, simply run the following command:
+# encoding: utf-8
+
+# To run the test suite against all 3 rubies: 1.9.3, 1.9.2, and 1.8.7, simply run the following command:
+#
# $ guard start
#
-# Be use you are using RVM and have Ruby 1.9.2, 1.8.7 and REE installed as well as all
-# Backup's gem dependencies for each of these Ruby intepreters.
+# Be use you are using RVM and have Ruby 1.9.3, 1.9.2, 1.8.7 installed as well as all of Backup's gem
+# dependencies for each of these Ruby versions.
+#
+# Be sure to run `bundle install` against every Ruby version, as well as `gem install thor POpen4`
-guard 'rspec',
+guard "rspec",
:version => 2,
- :rvm => ['1.9.3', '1.9.2', '1.8.7', 'ree'],
+ :rvm => ["1.9.3", "1.9.2", "1.8.7"],
:bundler => true,
- :cli => '--color --format Fuubar' do
+ :cli => "--color --format Fuubar" do
watch(%r{^spec/.+_spec\.rb})
- watch(%r{^lib/(.+)\.rb}) { 'spec' }
- watch('spec/spec_helper.rb') { 'spec' }
+ watch(%r{^lib/(.+)\.rb}) { "spec" }
+ watch("spec/spec_helper.rb") { "spec" }
end
Oops, something went wrong.

0 comments on commit 479f3f6

Please sign in to comment.