icinga 0.0.6 → 0.1.7

data/lib/icinga/responder.rb

@@ -0,0 +1,32 @@
+require 'csv'
+require 'json'
+
+module Icinga
+  class Responder
+    def initialize(server, request)
+      @server = server
+      @request = request
+    end
+
+    def response
+      begin
+        @response ||= @server.connection.request(@request)
+      rescue Exception => e
+        e
+      end
+    end
+
+    def data
+      if response.kind_of? Net::HTTPSuccess
+        {:data => JSON.parse(response)} if @server.options[:format] == "json"
+        {:data => CSV.parse(response)} if @server.options[:format] == "csv"
+      else
+        {:error => response.message}
+      end
+    end
+
+    def to_s
+      data[:data] || ""
+    end
+  end
+end

data/lib/icinga/server.rb

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'json'
 
 module Icinga
   class Server
@@ -8,6 +7,8 @@ module Icinga
     @@default_options = {
       :host => "localhost",
       :port => 80,
+      :remote_path => "/icinga/cgi-bin/status.cgi", 
+      :format => "json",
     }
 
     def connection
@@ -15,22 +16,20 @@ module Icinga
     end
 
     def new_request(path)
-      req = Net::HTTP::Get.new(path)
+      req = Net::HTTP::Get.new(@options[:remote_path] + path + "&" + @options[:format] + "output")
       req.basic_auth @options[:user], @options[:password] if @options[:user]
       req
     end
 
     def hosts
-      resp = connection.request(new_request("/icinga/cgi-bin/status.cgi?hostgroup=all&style=hostdetail&jsonoutput"))
-      JSON.parse(resp.body)
+      Responder.new(self, new_request("?hostgroup=all&style=hostdetail"))
     end
 
     def services
-      resp = connection.request(new_request("/icinga/cgi-bin/status.cgi?host=all&style=servicedetail&jsonoutput"))
-      JSON.parse(resp.body)
+      Responder.new(self, new_request("?host=all&style=servicedetail"))
     end
 
-    def initialize(options={})
+    def initialize(options = {})
       @options = @@default_options.merge(options)
     end
   end

data/lib/icinga/version.rb

@@ -1,3 +1,3 @@
 module Icinga
-  VERSION = "0.0.6"
+  VERSION = "0.1.7"
 end

data/lib/icinga.rb

@@ -1,5 +1,6 @@
 require "icinga/version"
 require "icinga/server"
+require "icinga/responder"
 
 module Icinga
 end

data/test/icinga/responder_spec.rb

@@ -0,0 +1,24 @@
+require 'icinga'
+
+describe Icinga::Responder do
+  before do
+    @server = Icinga::Server.new
+    @responder = Icinga::Responder.new(@server, @server.new_request(""))
+  end
+
+  it "should create a response" do
+    @responder.response.should respond_to(:message)
+  end
+
+  it "should respond to data with parsed data" do
+    @responder.data.should be_kind_of(Hash)
+  end
+
+  it "should respond to data with error info" do
+    @responder.data[:error].should be_kind_of(String)
+  end
+
+  it "should respond with empty string for bad connection/request" do
+    @responder.to_s.should match(/^$/)
+  end
+end

data/test/icinga/server_spec.rb

@@ -12,6 +12,20 @@ describe Icinga::Server do
     it "should set the default host" do
       @icinga.options[:host].should match("localhost")
     end
+    it "should set the default remote path" do
+      @icinga.options[:remote_path].should match("/icinga/cgi-bin/status.cgi")
+    end
+    it "should set the default format" do
+      @icinga.options[:format].should match("json")
+    end
+  end
+
+  it "should create a responder for hosts" do
+    @icinga.hosts.should be_kind_of(Icinga::Responder)
+  end
+
+  it "should create a responder for services" do
+    @icinga.services.should be_kind_of(Icinga::Responder)
   end
 
   it "should create a connection" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icinga
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000Z
+date: 2012-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21081700 !ruby/object:Gem::Requirement
+  requirement: &13055080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21081700
+  version_requirements: *13055080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21081020 !ruby/object:Gem::Requirement
+  requirement: &13054220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21081020
+  version_requirements: *13054220
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21080220 !ruby/object:Gem::Requirement
+  requirement: &13053380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21080220
+  version_requirements: *13053380
 description: Facilitates communication with Icinga servers.
 email:
 - jbussdieker@gmail.com
@@ -58,8 +58,10 @@ files:
 - Rakefile
 - icinga.gemspec
 - lib/icinga.rb
+- lib/icinga/responder.rb
 - lib/icinga/server.rb
 - lib/icinga/version.rb
+- test/icinga/responder_spec.rb
 - test/icinga/server_spec.rb
 - test/icinga_spec.rb
 homepage: http://github.com/jbussdieker/icinga
@@ -87,5 +89,6 @@ signing_key:
 specification_version: 3
 summary: Icinga API tools
 test_files:
+- test/icinga/responder_spec.rb
 - test/icinga/server_spec.rb
 - test/icinga_spec.rb