livestatus 0.2.0 → 0.2.1

data/config.ru

@@ -1,2 +1,3 @@
 require 'livestatus/api'
+$0 = "livestatusd"
 run Livestatus::API

data/lib/livestatus/api.rb

@@ -17,13 +17,20 @@ module Livestatus
       headers = parse_headers(request.env)
 
       halt 400, 'no query specified' unless headers.include?(:query)
-      method, model = headers.delete(:query).split
+      method, query = headers.delete(:query).split
 
       halt 400, 'invalid method' unless ['GET', 'COMMAND'].include?(method)
       method = method.downcase.to_sym
 
       c = Livestatus::Connection.new(:uri => 'unix:///var/nagios/rw/live')
-      Yajl::Encoder.encode(c.handler.send(method, model, headers))
+
+      case method
+      when :get
+        Yajl::Encoder.encode(c.get(query, headers))
+      when :command
+        c.command(query)
+        Yajl::Encoder.encode(c.command(query))
+      end
     end
   end
 end

data/lib/livestatus/handler/unix.rb

@@ -31,16 +31,22 @@ module Livestatus
       headers = headers.map { |k,v| "#{k.to_s.camelize}: #{v}" }.join("\n")
       headers += "\n" unless headers.empty?
 
-      @socket.write("#{method.to_s.upcase} #{query}\n#{headers}\n")
+      case method
+      when :get
+        @socket.write("#{method.to_s.upcase} #{query}\n#{headers}\n")
 
-      res = @socket.read(16)
-      status, length = res[0..2].to_i, res[4..14].chomp.to_i
+        res = @socket.read(16)
+        status, length = res[0..2].to_i, res[4..14].chomp.to_i
 
-      unless status == 200
-        raise HandlerException, "livestatus query failed with status #{status}"
-      end
+        unless status == 200
+          raise HandlerException, "livestatus query failed with status #{status}"
+        end
 
-      Yajl::Parser.new.parse(@socket.read(length))
+        Yajl::Parser.new.parse(@socket.read(length))
+      when :command
+        @socket.write("#{method.to_s.upcase} #{query}\n\n")
+        nil
+      end
     end
 
     private

data/lib/livestatus/version.rb

@@ -1,3 +1,3 @@
 module Livestatus
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: livestatus
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 0.2.0
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Benedikt B\xC3\xB6hm"
@@ -10,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 +01:00
-default_executable: 
+date: 2011-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -21,6 +25,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +39,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +53,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -54,6 +67,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -96,7 +112,6 @@ files:
 - lib/livestatus/models/timeperiod.rb
 - lib/livestatus/version.rb
 - livestatus.gemspec
-has_rdoc: true
 homepage: https://github.com/zenops/livestatus
 licenses: []
 
@@ -110,17 +125,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Livestatus is a simple Ruby library to control Nagios via MK Livestatus.