nagios_parser 1.2.0 → 1.2.1

data/CHANGES.md

@@ -1,6 +1,10 @@
 nagios_parser - ChangeLog
 =========================
 
+# 1.2.1
+* Apply original diff from Mitsuru to strip comments.
+  This catches more inline comments.
+
 # 1.2.0
 * Add NagiosParser::Resource parser to parse Nagios resource
   macro files.

data/lib/nagios_parser/object/parser.rb

@@ -31,6 +31,10 @@ def create_token(string)
       # ignore whitespace
     when scanner.scan(/#[^\n]*/)
       # ignore comments
+    when scanner.scan(/.*;[^\n]*/)
+      r = scanner.matched.sub(/(.*);[^\n]*/, '\1')
+      scanner.string = r + scanner.rest
+      scanner.reset
     when scanner.scan(/define/)
       result << [:DEFINE, nil]
     when (!inside and match = scanner.scan(/\w+/))
@@ -47,7 +51,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.split(';').first.gsub(/\s+$/, '')]
+      result << [:VALUE, match.first.gsub(/\s+$/, '')]
     else
       raise "Can't tokenize <#{scanner.peek(10)}>"
     end

data/lib/nagios_parser/object/parser.y

@@ -49,6 +49,10 @@ def create_token(string)
       # ignore whitespace
     when scanner.scan(/#[^\n]*/)
       # ignore comments
+    when scanner.scan(/.*;[^\n]*/)
+      r = scanner.matched.sub(/(.*);[^\n]*/, '\1')
+      scanner.string = r + scanner.rest
+      scanner.reset
     when scanner.scan(/define/)
       result << [:DEFINE, nil]
     when (!inside and match = scanner.scan(/\w+/))
@@ -65,7 +69,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.split(';').first.gsub(/\s+$/, '')]
+      result << [:VALUE, match.first.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.0"
+  VERSION = "1.2.1"
 end

data/spec/nagios_parser/object/parser_spec.rb

@@ -19,10 +19,11 @@ describe NagiosParser::Object::Parser do
             host_name foo.example.com
             _plugin_path  /usr/lib64/nagios/plugins
           }
+          ; comment
           define service {
             host_name   foo.example.com
             service_description SUPERD ; I like that!
-            }
+            } ; Another comment
         RUBY
 
         parser.create_token(string).should == [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nagios_parser
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Bernd Ahlers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 Z
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake