nagios_parser 1.2.2 → 1.3.0

data/.gitignore

@@ -3,3 +3,6 @@ pkg/*
 *.gem
 .bundle
 .rspec
+scripts
+.ruby-version
+.rvmrc

data/.travis.yml

@@ -1,6 +1,7 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-2.0
-  - jruby
+  - rbx-18mode
+  - rbx-19mode

data/CHANGES.md

@@ -1,6 +1,10 @@
 nagios\_parser - ChangeLog
 ==========================
 
+# 1.3.0 (2013-03-23)
+* Support multiple values for `cfg_file` and `cfg_dir` options.
+* Loose grammar to support more nagios configuration files. (alisonrosewarne)
+
 # 1.2.2 (2011-10-22)
 * Unbreak on Ruby 1.9.x.
 

data/lib/nagios_parser/config/parser.rb

@@ -1,18 +1,19 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.7
 # from Racc grammer file "".
 #
 
 require 'racc/parser.rb'
 
 require 'strscan'
+require 'nagios_parser/result'
 
 module NagiosParser
   module Config
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 19)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 20)
 
 def create_token(string)
   result = []
@@ -45,10 +46,10 @@ def self.parse(string)
 end
 
 def parse(string)
-  @result = {}
+  @result = NagiosParser::Result.new(:multi_value => %w{cfg_file cfg_dir})
   @token = create_token(string)
   do_parse
-  @result
+  @result.to_hash
 end
 
 def next_token
@@ -58,25 +59,25 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,     1,     1,     4,     7 ]
+     4,     6,     3,     3,     7 ]
 
 racc_action_check = [
-     2,     0,     2,     1,     5 ]
+     1,     3,     1,     0,     4 ]
 
 racc_action_pointer = [
-    -1,     0,     0,   nil,   nil,     4,   nil,   nil ]
+     1,     0,   nil,    -2,     4,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -4,    -4,    -4,    -1,    -3,    -4,    -2,     8 ]
+    -4,    -4,    -1,    -4,    -4,    -2,    -3,     8 ]
 
 racc_goto_table = [
-     3,     2,     6 ]
+     2,     5,     1 ]
 
 racc_goto_check = [
-     2,     1,     2 ]
+     2,     2,     1 ]
 
 racc_goto_pointer = [
-   nil,     1,     0 ]
+   nil,     2,     0 ]
 
 racc_goto_default = [
    nil,   nil,   nil ]

data/lib/nagios_parser/config/parser.y

@@ -14,6 +14,7 @@ end
 
 ---- header
 require 'strscan'
+require 'nagios_parser/result'
 
 ---- inner
 
@@ -48,10 +49,10 @@ def self.parse(string)
 end
 
 def parse(string)
-  @result = {}
+  @result = NagiosParser::Result.new(:multi_value => %w{cfg_file cfg_dir})
   @token = create_token(string)
   do_parse
-  @result
+  @result.to_hash
 end
 
 def next_token

data/lib/nagios_parser/object/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 
@@ -12,7 +12,7 @@ module NagiosParser
   module Object
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 34)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 35)
 
 private
 def last_is_key?(list)
@@ -23,6 +23,7 @@ public
 def create_token(string)
   result = []
   inside = false
+  inside_squigglies = false
   scanner = StringScanner.new(string)
 
   until scanner.empty?
@@ -40,16 +41,18 @@ def create_token(string)
       result << [:DEFINE, nil]
     when (!inside and match = scanner.scan(/\w+/))
       result << [:TYPE, match]
-    when match = scanner.scan(/\{/)
+    when (!inside and match = scanner.scan(/\{/))
       inside = true
       result << [:OPEN, nil]
-    when match = scanner.scan(/\}/)
+    when (match = scanner.scan(/\}/))
       inside = false
       result << [:CLOSE, nil]
     when (!last_is_key?(result) and match = scanner.scan(/\w+/))
       result << [:KEY, match.chomp.gsub(/\s+$/, '')]
     when (inside and match = scanner.scan(/\d+$/))
       result << [:VALUE, match.to_i]
+    when (inside and match = scanner.scan(/.*\{.+\}.*/))
+      result << [:VALUE, match.gsub(/\s+$/, '')]
     when (inside and match = scanner.scan(/[^\n\}]+/))
       # Make sure to ignore inline comments starting with ';'.
       result << [:VALUE, match.gsub(/\s+$/, '')]
@@ -81,27 +84,27 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,     8,     1,    13,    11,     7,     1,    11,     4,    14 ]
+     4,     8,     3,    12,    11,     7,     6,    11,     3,    14 ]
 
 racc_action_check = [
-     2,     5,     2,     9,     9,     4,     0,     7,     1,    11 ]
+     1,     6,     1,     9,     9,     4,     3,     8,     0,    11 ]
 
 racc_action_pointer = [
-     4,     5,     0,   nil,     1,     1,   nil,     1,   nil,    -2,
+     6,     0,   nil,     3,     5,   nil,    -3,   nil,     1,    -2,
    nil,     2,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -7,    -7,    -7,    -1,    -7,    -7,    -2,    -7,    15,    -7,
-    -4,    -7,    -5,    -3,    -6 ]
+    -8,    -8,    -1,    -8,    -8,    -2,    -8,    15,    -8,    -8,
+    -4,    -7,    -3,    -5,    -6 ]
 
 racc_goto_table = [
-    10,     3,    12,     6,     9,     2 ]
+    10,    13,     2,     5,     9,     1 ]
 
 racc_goto_check = [
-     4,     2,     4,     2,     3,     1 ]
+     4,     4,     2,     2,     3,     1 ]
 
 racc_goto_pointer = [
-   nil,     5,     1,    -3,    -7 ]
+   nil,     5,     2,    -4,    -8 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil ]
@@ -113,9 +116,10 @@ racc_reduce_table = [
   5, 10, :_reduce_3,
   1, 11, :_reduce_none,
   2, 11, :_reduce_5,
-  2, 12, :_reduce_6 ]
+  2, 12, :_reduce_6,
+  1, 12, :_reduce_7 ]
 
-racc_reduce_n = 7
+racc_reduce_n = 8
 
 racc_shift_n = 15
 
@@ -203,6 +207,13 @@ module_eval(<<'.,.,', 'parser.y', 25)
   end
 .,.,
 
+module_eval(<<'.,.,', 'parser.y', 26)
+  def _reduce_7(val, _values, result)
+     result = {val[0] => nil } 
+    result
+  end
+.,.,
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/nagios_parser/object/parser.y

@@ -24,6 +24,7 @@ class NagiosParser::Object::Parser
       ;
     assignment
       : KEY VALUE { result = {val[0] => val[1]} }
+      | KEY { result = {val[0] => nil } }
       ;
 end
 
@@ -41,6 +42,7 @@ public
 def create_token(string)
   result = []
   inside = false
+  inside_squigglies = false
   scanner = StringScanner.new(string)
 
   until scanner.empty?
@@ -58,16 +60,18 @@ def create_token(string)
       result << [:DEFINE, nil]
     when (!inside and match = scanner.scan(/\w+/))
       result << [:TYPE, match]
-    when match = scanner.scan(/\{/)
+    when (!inside and match = scanner.scan(/\{/))
       inside = true
       result << [:OPEN, nil]
-    when match = scanner.scan(/\}/)
+    when (match = scanner.scan(/\}/))
       inside = false
       result << [:CLOSE, nil]
     when (!last_is_key?(result) and match = scanner.scan(/\w+/))
       result << [:KEY, match.chomp.gsub(/\s+$/, '')]
     when (inside and match = scanner.scan(/\d+$/))
       result << [:VALUE, match.to_i]
+    when (inside and match = scanner.scan(/.*\{.+\}.*/))
+      result << [:VALUE, match.gsub(/\s+$/, '')]
     when (inside and match = scanner.scan(/[^\n\}]+/))
       # Make sure to ignore inline comments starting with ';'.
       result << [:VALUE, match.gsub(/\s+$/, '')]

data/lib/nagios_parser/result.rb

@@ -0,0 +1,30 @@
+module NagiosParser
+  class Result
+    def initialize(options = {})
+      @options = options
+      @result = {}
+    end
+
+    def []=(key, value)
+      if multi_value?(key)
+        (@result[key] ||= []) << value
+      else
+        @result[key] = value
+      end
+    end
+
+    def [](key)
+      @result[key]
+    end
+
+    def to_hash
+      @result.dup
+    end
+
+    private
+
+    def multi_value?(key)
+      Array(@options[:multi_value]).include?(key)
+    end
+  end
+end

data/lib/nagios_parser/version.rb

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

data/spec/nagios_parser/config/parser_spec.rb

@@ -60,12 +60,28 @@ describe NagiosParser::Config::Parser do
 
           lock_file=/var/run/nagios3/nagios3.pid
           event_broker_options=-1
+
+          cfg_dir=/etc/nagios/config1
+          cfg_dir=/etc/nagios/config2
+          cfg_dir=/etc/nagios/config3
+
+          cfg_file=/etc/nagios/file1
+          cfg_file=/etc/nagios/file2
         RUBY
 
         data = parser.parse(string)
         data['external_command_buffer_slots'].should == 4096
         data['lock_file'].should == '/var/run/nagios3/nagios3.pid'
         data['event_broker_options'].should == -1
+        data['cfg_dir'].should == [
+          '/etc/nagios/config1',
+          '/etc/nagios/config2',
+          '/etc/nagios/config3'
+        ]
+        data['cfg_file'].should == [
+          '/etc/nagios/file1',
+          '/etc/nagios/file2'
+        ]
       end
     end
 

data/spec/nagios_parser/object/parser_spec.rb

@@ -73,6 +73,33 @@ describe NagiosParser::Object::Parser do
       end
     end
 
+    context "with a valid string containing squiggly braces" do
+      it "returns a hash of object definitions" do
+        string = <<-RUBY
+          define command {
+            command_line   check_http -u /api -P '{"key":"value"}' -k "content-type: application/json"
+          }
+        RUBY
+
+        data = parser.parse(string)
+        data['command'].first['command_line'] == "check_http -u /api -P '{\"key\":\"value\"}' -k \"content-type: application/json\""
+      end
+    end
+
+    context "with a valid service definition containing empty notes" do
+      it "parses optional value" do
+        string = <<-RUBY
+          define service {
+            host_name   foo.example.com
+            notes
+          }
+        RUBY
+
+        data = parser.parse(string)
+        data['service'].first['notes'].should be_nil
+      end
+    end
+
     context "with an invalid object definition" do
       describe "example: FooBar { info test }" do
         it "will raise an exception" do

data/spec/nagios_parser/result_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'nagios_parser/result'
+
+describe NagiosParser::Result do
+  let(:result) { described_class.new }
+
+  it "sets a key value pair" do
+    result['foo'] = 'bar'
+
+    result['foo'].should == 'bar'
+  end
+
+  context "with multi_value option set" do
+    context "and a single value for a multi value key" do
+      it "returns a list with one value" do
+        result = described_class.new(:multi_value => %w{foo})
+        result['foo'] = 'bar'
+
+        result['foo'].should == ['bar']
+      end
+    end
+
+    context "and multiple values for a multi value key" do
+      it "returns a list with all values" do
+        result = described_class.new(:multi_value => %w{eek})
+        result['eek'] = 'foo'
+        result['eek'] = 'bar'
+
+        result['eek'].should == ['foo', 'bar']
+      end
+    end
+  end
+
+  context "without multi_value options set" do
+    context "and multiple values for the same key" do
+      it "returns the last value" do
+        result['baz'] = 'foo'
+        result['baz'] = 'bar'
+
+        result['baz'].should == 'bar'
+      end
+    end
+  end
+
+  describe "#to_hash" do
+    it "returns a hash representation of the result" do
+      result['foo'] = ['bar', 'baz']
+      result['one'] = 1
+
+      result.to_hash.should == {'foo' => ['bar', 'baz'], 'one' => 1}
+    end
+  end
+end

metadata

@@ -1,75 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nagios_parser
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
 platform: ruby
-authors: 
+authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-22 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: racc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The nagios_parser gem provides parsers for Nagios config and status files.
-email: 
+email:
 - bernd@tuneafish.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGES.md
@@ -84,6 +80,7 @@ files:
 - lib/nagios_parser/object/parser.y
 - lib/nagios_parser/resource/parser.rb
 - lib/nagios_parser/resource/parser.y
+- lib/nagios_parser/result.rb
 - lib/nagios_parser/status/parser.rb
 - lib/nagios_parser/status/parser.y
 - lib/nagios_parser/version.rb
@@ -92,41 +89,37 @@ files:
 - spec/nagios_parser/config/parser_spec.rb
 - spec/nagios_parser/object/parser_spec.rb
 - spec/nagios_parser/resource/parser_spec.rb
+- spec/nagios_parser/result_spec.rb
 - spec/nagios_parser/status/parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/nagios_parser
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3262026437497709506
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3262026437497709506
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: parser lib for parsing Nagios status and config files
 test_files: []
-