backup 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e4e7ea9006f973c8df272ad4520265fb5a25e1
-  data.tar.gz: ce45e91cc9d2b80f721cbcda2f4012fce936fb7f
+  metadata.gz: ba72c8ccbdf1baf26dba6c3e5ebd6710439e5264
+  data.tar.gz: 241aa7d8aa000d13de51befcb257f4d90d9b37ed
 SHA512:
-  metadata.gz: 866350af1103a7eeb171bd80d01c73d4a728f31eda444823b4250d3788d09402f6cbca600a6dfc0d48e05c0c74a2746fd68dee230b847acff3ba7d92a2a8bb07
-  data.tar.gz: b0585f85c576423c12291990521ad7d33a82fc6d1cadf97b009e332bbc8e0a42840b3debb9cd382291115e2282bbaa1f5b18088fa0dd6fde98e8edacc7f90e2b
+  metadata.gz: bf61900047f75ce5829209b122f78d7ccb0c18f7f283dac7e66e2ff41f5213080b684aeb93cbb9b1b13bc0ffb2718965746de73429d9d19a84e953af580fa48b
+  data.tar.gz: 5752616830b3e3ab035d2e7c85fa84ace35689aba1699e1c52c31804c42d5573d1e03343e2beea2ad86f92f5aceff1bbaf0593a04d9602121df8808709e03cd2

data/lib/backup/database/postgresql.rb

@@ -92,7 +92,7 @@ module Backup
       end
 
       def sudo_option
-        "#{ utility(:sudo) } -n -u #{ sudo_user } " if sudo_user
+        "#{ utility(:sudo) } -n -H -u #{ sudo_user } " if sudo_user
       end
 
       def username_option

data/lib/backup/notifier/command.rb

@@ -23,6 +23,7 @@ module Backup
       #
       # %l - Model label
       # %t - Model trigger
+      # %d - Backup duration (HH:MM:SS)
       # %s - Status (success/failure/warning)
       # %v - Status verb (succeeded/failed/succeeded with warnings)
       #
@@ -73,6 +74,8 @@ module Backup
                     model.label
                   when "t"
                     model.trigger.to_s
+                  when "d"
+                    model.duration
                   when "v"
                     status_verb(status)
                   when "s"

data/lib/backup/notifier/hipchat.rb

@@ -18,6 +18,10 @@ module Backup
       # Who the notification should appear from
       attr_accessor :from
 
+      ##
+      # Custom server URL
+      attr_accessor :server_url
+
       ##
       # The rooms that should be notified
       attr_accessor :rooms_notified
@@ -79,7 +83,9 @@ module Backup
       end
 
       def client_options
-        { api_version: @api_version }
+        { api_version: @api_version }.tap do |h|
+          h[:server_url] = server_url if server_url
+        end
       end
 
       # Hipchat::Client will raise an error if unsuccessful.

data/lib/backup/notifier/mail.rb

@@ -188,9 +188,9 @@ module Backup
         options =
             case method
             when 'smtp'
-              { :address              => @address,
+              opts = {
+                :address              => @address,
                 :port                 => @port,
-                :domain               => @domain,
                 :user_name            => @user_name,
                 :password             => @password,
                 :authentication       => @authentication,
@@ -199,6 +199,11 @@ module Backup
                 :ssl                  => @encryption == :ssl,
                 :tls                  => @encryption == :tls
               }
+
+              # Don't override default domain setting if domain not applicable.
+              # ref https://github.com/mikel/mail/blob/2.6.3/lib/mail/network/delivery_methods/smtp.rb#L82
+              opts[:domain] = @domain if @domain
+              opts
             when 'sendmail'
               opts = {}
               opts.merge!(:location  => utility(:sendmail))

data/lib/backup/notifier/ses.rb

@@ -21,6 +21,18 @@ module Backup
       # Receiver Email Address
       attr_accessor :to
 
+      ##
+      # CC receiver Email Address
+      attr_accessor :cc
+
+      ##
+      # BCC receiver Email Address
+      attr_accessor :bcc
+
+      ##
+      # Set reply to email address
+      attr_accessor :reply_to
+
       def initialize(model, &block)
         super
         instance_eval(&block) if block_given?
@@ -66,8 +78,13 @@ module Backup
       # : backup log, if `on_failure` is `true`.
       #
       def notify!(status)
-        email = ::Mail.new(:to => to, :from => from)
-        email.subject = message.call(model, :status => status_data_for(status))
+        email = ::Mail.new
+        email.to       = to
+        email.from     = from
+        email.cc       = cc
+        email.bcc      = bcc
+        email.reply_to = reply_to
+        email.subject  = message.call(model, :status => status_data_for(status))
 
         send_log = send_log_on.include?(status)
         template = Backup::Template.new({ :model => model, :send_log => send_log })

data/lib/backup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -613,19 +613,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: mini_portile
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -730,14 +730,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -766,6 +766,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: pkg-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: qiniu
   requirement: !ruby/object:Gem::Requirement
@@ -1074,4 +1088,3 @@ signing_key:
 specification_version: 4
 summary: Provides an elegant DSL in Ruby for performing backups on UNIX-like systems.
 test_files: []
-has_rdoc: