icinga 0.1.7 → 0.1.8

data/lib/icinga.rb

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

data/lib/icinga/{server.rb → client.rb}

@@ -1,7 +1,9 @@
 require 'net/http'
 
 module Icinga
-  class Server
+
+  # Client connection to Icinga server
+  class Client
     attr_accessor :options
 
     @@default_options = {
@@ -11,26 +13,27 @@ module Icinga
       :format => "json",
     }
 
-    def connection
-      @conn ||= Net::HTTP.new(@options[:host], @options[:port])
+    # @param [Hash] options
+    def initialize(options = {})
+      @options = @@default_options.merge(options)
     end
 
-    def new_request(path)
-      req = Net::HTTP::Get.new(@options[:remote_path] + path + "&" + @options[:format] + "output")
-      req.basic_auth @options[:user], @options[:password] if @options[:user]
-      req
+    def hosts
+      Responder.create(Host, self, new_request("?hostgroup=all&style=hostdetail"))
     end
 
-    def hosts
-      Responder.new(self, new_request("?hostgroup=all&style=hostdetail"))
+    def services(host=nil)
+      Responder.create(Service, self, new_request("?host=#{host.nil? ? "all" : host}&style=servicedetail"))
     end
 
-    def services
-      Responder.new(self, new_request("?host=all&style=servicedetail"))
+    def connection
+      @conn ||= Net::HTTP.new(@options[:host], @options[:port])
     end
 
-    def initialize(options = {})
-      @options = @@default_options.merge(options)
+    def new_request(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
   end
 end

data/lib/icinga/object.rb

@@ -0,0 +1,21 @@
+module Icinga
+  class Object < Hash
+    require 'icinga/object/host'
+    require 'icinga/object/service'
+
+    # @param [Hash] data
+    def initialize(data)
+      merge!(data)
+      name_field = self.class.to_s.split("::").last.downcase
+      self["name"] = data[name_field]
+    end
+
+    def method_missing(method, *args, &block)
+      self[method.to_s]
+    end
+
+    def to_s
+      self["name"]
+    end
+  end
+end

data/lib/icinga/object/host.rb

@@ -0,0 +1,4 @@
+module Icinga
+  class Host < Object
+  end
+end

data/lib/icinga/object/service.rb

@@ -0,0 +1,4 @@
+module Icinga
+  class Service < Object
+  end
+end

data/lib/icinga/responder.rb

@@ -1,32 +1,35 @@
-require 'csv'
-require 'json'
-
 module Icinga
   class Responder
-    def initialize(server, request)
-      @server = server
-      @request = request
+    attr_reader :data
+
+    require 'icinga/responder/json'
+    require 'icinga/responder/csv'
+
+    def self.create(klass, client, request)
+      responder_klass = Icinga.const_get("#{client.options[:format].upcase}Responder")
+      responder_klass.new(klass, client, request)
     end
 
     def response
       begin
-        @response ||= @server.connection.request(@request)
+        @response ||= @client.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
+    def initialize(klass, client, request)
+      @klass = klass
+      @client = client
+      @request = request
     end
 
     def to_s
-      data[:data] || ""
+      data.to_s
+    end
+
+    def each
+      data.each {|item| yield(@klass.new(item))}
     end
   end
 end

data/lib/icinga/responder/csv.rb

@@ -0,0 +1,17 @@
+require 'csv'
+
+module Icinga
+  class CSVResponder < Responder
+    def data
+      parse_options = {:headers => :first_row, :col_sep => ";", :quote_char => "'"}
+
+      CSV.parse(response.body.strip, parse_options).collect do |row|
+        new_hash = {}
+        row.to_hash.each_pair do |k,v|
+          new_hash.merge!({k.downcase => v}) 
+        end
+        new_hash
+      end
+    end
+  end
+end

data/lib/icinga/responder/json.rb

@@ -0,0 +1,9 @@
+require 'json'
+
+module Icinga
+  class JSONResponder < Responder
+    def data
+      JSON.parse(response.body)["status"].first.last
+    end
+  end
+end

data/lib/icinga/version.rb

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

data/test/icinga/{server_spec.rb → client_spec.rb}

@@ -1,8 +1,8 @@
 require 'icinga'
 
-describe Icinga::Server do
+describe Icinga::Client do
   before do
-    @icinga = Icinga::Server.new
+    @icinga = Icinga::Client.new
   end
 
   describe "when initialized" do

data/test/icinga/object/host_spec.rb

@@ -0,0 +1,4 @@
+require 'icinga'
+
+describe Icinga::Host do
+end

data/test/icinga/object/service_spec.rb

@@ -0,0 +1,4 @@
+require 'icinga'
+
+describe Icinga::Service do
+end

data/test/icinga/object_spec.rb

@@ -0,0 +1,13 @@
+require 'icinga'
+
+describe Icinga::Object do
+  before do
+    @object = Icinga::Object.new({"object"=>"name"})
+  end
+
+  describe "when created" do
+    it "should populate name" do
+      @object.name.should match(/^name$/)
+    end
+  end
+end

data/test/icinga/responder/csv_spec.rb

@@ -0,0 +1,4 @@
+require 'icinga'
+
+describe Icinga::CSVResponder do
+end

data/test/icinga/responder/json_spec.rb

@@ -0,0 +1,4 @@
+require 'icinga'
+
+describe Icinga::JSONResponder do
+end

data/test/icinga/responder_spec.rb

@@ -2,23 +2,11 @@ require 'icinga'
 
 describe Icinga::Responder do
   before do
-    @server = Icinga::Server.new
-    @responder = Icinga::Responder.new(@server, @server.new_request(""))
+    @client = Icinga::Client.new
+    @responder = Icinga::Responder.new(Icinga::Object, @client, @client.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icinga
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13055080 !ruby/object:Gem::Requirement
+  requirement: &15337900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13055080
+  version_requirements: *15337900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13054220 !ruby/object:Gem::Requirement
+  requirement: &15337000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13054220
+  version_requirements: *15337000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13053380 !ruby/object:Gem::Requirement
+  requirement: &15336140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13053380
+  version_requirements: *15336140
 description: Facilitates communication with Icinga servers.
 email:
 - jbussdieker@gmail.com
@@ -58,11 +58,21 @@ files:
 - Rakefile
 - icinga.gemspec
 - lib/icinga.rb
+- lib/icinga/client.rb
+- lib/icinga/object.rb
+- lib/icinga/object/host.rb
+- lib/icinga/object/service.rb
 - lib/icinga/responder.rb
-- lib/icinga/server.rb
+- lib/icinga/responder/csv.rb
+- lib/icinga/responder/json.rb
 - lib/icinga/version.rb
+- test/icinga/client_spec.rb
+- test/icinga/object/host_spec.rb
+- test/icinga/object/service_spec.rb
+- test/icinga/object_spec.rb
+- test/icinga/responder/csv_spec.rb
+- test/icinga/responder/json_spec.rb
 - test/icinga/responder_spec.rb
-- test/icinga/server_spec.rb
 - test/icinga_spec.rb
 homepage: http://github.com/jbussdieker/icinga
 licenses: []
@@ -89,6 +99,11 @@ signing_key:
 specification_version: 3
 summary: Icinga API tools
 test_files:
+- test/icinga/client_spec.rb
+- test/icinga/object/host_spec.rb
+- test/icinga/object/service_spec.rb
+- test/icinga/object_spec.rb
+- test/icinga/responder/csv_spec.rb
+- test/icinga/responder/json_spec.rb
 - test/icinga/responder_spec.rb
-- test/icinga/server_spec.rb
 - test/icinga_spec.rb