nagios_parser 1.2.1 → 1.2.2

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-2.0
+  - jruby

data/CHANGES.md

@@ -1,11 +1,14 @@
-nagios_parser - ChangeLog
-=========================
+nagios\_parser - ChangeLog
+==========================
 
-# 1.2.1
+# 1.2.2 (2011-10-22)
+* Unbreak on Ruby 1.9.x.
+
+# 1.2.1 (2011-06-22)
 * Apply original diff from Mitsuru to strip comments.
   This catches more inline comments.
 
-# 1.2.0
+# 1.2.0 (2011-06-20)
 * Add NagiosParser::Resource parser to parse Nagios resource
   macro files.
 * Add NagiosParser::Config parser to parse the Nagios main
@@ -13,9 +16,9 @@ nagios_parser - ChangeLog
 * Ignore inline comments starting with ';' in the object
   configuration files.
 
-# 1.1.0
+# 1.1.0 (2011-01-09)
 * Remove hardcoded status types to make the parser less strict.
 * More Nagios 2.x/3.x status types. (mariussturm)
 
-# 1.0.0
+# 1.0.0 (2010-12-16)
 * Initial release

data/README.md

@@ -1,6 +1,8 @@
 Nagios Parser
 =============
 
+[![Build Status](https://secure.travis-ci.org/bernd/nagios_parser.png)](http://travis-ci.org/bernd/nagios\_parser])
+
 # Description
 
 The `nagios_parser` gem provides a parser for the Nagios `status.dat`

data/Rakefile

@@ -3,6 +3,8 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 
+task :default => :spec
+
 RSpec::Core::RakeTask.new do |t|
   t.rcov = false
 end

data/lib/nagios_parser/object/parser.rb

@@ -32,6 +32,7 @@ def create_token(string)
     when scanner.scan(/#[^\n]*/)
       # ignore comments
     when scanner.scan(/.*;[^\n]*/)
+      # ignore inline comments
       r = scanner.matched.sub(/(.*);[^\n]*/, '\1')
       scanner.string = r + scanner.rest
       scanner.reset
@@ -51,7 +52,7 @@ def create_token(string)
       result << [:VALUE, match.to_i]
     when (inside and match = scanner.scan(/[^\n\}]+/))
       # Make sure to ignore inline comments starting with ';'.
-      result << [:VALUE, match.first.gsub(/\s+$/, '')]
+      result << [:VALUE, match.gsub(/\s+$/, '')]
     else
       raise "Can't tokenize <#{scanner.peek(10)}>"
     end

data/lib/nagios_parser/object/parser.y

@@ -50,6 +50,7 @@ def create_token(string)
     when scanner.scan(/#[^\n]*/)
       # ignore comments
     when scanner.scan(/.*;[^\n]*/)
+      # ignore inline comments
       r = scanner.matched.sub(/(.*);[^\n]*/, '\1')
       scanner.string = r + scanner.rest
       scanner.reset
@@ -69,7 +70,7 @@ def create_token(string)
       result << [:VALUE, match.to_i]
     when (inside and match = scanner.scan(/[^\n\}]+/))
       # Make sure to ignore inline comments starting with ';'.
-      result << [:VALUE, match.first.gsub(/\s+$/, '')]
+      result << [:VALUE, match.gsub(/\s+$/, '')]
     else
       raise "Can't tokenize <#{scanner.peek(10)}>"
     end

data/lib/nagios_parser/version.rb

@@ -1,3 +1,3 @@
 module NagiosParser
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/github_issues_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'nagios_parser/object/parser'
+
+describe "Github issues" do
+  describe "#3" do
+    it "can parse the user provided object config" do
+      object = <<-__OBJ
+define host{
+        use              switch
+        host_name   Foo-ibb
+        alias            Foo iBootBar
+        address       10.3.1.20
+        hostgroups   iboots,Foo
+        parents        Foo-modem
+      }
+      __OBJ
+
+      out = NagiosParser::Object::Parser.parse(object)
+      host = out['host'].first
+      host['use'].should == 'switch'
+      host['host_name'].should == 'Foo-ibb'
+      host['alias'].should == 'Foo iBootBar'
+      host['address'].should == '10.3.1.20'
+      host['hostgroups'].should == 'iboots,Foo'
+      host['parents'].should == 'Foo-modem'
+    end
+  end
+end

data/spec/nagios_parser/status/parser_spec.rb

@@ -24,6 +24,11 @@ describe NagiosParser::Status::Parser do
           }
           info { version=3.2.0 }
 
+          servicestatus {
+            service_description=POP3S
+            plugin_output=POP OK - 0.062 second response time on port 995 [+OK Dovecot ready. <123.456@example.com>]
+          }
+
           programstatus {
             last_command_check=1291408262
             global_service_event_handler=
@@ -43,6 +48,11 @@ describe NagiosParser::Status::Parser do
           [:OPEN, nil],
           [:KEY, 'version'], [:VALUE, '3.2.0'],
           [:CLOSE, nil],
+          [:TYPE, 'servicestatus'],
+          [:OPEN, nil],
+          [:KEY, 'service_description'], [:VALUE, 'POP3S'],
+          [:KEY, 'plugin_output'], [:VALUE, 'POP OK - 0.062 second response time on port 995 [+OK Dovecot ready. <123.456@example.com>]'],
+          [:CLOSE, nil],
           [:TYPE, 'programstatus'],
           [:OPEN, nil],
           [:KEY, 'last_command_check'], [:VALUE, 1291408262],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nagios_parser
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Bernd Ahlers
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-10-22 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -70,6 +71,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -86,11 +88,13 @@ files:
 - lib/nagios_parser/status/parser.y
 - lib/nagios_parser/version.rb
 - nagios_parser.gemspec
+- spec/github_issues_spec.rb
 - spec/nagios_parser/config/parser_spec.rb
 - spec/nagios_parser/object/parser_spec.rb
 - spec/nagios_parser/resource/parser_spec.rb
 - spec/nagios_parser/status/parser_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://rubygems.org/gems/nagios_parser
 licenses: []
 
@@ -120,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: parser lib for parsing Nagios status and config files