backup 4.1.10 → 4.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 983870cd703f0d01283a94f8f8c45203d13d1284
-  data.tar.gz: 0e61989e4f48614f6666af3f447994820d2505a2
+  metadata.gz: 090ea9bc099efe67691fd99049e41b6d8d2ea39f
+  data.tar.gz: d80d17b22d496fc82c0428267245f4bf76b23f43
 SHA512:
-  metadata.gz: 9d3323dfbf3326659c4d2fea94ce833a47d6afb1dcbdbe5d21dca409220c5a4a55a44fd9c4f093f7dffb79f55f5ef7506e399f0bb9d7fe430c4a0fdb142922b8
-  data.tar.gz: ceae4fe4dba98f0b962a034dcf75fe7eb687060fa3f56c689e5c14bee0ef26f5e070c7a1689c32903f187a0833c1ff40ed18ddbf24adf8e6e9e8bbe4cdc2108d
+  metadata.gz: fd79088bb12aaf37821f6732240ce9f002acf5b85b4bbc4f7788d6aae6dd7930080215f21f2a2ac20e0ad162e06829fe99db984192a69ab05ec5c8a920feb599
+  data.tar.gz: f55230f51475db510b0218c8b059cf9d818f112b7d26d3fc8a1213f1835e6ad7694f641dc221edf321fb92f5d9ff2b018901ed544e0a33a7bec117d62583596d

data/README.md

@@ -1,7 +1,9 @@
 Backup v4.x
 ===========
+
 [![Code Climate](https://codeclimate.com/github/backup/backup.png)](https://codeclimate.com/github/backup/backup)
 [![Build Status](https://travis-ci.org/backup/backup.svg?branch=master)](https://travis-ci.org/backup/backup)
+[![Join the chat at https://gitter.im/backup/backup](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/backup/backup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Backup is a system utility for Linux and Mac OS X, distributed as a RubyGem, that allows you to easily perform backup
 operations. It provides an elegant DSL in Ruby for _modeling_ your backups. Backup has built-in support for various
@@ -20,6 +22,6 @@ Released under the **MIT** [License](LICENSE.md).
 [Release Notes]: http://backup.github.io/backup/v4/release-notes
 [Documentation]: http://backup.github.io/backup/v4
 [Issues]: https://github.com/backup/backup/issues
-[Features]: https://github.com/meskyanichi/backup-features/issues
+[Features]: https://github.com/backup/backup-features/issues
 [Michael van Rooijen]: http://michaelvanrooijen.com
 [@meskyanichi]: http://twitter.com/#!/meskyanichi

data/lib/backup.rb

@@ -116,6 +116,7 @@ module Backup
     autoload :Zabbix,    File.join(NOTIFIER_PATH, 'zabbix')
     autoload :DataDog,   File.join(NOTIFIER_PATH, 'datadog')
     autoload :Ses,       File.join(NOTIFIER_PATH, 'ses')
+    autoload :Command,   File.join(NOTIFIER_PATH, 'command')
   end
 
   ##

data/lib/backup/config/dsl.rb

@@ -43,7 +43,7 @@ module Backup
               # Notifiers
               ['Mail', 'Twitter', 'Campfire', 'Prowl',
               'Hipchat', 'PagerDuty', 'Pushover', 'HttpPost', 'Nagios',
-              'Slack', 'FlowDock', 'Zabbix', 'Ses', 'DataDog']
+              'Slack', 'FlowDock', 'Zabbix', 'Ses', 'DataDog', 'Command']
             ]
           )
         end

data/lib/backup/model.rb

@@ -303,7 +303,7 @@ module Backup
       return [] unless databases.any? || archives.any?
 
       [lambda { prepare! }, databases, archives,
-       lambda { package! }, storages, lambda { clean! }]
+       lambda { package! }, lambda { store! }, lambda { clean! }]
     end
 
     ##
@@ -325,6 +325,31 @@ module Backup
       Cleaner.remove_packaging(self)
     end
 
+    ##
+    # Attempts to use all configured Storages, even if some of them result in exceptions.
+    # Returns true or raises first encountered exception.
+    def store!
+      storage_results = storages.map do |storage|
+        begin
+          storage.perform!
+        rescue => ex
+          ex
+        end
+      end
+
+      first_exception, *other_exceptions = storage_results.select { |result| result.is_a? Exception }
+
+      if first_exception
+        other_exceptions.each do |exception|
+         Logger.error exception.to_s
+         Logger.error exception.backtrace.join('\n')
+        end
+        raise first_exception
+      else
+        true
+      end
+    end
+
     ##
     # Removes the final package file(s) once all configured Storages have run.
     def clean!

data/lib/backup/notifier/command.rb

@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+module Backup
+  module Notifier
+    class Command < Base
+
+      ##
+      # Command to execute.
+      #
+      # Make sure it is accessible from your $PATH, or provide
+      # the absolute path to the command.
+      attr_accessor :command
+
+      ##
+      # Arguments to pass to the command.
+      #
+      # Must be an array of strings or callable objects.
+      #
+      # Callables will be invoked with #call(model, status),
+      # and the return value used as the argument.
+      #
+      # In strings you can use the following placeholders:
+      #
+      # %l - Model label
+      # %t - Model trigger
+      # %s - Status (success/failure/warning)
+      # %v - Status verb (succeeded/failed/succeeded with warnings)
+      #
+      # All placeholders can be used with uppercase letters to capitalize
+      # the value.
+      #
+      # Defaults to ["%L %v"]
+      attr_accessor :args
+
+      def initialize(model, &block)
+        super
+        instance_eval(&block) if block_given?
+
+        @args ||= ["%L %v"]
+      end
+
+      private
+
+      ##
+      # Notify the user of the backup operation results.
+      #
+      # `status` indicates one of the following:
+      #
+      # `:success`
+      # : The backup completed successfully.
+      # : Notification will be sent if `on_success` is `true`.
+      #
+      # `:warning`
+      # : The backup completed successfully, but warnings were logged.
+      # : Notification will be sent if `on_warning` or `on_success` is `true`.
+      #
+      # `:failure`
+      # : The backup operation failed.
+      # : Notification will be sent if `on_warning` or `on_success` is `true`.
+      #
+      def notify!(status)
+        IO.popen([@command] + args.map { |arg| format_arg(arg, status) })
+      end
+
+      def format_arg(arg, status)
+        if arg.respond_to?(:call)
+          arg.call(model, status)
+        else
+          arg.gsub(/%(\w)/) do |match|
+            ph = match[1]
+            val = case ph.downcase
+                  when "l"
+                    model.label
+                  when "t"
+                    model.trigger.to_s
+                  when "v"
+                    status_verb(status)
+                  when "s"
+                    status.to_s
+                  end
+            val.capitalize! if ph == ph.upcase
+            val
+          end
+        end
+      end
+
+      def status_verb(status)
+        case status
+        when :success
+          "succeeded"
+        when :failure
+          "failed"
+        when :warning
+          "succeeded with warnings"
+        end
+      end
+    end
+  end
+end

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backup
-  VERSION = '4.1.10'
+  VERSION = '4.1.11'
 end

data/templates/cli/notifiers/command

@@ -0,0 +1,32 @@
+  ##
+  # Command [Notifier]
+  #
+  notify_by Command do |cmd|
+    cmd.on_success = true
+    cmd.on_warning = true
+    cmd.on_failure = true
+
+    # Command to execute
+    cmd.command = 'notify-send'
+
+    # Arguments to pass to the command.
+    #
+    # Must be an array of strings or callable objects.
+    #
+    # Callables will be invoked with #call(model, status),
+    # and the return value used as the argument.
+    #
+    # In strings you can use the following placeholders:
+    #
+    # %l - Model label
+    # %t - Model trigger
+    # %s - Status (success/failure/warning)
+    # %v - Status verb (succeeded/failed/succeeded with warnings)
+    #
+    # All placeholders can be used with uppercase letters to capitalize
+    # the value.
+    #
+    # Defaults to ["%L %v"]
+    #
+    # cmd.args = ["Backup %L", "%V"]
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.11
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -928,6 +928,7 @@ files:
 - lib/backup/model.rb
 - lib/backup/notifier/base.rb
 - lib/backup/notifier/campfire.rb
+- lib/backup/notifier/command.rb
 - lib/backup/notifier/datadog.rb
 - lib/backup/notifier/flowdock.rb
 - lib/backup/notifier/hipchat.rb
@@ -985,6 +986,7 @@ files:
 - templates/cli/model
 - templates/cli/notifier/zabbix
 - templates/cli/notifiers/campfire
+- templates/cli/notifiers/command
 - templates/cli/notifiers/datadog
 - templates/cli/notifiers/flowdock
 - templates/cli/notifiers/hipchat
@@ -1024,16 +1026,7 @@ homepage: https://github.com/backup/backup
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-      Thank you for installing Backup!
-
-      See the Release Notes for changes in this version:
-      http://backup.github.io/backup/v4/release-notes
-
-      If you're upgrading from v3.x, be sure to read:
-      http://backup.github.io/backup/v4/upgrading
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1041,7 +1034,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1049,7 +1042,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Provides an elegant DSL in Ruby for performing backups on UNIX-like systems.