nagios_parser 1.0.0 → 1.1.0

data/CHANGES.md

@@ -0,0 +1,9 @@
+nagios_parser - ChangeLog
+=========================
+
+# next
+* Remove hardcoded status types to make the parser less strict.
+* More Nagios 2.x/3.x status types. (mariussturm)
+
+# 1.0.0
+* Initial release

data/lib/nagios_parser/status/parser.rb

@@ -12,7 +12,7 @@ module NagiosParser
   module Status
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 39)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 35)
 
 def create_token(string)
   result = []
@@ -26,7 +26,7 @@ def create_token(string)
     when scanner.scan(/#[^\n]*/)
       # ignore comments
     when (!inside and match = scanner.scan(/\w+/))
-      result << [match, match]
+      result << [:TYPE, match]
     when match = scanner.scan(/\{/)
       inside = true
       result << [:OPEN, nil]
@@ -67,74 +67,55 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    11,    19,    15,    13,    15,    18,     6,     7,     8,     9,
-    10,     1,     2,     6,     7,     8,     9,    10,     1,     2,
-    14 ]
+     5,     8,     1,    13,     8,     4,    10,    11,     1 ]
 
 racc_action_check = [
-     3,    16,    16,     5,    13,    15,     3,     3,     3,     3,
-     3,     3,     3,     0,     0,     0,     0,     0,     0,     0,
-    11 ]
+     2,     4,     2,     9,     9,     1,     5,     8,     0 ]
 
 racc_action_pointer = [
-     7,   nil,   nil,     0,   nil,     1,   nil,   nil,   nil,   nil,
-   nil,    20,   nil,     0,   nil,     0,    -2,   nil,   nil,   nil,
-   nil ]
+     6,     2,     0,   nil,    -4,     6,   nil,   nil,     1,    -1,
+   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -15,    -9,   -10,   -15,    -1,   -15,    -4,    -5,    -6,    -7,
-    -8,   -15,    -2,   -15,    21,   -13,   -15,   -11,   -14,    -3,
-   -12 ]
+    -8,    -8,    -8,    -1,    -8,    -8,    -2,    -4,    -6,    -8,
+    14,    -7,    -5,    -3 ]
 
 racc_goto_table = [
-    17,     4,    16,    20,    12,     3 ]
+     7,     3,     9,     6,     2,    12 ]
 
 racc_goto_check = [
-     5,     2,     4,     5,     2,     1 ]
+     4,     2,     3,     2,     1,     4 ]
 
 racc_goto_pointer = [
-   nil,     5,     1,   nil,   -11,   -13 ]
+   nil,     4,     1,    -2,    -4 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     5,   nil,   nil ]
+   nil,   nil,   nil,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 14, :_reduce_none,
-  2, 14, :_reduce_none,
-  4, 15, :_reduce_3,
-  1, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  1, 17, :_reduce_none,
-  2, 17, :_reduce_12,
-  1, 18, :_reduce_13,
-  2, 18, :_reduce_14 ]
-
-racc_reduce_n = 15
-
-racc_shift_n = 21
+  1, 8, :_reduce_none,
+  2, 8, :_reduce_none,
+  4, 9, :_reduce_3,
+  1, 10, :_reduce_none,
+  2, 10, :_reduce_5,
+  1, 11, :_reduce_6,
+  2, 11, :_reduce_7 ]
+
+racc_reduce_n = 8
+
+racc_shift_n = 14
 
 racc_token_table = {
   false => 0,
   :error => 1,
-  :OPEN => 2,
-  :CLOSE => 3,
-  :KEY => 4,
-  :VALUE => 5,
-  "hostcomment" => 6,
-  "servicestatus" => 7,
-  "info" => 8,
-  "programstatus" => 9,
-  "hoststatus" => 10,
-  "contactstatus" => 11,
-  "servicecomment" => 12 }
-
-racc_nt_base = 13
+  :TYPE => 2,
+  :OPEN => 3,
+  :CLOSE => 4,
+  :KEY => 5,
+  :VALUE => 6 }
+
+racc_nt_base = 7
 
 racc_use_result_var = true
 
@@ -157,21 +138,14 @@ Racc_arg = [
 Racc_token_to_s_table = [
   "$end",
   "error",
+  "TYPE",
   "OPEN",
   "CLOSE",
   "KEY",
   "VALUE",
-  "\"hostcomment\"",
-  "\"servicestatus\"",
-  "\"info\"",
-  "\"programstatus\"",
-  "\"hoststatus\"",
-  "\"contactstatus\"",
-  "\"servicecomment\"",
   "$start",
   "types",
   "type",
-  "type_names",
   "assignments",
   "assignment" ]
 
@@ -196,22 +170,8 @@ module_eval(<<'.,.,', 'parser.y', 11)
 
 # reduce 4 omitted
 
-# reduce 5 omitted
-
-# reduce 6 omitted
-
-# reduce 7 omitted
-
-# reduce 8 omitted
-
-# reduce 9 omitted
-
-# reduce 10 omitted
-
-# reduce 11 omitted
-
-module_eval(<<'.,.,', 'parser.y', 22)
-  def _reduce_12(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 18)
+  def _reduce_5(val, _values, result)
             val[1].each do |key, value|
           val[0][key] = value
         end
@@ -221,15 +181,15 @@ module_eval(<<'.,.,', 'parser.y', 22)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 29)
-  def _reduce_13(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 25)
+  def _reduce_6(val, _values, result)
      result = {val[0] => nil}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 30)
-  def _reduce_14(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 26)
+  def _reduce_7(val, _values, result)
      result = {val[0] => val[1]} 
     result
   end

data/lib/nagios_parser/status/parser.y

@@ -1,6 +1,6 @@
 class NagiosParser::Status::Parser
   token
-    OPEN CLOSE KEY VALUE
+    TYPE OPEN CLOSE KEY VALUE
 
   rule
     types
@@ -8,15 +8,11 @@ class NagiosParser::Status::Parser
       | types type
       ;
     type
-      : type_names OPEN assignments CLOSE {
+      : TYPE OPEN assignments CLOSE {
         @result[val[0]] ||= []
 	@result[val[0]] << val[2]
       }
       ;
-    type_names
-      : 'hostcomment' | 'servicestatus' | 'info' | 'programstatus'
-      | 'hoststatus' | 'contactstatus' | 'servicecomment'
-      ;
     assignments
       : assignment
       | assignments assignment {
@@ -49,7 +45,7 @@ def create_token(string)
     when scanner.scan(/#[^\n]*/)
       # ignore comments
     when (!inside and match = scanner.scan(/\w+/))
-      result << [match, match]
+      result << [:TYPE, match]
     when match = scanner.scan(/\{/)
       inside = true
       result << [:OPEN, nil]

data/lib/nagios_parser/version.rb

@@ -1,3 +1,3 @@
 module NagiosParser
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/nagios_parser.gemspec

@@ -10,10 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["bernd@tuneafish.de"]
   s.homepage    = "http://rubygems.org/gems/nagios_parser"
   s.summary     = %q{parser lib for parsing Nagios status and config files}
-  s.description = %q{
-    The nagios_parser gem provides parsers for Nagios config
-    and status files.
-  }
+  s.description = %q{The nagios_parser gem provides parsers for Nagios config and status files.}
 
   #s.rubyforge_project = "nagios_parser"
 

data/spec/nagios_parser/object/parser_spec.rb

@@ -5,7 +5,7 @@ describe NagiosParser::Object::Parser do
   let(:parser) { NagiosParser::Object::Parser.new }
 
   describe ".parse" do
-    it "returns a hash of status types" do
+    it "returns a hash of object definitions" do
       data = parser.parse('define host { host_name foo }')
       data['host'].first['host_name'].should == 'foo'
     end
@@ -58,7 +58,7 @@ describe NagiosParser::Object::Parser do
 
   describe "#parse" do
     context "with a valid string" do
-      it "returns a hash of status types" do
+      it "returns a hash of object definitions" do
         string = <<-RUBY
           define host {
             host_name foo.example.com
@@ -72,19 +72,21 @@ describe NagiosParser::Object::Parser do
       end
     end
 
-    context "with an invalid status type" do
-      it "will raise an exception" do
-        expect {
-          parser.parse('FooBar { info test }')
-        }.to raise_error
+    context "with an invalid object definition" do
+      describe "example: FooBar { info test }" do
+        it "will raise an exception" do
+          expect {
+            parser.parse('FooBar { info test }')
+          }.to raise_error
+        end
       end
-    end
 
-    context "with invalid status data" do
-      it "will raise an exception" do
-        expect {
-          parser.parse('define host { =test }')
-        }.to raise_error
+      describe "example: define host { =test }" do
+        it "will raise an exception" do
+          expect {
+            parser.parse('define host { =test }')
+          }.to raise_error
+        end
       end
     end
   end

data/spec/nagios_parser/status/parser_spec.rb

@@ -31,7 +31,7 @@ describe NagiosParser::Status::Parser do
         RUBY
 
         parser.create_token(string).should == [
-          ['hoststatus', 'hoststatus'],
+          [:TYPE, 'hoststatus'],
           [:OPEN, nil],
           [:KEY, 'bar'], [:VALUE, 'baz'],
           [:KEY, 'hello'], [:VALUE, 'world'],
@@ -39,11 +39,11 @@ describe NagiosParser::Status::Parser do
           [:KEY, 'foo'], [:VALUE, 'bar baz hello world'],
           [:KEY, 'eek'], [:VALUE, 1],
           [:CLOSE, nil],
-          ['info', 'info'],
+          [:TYPE, 'info'],
           [:OPEN, nil],
           [:KEY, 'version'], [:VALUE, '3.2.0'],
           [:CLOSE, nil],
-          ['programstatus', 'programstatus'],
+          [:TYPE, 'programstatus'],
           [:OPEN, nil],
           [:KEY, 'last_command_check'], [:VALUE, 1291408262],
           [:KEY, 'global_service_event_handler'],
@@ -72,20 +72,17 @@ describe NagiosParser::Status::Parser do
             version = 1
           }
           info { version=3.2.0 }
+
+          program {
+              version=2.x.x
+                                   }
         RUBY
 
         data = parser.parse(string)
         data['info'].first['version'].should == '3.2.0'
         data['hoststatus'].first['bar'].should == 'baz'
         data['hoststatus'].first['version'].should == 1
-      end
-    end
-
-    context "with an invalid status type" do
-      it "will raise an exception" do
-        expect {
-          parser.parse('FooBar { info=test }')
-        }.to raise_error
+        data['program'].first['version'].should == '2.x.x'
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nagios_parser
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Bernd Ahlers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +01:00
+date: 2011-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: "\n    The nagios_parser gem provides parsers for Nagios config\n    and status files.\n  "
+description: The nagios_parser gem provides parsers for Nagios config and status files.
 email: 
 - bernd@tuneafish.de
 executables: []
@@ -71,6 +71,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: parser lib for parsing Nagios status and config files