nagira 0.5.1 → 0.5.2

data/spec/put/support.rb

@@ -42,9 +42,9 @@ end
 
 shared_examples_for :write_to_nagios_cmd_file do
   before (:all) do
-    File.delete ::Nagira::Parser.commands.path rescue nil
+    FileUtils.rm_f ::Nagira::Writer.commands.path
   end
-  let (:cmd) { ::Nagira::Parser.commands.path }
+  let (:cmd) { ::Nagira::Writer.commands.path }
 
   it "writes to nagios.cmd file" do
     expect(File).to exist(cmd)
@@ -52,7 +52,7 @@ shared_examples_for :write_to_nagios_cmd_file do
   end
 
   after (:each) do
-      File.delete ::Nagira::Parser.commands.path rescue nil
+    FileUtils.rm_f ::Nagira::Writer.commands.path
   end
 end
 

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-$: << File.dirname(__FILE__) + '/../lib/'
-require_relative '../lib/nagira.rb'
 require_relative '../app/app.rb'
 require 'rack/test'
 
@@ -13,7 +11,9 @@ IMPLEMENTED = {
 
 RANDOM = %w{ _bla _foo bla foo ahdhjdjda }
 
-set :environment, ENV['RACK_ENV'] || :test
+class Nagira < Sinatra::Base
+  set :environment, ENV['RACK_ENV'] || :test
+end
 
 def dont_run_in_production(file)
   if Nagira.settings.environment == :production

data/version.txt

@@ -1 +1 @@
-0.5.1
+0.5.2

metadata

@@ -1,285 +1,285 @@
 --- !ruby/object:Gem::Specification
 name: nagira
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Dmytro Kovalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: sherlock_os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: ruby-nagios
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: guard-brakeman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: |2+
@@ -301,14 +301,30 @@ files:
 - History.md
 - Rakefile
 - app/app.rb
-- app/get/config.rb
-- app/get/objects.rb
-- app/get/status.rb
-- app/get/status/hostgroups.rb
-- app/get/status/servicegroups.rb
-- app/put.rb
-- app/put/host.rb
-- app/put/status.rb
+- app/concerns/host_status_name_concerneable.rb
+- app/concerns/output_typeable.rb
+- app/controllers/api_help_controller.rb
+- app/controllers/host_status_controller.rb
+- app/controllers/hostgroup_controller.rb
+- app/controllers/resource_status_controler.rb
+- app/controllers/service_status_controler.rb
+- app/controllers/servicegroups_controller.rb
+- app/filters/after.rb
+- app/filters/before.rb
+- app/filters/configure.rb
+- app/helpers/put_helpers.rb
+- app/loggers/simple_logger.rb
+- app/parsers/background_parse.rb
+- app/parsers/parser.rb
+- app/routes/get.rb
+- app/routes/get/config.rb
+- app/routes/get/objects.rb
+- app/routes/get/status.rb
+- app/routes/get/status/hostgroups.rb
+- app/routes/get/status/servicegroups.rb
+- app/routes/put/host.rb
+- app/routes/put/status.rb
+- app/writers/external_command_writer.rb
 - bin/nagira
 - bin/nagira-setup
 - config/defaults.rb
@@ -316,14 +332,8 @@ files:
 - config/nagira.defaults
 - config/nagira.init_d
 - config/puma.rb
-- lib/nagira.rb
-- lib/nagira/background_parse.rb
-- lib/nagira/hostgroup.rb
 - lib/nagira/hostservice.rb
 - lib/nagira/nagios.rb
-- lib/nagira/parser.rb
-- lib/nagira/servicegroup.rb
-- lib/nagira/simple_logger.rb
 - lib/nagira/timed_parse.rb
 - lib/tasks/config.rake
 - lib/tasks/debug.rake
@@ -373,12 +383,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/app/get/config.rb

@@ -1,24 +0,0 @@
-class Nagira < Sinatra::Base
-
-  # Config routes
-  # ============================================================
-
-  # @!macro  [attach] sinatra.get
-  #
-  #    @overload get "$1"
-  #
-  #    @return HTTP response. Hash formatted in the format defined by
-  #         requested output type(XML, YAML or JSON).
-  #
-  #
-
-  # @method get_config
-  # @overload get("/_config")
-  #
-  # Get Nagios configuration hash form parsing main Nagios
-  # configuration file nagios.cfg
-  get "/_config" do
-    @data = Parser.config.configuration
-    nil
-  end
-end