backup 3.6.0 → 3.7.0

data/templates/cli/storage/s3

@@ -1,19 +1,12 @@
   ##
   # Amazon Simple Storage Service [Storage]
   #
-  # Available Regions:
-  #
-  #  - ap-northeast-1
-  #  - ap-southeast-1
-  #  - eu-west-1
-  #  - us-east-1
-  #  - us-west-1
-  #
+  # See the documentation on the Wiki for details.
+  # https://github.com/meskyanichi/backup/wiki/Storages
   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            = "bucket-name"
-    s3.path              = "/path/to/my/backups"
-    s3.keep              = 10
+    s3.path              = "path/to/backups"
   end

data/templates/cli/syncer/cloud_files

@@ -1,43 +1,15 @@
   ##
   # Rackspace Cloud Files [Syncer]
   #
-  # Available Auth URLs:
-  #
-  #   - https://auth.api.rackspacecloud.com     (US - Default)
-  #   - https://lon.auth.api.rackspacecloud.com (UK)
-  #
-  # Servicenet:
-  #
-  #   Set this to 'true' if Backup runs on a Rackspace server.
-  #   It will avoid transfer charges and it's more performant.
-  #
-  # Mirroring:
-  #
-  #   When enabled it will keep an exact mirror of your filesystem on Cloud Files.
-  #   This means that when you remove a file from the filesystem,
-  #   it will also remote it from Cloud Files.
-  #
-  # Concurrency:
-  #
-  #   `concurrency_type` may be set to:
-  #
-  #     - false (default)
-  #     - :threads
-  #     - :processes
-  #
-  #   Set `concurrency_level` to the number of threads/processes to use.
-  #   Defaults to 2.
-  #
+  # See the documentation on the Wiki for details.
+  # https://github.com/meskyanichi/backup/wiki/Syncers
   sync_with Cloud::CloudFiles do |cf|
     cf.username          = "my_username"
     cf.api_key           = "my_api_key"
     cf.container         = "my_container"
-    cf.auth_url          = "https://auth.api.rackspacecloud.com"
-    cf.servicenet        = false
     cf.path              = "/backups"
     cf.mirror            = true
-    cf.concurrency_type  = false
-    cf.concurrency_level = 2
+    cf.thread_count      = 10
 
     cf.directories do |directory|
       directory.add "/path/to/directory/to/sync"

data/templates/cli/syncer/s3

@@ -1,31 +1,8 @@
   ##
   # Amazon S3 [Syncer]
   #
-  # Available Regions:
-  #
-  #   - ap-northeast-1
-  #   - ap-southeast-1
-  #   - eu-west-1
-  #   - us-east-1
-  #   - us-west-1
-  #
-  # Mirroring:
-  #
-  #   When enabled it will keep an exact mirror of your filesystem on S3.
-  #   This means that when you remove a file from the filesystem,
-  #   it will also remote it from S3.
-  #
-  # Concurrency:
-  #
-  #   `concurrency_type` may be set to:
-  #
-  #     - false (default)
-  #     - :threads
-  #     - :processes
-  #
-  #   Set `concurrency_level` to the number of threads/processes to use.
-  #   Defaults to 2.
-  #
+  # See the documentation on the Wiki for details.
+  # https://github.com/meskyanichi/backup/wiki/Syncers
   sync_with Cloud::S3 do |s3|
     s3.access_key_id     = "my_access_key_id"
     s3.secret_access_key = "my_secret_access_key"
@@ -33,8 +10,7 @@
     s3.region            = "us-east-1"
     s3.path              = "/backups"
     s3.mirror            = true
-    s3.concurrency_type  = false
-    s3.concurrency_level = 2
+    s3.thread_count      = 10
 
     s3.directories do |directory|
       directory.add "/path/to/directory/to/sync"

data/templates/notifier/mail/failure.erb

@@ -1,5 +1,10 @@
 
-Backup <%= @model.label %> (<%= @model.trigger %>) Failed!
+Backup Failed!
+
+Job: <%= @model.label %> (<%= @model.trigger %>)
+Started:  <%= @model.started_at %>
+Finished: <%= @model.finished_at %>
+Duration: <%= @model.duration %>
 <% if @send_log %>
 
 See the attached backup log for details.

data/templates/notifier/mail/success.erb

@@ -1,5 +1,10 @@
 
-Backup <%= @model.label %> (<%= @model.trigger %>) finished without any errors!
+Backup Completed Successfully!
+
+Job: <%= @model.label %> (<%= @model.trigger %>)
+Started:  <%= @model.started_at %>
+Finished: <%= @model.finished_at %>
+Duration: <%= @model.duration %>
 <% if @send_log %>
 
 See the attached backup log for details.

data/templates/notifier/mail/warning.erb

@@ -1,5 +1,10 @@
 
-Backup <%= @model.label %> (<%= @model.trigger %>) finished with warnings.
+Backup Completed Successfully (with Warnings)!
+
+Job: <%= @model.label %> (<%= @model.trigger %>)
+Started:  <%= @model.started_at %>
+Finished: <%= @model.finished_at %>
+Duration: <%= @model.duration %>
 <% if @send_log %>
 
 See the attached backup log for details.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.25.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.25.3
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +240,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.7
+        version: 2.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.7
+        version: 2.6.8
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +276,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
@@ -352,28 +338,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.12
+        version: 1.4.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.12
+        version: 1.4.14
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 4.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 4.8.1
 description: Backup is a RubyGem, written for UNIX-like operating systems, that allows
   you to easily perform backup operations on both your remote and local environments.
   It provides you with an elegant DSL in Ruby for modeling your backups. Backup has
@@ -386,12 +372,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
+- README.md
 - bin/backup
 - lib/backup.rb
 - lib/backup/archive.rb
 - lib/backup/binder.rb
 - lib/backup/cleaner.rb
 - lib/backup/cli.rb
+- lib/backup/cloud_io/base.rb
+- lib/backup/cloud_io/cloud_files.rb
+- lib/backup/cloud_io/s3.rb
 - lib/backup/compressor/base.rb
 - lib/backup/compressor/bzip2.rb
 - lib/backup/compressor/custom.rb
@@ -414,13 +405,16 @@ files:
 - lib/backup/errors.rb
 - lib/backup/logger.rb
 - lib/backup/logger/console.rb
+- lib/backup/logger/fog_adapter.rb
 - lib/backup/logger/logfile.rb
 - lib/backup/logger/syslog.rb
 - lib/backup/model.rb
 - lib/backup/notifier/base.rb
 - lib/backup/notifier/campfire.rb
 - lib/backup/notifier/hipchat.rb
+- lib/backup/notifier/http_post.rb
 - lib/backup/notifier/mail.rb
+- lib/backup/notifier/nagios.rb
 - lib/backup/notifier/prowl.rb
 - lib/backup/notifier/pushover.rb
 - lib/backup/notifier/twitter.rb
@@ -429,7 +423,7 @@ files:
 - lib/backup/pipeline.rb
 - lib/backup/splitter.rb
 - lib/backup/storage/base.rb
-- lib/backup/storage/cloudfiles.rb
+- lib/backup/storage/cloud_files.rb
 - lib/backup/storage/cycler.rb
 - lib/backup/storage/dropbox.rb
 - lib/backup/storage/ftp.rb
@@ -442,6 +436,7 @@ files:
 - lib/backup/syncer/base.rb
 - lib/backup/syncer/cloud/base.rb
 - lib/backup/syncer/cloud/cloud_files.rb
+- lib/backup/syncer/cloud/local_file.rb
 - lib/backup/syncer/cloud/s3.rb
 - lib/backup/syncer/rsync/base.rb
 - lib/backup/syncer/rsync/local.rb
@@ -467,7 +462,9 @@ files:
 - templates/cli/model.erb
 - templates/cli/notifier/campfire
 - templates/cli/notifier/hipchat
+- templates/cli/notifier/http_post
 - templates/cli/notifier/mail
+- templates/cli/notifier/nagios
 - templates/cli/notifier/prowl
 - templates/cli/notifier/pushover
 - templates/cli/notifier/twitter
@@ -494,8 +491,6 @@ files:
 - templates/storage/dropbox/authorization_url.erb
 - templates/storage/dropbox/authorized.erb
 - templates/storage/dropbox/cache_file_written.erb
-- README.md
-- LICENSE.md
 homepage: https://github.com/meskyanichi/backup
 licenses:
 - MIT
@@ -516,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Provides an elegant DSL in Ruby for performing backups on UNIX-like systems.

data/lib/backup/storage/cloudfiles.rb

@@ -1,68 +0,0 @@
-# encoding: utf-8
-require 'fog'
-
-module Backup
-  module Storage
-    class CloudFiles < Base
-
-      ##
-      # Rackspace Cloud Files Credentials
-      attr_accessor :username, :api_key, :auth_url
-
-      ##
-      # Rackspace Service Net
-      # (LAN-based transfers to avoid charges and improve performance)
-      attr_accessor :servicenet
-
-      ##
-      # Rackspace Cloud Files container name
-      attr_accessor :container
-
-      def initialize(model, storage_id = nil, &block)
-        super
-        instance_eval(&block) if block_given?
-
-        @servicenet ||= false
-        @path       ||= 'backups'
-        path.sub!(/^\//, '')
-      end
-
-      private
-
-      def connection
-        @connection ||= Fog::Storage.new(
-          :provider             => 'Rackspace',
-          :rackspace_username   => username,
-          :rackspace_api_key    => api_key,
-          :rackspace_auth_url   => auth_url,
-          :rackspace_servicenet => servicenet
-        )
-      end
-
-      def transfer!
-        connection.put_container(container)
-
-        package.filenames.each do |filename|
-          src = File.join(Config.tmp_path, filename)
-          dest = File.join(remote_path, filename)
-          Logger.info "Storing '#{ container }/#{ dest }'..."
-          File.open(src, 'r') do |file|
-            connection.put_object(container, dest, file)
-          end
-        end
-      end
-
-      # Called by the Cycler.
-      # Any error raised will be logged as a warning.
-      def remove!(package)
-        Logger.info "Removing backup package dated #{ package.time }..."
-
-        remote_path = remote_path_for(package)
-        package.filenames.each do |filename|
-          connection.delete_object(container, File.join(remote_path, filename))
-        end
-      end
-
-    end
-  end
-end