flapjack 0.6.43 → 0.6.44

data/spec/lib/flapjack/data/entity_spec.rb

@@ -14,6 +14,41 @@ describe Flapjack::Data::Entity, :redis => true do
     @redis.get("entity_id:#{name}").should == ''
   end
 
+  it "adds a registered contact with an entity" do
+    Flapjack::Data::Contact.add({'id'         => '362',
+                                 'first_name' => 'John',
+                                 'last_name'  => 'Johnson',
+                                 'email'      => 'johnj@example.com' },
+                                 :redis       => @redis)
+
+    Flapjack::Data::Entity.add({'id'   => '5000',
+                                'name' => name,
+                                'contacts' => ['362']},
+                                :redis => @redis)
+
+    entity = Flapjack::Data::Entity.find_by_id('5000', :redis => @redis)
+    entity.should_not be_nil
+    contacts = entity.contacts
+    contacts.should_not be_nil
+    contacts.should be_an(Array)
+    contacts.should have(1).contact
+    contacts.first.name.should == 'John Johnson'
+  end
+
+  it "does not add a registered contact with an entity if the contact is unknown" do
+    Flapjack::Data::Entity.add({'id'   => '5000',
+                                'name' => name,
+                                'contacts' => ['362']},
+                                :redis => @redis)
+
+    entity = Flapjack::Data::Entity.find_by_id('5000', :redis => @redis)
+    entity.should_not be_nil
+    contacts = entity.contacts
+    contacts.should_not be_nil
+    contacts.should be_an(Array)
+    contacts.should be_empty
+  end
+
   it "finds an entity by id" do
     Flapjack::Data::Entity.add({'id'   => '5000',
                                 'name' => name},
@@ -35,10 +70,6 @@ describe Flapjack::Data::Entity, :redis => true do
   end
 
   it "returns a list of all entities" do
-
-    pending "Broken with redis 2.6, which changes the default ordering. " +
-    "I have a fix for this in another branch, will handle on merge."
-
     Flapjack::Data::Entity.add({'id'   => '5000',
                                 'name' => name},
                                 :redis => @redis)
@@ -86,4 +117,22 @@ describe Flapjack::Data::Entity, :redis => true do
     check_count.should == 2
   end
 
+  it "finds entity names matching a pattern" do
+    Flapjack::Data::Entity.add({'id'       => '5000',
+                                'name'     => 'abc-123',
+                                'contacts' => []},
+                               :redis => @redis)
+
+    Flapjack::Data::Entity.add({'id'       => '5001',
+                                'name'     => 'def-456',
+                                'contacts' => []},
+                               :redis => @redis)
+
+    entities = Flapjack::Data::Entity.find_all_name_matching('abc', :redis => @redis)
+    entities.should_not be_nil
+    entities.should be_an(Array)
+    entities.should have(1).entity
+    entities.first.should == 'abc-123'
+  end
+
 end

data/spec/lib/flapjack/{api → gateways/api}/entity_check_presenter_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
-require 'flapjack/api/entity_check_presenter'
+require 'flapjack/gateways/api/entity_check_presenter'
 
-# require 'flapjack/data/entity'
-# require 'flapjack/data/entity_check'
-
-describe 'Flapjack::API::EntityCheck::Presenter' do
+describe 'Flapjack::Gateways::API::EntityCheck::Presenter' do
 
   let(:entity_check) { mock(Flapjack::Data::EntityCheck) }
 
@@ -47,7 +44,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:historical_state_before).
       with(time - (4 * 60 * 60)).and_return(nil)
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     outages = ecp.outages(time - (5 * 60 * 60), time - (2 * 60 * 60))
     outages.should_not be_nil
     outages.should be_an(Array)
@@ -63,7 +60,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:historical_state_before).
       with(time - (4 * 60 * 60)).and_return(nil)
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     outages = ecp.outages(nil, nil)
     outages.should_not be_nil
     outages.should be_an(Array)
@@ -78,7 +75,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:historical_state_before).
       with(time - (4 * 60 * 60)).and_return(nil)
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     outages = ecp.outages(nil, nil)
     outages.should_not be_nil
     outages.should be_an(Array)
@@ -92,7 +89,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:maintenances).
       with(nil, time - (12 * 60 * 60), :scheduled => false).and_return([])
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     unsched_maint = ecp.unscheduled_maintenance(time - (12 * 60 * 60), time)
 
     unsched_maint.should be_an(Array)
@@ -108,7 +105,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:maintenances).
       with(nil, time - (12 * 60 * 60), :scheduled => true).and_return([])
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     sched_maint = ecp.scheduled_maintenance(time - (12 * 60 * 60), time)
 
     sched_maint.should be_an(Array)
@@ -130,7 +127,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:maintenances).
       with(nil, time - (12 * 60 * 60), :scheduled => true).and_return([])
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     downtimes = ecp.downtime(time - (12 * 60 * 60), time)
 
     # 22 minutes, 3 + 8 + 11
@@ -155,7 +152,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:maintenances).
       with(nil, nil, :scheduled => true).and_return(maintenances)
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     downtimes = ecp.downtime(nil, nil)
 
     # 22 minutes, 3 + 8 + 11
@@ -182,7 +179,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     entity_check.should_receive(:maintenances).
       with(nil, nil, :scheduled => true).and_return([])
 
-    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    ecp = Flapjack::Gateways::API::EntityCheckPresenter.new(entity_check)
     downtimes = ecp.downtime(nil, nil)
 
     downtimes.should be_a(Hash)

data/spec/lib/flapjack/{api → gateways/api}/entity_presenter_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
-require 'flapjack/api/entity_presenter'
+require 'flapjack/gateways/api/entity_presenter'
 
-describe 'Flapjack::API::Entity::Presenter' do
+describe 'Flapjack::Gateways::API::Entity::Presenter' do
 
   let(:entity) { mock(Flapjack::Data::Entity) }
 
   let(:check_a) { mock(Flapjack::Data::EntityCheck) }
   let(:check_b) { mock(Flapjack::Data::EntityCheck) }
 
-  let(:checkpres_a) { mock(Flapjack::API::EntityCheckPresenter) }
-  let(:checkpres_b) { mock(Flapjack::API::EntityCheckPresenter) }
+  let(:checkpres_a) { mock(Flapjack::Gateways::API::EntityCheckPresenter) }
+  let(:checkpres_b) { mock(Flapjack::Gateways::API::EntityCheckPresenter) }
 
   let(:time) { Time.now.to_i }
 
@@ -23,9 +23,9 @@ describe 'Flapjack::API::Entity::Presenter' do
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', anything).and_return(check_b)
 
-    Flapjack::API::EntityCheckPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
       with(check_a).and_return(checkpres_a)
-    Flapjack::API::EntityCheckPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
       with(check_b).and_return(checkpres_b)
   end
 
@@ -38,7 +38,7 @@ describe 'Flapjack::API::Entity::Presenter' do
     checkpres_b.should_receive(:outages).with(start_time, end_time).
       and_return(outages_b)
 
-    ep = Flapjack::API::EntityPresenter.new(entity)
+    ep = Flapjack::Gateways::API::EntityPresenter.new(entity)
     outages = ep.outages(start_time, end_time)
     outages.should == [{:check => 'ssh',  :outages => outages_a},
                        {:check => 'ping', :outages => outages_b}]
@@ -53,7 +53,7 @@ describe 'Flapjack::API::Entity::Presenter' do
     checkpres_b.should_receive(:unscheduled_maintenance).with(start_time, end_time).
       and_return(unsched_maint_b)
 
-    ep = Flapjack::API::EntityPresenter.new(entity)
+    ep = Flapjack::Gateways::API::EntityPresenter.new(entity)
     unsched_maint = ep.unscheduled_maintenance(start_time, end_time)
     unsched_maint.should == [{:check => 'ssh',  :unscheduled_maintenance => unsched_maint_a},
                              {:check => 'ping', :unscheduled_maintenance => unsched_maint_b}]
@@ -68,7 +68,7 @@ describe 'Flapjack::API::Entity::Presenter' do
     checkpres_b.should_receive(:scheduled_maintenance).with(start_time, end_time).
       and_return(sched_maint_b)
 
-    ep = Flapjack::API::EntityPresenter.new(entity)
+    ep = Flapjack::Gateways::API::EntityPresenter.new(entity)
     sched_maint = ep.scheduled_maintenance(start_time, end_time)
     sched_maint.should == [{:check => 'ssh',  :scheduled_maintenance => sched_maint_a},
                            {:check => 'ping', :scheduled_maintenance => sched_maint_b}]
@@ -83,7 +83,7 @@ describe 'Flapjack::API::Entity::Presenter' do
     checkpres_b.should_receive(:downtime).with(start_time, end_time).
       and_return(downtime_b)
 
-    ep = Flapjack::API::EntityPresenter.new(entity)
+    ep = Flapjack::Gateways::API::EntityPresenter.new(entity)
     downtime = ep.downtime(start_time, end_time)
     downtime.should == [{:check => 'ssh',  :downtime => downtime_a},
                         {:check => 'ping', :downtime => downtime_b}]

data/spec/lib/flapjack/{api_spec.rb → gateways/api_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require 'flapjack/api'
+require 'flapjack/gateways/api'
 
-describe 'Flapjack::API', :sinatra => true do
+describe 'Flapjack::Gateways::API', :sinatra => true do
 
   def app
-    Flapjack::API
+    Flapjack::Gateways::API
   end
 
   let(:entity)          { mock(Flapjack::Data::Entity) }
@@ -14,14 +14,14 @@ describe 'Flapjack::API', :sinatra => true do
   let(:entity_name_esc) { URI.escape(entity_name) }
   let(:check)           { 'ping' }
 
-  let(:entity_presenter)       { mock(Flapjack::API::EntityPresenter) }
-  let(:entity_check_presenter) { mock(Flapjack::API::EntityCheckPresenter) }
+  let(:entity_presenter)       { mock(Flapjack::Gateways::API::EntityPresenter) }
+  let(:entity_check_presenter) { mock(Flapjack::Gateways::API::EntityCheckPresenter) }
 
   let(:redis)           { mock(::Redis) }
 
   before(:each) do
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
-    Flapjack::API.bootstrap(:config => {})
+    Flapjack::Gateways::API.bootstrap(:config => {})
   end
 
   it "returns a list of checks for an entity" do
@@ -40,7 +40,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_presenter.should_receive(:scheduled_maintenance).with(nil, nil).and_return(result)
-    Flapjack::API::EntityPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
       with(entity, :redis => redis).and_return(entity_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -68,7 +68,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_check_presenter.should_receive(:scheduled_maintenance).with(nil, nil).and_return(result)
-    Flapjack::API::EntityCheckPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
       with(entity_check).and_return(entity_check_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -85,7 +85,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_presenter.should_receive(:unscheduled_maintenance).with(nil, nil).and_return(result)
-    Flapjack::API::EntityPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
       with(entity, :redis => redis).and_return(entity_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -100,7 +100,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_check_presenter.should_receive(:unscheduled_maintenance).with(nil, nil).and_return(result)
-    Flapjack::API::EntityCheckPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
       with(entity_check).and_return(entity_check_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -120,7 +120,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_presenter.should_receive(:outages).with(nil, nil).and_return(result)
-    Flapjack::API::EntityPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
       with(entity, :redis => redis).and_return(entity_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -135,7 +135,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_check_presenter.should_receive(:outages).with(nil, nil).and_return(result)
-    Flapjack::API::EntityCheckPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
       with(entity_check).and_return(entity_check_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -152,7 +152,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_presenter.should_receive(:downtime).with(nil, nil).and_return(result)
-    Flapjack::API::EntityPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
       with(entity, :redis => redis).and_return(entity_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
@@ -167,7 +167,7 @@ describe 'Flapjack::API', :sinatra => true do
     result_json = %q{"result"}
     result.should_receive(:to_json).and_return(result_json)
     entity_check_presenter.should_receive(:downtime).with(nil, nil).and_return(result)
-    Flapjack::API::EntityCheckPresenter.should_receive(:new).
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
       with(entity_check).and_return(entity_check_presenter)
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)

data/spec/lib/flapjack/gateways/email_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/gateways/email'
+
+describe Flapjack::Gateways::Email do
+
+end

data/spec/lib/flapjack/{jabber_spec.rb → gateways/jabber_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'flapjack/jabber'
+require 'flapjack/gateways/jabber'
 
-describe Flapjack::Jabber do
+describe Flapjack::Gateways::Jabber do
 
   let(:config) { {'queue'    => 'jabber_notifications',
                   'server'   => 'example.com',
@@ -18,7 +18,7 @@ describe Flapjack::Jabber do
   it "hooks up event handlers to the appropriate methods" do
     Socket.should_receive(:gethostname).and_return('thismachine')
 
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
@@ -40,7 +40,7 @@ describe Flapjack::Jabber do
   end
 
   it "joins a chat room after connecting" do
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new).twice
     fj.bootstrap(:config => config)
 
@@ -72,7 +72,7 @@ describe Flapjack::Jabber do
       with('main-example.com:ping', :redis => redis).
       and_return(entity_check)
 
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
     fj.instance_variable_set('@redis_handler', redis)
@@ -89,7 +89,7 @@ describe Flapjack::Jabber do
     from.should_receive(:stripped).and_return('sender')
     stanza.should_receive(:from).and_return(from)
 
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
@@ -100,7 +100,7 @@ describe Flapjack::Jabber do
   end
 
   it "reconnects when disconnected (if not quitting)" do
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
@@ -115,7 +115,7 @@ describe Flapjack::Jabber do
     redis = mock('redis')
     redis.should_receive(:rpush).with('jabber_notifications', %q{{"notification_type":"shutdown"}})
 
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
@@ -133,7 +133,7 @@ describe Flapjack::Jabber do
     redis = mock('redis')
     redis.should_receive(:empty!)
 
-    fj = Flapjack::Jabber.new
+    fj = Flapjack::Gateways::Jabber.new
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fj.bootstrap(:config => config)
     fj.should_receive(:register_handler).exactly(4).times

data/spec/lib/flapjack/{oobetet_spec.rb → gateways/oobetet_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'flapjack/oobetet'
+require 'flapjack/gateways/oobetet'
 
-describe Flapjack::Oobetet do
+describe Flapjack::Gateways::Oobetet do
 
   let(:config) { {'server'   => 'example.com',
                   'port'     => '5222',
@@ -19,7 +19,7 @@ describe Flapjack::Oobetet do
   it "raises an error if a required config setting is not set" do
     Socket.should_receive(:gethostname).and_return('thismachine')
 
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config.delete('watched_check'))
 
     lambda {
@@ -28,7 +28,7 @@ describe Flapjack::Oobetet do
   end
 
   it "hooks up event handlers to the appropriate methods" do
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
 
     EventMachine::Synchrony.should_receive(:next_tick).exactly(3).times.and_yield
@@ -46,7 +46,7 @@ describe Flapjack::Oobetet do
   end
 
   it "joins a chat room after connecting" do
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
 
     fo.should_receive(:write).with(an_instance_of(Blather::Stanza::Presence))
@@ -56,7 +56,7 @@ describe Flapjack::Oobetet do
   end
 
   it "reconnects when disconnected (if not quitting)" do
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
 
     EventMachine::Timer.should_receive(:new).with(1).and_yield
@@ -67,7 +67,7 @@ describe Flapjack::Oobetet do
   end
 
   it "records times of a problem status messages" do
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
 
     fo.setup
@@ -85,7 +85,7 @@ describe Flapjack::Oobetet do
   end
 
   it "records times of a recovery status messages" do
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
 
     fo.setup
@@ -103,7 +103,7 @@ describe Flapjack::Oobetet do
   end
 
   it "records times of an acknowledgement status messages" do
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
 
     fo.setup
@@ -125,7 +125,7 @@ describe Flapjack::Oobetet do
     timer.should_receive(:cancel)
     EM::Synchrony.should_receive(:add_periodic_timer).with(60).and_return(timer)
 
-    fo = Flapjack::Oobetet.new
+    fo = Flapjack::Gateways::Oobetet.new
     fo.bootstrap(:config => config)
     fo.should_receive(:register_handler).exactly(3).times