sensu-plugins-mailer 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 511b8ca719d1df99caab5a4c0201ca72f4e165ef
-  data.tar.gz: 5e3fdaaf730021fc4868bcf08591fd3364ea166d
+SHA256:
+  metadata.gz: 8ad181e78c5e2610cd7e1c71df58c691abfd61a79d6a5a0d204be3c9f2678ef3
+  data.tar.gz: d553fba10bcb51805773fbc93a0403b4b020cf39850b35265886d13e2bf44c4f
 SHA512:
-  metadata.gz: b6fa085f83410b75bbeb79fb3d64783ead7458cfefaf30d04837c3c67ee6579c22a9e7b8aefe86f68397ceabe4e3322061bc4f75ccbe9ffe760eccac1d2822c7
-  data.tar.gz: 859e4f9c3891d272b4c4d981e893314d42055f7d181e7bac605609385bd327924c977b9c6b0e52ca8648885cd90d823daa2bc76e3b0c1dd5cd40a5aa11bf947b
+  metadata.gz: 57cf094ec41772b4299865f4ecc5bcf15b9d5ba9a57820511c559516b92b89a975fe03a8b635651a0b1e738f17d87d1e38e7e821d8e0e2ff30baf4bdad3d0fee
+  data.tar.gz: 14a247af62a6d06a6dcfd3e2d9c217246b1315cbe99fdd373903f30e9c1c2105d0760f42b2d7f3c8e5476592f548e7239598376f07a22eb08557d84ce5f1e14e

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.0.1] - 2018-01-31
+### Fixed
+- handler-mailer.rb: emit an `unknown` with a helpful message when receiving an event `@event['contact']` with multiple objects in an array. This helps avoid confusion over using `contact` when you meant `contacts`. (@majormoses)
+
 ## [2.0.0] - 2017-10-21
 ### Breaking Change
 - handler-mailer.rb: emit an `unknown` with a helpful message when trying to configure `settings['contact']` with multiple objects. This helps avoid confusion over using `contact` when you meant `contacts`. (@majormoses)
@@ -101,7 +105,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/2.0.1...HEAD
+[2.0.1]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.2.0...2.0.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-mailer/compare/1.0.0...1.1.0

data/bin/handler-mailer.rb

@@ -135,6 +135,14 @@ class Mailer < Sensu::Handler
     end
   end
 
+  def raise_contact_is_array(src)
+    msg = "you passed #{src} which is meant to be a string, "
+    msg += 'if you need more than one contact you can use `contacts` to '
+    msg += 'configure multiple recipients'
+    p msg
+    exit 3 # unknown
+  end
+
   def build_mail_to_list
     mail_to = Set.new
     mail_to.add(@event['client']['mail_to'] || json_config_settings['mail_to'])
@@ -146,15 +154,13 @@ class Mailer < Sensu::Handler
       end
     end
     if settings.key?('contact') && settings['contact'].is_a?(Array)
-      msg = "you passed #{settings['contact']} which is meant to be a string, "
-      msg += 'if you need more than one contact you can use `contacts` to '
-      msg += 'configure multiple recipients'
-      p msg
-      exit 3 # unknown
+      raise_contact_is_array(settings['contact'])
     elsif settings.key?('contacts')
       all_contacts = []
       %w(check client).each do |field|
-        if @event[field].key?('contact')
+        if @event[field].key?('contact') && @event[field]['contact'].is_a?(Array)
+          raise_contact_is_array(@event[field]['contact'])
+        elsif @event[field].key?('contact')
           all_contacts << @event[field]['contact']
         end
         if @event[field].key?('contacts')

data/lib/sensu-plugins-mailer/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsMailer
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mailer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-ses
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for mailer