nagira 0.3.3 → 0.4.0

data/spec/put/status_spec.rb

@@ -42,66 +42,67 @@ describe Nagira do
   #
 
   context "/_status/:host/_services" do
-    
-    context :single do 
-      
+
+    context :single do
+
       let (:url) { "/_status/#{host}/_services" }
       before (:each) do
         put url, @input.to_json, content_type
       end
-      
+
       it_should_behave_like :put_status
-      
+
       it "URL param hostname is higher priority than JSON" do
         pending
+        fail
 #         put url, @input.merge({ "host_name" => "fake_host"}).to_json, content_type
 
-#         out = JSON.parse last_response.body 
+#         out = JSON.parse last_response.body
 # pp out
 #         out["object"]["data"]["host_name"].should eq host
       end
-      
+
       it "update with valid data" do
-        last_response.should be_ok
+        expect(last_response).to be_ok
       end
-      
+
       it 'Fails with missing data' do
         @input.keys.each do |key|
           data = @input.dup
           data.delete key
           put url, data.to_json, content_type
-          last_response.status.should be 400
+          expect(last_response.status).to eq 400
         end
       end
     end
-    
+
     context :multiple do
       let (:url) { "/_status/#{host}/_services" }
       before do
         put url, [@input, @input2].to_json, content_type
       end
-      
+
       let (:out) { JSON.parse last_response.body }
-      
+
       it_should_behave_like :put_status
-      
-      context "data check" do 
+
+      context "data check" do
         subject {  out["object"] }
-        
-        it {  should be_a_kind_of Array }
-        it {  subject.size.should eq 2 }
+
+        it {  expect(subject).to be_a_kind_of Array }
+        it {  expect(subject.size).to eq 2 }
       end
     end
   end
-  
+
   context "/_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
     end
-    
+
     it "writes status" do
-      last_response.should be_ok
+      expect(last_response).to be_ok
     end
     it_should_behave_like :put_status
 
@@ -125,7 +126,7 @@ describe Nagira do
 
 
   context "/_status/:host_name/_services/:service_description/_return_code/:return_code/_plugin_output/:plugin_output" do
-    it { pending "To be depreciated "}
+    it { pending "To be depreciated "; fail}
   end
 
 end                           # update /_hosts

data/spec/put/support.rb

@@ -1,31 +1,31 @@
-shared_examples_for :json_response do 
-  before (:each) do 
+shared_examples_for :json_response do
+  before (:each) do
     @ret = JSON.parse(last_response.body)
   end
   subject { @ret }
-  
-  it { should be_a_kind_of Hash }
-  it { should have_key "result" }
-  it { should have_key "object" }
+
+  it { expect(subject).to be_a_kind_of Hash }
+  it { expect(subject).to have_key "result" }
+  it { expect(subject).to have_key "object" }
 
   let (:obj) {  subject["object"] }
 
   context :object do
     # subject { obj }
-    
-    it { obj.should be_a_kind_of Array }
-    it { 
-      obj.each { |x| x.should be_a_kind_of Hash }
+
+    it { expect(obj).to be_a_kind_of Array }
+    it {
+      obj.each { |x| expect(x).to be_a_kind_of Hash }
     }
 
     context :data_keys do
-      
+
       it do
-        obj.each do |x| 
-          x.should have_key "data"
-          x.should have_key "result"
-          x.should have_key "messages"
-          [true, false].should include x["result"]
+        obj.each do |x|
+          expect(x).to have_key "data"
+          expect(x).to have_key "result"
+          expect(x).to have_key "messages"
+          expect([true, false]).to include x["result"]
         end
       end
     end
@@ -33,31 +33,31 @@ shared_examples_for :json_response do
 end
 
 shared_examples_for :json_success_response do
-  before (:each) do 
+  before (:each) do
     @ret = JSON.parse(last_response.body)
   end
   subject { @ret }
-  
+
 end
 
 shared_examples_for :write_to_nagios_cmd_file do
-  before (:all) do 
+  before (:all) do
       File.delete $nagios[:commands].path rescue nil
   end
   let (:cmd) { $nagios[:commands].path }
-  
+
   it "writes to nagios.cmd file" do
-    File.should exist(cmd)
-    File.read(cmd).should =~ /^\[\d+\] PROCESS_(SERVICE|HOST)_CHECK_RESULT;#{host}/
+    expect(File).to exist(cmd)
+    expect(File.read(cmd)).to match(/^\[\d+\] PROCESS_(SERVICE|HOST)_CHECK_RESULT;#{host}/)
   end
 
-  after (:each) do 
+  after (:each) do
       File.delete $nagios[:commands].path rescue nil
   end
 end
 
 
-shared_examples_for :put_status do 
+shared_examples_for :put_status do
       it_should_behave_like :json_response
       it_should_behave_like :write_to_nagios_cmd_file
 end

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
 $: << File.dirname(__FILE__) + '/../lib/'
 require_relative '../lib/nagira.rb'
-require_relative '../lib/app.rb'
+require_relative '../app/app.rb'
 require 'rack/test'
 
 IMPLEMENTED = {
   top:            %w{ _api _status _objects _config _runtime},
   output:          %w{ _list _state _full }, # Type of requests as in varaible @output
   hosts:          %w{ archive tv },
-  status:         %w{ _services _servicecomments _hostcomments }
+  hostgoups:      %w{ all linux },
+  status:         %w{ _services _servicecomments _hostcomments}
 }
 
 RANDOM = %w{ _bla _foo bla foo ahdhjdjda }

data/version.txt

@@ -1 +1 @@
-0.3.3
+0.4.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagira
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmytro Kovalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
 - !ruby/object:Gem::Dependency
   name: sherlock_os
   requirement: !ruby/object:Gem::Requirement
@@ -90,44 +90,44 @@ dependencies:
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.x
 - !ruby/object:Gem::Dependency
   name: ruby-nagios
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.x
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.x
 - !ruby/object:Gem::Dependency
   name: guard-brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -224,14 +238,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 4.x.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 4.x.x
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -278,21 +292,23 @@ extra_rdoc_files: []
 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/put.rb
+- app/put/host.rb
+- app/put/status.rb
 - bin/nagira
 - bin/nagira-setup
 - config/defaults.rb
 - config/environment.rb
 - config/nagira.defaults
 - config/nagira.init_d
-- lib/app.rb
-- lib/app/routes/get/config.rb
-- lib/app/routes/get/objects.rb
-- lib/app/routes/get/status.rb
-- lib/app/routes/put.rb
-- lib/app/routes/put/host.rb
-- lib/app/routes/put/status.rb
 - lib/nagira.rb
 - lib/nagira/background_parse.rb
+- lib/nagira/hostgroup.rb
 - lib/nagira/nagios.rb
 - lib/nagira/timed_parse.rb
 - lib/tasks/config.rake
@@ -305,6 +321,7 @@ files:
 - spec/01_data_format/03_api_spec.rb
 - spec/get/comments_spec.rb
 - spec/get/endpoints_spec.rb
+- spec/get/hostgroup.rb
 - spec/get/hosts_spec.rb
 - spec/get/services_spec.rb
 - spec/put/host_spec.rb
@@ -354,3 +371,4 @@ signing_key:
 specification_version: 4
 summary: 'Nagira : Nagios RESTful API'
 test_files: []
+has_rdoc: