backup 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca73fdee095965690119b7f88bd58f3275ca09e
-  data.tar.gz: a8d4446e87d9315ca051bb92a613c3608a777f5e
+  metadata.gz: 3962cf879bd26668539060945c2081db3bd13046
+  data.tar.gz: 061ae2f749d7fc1494ac20c4f116e1201e8ce86a
 SHA512:
-  metadata.gz: 565291689a33745325adc776df783c1d314a50db30e5566bd0ac641a62df0f80788cc2c4c0eb64983a39fed23408047b7a9f6fd24a38d9cc2abfe63870f0d3fd
-  data.tar.gz: e1928778dc5c60155163f1a1994a74c3a0c07206c711b5f7ff5be58115906f25b6577878054a6a3c5d2e78b66eb1c36a7762a89bd0de60f71a903c99cb459c65
+  metadata.gz: 077072ee73e085c6151592a2506c2e65895d9a435cfdec6232c34fc67452a0f70356105de93b7aa40410ad21f6666da0f143a922edb180e8872d97a06a4e9014
+  data.tar.gz: bb86e8d7e30d2085691b598a662e3bdb10ffc30c5ba45fe5a2f8065559129dd3a0e931cc27e47eb957809131393d114e515e1d930827dcf5ed6d0cc913c9ff77

data/lib/backup.rb

@@ -11,6 +11,7 @@ require 'thread'
 
 require 'open4'
 require 'thor'
+require 'shellwords'
 
 require 'excon'
 # Include response.inspect in error messages.
@@ -105,6 +106,7 @@ module Backup
     autoload :Campfire,  File.join(NOTIFIER_PATH, 'campfire')
     autoload :Prowl,     File.join(NOTIFIER_PATH, 'prowl')
     autoload :Hipchat,   File.join(NOTIFIER_PATH, 'hipchat')
+    autoload :PagerDuty, File.join(NOTIFIER_PATH, 'pagerduty')
     autoload :Pushover,  File.join(NOTIFIER_PATH, 'pushover')
     autoload :Slack,     File.join(NOTIFIER_PATH, 'slack')
     autoload :HttpPost,  File.join(NOTIFIER_PATH, 'http_post')

data/lib/backup/config/dsl.rb

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

data/lib/backup/database/mysql.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'shellwords'
 
 module Backup
   module Database

data/lib/backup/database/postgresql.rb

@@ -88,7 +88,7 @@ module Backup
       end
 
       def password_option
-        "PGPASSWORD='#{ password }' " if password
+        "PGPASSWORD=#{ Shellwords.escape(password) } " if password
       end
 
       def sudo_option
@@ -96,7 +96,7 @@ module Backup
       end
 
       def username_option
-        "--username='#{ username }'" if username
+        "--username=#{ Shellwords.escape(username) }" if username
       end
 
       def connectivity_options

data/lib/backup/notifier/pagerduty.rb

@@ -0,0 +1,81 @@
+# encoding: utf-8
+require 'pagerduty'
+
+module Backup
+  module Notifier
+    class PagerDuty < Base
+
+      ##
+      # PagerDuty Service API Key. Should be a 32 character hex string.
+      attr_accessor :service_key
+
+      ##
+      # Determines if a backup with a warning should resolve an incident rather
+      # than trigger one.
+      #
+      # Defaults to false.
+      attr_accessor :resolve_on_warning
+
+      def initialize(mode, &block)
+        super
+        instance_eval(&block) if block_given?
+
+        @resolve_on_warning ||= false
+      end
+
+      private
+
+      ##
+      # Trigger or resolve a PagerDuty incident for this model
+      #
+      # `status` indicates one of the following:
+      #
+      # `:success`
+      # : The backup completed successfully.
+      # : The incident will be resolved if `on_success` is `true`.
+      #
+      # `:warning`
+      # : The backup completed successfully, but warnings were logged.
+      # : An incident will be triggered if `on_warning` or `on_success` is `true`.
+      #
+      # `:failure`
+      # : The backup operation failed.
+      # : An incident will be triggered if `on_failure` is `true`.
+      #
+      def notify!(status)
+        incident_description = "Backup - #{model.label}"
+        incident_key = "backup/#{model.trigger}"
+        incident_details = {
+          :incident_key => incident_key,
+          :details => {
+            :trigger => model.trigger,
+            :label => model.label,
+            :started_at => model.started_at,
+            :finished_at => model.finished_at,
+            :duration => model.duration,
+            :status => status,
+            :exception => model.exception
+          }
+        }
+
+        event_type = case status
+                     when :success then :resolve
+                     when :warning then resolve_on_warning ? :resolve : :trigger
+                     when :failure then :trigger
+                     end
+
+        case event_type
+        when :trigger
+          pagerduty.trigger(incident_description, incident_details)
+        when :resolve
+          incident = pagerduty.get_incident(incident_key)
+          incident.resolve(incident_description, incident_details)
+        end
+      end
+
+      def pagerduty
+        @pagerduty ||= Pagerduty.new(service_key)
+      end
+    end
+  end
+end

data/lib/backup/version.rb

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

data/templates/cli/notifiers/pagerduty

@@ -0,0 +1,12 @@
+##
+# PagerDuty [Notifier]
+#
+
+notify_by PagerDuty do |pagerduty|
+  pagerduty.on_success = true
+  pagerduty.on_warning = true
+  pagerduty.on_failure = true
+
+  pagerduty.service_key = '0123456789abcdef01234567890abcde'
+  pagerduty.resolve_on_warning = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -416,6 +416,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: pagerduty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
@@ -596,6 +610,7 @@ files:
 - lib/backup/notifier/http_post.rb
 - lib/backup/notifier/mail.rb
 - lib/backup/notifier/nagios.rb
+- lib/backup/notifier/pagerduty.rb
 - lib/backup/notifier/prowl.rb
 - lib/backup/notifier/pushover.rb
 - lib/backup/notifier/slack.rb
@@ -649,6 +664,7 @@ files:
 - templates/cli/notifiers/http_post
 - templates/cli/notifiers/mail
 - templates/cli/notifiers/nagios
+- templates/cli/notifiers/pagerduty
 - templates/cli/notifiers/prowl
 - templates/cli/notifiers/pushover
 - templates/cli/notifiers/slack