backup 3.0.19 → 3.0.20

data/spec/syncer/rsync_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Syncer::RSync do
 
@@ -176,7 +176,7 @@ describe Backup::Syncer::RSync do
       Backup::Logger.expects(:message).with("Backup::Syncer::RSync started syncing '/some/random/directory' '/another/random/directory'.")
       rsync.expects(:utility).with(:rsync).returns(:rsync)
       rsync.expects(:remove_password_file!)
-      rsync.expects(:run).with("rsync -vhP --archive --delete --compress -e 'ssh -p 22' --password-file='#{rsync.instance_variable_get('@password_file').path}' " +
+      rsync.expects(:run).with("rsync --archive --delete --compress -e 'ssh -p 22' --password-file='#{rsync.instance_variable_get('@password_file').path}' " +
                                "'/some/random/directory' '/another/random/directory' 'my_username@123.45.678.90:backups/'")
       rsync.perform!
     end
@@ -186,7 +186,7 @@ describe Backup::Syncer::RSync do
       rsync.password = nil
       rsync.expects(:utility).with(:rsync).returns(:rsync)
       rsync.expects(:remove_password_file!)
-      rsync.expects(:run).with("rsync -vhP --archive --delete --compress -e 'ssh -p 22' " +
+      rsync.expects(:run).with("rsync --archive --delete --compress -e 'ssh -p 22' " +
                                "'/some/random/directory' '/another/random/directory' 'my_username@123.45.678.90:backups/'")
       rsync.perform!
     end

data/spec/syncer/s3_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Syncer::S3 do
 

data/spec/version_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('../spec_helper.rb', __FILE__)
 
 def set_version(major, minor, patch)
   Backup::Version.stubs(:major).returns(major)

data/templates/cli/utility/archive

@@ -0,0 +1,13 @@
+  ##
+  # Archive [Archive]
+  #
+  archive :my_archive do |archive|
+    # add a file
+    archive.add '/path/to/a/file.rb'
+    # add a folder (including sub-folders)
+    archive.add '/path/to/a/folder/'
+    # exclude a file
+    archive.exclude '/path/to/a/excluded_file.rb'
+    # exclude a folder (including sub-folders)
+    archive.exclude '/path/to/a/excluded_folder/'
+  end

data/{lib/templates → templates/cli/utility}/compressor/bzip2

@@ -4,4 +4,4 @@
   compress_with Bzip2 do |compression|
     compression.best = true
     compression.fast = false
-  end
+  end

data/{lib/templates → templates/cli/utility}/compressor/gzip

@@ -4,4 +4,4 @@
   compress_with Gzip do |compression|
     compression.best = true
     compression.fast = false
-  end
+  end

data/templates/cli/utility/compressor/pbzip2

@@ -0,0 +1,7 @@
+  ##
+  # Pbzip2 [Compressor]
+  #
+  compress_with Pbzip2 do |compression|
+    compression.best = true
+    compression.fast = false
+  end

data/templates/cli/utility/config

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+##
+# Backup
+# Generated Main Config Template
+#
+# For more information:
+#
+# View the Git repository at https://github.com/meskyanichi/backup
+# View the Wiki/Documentation at https://github.com/meskyanichi/backup/wiki
+# View the issue log at https://github.com/meskyanichi/backup/issues
+
+##
+# Global Configuration
+# Add more (or remove) global configuration below
+Backup::Configuration::Storage::S3.defaults do |s3|
+  # s3.access_key_id     = "my_access_key_id"
+  # s3.secret_access_key = "my_secret_access_key"
+end
+
+Backup::Configuration::Encryptor::OpenSSL.defaults do |encryption|
+  # encryption.password = "my_password"
+  # encryption.base64   = true
+  # encryption.salt     = true
+end
+
+##
+# Load all models from the models directory (after the above global configuration blocks)
+Dir[File.join(File.dirname(Backup::CONFIG_FILE), "models", "*.rb")].each do |model|
+  instance_eval(File.read(model))
+end

data/{lib/templates → templates/cli/utility}/database/mongodb

@@ -11,4 +11,4 @@
     db.only_collections   = ['only', 'these' 'collections']
     db.additional_options = []
     db.lock               = false
-  end
+  end

data/{lib/templates → templates/cli/utility}/database/mysql

@@ -11,4 +11,4 @@
     db.skip_tables        = ['skip', 'these', 'tables']
     db.only_tables        = ['only', 'these' 'tables']
     db.additional_options = ['--quick', '--single-transaction']
-  end
+  end

data/{lib/templates → templates/cli/utility}/database/postgresql

@@ -11,4 +11,4 @@
     db.skip_tables        = ['skip', 'these', 'tables']
     db.only_tables        = ['only', 'these' 'tables']
     db.additional_options = ['-xc', '-E=utf8']
-  end
+  end

data/{lib/templates → templates/cli/utility}/database/redis

@@ -10,4 +10,4 @@
     db.socket             = "/tmp/redis.sock"
     db.additional_options = []
     db.invoke_save        = true
-  end
+  end

data/templates/cli/utility/database/riak

@@ -0,0 +1,8 @@
+  ##
+  # Riak [Database]
+  #
+  database Riak do |db|
+    db.name   = "hostname"
+    db.node   = "riak@hostname"
+    db.cookie = "cookie"
+  end

data/{lib/templates → templates/cli/utility}/encryptor/gpg

@@ -9,4 +9,4 @@
           <Your GPG Public Key Here>
       -----END PGP PUBLIC KEY BLOCK-----
     KEY
-  end
+  end

data/templates/cli/utility/encryptor/openssl

@@ -0,0 +1,9 @@
+  ##
+  # OpenSSL [Encryptor]
+  #
+  encrypt_with OpenSSL do |encryption|
+    encryption.password      = 'my_password'            # From String
+    encryption.password_file = '/path/to/password/file' # Or from File
+    encryption.base64        = true
+    encryption.salt          = true
+  end

data/templates/cli/utility/model.erb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+##
+# Backup Generated: <%= @options[:trigger] %>
+# Once configured, you can run the backup with the following command:
+#
+# $ backup perform -t <%= @options[:trigger] %> [-c <path_to_configuration_file>]
+#
+Backup::Model.new(:<%= @options[:trigger] %>, 'Description for <%= @options[:trigger] %>') do
+<% if @options[:splitter] %>
+<%= Backup::Template.new.result("cli/utility/splitter") %>
+<% end; if @options[:archives] %>
+<%= Backup::Template.new.result("cli/utility/archive") %>
+<% end; [:databases, :storages, :syncers, :encryptors, :compressors, :notifiers].each do |item|
+  if @options[item]
+    @options[item].split(',').map(&:strip).uniq.each do |entry|
+      if File.exist?(File.join(Backup::TEMPLATE_PATH, 'cli', 'utility', item.to_s[0..-2], entry)) %>
+<%= Backup::Template.new.result("cli/utility/#{item.to_s[0..-2]}/#{entry}") %>
+<%    end
+    end
+  end
+end %>
+end

data/{lib/templates → templates/cli/utility}/notifier/campfire

@@ -3,9 +3,10 @@
   #
   notify_by Campfire do |campfire|
     campfire.on_success = true
+    campfire.on_warning = true
     campfire.on_failure = true
 
     campfire.api_token = 'my_api_authentication_token'
     campfire.subdomain = 'my_subdomain'
     campfire.room_id   = 'my_room_id'
-  end
+  end

data/templates/cli/utility/notifier/hipchat

@@ -0,0 +1,15 @@
+  ##
+  # Hipchat [Notifier]
+  #
+  notify_by Hipchat do |hipchat|
+    hipchat.on_success = true
+    hipchat.on_warning = true
+    hipchat.on_failure = true
+
+    hipchat.token          = 'token'
+    hipchat.from           = 'DB Backup'
+    hipchat.rooms_notified = ['activity']
+    hipchat.success_color  = 'green'
+    hipchat.warning_color  = 'yellow'
+    hipchat.failure_color  = 'red'
+  end

data/{lib/templates → templates/cli/utility}/notifier/mail

@@ -1,8 +1,13 @@
   ##
   # Mail [Notifier]
   #
+  # The default delivery method for Mail Notifiers is 'SMTP'.
+  # See the Wiki for other delivery options.
+  # https://github.com/meskyanichi/backup/wiki/Notifiers
+  #
   notify_by Mail do |mail|
     mail.on_success           = true
+    mail.on_warning           = true
     mail.on_failure           = true
 
     mail.from                 = 'sender@email.com'
@@ -14,4 +19,4 @@
     mail.password             = 'my_password'
     mail.authentication       = 'plain'
     mail.enable_starttls_auto = true
-  end
+  end

data/{lib/templates → templates/cli/utility}/notifier/presently

@@ -3,6 +3,7 @@
   #
   notify_by Presently do |presently|
     presently.on_success = true
+    presently.on_warning = true
     presently.on_failure = true
 
     presently.subdomain = 'my_subdomain'

data/templates/cli/utility/notifier/prowl

@@ -0,0 +1,11 @@
+  ##
+  # Prowl [Notifier]
+  #
+  notify_by Prowl do |prowl|
+    prowl.on_success = true
+    prowl.on_warning = true
+    prowl.on_failure = true
+
+    prowl.application	= 'my_application'
+    prowl.api_key    	= 'my_api_key'
+  end

data/{lib/templates → templates/cli/utility}/notifier/twitter

@@ -3,10 +3,11 @@
   #
   notify_by Twitter do |tweet|
     tweet.on_success = true
+    tweet.on_warning = true
     tweet.on_failure = true
 
     tweet.consumer_key       = 'my_consumer_key'
     tweet.consumer_secret    = 'my_consumer_secret'
     tweet.oauth_token        = 'my_oauth_token'
     tweet.oauth_token_secret = 'my_oauth_token_secret'
-  end
+  end

data/templates/cli/utility/splitter

@@ -0,0 +1,7 @@
+  ##
+  # Split [Splitter]
+  #
+  # Split the backup file in to chunks of 250 megabytes
+  # if the backup file size exceeds 250 megabytes
+  #
+  split_into_chunks_of 250

data/templates/cli/utility/storage/cloudfiles

@@ -0,0 +1,12 @@
+  ##
+  # Rackspace Cloud Files [Storage]
+  #
+  store_with CloudFiles do |cf|
+    cf.api_key    = 'my_api_key'
+    cf.username   = 'my_username'
+    cf.container  = 'my_container'
+    cf.path       = '/path/to/my/backups'
+    cf.keep       = 5
+    cf.auth_url   = 'lon.auth.api.rackspacecloud.com'
+    cf.servicenet = false
+  end

data/{lib/templates → templates/cli/utility}/storage/dropbox

@@ -9,4 +9,4 @@
     db.timeout    = 300
     db.path       = '/path/to/my/backups'
     db.keep       = 25
-  end
+  end

data/templates/cli/utility/storage/local

@@ -0,0 +1,7 @@
+  ##
+  # Local (Copy) [Storage]
+  #
+  store_with Local do |local|
+    local.path       = '~/backups/'
+    local.keep       = 5
+  end

data/{lib/templates → templates/cli/utility}/storage/ninefold

@@ -6,4 +6,4 @@
     nf.storage_secret  = 'my_storage_secret'
     nf.path            = '/path/to/my/backups'
     nf.keep            = 10
-  end
+  end

data/templates/cli/utility/storage/rsync

@@ -0,0 +1,11 @@
+  ##
+  # RSync [Storage]
+  #
+  store_with RSync do |server|
+    server.username   = 'my_username'
+    server.password   = 'my_password'
+    server.ip         = '123.45.678.90'
+    server.port       = 22
+    server.path       = '~/backups/'
+    server.local      = false
+  end

data/{lib/templates → templates/cli/utility}/storage/s3

@@ -17,5 +17,3 @@
     s3.path               = '/path/to/my/backups'
     s3.keep               = 10
   end
-  
-  

data/templates/cli/utility/storage/scp

@@ -0,0 +1,11 @@
+  ##
+  # SCP (Secure Copy) [Storage]
+  #
+  store_with SCP do |server|
+    server.username   = 'my_username'
+    server.password   = 'my_password'
+    server.ip         = '123.45.678.90'
+    server.port       = 22
+    server.path       = '~/backups/'
+    server.keep       = 5
+  end

data/templates/cli/utility/storage/sftp

@@ -0,0 +1,11 @@
+  ##
+  # SFTP (Secure File Transfer Protocol) [Storage]
+  #
+  store_with SFTP do |server|
+    server.username   = 'my_username'
+    server.password   = 'my_password'
+    server.ip         = '123.45.678.90'
+    server.port       = 22
+    server.path       = '~/backups/'
+    server.keep       = 5
+  end

data/{lib/templates → templates/cli/utility}/syncer/rsync

@@ -14,4 +14,4 @@
       directory.add "/var/apps/my_app/public/uploads"
       directory.add "/var/apps/my_app/logs"
     end
-  end
+  end

data/{lib/templates → templates/cli/utility}/syncer/s3

@@ -12,4 +12,4 @@
       directory.add "/path/to/directory/to/sync"
       directory.add "/path/to/other/directory/to/sync"
     end
-  end
+  end

data/templates/general/links

@@ -0,0 +1,11 @@
+Backup's Ruby Gem releases:
+http://rubygems.org/gems/backup
+
+Backup's Git repository:
+https://github.com/meskyanichi/backup
+
+Backup's Issue Tracker:
+https://github.com/meskyanichi/backup/issues
+
+Backup's Wikipedia/Documentation/Guides:
+https://github.com/meskyanichi/backup/wiki

data/templates/general/version.erb

@@ -0,0 +1,2 @@
+Backup version <%= Backup::Version.current %>
+Ruby version <%= RUBY_DESCRIPTION %>

data/templates/notifier/mail/failure.erb

@@ -0,0 +1,9 @@
+
+Backup <%= @model.label %> (<%= @model.trigger %>) Failed!
+
+See the attached backup log for details.
+
+===========================================================================
+<%= Backup::Template.new.result("general/version.erb") %>
+
+<%= Backup::Template.new.result("general/links") %>

data/templates/notifier/mail/success.erb

@@ -0,0 +1,7 @@
+
+Backup <%= @model.label %> (<%= @model.trigger %>) finished without any errors!
+
+===========================================================================
+<%= Backup::Template.new.result("general/version.erb") %>
+
+<%= Backup::Template.new.result("general/links") %>

data/templates/notifier/mail/warning.erb

@@ -0,0 +1,9 @@
+
+Backup <%= @model.label %> (<%= @model.trigger %>) finished with warnings.
+
+See the attached backup log for details.
+
+===========================================================================
+<%= Backup::Template.new.result("general/version.erb") %>
+
+<%= Backup::Template.new.result("general/links") %>