sensu-plugins-hipchat 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 5ac4483194b7045988193f456e15f9673ac3e089
-  data.tar.gz: ebd17ce3478e65f7fb4ede98a98988ca8860d4d5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Njk0YWY0OWY3M2ZlMTMyMGY1NWM0ZjQ5MmJkM2I5ZGNmNjhiMTZhYQ==
+  data.tar.gz: !binary |-
+    YjNiYTZkYTczODAyNzg0MDcyYWE2YjI5ZTQ3NTU4NTc3ZGY0MDQwNw==
 SHA512:
-  metadata.gz: 3f367757132393538a49b096074b3b0a52e4bc5cceec7b7baab6f76ee37847d23d2ad6a04872b767bf92fae311ac51451700ab0961051df41d8905e98e5c82e1
-  data.tar.gz: 0a850d1f1d7bd8cf7c9df47f776d5f1e2001d0d10a2872bf09912a57302fbc705a583be5907a2955836c8a570386e310b61bf19540640e1cd21f38a5c6e115e0
+  metadata.gz: !binary |-
+    NzAxNjU5M2ZkZjQzOGI0ZjA0ZmQyNjg4YmZiODYzNmRmM2VhMGY1YTZhMzdm
+    YWRkNTFhZDkxMWIwOGIxMGQzYTA0MWE1N2RhODU1NTgzMmI2M2Q4MGE3NTAy
+    YjhlNmY2YzcyNDdmNGI0MTgxMDQyNDQwNjM1ZjlkYzU3MjE5MjU=
+  data.tar.gz: !binary |-
+    MTQ4ZmIyNDBiYmYxY2Q2NGIzMWMyMDM0OTQxZDY3ZDQ0ZTc1ZWQxMmNiNGIy
+    MzZhNTU5YWRlOGUyZTZlYzMyY2NiZTIxMjYwMzY2NjU0OGU1MmEwNDdkYjc5
+    OTIxMWEwM2I4MDE3YjM2NjZlZjYzZjFiZTM3ZGY0MjBhYjFjMjA=

data/CHANGELOG.md

@@ -3,7 +3,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased][unreleased]
+## [Unreleased]
+
+## [0.0.4] - 2016-08-10
+### Changed
+- Updated sensu-plugin dependency from `= 1.2.0` to `~> 1.2`
+- improved description for --json_config option
 
 ## [0.0.3] - 2015-07-14
 ### Changed
@@ -13,7 +18,6 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - ability to specify the room at the check level
 
 ## [0.0.2] - 2015-06-02
-
 ### Fixed
 - added binstubs
 ### Changed
@@ -23,3 +27,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-hipchat/compare/0.0.4...HEAD
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-hipchat/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-hipchat/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-hipchat/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-hipchat/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-hipchat)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-hipchat/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-hipchat)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-hipchat.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-hipchat)
-[![Codeship Status for sensu-plugins/sensu-plugins-hipchat](https://codeship.com/projects/6a226580-e891-0132-adeb-62885e5c211b/status?branch=master)](https://codeship.com/projects/82832)
 
 ## Functionality
 
@@ -26,6 +25,6 @@
 ```
 ## Installation
 
-[Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
+[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes

data/bin/handler-hipchat.rb

@@ -9,17 +9,16 @@
 #      @event['action'] - Property to figure out the event type i.e. whether it is create or resolve.
 #      @event['check'] - Map of attributes from the check config which is calling this handler
 #      @event['client'] - Map of attributes from the client config for the clients from which this event is generated.
-#   option: json_config - By default, assumes the hipchat config parameters are in a file called "hipchat.json" with
-#                         "hipchat" being the top-level key of the json. This command line option allows to specify
-#                         a custom file instead of "hipchat.json" to fetch the hipchat config from.
+#   option: json_config - By default, assumes the hipchat config parameters are in the "hipchat" top-level json key.
+#                         This command line option allows to specify a custom json key.
 #
 # Output:
 #    Green coloured notification on the Hipchat room if a resolve event is seen.
 #    Yellow coloured notification used to notify warning if a create event is seen with a status of 1
 #    Red coloured notification used to notify critical if a create event is seen with a status other than 1
 #
-# Note: The default hipchat config is fetched from the predefined json config file which is "hipchat.json" or any other
-#       file defiend using the "json_config" command line option. The hipchat room could also be configured on a per client basis
+# Note: The handler config is fetched and merged from all json config files. The "hipchat" json key is used by default which can
+#       be overridden with the "json_config" command line option. The hipchat room could also be configured on a per client basis
 #       by defining the "hipchat_room" attribute in the client config file. This will override the default hipchat room where the
 #       alerts are being routed to for that particular client.
 
@@ -29,17 +28,18 @@ require 'timeout'
 
 class HipChatNotif < Sensu::Handler
   option :json_config,
-         description: 'Config Name',
-         short: '-j JsonConfig',
-         long: '--json_config JsonConfig',
-         required: false
+         description: 'JSON config key name',
+         short: '-j JsonKeyName',
+         long: '--json_config JsonKeyName',
+         required: false,
+         default: 'hipchat'
 
   def event_name
     @event['client']['name'] + '/' + @event['check']['name']
   end
 
   def handle
-    json_config = config[:json_config] || 'hipchat'
+    json_config = config[:json_config]
     server_url = settings[json_config]['server_url'] || 'https://api.hipchat.com'
     apiversion = settings[json_config]['apiversion'] || 'v1'
     proxy_url = settings[json_config]['proxy_url']
@@ -54,11 +54,11 @@ class HipChatNotif < Sensu::Handler
     if @event['check']['playbook']
       begin
         uri = URI.parse(@event['check']['playbook'])
-        if %w( http https ).include?(uri.scheme)
-          message << "  [<a href='#{@event['check']['playbook']}'>Playbook</a>]"
-        else
-          message << "  Playbook:  #{@event['check']['playbook']}"
-        end
+        message << if %w( http https ).include?(uri.scheme)
+                     "  [<a href='#{@event['check']['playbook']}'>Playbook</a>]"
+                   else
+                     "  Playbook:  #{@event['check']['playbook']}"
+                   end
       rescue
         message << "  Playbook:  #{@event['check']['playbook']}"
       end

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

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

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-hipchat
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 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-07-14 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: hipchat
   requirement: !ruby/object:Gem::Requirement
@@ -61,133 +39,133 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
 description: Sensu plugins for hipchat
-email: "<sensu-users@googlegroups.com>"
+email: <sensu-users@googlegroups.com>
 executables:
 - handler-hipchat.rb
 extensions: []
@@ -215,17 +193,17 @@ 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.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for hipchat