sensu-plugins-mailer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1c3d712e7a473e4dc7571e465f067e4497484b42
-  data.tar.gz: f47d34aa664b4c8c9e65e081d3b00f5e613a01c4
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjJkYjU5MTAzODM1ZDc5M2UxNGMyZDU4MTgxMDBkYTA4N2UwMzU0Yw==
+  data.tar.gz: !binary |-
+    OTc1ODdlMzA1YWQ4ODE4YTAzMGUxMGU3NWQ3M2M0ZTViOGM1ZDk3Yg==
 SHA512:
-  metadata.gz: 073a92eb9c05aa317b8ad32ecac10920fd2d465fdf26d6bc1976c1a10c743e251535b63698a7a7aa44fd4b0ae2b61dfeafc29813ac2c92a29233271c87502550
-  data.tar.gz: 6406eeaf78409ec3957ea6f66a028b7e03770321754df94123a4e49f965b7fedd18c2764538d5f49d77935d7927045f45ab0d873a34533c2aa21bbed23248ba3
+  metadata.gz: !binary |-
+    YWY0OTA2OGJkNzhiZDgxM2E4ODJjMmI4NzY2OGNjNDcxZDViMDk2MjU5NWIz
+    M2U3ZGE2MDNkOTNmZDk1ZmFiYWJkN2RkODY1ODA5MDYyYzAwMGZlMmExYjUz
+    MThlNjQxMzQyYmFiOTRmM2YwMjkzODBjM2MxODQ3YWVjNTJjN2Q=
+  data.tar.gz: !binary |-
+    YzM4YTE2NDgyZTE1ZGE4MzcxZjVlNjUyYTRlNWYxZTU0OWMzZGNlMGQ5ODIy
+    YTBiMzVlOTlmMmRhMzViNjNjNDM3OTQzOTY2YTQ5NGIzNTQ5MDY3MmYxZDdl
+    NWJkYWYxOTliOWUyYWM0OWY5MDI1ZWUwMzlmZDlmNmY3NDI2OGU=

data/bin/handler-mailer.rb

@@ -74,17 +74,17 @@ class Mailer < Sensu::Handler
   end
 
   def parse_content_type
-    if config[:content_type]
-      use = config[:content_type]
-    elsif @event['check']['content_type']
-      use = @event['check']['content_type']
-    elsif settings[config[:json_config]]['content_type']
-      use = settings[config[:json_config]]['content_type']
-    else
-      use = 'plain'
-    end
-
-    if use.downcase == 'html'
+    use = if config[:content_type]
+            config[:content_type]
+          elsif @event['check']['content_type']
+            @event['check']['content_type']
+          elsif settings[config[:json_config]]['content_type']
+            settings[config[:json_config]]['content_type']
+          else
+            'plain'
+          end
+
+    if use.casecmp('html')
       'text/html; charset=UTF-8'
     else
       'text/plain; charset=ISO-8859-1'
@@ -115,14 +115,14 @@ class Mailer < Sensu::Handler
     json_config = config[:json_config]
     admin_gui = settings[json_config]['admin_gui'] || 'http://localhost:8080/'
     # try to redact passwords from output and command
-    output = "#{@event['check']['output']}".gsub(/(\s-p|\s-P|\s--password)(\s*\S+)/, '\1 <password omitted>')
-    command = "#{@event['check']['command']}".gsub(/(\s-p|\s-P|\s--password)(\s*\S+)/, '\1 <password omitted>')
+    output = (@event['check']['output']).to_s.gsub(/(\s-p|\s-P|\s--password)(\s*\S+)/, '\1 <password omitted>')
+    command = (@event['check']['command']).to_s.gsub(/(\s-p|\s-P|\s--password)(\s*\S+)/, '\1 <password omitted>')
     playbook = "Playbook:  #{@event['check']['playbook']}" if @event['check']['playbook']
 
-    if message_template && File.readable?(message_template)
-      template = File.read(message_template)
-    else
-      template = <<-BODY.gsub(/^\s+/, '')
+    template = if message_template && File.readable?(message_template)
+                 File.read(message_template)
+               else
+                 <<-BODY.gsub(/^\s+/, '')
         <%= output %>
         Admin GUI: <%= admin_gui %>
         Host: <%= @event['client']['name'] %>
@@ -134,7 +134,7 @@ class Mailer < Sensu::Handler
         Occurrences:  <%= @event['occurrences'] %>
         <%= playbook %>
       BODY
-    end
+               end
     eruby = Erubis::Eruby.new(template)
     eruby.result(binding)
   end
@@ -144,7 +144,7 @@ class Mailer < Sensu::Handler
     body = build_body
     content_type = parse_content_type
     mail_to = build_mail_to_list
-    mail_from =  settings[json_config]['mail_from']
+    mail_from = settings[json_config]['mail_from']
     reply_to = settings[json_config]['reply_to'] || mail_from
 
     delivery_method = settings[json_config]['delivery_method'] || 'smtp'
@@ -160,19 +160,19 @@ class Mailer < Sensu::Handler
     timeout_interval = settings[json_config]['timeout'] || 10
 
     headers = {
-      'X-Sensu-Host'        => "#{@event['client']['name']}",
-      'X-Sensu-Timestamp'   => "#{Time.at(@event['check']['issued'])}",
-      'X-Sensu-Address'     => "#{@event['client']['address']}",
-      'X-Sensu-Check-Name'  => "#{@event['check']['name']}",
-      'X-Sensu-Status'      => "#{status_to_string}",
-      'X-Sensu-Occurrences' => "#{@event['occurrences']}"
+      'X-Sensu-Host'        => (@event['client']['name']).to_s,
+      'X-Sensu-Timestamp'   => Time.at(@event['check']['issued']).to_s,
+      'X-Sensu-Address'     => (@event['client']['address']).to_s,
+      'X-Sensu-Check-Name'  => (@event['check']['name']).to_s,
+      'X-Sensu-Status'      => status_to_string.to_s,
+      'X-Sensu-Occurrences' => (@event['occurrences']).to_s
     }
 
-    if @event['check']['notification'].nil?
-      subject = "#{action_to_string} - #{short_name}: #{status_to_string}"
-    else
-      subject = "#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
-    end
+    subject = if @event['check']['notification'].nil?
+                "#{action_to_string} - #{short_name}: #{status_to_string}"
+              else
+                "#{action_to_string} - #{short_name}: #{@event['check']['notification']}"
+              end
 
     Mail.defaults do
       delivery_options = {

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

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

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-12-30 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws
@@ -106,84 +84,84 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -204,36 +182,36 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Sensu mailer plugins
-email: "<sensu-users@googlegroups.com>"
+email: <sensu-users@googlegroups.com>
 executables:
-- handler-mailer.rb
-- handler-mailer-ses.rb
 - handler-mailer-mailgun.rb
+- handler-mailer-ses.rb
+- handler-mailer.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -261,18 +239,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for mailer
 test_files: []
+has_rdoc: 

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-�����D_6���#݊��M=i��KP��W��2��Ɗ��Y5��8��CC��;Վ=��l�/`�g�n��K�#������Y
-'�߀��u�ŷy⪽n�IX6�3ׇN�I��Sq����Td|���m�Wj�����G�{�e��]�z����[x{�c3/j"x\_��T�Il���a���6#6݀�fFyz�E�7�c���q�uSfbk�C�^"�pU�N���T����7q��\�kVe

metadata.gz.sig

@@ -1 +0,0 @@
-���9p�����r��>�Ȃ�e�QD�`�֣�9��)Ua���s�����_ۣ�r�����z�r�Ȅ{�ى��njg ��05�Qd�u���=ƨi�qb����Wp�'h�>���]�WsR�DQX�b�������t���}�M����L%����}�@�)���4��*�������I�H�o���������B���y ,޶�2�VV5��nV�u� �ܼ�6�.���K6Z��4aA�}���h32���SX�4_