lita-nagios 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebcf98f262d143c01d14c6578dc817ac99b289a
-  data.tar.gz: 99449e4ffc1b4ce9b6410b0a437a206ab36e9f5a
+  metadata.gz: 88f8e45007a3d4f0268225a304e51588abcf42bd
+  data.tar.gz: 8483c8262be5092f99e957422c4a62e237d506b8
 SHA512:
-  metadata.gz: c496d8326859e44b31ed05488497b39eaa2cd78d70251cea5680a9b61a4a156486112e493cdadc0241389f4c4d8f382b1b53cbda23d61bc70ffa1fab329b7613
-  data.tar.gz: b1d490206425af2b14f804853ae484db65589947d28f208a9fd78cc5ad91b5e68f8751383689020f9b939d8edd62e3de81b2c786380d2d42dc1aa2ebb8959702
+  metadata.gz: 1d9af0f47043be5e55490aba6e1c64042424e6066c64f0b065651a4a0cfe463c0e873be66cddc1ae9771f12fd334924a401f8c6d464499b833258897e535b888
+  data.tar.gz: 73ab2c13d36eb3988bc62391a3cc2ea49c3bd1a1b476d57606b9d99d86b0fe1272bca372cc0b8401de4cf3a9126099ca6a1bc59f8a168520bfc445a45db5f57c

data/lib/lita/handlers/nagios.rb

@@ -2,24 +2,22 @@ module Lita
   module Handlers
     class Nagios < Handler
 
-      def self.default_config(config)
-        config.default_room = nil
-        config.cgi = nil
-        config.user = nil
-        config.pass = nil
-        config.version = 3
-        config.time_format = "iso8601"
-        config.verify_ssl = true
-      end
+      config :default_room
+      config :cgi, default: "http://nagios.example.com/cgi-bin/nagios3"
+      config :user, default: "nagiosuser"
+      config :pass, default: "nagiospass"
+      config :version, default: 3
+      config :time_format, default: "iso8601"
+      config :verify_ssl, default: true
 
       def initialize(robot)
         @site = NagiosHarder::Site.new(
-          config.cgi,
-          config.user,
-          config.pass,
-          config.version,
-          config.time_format,
-          config.verify_ssl
+          robot.config.handlers.nagios.cgi,
+          robot.config.handlers.nagios.user,
+          robot.config.handlers.nagios.pass,
+          robot.config.handlers.nagios.version,
+          robot.config.handlers.nagios.time_format,
+          robot.config.handlers.nagios.verify_ssl
         )
         super(robot)
       end
@@ -30,7 +28,7 @@ module Lita
 
       route /^nagios\s+(?<action>enable|disable)\s+notif(ication(s)?)?/, :toggle_notifications,
         command: true,
-        restrict_to: ["admins"],
+        restrict_to: ["nagios_admins"],
         kwargs: {
           host: { short: "h" },
           service: { short: "s" }
@@ -52,7 +50,7 @@ module Lita
 
       route /^nagios\s+recheck/, :recheck,
         command: true,
-        restrict_to: ["admins"],
+        restrict_to: ["nagios_admins"],
         kwargs: {
           host: { short: "h" },
           service: { short: "s" }
@@ -79,7 +77,7 @@ module Lita
 
       route /^nagios\s+ack(nowledge)?/, :acknowledge,
         command: true,
-        restrict_to: ["admins"],
+        restrict_to: ["nagios_admins"],
         kwargs: {
           host: { short: "h" },
           service: { short: "s" },
@@ -110,7 +108,7 @@ module Lita
 
       route /^nagios(\s+(?<type>fixed|flexible))?\s+downtime/, :schedule_downtime,
         command: true,
-        restrict_to: ["admins"],
+        restrict_to: ["nagios_admins"],
         kwargs: {
           host: { short: "h" },
           service: { short: "s" },

data/lita-nagios.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-nagios"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Jonathan Amiez"]
   spec.email         = ["jonathan.amiez@gmail.com"]
   spec.description   = "Nagios interaction with Lita"
@@ -14,13 +14,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", ">= 3.2"
+  spec.add_runtime_dependency "lita", "~> 4.0"
   spec.add_runtime_dependency "lita-keyword-arguments"
   spec.add_runtime_dependency "nagiosharder", ">= 0.5.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rspec", ">= 3.0.0.beta2"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
 end

data/spec/lita/handlers/nagios_spec.rb

@@ -1,4 +1,18 @@
 require "spec_helper"
 
 describe Lita::Handlers::Nagios, lita_handler: true do
+  it { is_expected.to route_http(:post, "/nagios/notifications").to(:receive) }
+  it { is_expected.to route_command("nagios enable notif -h par-db4").with_authorization_for(:nagios_admins).to(:toggle_notifications) }
+  it { is_expected.to route_command("nagios enable notif -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:toggle_notifications) }
+  it { is_expected.to route_command("nagios disable notification -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:toggle_notifications) }
+  it { is_expected.to route_command("nagios disable notifications -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:toggle_notifications) }
+
+  it { is_expected.to route_command("nagios recheck -h par-db4").with_authorization_for(:nagios_admins).to(:recheck) }
+  it { is_expected.to route_command("nagios recheck -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:recheck) }
+
+  it { is_expected.to route_command("nagios ack -h par-db4").with_authorization_for(:nagios_admins).to(:acknowledge) }
+  it { is_expected.to route_command("nagios ack -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:acknowledge) }
+
+  it { is_expected.to route_command("nagios fixed downtime -d 2h -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:schedule_downtime) }
+  it { is_expected.to route_command("nagios flexible downtime -d 2h -h par-db4 -s Load").with_authorization_for(:nagios_admins).to(:schedule_downtime) }
 end

data/spec/spec_helper.rb

@@ -1,2 +1,11 @@
+require "simplecov"
+require "coveralls"
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start { add_filter "/spec/" }
+
 require "lita-nagios"
 require "lita/rspec"
+Lita.version_3_compatibility_mode = false

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lita-nagios
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jonathan Amiez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: lita-keyword-arguments
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement