nagira 0.5.1 → 0.5.2

data/bin/nagira

@@ -4,7 +4,7 @@ begin
   require 'app.rb'
 rescue LoadError => e
   require 'rubygems'
-  root = File.dirname(File.dirname(__FILE__))
+  root = File.dirname(__dir__)
   $: << (File.expand_path 'lib', root) << (File.expand_path 'app', root)
   require 'app'
 end

data/config/defaults.rb

@@ -12,10 +12,10 @@
 DEFAULT = {
 
   format_extensions: '\.(json|yaml|xml)$', #  Regex for available
-                                           #  formats: xml, json, yaml
+  #  formats: xml, json, yaml
 
   format: :xml, # default format for application to send output, if
-                # format is not specified
+  # format is not specified
 
 
   # No path to file configuration file by default. Main nagios config
@@ -76,18 +76,26 @@ DEFAULT = {
 
 }
 
-require 'sinatra'
 class Nagira < Sinatra::Base
 
-##
-# For every key in the DEFAULT hash create setting with the same name
-# and value. Values can be overrriden in environment.rb file if
-# required.
-# @method define_methods_for_defaults
-configure do
-  ::DEFAULT.each do |key,val|
-    set key,val
+  BASE = File.dirname(__dir__).freeze
+
+  VERSION  = File.read("#{BASE}/version.txt").strip.freeze
+  GITHUB   = "http://dmytro.github.com/nagira/".freeze
+  ##
+  # For every key in the DEFAULT hash create setting with the same name
+  # and value. Values can be overrriden in environment.rb file if
+  # required.
+  # @method define_methods_for_defaults
+  configure do
+    ::DEFAULT.each do |key,val|
+      set key,val
+    end
   end
-end
 
+  ##
+  # When this prefix added to routes convert output to ActiveResource
+  # compatible format (basically Array instead of Hash).
+  #
+  AR_PREFIX = "/ar"
 end

data/config/environment.rb

@@ -1,4 +1,3 @@
-require 'pry'
 class Nagira < Sinatra::Base
 
 
@@ -21,6 +20,8 @@ class Nagira < Sinatra::Base
   # Development and test environments use local files located in the
   # development tree: ./test/data.
   configure :development, :test do
+    require 'pry'
+
     register Sinatra::Reloader
     also_reload("#{root}/*.rb")
     also_reload("#{root}/{config,app,lib}/**/*.rb")

data/lib/nagira/timed_parse.rb

@@ -9,7 +9,7 @@ module Nagios
     # even if file changes often, we do not want to parse it more
     # often, then this number of seconds.
 
-    TTL = ::DEFAULT[:ttl] || 0
+    TTL = 0# FIXME ::DEFAULT[:ttl] || 0
 
     # Override constructor and parse method from ::Nagios::Objects or
     # ::Nagios::Status classes, add instance variables to handle

data/spec/01_background_parser.rb

@@ -4,23 +4,23 @@ require 'spec_helper'
 describe "BackgroundParser" do
 
   before {
-    Nagios::BackgroundParser.ttl = 1
-    Nagios::BackgroundParser.start = true
+    Nagira::BackgroundParser.ttl = 1
+    Nagira::BackgroundParser.start = true
   }
 
   it "is configured" do
-    expect(Nagios::BackgroundParser).to be_configured
+    expect(Nagira::BackgroundParser).to be_configured
   end
 
   context "after start" do
 
     before {
-      Nagios::BackgroundParser.run
+      Nagira::BackgroundParser.run
       sleep 0.1
     }
 
     it "is running" do
-      expect(Nagios::BackgroundParser).to be_alive
+      expect(Nagira::BackgroundParser).to be_alive
     end
 
   end

data/spec/01_data_format/01_nagira_response_spec.rb

@@ -16,7 +16,7 @@ describe Nagira do
 
   context "simple page load" do
     TOP_PAGES.each do |page|
-      it "/#{page} should load" do
+      it "GET /#{page} " do
         get "/#{page}"
         expect(last_response).to be_ok
       end
@@ -25,7 +25,7 @@ describe Nagira do
         # Check 3 different formats
         FORMATS.each do |format|
 
-          it "should load '#{page}.#{format}' page" do
+          it "loads '#{page}.#{format}'" do
             get "/#{page}.#{format}"
             expect(last_response).to be_ok
           end
@@ -53,11 +53,11 @@ describe Nagira do
               expect(@header['Content-Type']).to match(/^application\/#{format}.*/)
             end
 
-            it "body should have content" do
+            it "body has content" do
               expect(@body).to_not be_empty
             end
 
-            it "#{format} should be parseable" do
+            it "#{format} is parseable" do
               case format
               when 'json'
                 expect { JSON.parse    @body }.not_to raise_error
@@ -71,8 +71,8 @@ describe Nagira do
 
         end
 
-        context 'default format' do
-          it "/#{page}.#{Nagira.settings.format} response should be the same as /#{page}" do
+        context 'With the default format' do
+          it "/#{page}.#{Nagira.settings.format} response is the same as /#{page}" do
             get "/#{page}.#{Nagira.settings.format}"
             a = last_response.body
             get "/#{page}"

data/spec/01_data_format/02_0_status_spec.rb

@@ -39,7 +39,7 @@ describe Nagira do
       "/_status/_list" => Array
     }.each do |url,klas|
 
-      it "#{url} should return #{klas}" do
+      it "GET #{url} returns #{klas}" do
         get "#{url}.json"
         expect(JSON.parse(last_response.body)).to be_a_kind_of klas
       end

data/spec/01_data_format/02_nagira_data_spec.rb

@@ -27,7 +27,7 @@ describe Nagira do
   #
   # GET /objects/...
   # ----------------------------------------
-  context "/objects" do
+  context "GET /objects" do
 
     before :all do
       get "/_objects"
@@ -39,7 +39,7 @@ describe Nagira do
     end
 
 
-    context 'hash key' do
+    context 'GET hash key' do
       %w{host service contact timeperiod}.each do |obj|
         it "objects[#{obj}] should exist" do
           expect(@data[obj]).to be_a_kind_of Hash
@@ -48,7 +48,7 @@ describe Nagira do
     end
 
       %w{host service contact timeperiod}.each do |obj|
-      context "/_objects/#{obj}" do
+      context "GET /_objects/#{obj}" do
 
         it "should respond to HTTP resuest" do
           get "/_objects/#{obj}.json"
@@ -69,7 +69,7 @@ describe Nagira do
   # GET /status
   # -----------------------------
 
-  context '/status' do
+  context 'GET /status' do
     before :all do
       get "/_status"
       @data = JSON.parse last_response.body
@@ -81,16 +81,16 @@ describe Nagira do
       @state = JSON.parse last_response.body
     end
 
-    context "list of hosts should be the same" do
-      it "full and state" do
+    context "Compare list of hostsnames" do
+      it "full and state are the same " do
         expect(@data.keys).to eq @state.keys
       end
 
-      it "list and state" do
+      it "list and state are the same " do
         expect(@list).to eq @state.keys
       end
 
-      it "list and data" do
+      it "list and data are the same " do
         expect(@list).to eq @data.keys
       end
     end

data/spec/01_data_format/03_api_spec.rb

@@ -13,7 +13,7 @@ describe Nagira do
 
 
 
-  context "API data" do
+  context "GET API help" do
     before :all do
       get "/_api.json"
       @data = JSON.parse last_response.body
@@ -30,11 +30,11 @@ describe Nagira do
       METHODS.each do |method|
 
         context method do
-          it "routes should be an Array" do
+          it "routes are Array" do
             expect(@data[method]).to be_a_kind_of Array if @data[method]
           end
 
-          it "should star with slash" do
+          it "starts with slash" do
             if @data[method]
               @data[method].each do |path|
                 expect(path).to match( /^\//)

data/spec/get/status/comments_spec.rb

@@ -34,13 +34,13 @@ describe Nagira do
     @host = JSON.parse(last_response.body).first
   end
 
-  context "/_status/:host/_hostcomments" do
+  context "GET /_status/:host/_hostcomments" do
     before {  get "/_status/#{@host}/_hostcomments.json" }
     it_should_behave_like :comment_data
   end
 
 
-  context "/_status/:host/_servicecomments" do
+  context "GET /_status/:host/_servicecomments" do
     before { get "/_status/#{@host}/_servicecomments.json" }
 
     it_should_behave_like :comment_data

data/spec/get/status/endpoints_spec.rb

@@ -50,7 +50,7 @@ describe Nagira do
     @app ||= Nagira
   end
 
-  context "API endpoints" do
+  context "GET API endpoints" do
 
     host   = IMPLEMENTED[:hosts].first
     hostgroup = 'all'
@@ -63,17 +63,17 @@ describe Nagira do
     end
 
 
-    context "/_status" do
+    context "GET /_status" do
       it_should_behave_like :respond_to_valid_url,  "/_status", IMPLEMENTED[:hosts]
       it_should_behave_like :respond_to_valid_url,  "/_status", IMPLEMENTED[:output] + ["_hosts"]
       it_should_behave_like :fail_on_random_url, '/_status'
     end
 
-    context "/_status/:host" do
+    context "GET /_status/:host" do
       it_should_behave_like :respond_to_valid_url,  "/_status/#{host}", IMPLEMENTED[:status]
       it_should_behave_like :fail_on_random_url,    "/_status/#{host}"
 
-      context "hostname with space" do
+      context "GET hostname with space" do
         it_should_behave_like :fail_on_bad_url,  "/_status/#{spaces}"
       end
 
@@ -83,33 +83,33 @@ describe Nagira do
       end
     end                         # /_status/:host
 
-    context "/_status/:host/_services" do
+    context "GET /_status/:host/_services" do
       it_should_behave_like :respond_to_valid_url,  "/_status/#{host}/_services"
       it_should_behave_like :respond_to_valid_url,  "/_status/#{host}/_services", ["SSH", "PING"]
 
-      context "hostname with space" do
+      context "GET hostname with space" do
         it_should_behave_like :fail_on_bad_url,  "/_status/#{spaces}/_services"
       end
     end
 
 
-    context "custom hostname regex - host with spaces" do
+    context "GET custom hostname regex - host with spaces" do
 
       it { pending "Need to figure out how to change hostname regex on the fly"; fail }
         #it_should_behave_like :respond_to_valid_url,  "/_status/#{spaces}", nil, '\w[(%20)\w\-\.]+'
         #it_should_behave_like :respond_to_valid_url,  "/_status/#{spaces}/_services"
     end                         # custom hostname regex
 
-    context "Hostgroups" do
+    context "GET Hostgroups" do
 
-      context "/_status/_hostgroups/:hostgroup" do
+      context "GET /_status/_hostgroups/:hostgroup" do
         it_should_behave_like :respond_to_valid_url,  "/_status/_hostgroup/#{hostgroup}"
       end
 
-      context "/_status/_hostgroups/:hostgroup/_service" do
+      context "GET /_status/_hostgroups/:hostgroup/_service" do
         it_should_behave_like :respond_to_valid_url,  "/_status/_hostgroup/#{hostgroup}/_service"
       end
-      context "/_status/_hostgroups/:hostgroup/_host" do
+      context "GET /_status/_hostgroups/:hostgroup/_host" do
         it_should_behave_like :respond_to_valid_url,  "/_status/_hostgroup/#{hostgroup}/_host"
       end
     end                         # Hostgroup

data/spec/get/status/hostgroup.rb

@@ -15,7 +15,7 @@ describe Nagira do
 
   end
 
-  context  "/_status/_hostgroup/@hostgroup " do
+  context "GET /_status/_hostgroup/@hostgroup " do
 
     before do
       get "/_status/_hostgroup/#{ @hostgroup }"
@@ -37,7 +37,7 @@ describe Nagira do
   end
 
 
-  context  "/_status/_hostgroup/@hostgroup/_host" do
+  context "GET /_status/_hostgroup/@hostgroup/_host" do
 
     before do
       get "/_status/_hostgroup/#{ @hostgroup }/_host"
@@ -54,7 +54,7 @@ describe Nagira do
 
   end
 
-  context  "/_status/_hostgroup/@hostgroup/_service" do
+  context "GET /_status/_hostgroup/@hostgroup/_service" do
 
     before do
       get "/_status/_hostgroup/#{ @hostgroup }/_service"

data/spec/get/status/hosts_spec.rb

@@ -7,7 +7,7 @@ describe Nagira do
     @app ||= Nagira
   end
 
-  context "/_hosts" do
+  context "GET /_hosts" do
 
     before :each do
       get "/_status/_list"

data/spec/get/status/servicegroup.rb

@@ -11,7 +11,7 @@ describe Nagira do
     @hosts = %w{archive kurobka airport}.sort
   end
 
-  context  "/_status/_servicegroup/@servicegroup " do
+  context "GET /_status/_servicegroup/@servicegroup " do
 
     before do
       get "/_status/_servicegroup/#{ @servicegroup }"
@@ -29,7 +29,7 @@ describe Nagira do
   end
 
 
-  context  "/_status/_servicegroup/@servicegroup/_list" do
+  context "GET /_status/_servicegroup/@servicegroup/_list" do
 
     before do
       get "/_status/_servicegroup/#{ @servicegroup }/_list"
@@ -46,7 +46,7 @@ describe Nagira do
 
   end
 
-  context  "/_status/_servicegroup/@servicegroup/_state" do
+  context "GET /_status/_servicegroup/@servicegroup/_state" do
 
     before do
       get "/_status/_servicegroup/#{ @servicegroup }/_state"
@@ -67,7 +67,7 @@ describe Nagira do
 
   end
 
-  context  "Data completeness /_status/_servicegroup/@servicegroup" do
+  context "Data completeness of GET /_status/_servicegroup/@servicegroup" do
 
     before do
       get "/_status/_servicegroup/#{ @servicegroup }"

data/spec/get/status/services_spec.rb

@@ -16,7 +16,7 @@ describe Nagira do
     @host = JSON.parse(last_response.body).first
   end
 
-  context "/_hosts/:host/_services" do
+  context "GET /_hosts/:host/_services" do
 
     before :each do
       get "/_status/#{@host}/_services"

data/spec/put/host_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require_relative 'support'
 require 'pp'
 
-describe Nagira do
+describe "PUT hoststatus" do
 
   dont_run_in_production(__FILE__) and break
 
@@ -29,11 +29,11 @@ describe Nagira do
   # Tests
   #
 
-  context "/_status" do
+  context "PUT /_status" do
     it { pending "Not implemented"; fail }
   end                           # ----------- "/_status" do
 
-  context "/_status/:host_name" do
+  context "PUT /_status/:host_name" do
     let (:url) { "/_status/#{host}"}
 
     before (:each) do
@@ -50,7 +50,7 @@ describe Nagira do
       end
     end
 
-    context "/_host_status/:host_name" do
+    context "PUT /_host_status/:host_name" do
       it { pending "Not implemented" ; fail }
     end                         # ----------- "/_host_status/:host_name"
 

data/spec/put/status_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require_relative 'support'
 
-describe Nagira do
+describe "PUT service status" do
 
   dont_run_in_production(__FILE__) and break
 
@@ -42,7 +42,7 @@ describe Nagira do
   # Tests
   #
 
-  context "/_status/:host/_services" do
+  context "PUT /_status/:host/_services" do
 
     context :single do
 
@@ -87,7 +87,7 @@ describe Nagira do
 
       it_should_behave_like :put_status
 
-      context "data check" do
+      context "PUT data check" do
         subject {  out["object"] }
 
         it {  expect(subject).to be_a_kind_of Array }
@@ -96,7 +96,7 @@ describe Nagira do
     end
   end
 
-  context "/_status/:host_name/_services/:service_description" do
+  context "PUT /_status/:host_name/_services/:service_description" do
     let(:url) { "/_status/#{host}/_services/PING" }
     before do
       put url, [{ return_code: 0, plugin_output: "All OK"}].to_json, content_type
@@ -126,7 +126,7 @@ describe Nagira do
 #   end                         # host does not exist
 
 
-  context "/_status/:host_name/_services/:service_description/_return_code/:return_code/_plugin_output/:plugin_output" do
+  context "PUT /_status/:host_name/_services/:service_description/_return_code/:return_code/_plugin_output/:plugin_output" do
     it { pending "To be depreciated "; fail}
   end