flapjack 0.7.27 → 0.7.28

data/spec/lib/flapjack/gateways/api/entity_presenter_spec.rb

@@ -3,13 +3,13 @@ require 'flapjack/gateways/api/entity_presenter'
 
 describe 'Flapjack::Gateways::API::EntityPresenter' do
 
-  let(:entity) { mock(Flapjack::Data::Entity) }
+  let(:entity) { double(Flapjack::Data::Entity) }
 
-  let(:check_a) { mock(Flapjack::Data::EntityCheck) }
-  let(:check_b) { mock(Flapjack::Data::EntityCheck) }
+  let(:check_a) { double(Flapjack::Data::EntityCheck) }
+  let(:check_b) { double(Flapjack::Data::EntityCheck) }
 
-  let(:checkpres_a) { mock(Flapjack::Gateways::API::EntityCheckPresenter) }
-  let(:checkpres_b) { mock(Flapjack::Gateways::API::EntityCheckPresenter) }
+  let(:checkpres_a) { double(Flapjack::Gateways::API::EntityCheckPresenter) }
+  let(:checkpres_b) { double(Flapjack::Gateways::API::EntityCheckPresenter) }
 
   let(:time) { Time.now.to_i }
 
@@ -33,8 +33,8 @@ describe 'Flapjack::Gateways::API::EntityPresenter' do
   it 'returns a list of status hashes for each check on an entity' do
     expect_check_presenters
 
-    status_a = mock('status_a')
-    status_b = mock('status_b')
+    status_a = double('status_a')
+    status_b = double('status_b')
     checkpres_a.should_receive(:status).and_return(status_a)
     checkpres_b.should_receive(:status).and_return(status_b)
 
@@ -47,8 +47,8 @@ describe 'Flapjack::Gateways::API::EntityPresenter' do
 
   it "returns a list of outage hashes for each check on an entity" do
     expect_check_presenters
-    outages_a = mock('outages_a')
-    outages_b = mock('outages_b')
+    outages_a = double('outages_a')
+    outages_b = double('outages_b')
     checkpres_a.should_receive(:outages).with(start_time, end_time).
       and_return(outages_a)
     checkpres_b.should_receive(:outages).with(start_time, end_time).
@@ -62,8 +62,8 @@ describe 'Flapjack::Gateways::API::EntityPresenter' do
 
   it "returns a list of unscheduled maintenance periods for each check on an entity" do
     expect_check_presenters
-    unsched_maint_a = mock('unsched_maint_a')
-    unsched_maint_b = mock('unsched_maint_b')
+    unsched_maint_a = double('unsched_maint_a')
+    unsched_maint_b = double('unsched_maint_b')
     checkpres_a.should_receive(:unscheduled_maintenances).with(start_time, end_time).
       and_return(unsched_maint_a)
     checkpres_b.should_receive(:unscheduled_maintenances).with(start_time, end_time).
@@ -77,8 +77,8 @@ describe 'Flapjack::Gateways::API::EntityPresenter' do
 
   it "returns a list of scheduled maintenance periods for each check on an entity" do
     expect_check_presenters
-    sched_maint_a = mock('sched_maint_a')
-    sched_maint_b = mock('sched_maint_b')
+    sched_maint_a = double('sched_maint_a')
+    sched_maint_b = double('sched_maint_b')
     checkpres_a.should_receive(:scheduled_maintenances).with(start_time, end_time).
       and_return(sched_maint_a)
     checkpres_b.should_receive(:scheduled_maintenances).with(start_time, end_time).
@@ -92,8 +92,8 @@ describe 'Flapjack::Gateways::API::EntityPresenter' do
 
   it "returns a list of downtime for each check on an entity" do
     expect_check_presenters
-    downtime_a = mock('downtime_a')
-    downtime_b = mock('downtime_b')
+    downtime_a = double('downtime_a')
+    downtime_b = double('downtime_b')
     checkpres_a.should_receive(:downtime).with(start_time, end_time).
       and_return(downtime_a)
     checkpres_b.should_receive(:downtime).with(start_time, end_time).

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

@@ -4,12 +4,12 @@ require 'flapjack/gateways/email'
 describe Flapjack::Gateways::Email, :logger => true do
 
   it "sends a mail with text and html parts" do
-    email = mock('email')
+    email = double('email')
 
-    entity_check = mock(Flapjack::Data::EntityCheck)
+    entity_check = double(Flapjack::Data::EntityCheck)
     entity_check.should_receive(:in_scheduled_maintenance?).and_return(false)
     entity_check.should_receive(:in_unscheduled_maintenance?).and_return(false)
-    redis = mock('redis')
+    redis = double('redis')
 
     Flapjack::Data::EntityCheck.should_receive(:for_event_id).
       with('example.com:ping', :redis => redis).and_return(entity_check)
@@ -19,7 +19,7 @@ describe Flapjack::Gateways::Email, :logger => true do
       hash_including(:host    => 'localhost',
                      :port    => 25)).and_return(email)
 
-    response = mock(response)
+    response = double(response)
     response.should_receive(:"respond_to?").with(:code).and_return(true)
     response.should_receive(:code).and_return(250)
 

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

@@ -13,7 +13,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
                  }
   }
 
-  let(:stanza) { mock('stanza') }
+  let(:stanza) { double('stanza') }
 
   it "hooks up event handlers to the appropriate methods" do
     Socket.should_receive(:gethostname).and_return('thismachine')
@@ -53,15 +53,15 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
   it "receives an acknowledgement message" do
     stanza.should_receive(:body).and_return('flapjack: ACKID 876 fixing now duration: 90m')
-    from = mock('from')
+    from = double('from')
     from.should_receive(:stripped).and_return('sender')
     stanza.should_receive(:from).and_return(from)
 
-    redis = mock('redis')
+    redis = double('redis')
     redis.should_receive(:hget).with('unacknowledged_failures', '876').
       and_return('main-example.com:ping')
 
-    entity_check = mock(Flapjack::Data::EntityCheck)
+    entity_check = double(Flapjack::Data::EntityCheck)
     entity_check.should_receive(:in_unscheduled_maintenance?)
 
     Flapjack::Data::Event.should_receive(:create_acknowledgement).
@@ -88,21 +88,20 @@ describe Flapjack::Gateways::Jabber, :logger => true do
       and_return('flapjack: tell me about <span style="text-decoration: underline;">' +
                  '<a href="http://example.org/">example.org</a></span>')
 
-    from = mock('from')
+    from = double('from')
     from.should_receive(:stripped).and_return('sender')
     stanza.should_receive(:from).and_return(from)
 
-    redis = mock('redis')
-    entity = mock(Flapjack::Data::Entity)
+    redis = double('redis')
+    entity = double(Flapjack::Data::Entity)
     entity.should_receive(:check_list).and_return(['ping'])
 
     Flapjack::Data::Entity.should_receive(:find_by_name).with('example.org',
       :redis => redis).and_return(entity)
 
-    entity_check = mock(Flapjack::Data::EntityCheck)
+    entity_check = double(Flapjack::Data::EntityCheck)
     entity_check.should_receive(:current_maintenance).with(:scheduled => true).and_return(nil)
     entity_check.should_receive(:current_maintenance).with(:unscheduled => true).and_return(nil)
-    entity_check.should_receive(:check).and_return('ping')
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).with(entity, 'ping',
       :redis => redis).and_return(entity_check)
@@ -119,7 +118,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
   it "receives a message it doesn't understand" do
     stanza.should_receive(:body).once.and_return('flapjack: hello!')
-    from = mock('from')
+    from = double('from')
     from.should_receive(:stripped).and_return('sender')
     stanza.should_receive(:from).and_return(from)
 
@@ -151,11 +150,11 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "prompts the blocking redis connection to quit" do
-    shutdown_redis = mock('shutdown_redis')
+    shutdown_redis = double('shutdown_redis')
     shutdown_redis.should_receive(:rpush).with('jabber_notifications', %q{{"notification_type":"shutdown"}})
     EM::Hiredis.should_receive(:connect).and_return(shutdown_redis)
 
-    redis = mock('redis')
+    redis = double('redis')
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fj = Flapjack::Gateways::Jabber.new(:config => config, :logger => @logger)
 
@@ -163,11 +162,11 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "runs a blocking loop listening for notifications" do
-    timer = mock('timer')
+    timer = double('timer')
     timer.should_receive(:cancel)
     EM::Synchrony.should_receive(:add_periodic_timer).with(1).and_return(timer)
 
-    redis = mock('redis')
+    redis = double('redis')
 
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fj = Flapjack::Gateways::Jabber.new(:config => config, :logger => @logger)

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

@@ -14,7 +14,7 @@ describe Flapjack::Gateways::Oobetet, :logger => true do
                  }
   }
 
-  let(:stanza) { mock('stanza') }
+  let(:stanza) { double('stanza') }
 
   it "raises an error if a required config setting is not set" do
     Socket.should_receive(:gethostname).and_return('thismachine')
@@ -111,7 +111,7 @@ describe Flapjack::Gateways::Oobetet, :logger => true do
   end
 
   it "runs a loop checking for recorded problems" do
-    timer = mock('timer')
+    timer = double('timer')
     timer.should_receive(:cancel)
     EM::Synchrony.should_receive(:add_periodic_timer).with(60).and_return(timer)
 

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

@@ -8,10 +8,10 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
 
   let(:time)   { Time.new }
 
-  let(:redis) {  mock('redis') }
+  let(:redis) {  double('redis') }
 
   it "prompts the blocking redis connection to quit" do
-    shutdown_redis = mock('shutdown_redis')
+    shutdown_redis = double('shutdown_redis')
     shutdown_redis.should_receive(:rpush).with(config['queue'], %q{{"notification_type":"shutdown"}})
     EM::Hiredis.should_receive(:connect).and_return(shutdown_redis)
 
@@ -94,7 +94,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fp = Flapjack::Gateways::Pagerduty.new(:config => config, :logger => @logger)
 
-    contact = mock('contact')
+    contact = double('contact')
     contact.should_receive(:pagerduty_credentials).and_return({
       'service_key' => '12345678',
       'subdomain"'  => 'flpjck',
@@ -102,7 +102,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
       'password'    => 'password123'
     })
 
-    entity_check = mock('entity_check')
+    entity_check = double('entity_check')
     entity_check.should_receive(:check).and_return('PING')
     entity_check.should_receive(:contacts).and_return([contact])
     entity_check.should_receive(:entity_name).exactly(2).times.and_return('foo-app-01.bar.net')
@@ -117,7 +117,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
   end
 
   it "runs a blocking loop listening for notifications" do
-    timer = mock('timer')
+    timer = double('timer')
     timer.should_receive(:cancel)
     EM::Synchrony.should_receive(:add_periodic_timer).with(10).and_return(timer)
 

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

@@ -3,7 +3,7 @@ require 'flapjack/gateways/sms_messagenet'
 
 describe Flapjack::Gateways::SmsMessagenet, :logger => true do
 
-  let(:lock) { mock(Monitor) }
+  let(:lock) { double(Monitor) }
 
   let(:config) { {'username'  => 'user',
                   'password'  => 'password'

data/spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe 'web/views/contact.html.erb', :erb_view => true do
 
   it "should escape unsafe check characters in URI parameters" do
-    @contact = mock('contact')
+    @contact = double('contact')
     @contact.should_receive(:media)
     @contact.should_receive(:name).twice.and_return('Aeschylus')
     @contact.should_receive(:notification_rules)
 
-    entity = mock('entity')
+    entity = double('entity')
     entity.should_receive(:name).exactly(3).times.and_return('abc-xyz-01')
 
     checks = ['Disk / Utilisation']

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

@@ -11,10 +11,10 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   let(:entity_name_esc) { CGI.escape(entity_name) }
   let(:check)           { 'ping' }
 
-  let(:entity)          { mock(Flapjack::Data::Entity) }
-  let(:entity_check)    { mock(Flapjack::Data::EntityCheck) }
+  let(:entity)          { double(Flapjack::Data::Entity) }
+  let(:entity_check)    { double(Flapjack::Data::EntityCheck) }
 
-  let(:redis) { mock('redis') }
+  let(:redis) { double('redis') }
 
   before(:all) do
     Flapjack::Gateways::Web.class_eval {
@@ -239,7 +239,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   it "shows details of an individual contact found by id" do
-    contact = mock('contact')
+    contact = double('contact')
     contact.should_receive(:name).twice.and_return("Smithson Smith")
     contact.should_receive(:media).exactly(3).times.and_return({})
     contact.should_receive(:entities).with(:checks => true).and_return([])

data/spec/lib/flapjack/logger_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe Flapjack::Logger do
 
-  let(:logger)     { mock(::Logger) }
+  let(:logger)     { double(::Logger) }
 
-  let(:sys_logger) { mock(::Logger) }
-  let(:syslog)     { mock(Syslog) }
+  let(:sys_logger) { double(::Logger) }
+  let(:syslog)     { double(Syslog) }
 
   it "creates a logger logging to STDOUT and syslog" do
     logger.should_receive(:formatter=).with(an_instance_of(Proc))

data/spec/lib/flapjack/pikelet_spec.rb

@@ -3,12 +3,12 @@ require 'flapjack/pikelet'
 
 describe Flapjack::Pikelet do
 
-  let(:config) { mock('config') }
-  let(:redis_config) { mock('redis_config') }
+  let(:config) { double('config') }
+  let(:redis_config) { double('redis_config') }
 
-  let(:logger) { mock(Flapjack::Logger) }
+  let(:logger) { double(Flapjack::Logger) }
 
-  let(:fiber) { mock(Fiber) }
+  let(:fiber) { double(Fiber) }
 
   let(:time) { Time.now }
 
@@ -21,9 +21,9 @@ describe Flapjack::Pikelet do
 
     config.should_receive(:[]).with('logger').and_return(nil)
 
-    fc = mock('coordinator')
+    fc = double('coordinator')
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:start)
     Flapjack::Processor.should_receive(:new).with(:config => config,
         :redis_config => redis_config, :boot_time => time, :logger => logger, :coordinator => fc).
@@ -44,8 +44,8 @@ describe Flapjack::Pikelet do
     config.should_receive(:[]).with('logger').and_return(nil)
     config.should_receive(:[]).with('queue').and_return('email_notif')
 
-    resque_redis = mock('resque_redis')
-    redis = mock('redis')
+    resque_redis = double('resque_redis')
+    redis = double('redis')
     Flapjack::RedisPool.should_receive(:new).twice.and_return(resque_redis, redis)
     Resque.should_receive(:redis=).with(resque_redis)
 
@@ -56,7 +56,7 @@ describe Flapjack::Pikelet do
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
       with('@logger', logger)
 
-    worker = mock('worker')
+    worker = double('worker')
     worker.should_receive(:work).with(0.1)
     Flapjack::Gateways::Email.should_receive(:start)
     EM::Resque::Worker.should_receive(:new).with('email_notif').and_return(worker)
@@ -77,7 +77,7 @@ describe Flapjack::Pikelet do
     config.should_receive(:[]).with('port').and_return(7654)
     config.should_receive(:[]).with('timeout').and_return(90)
 
-    server = mock('server')
+    server = double('server')
     server.should_receive(:timeout=).with(90)
     server.should_receive(:start)
     Thin::Server.should_receive(:new).

data/spec/lib/flapjack/processor_spec.rb

@@ -7,7 +7,7 @@ describe Flapjack::Processor, :logger => true do
   # NB: this is only testing the public API of the Processor class, which is pretty limited.
   # (initialize, main, stop). Most test coverage for this class comes from the cucumber features.
 
-  let(:config) { mock(Flapjack::Configuration) }
+  let(:config) { double(Flapjack::Configuration) }
 
   # TODO this does too much -- split it up
   it "starts up, runs and shuts down" do
@@ -19,7 +19,7 @@ describe Flapjack::Processor, :logger => true do
     Flapjack::Filters::Delays.should_receive(:new)
     Flapjack::Filters::Acknowledgement.should_receive(:new)
 
-    redis = mock('redis')
+    redis = double('redis')
 
     redis.should_receive(:hset).with(/^executive_instance:/, "boot_time", anything)
     redis.should_receive(:hget).with('event_counters', 'all').and_return(nil)
@@ -43,11 +43,11 @@ describe Flapjack::Processor, :logger => true do
 
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
 
-    fc = mock('coordinator')
+    fc = double('coordinator')
 
     executive = Flapjack::Processor.new(:config => {}, :logger => @logger, :coordinator => fc)
 
-    noop_evt = mock(Flapjack::Data::Event)
+    noop_evt = double(Flapjack::Data::Event)
     noop_evt.should_receive(:inspect)
     noop_evt.should_receive(:type).and_return('noop')
     Flapjack::Data::Event.should_receive(:next) {

data/spec/lib/flapjack/redis_pool_spec.rb

@@ -8,7 +8,7 @@ describe Flapjack::RedisPool do
       redis_count = 3
 
       redis_conns = redis_count.times.collect {
-        redis = mock('redis')
+        redis = double('redis')
         redis
       }
       ::Redis.should_receive(:new).exactly(redis_count).times.and_return(*redis_conns)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.27
+  version: 0.7.28
+  prerelease: 
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -29,6 +32,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -43,6 +48,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -50,6 +56,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -57,6 +64,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,6 +72,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -85,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -99,6 +112,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -106,6 +120,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -113,6 +128,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-resque
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,6 +136,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,6 +144,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,6 +152,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,6 +160,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -148,6 +168,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -155,6 +176,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -162,6 +184,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -169,6 +192,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -176,6 +200,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -183,6 +208,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,6 +216,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -197,6 +224,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -204,6 +232,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -211,6 +240,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -218,6 +248,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -225,6 +256,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -232,6 +264,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -239,6 +272,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,6 +280,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -253,6 +288,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -260,6 +296,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -267,6 +304,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -274,6 +312,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -281,6 +320,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -288,6 +328,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -295,6 +336,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -302,6 +344,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -350,16 +393,20 @@ files:
 - dist/puppet/ruby/manifests/rubygems.pp
 - dist/puppet/sqlite3/manifests/dev.pp
 - etc/flapjack_config.yaml.example
+- features/cli.feature
 - features/events.feature
 - features/events_check_names.feature
 - features/notification_rules.feature
 - features/notifications.feature
 - features/packaging-lintian.feature
+- features/rollup.feature
+- features/steps/cli_steps.rb
 - features/steps/events_steps.rb
 - features/steps/flapjack-netsaint-parser_steps.rb
 - features/steps/notifications_steps.rb
 - features/steps/packaging-lintian_steps.rb
 - features/steps/time_travel_steps.rb
+- features/support/daemons.rb
 - features/support/env.rb
 - features/support/silent_system.rb
 - flapjack.gemspec
@@ -393,10 +440,16 @@ files:
 - lib/flapjack/gateways/email.rb
 - lib/flapjack/gateways/email/alert.html.erb
 - lib/flapjack/gateways/email/alert.text.erb
+- lib/flapjack/gateways/email/alert_subject.text.erb
+- lib/flapjack/gateways/email/rollup.html.erb
+- lib/flapjack/gateways/email/rollup.text.erb
+- lib/flapjack/gateways/email/rollup_subject.text.erb
 - lib/flapjack/gateways/jabber.rb
 - lib/flapjack/gateways/oobetet.rb
 - lib/flapjack/gateways/pagerduty.rb
 - lib/flapjack/gateways/sms_messagenet.rb
+- lib/flapjack/gateways/sms_messagenet/alert.text.erb
+- lib/flapjack/gateways/sms_messagenet/rollup.text.erb
 - lib/flapjack/gateways/web.rb
 - lib/flapjack/gateways/web/public/css/bootstrap-responsive.min.css
 - lib/flapjack/gateways/web/public/css/bootstrap.min.css
@@ -430,6 +483,7 @@ files:
 - lib/flapjack/redis_pool.rb
 - lib/flapjack/utility.rb
 - lib/flapjack/version.rb
+- log/.gitkeep
 - spec/lib/flapjack/coordinator_spec.rb
 - spec/lib/flapjack/data/contact_spec.rb
 - spec/lib/flapjack/data/entity_check_spec.rb
@@ -493,38 +547,49 @@ files:
 homepage: http://flapjack-project.com/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3626435737663175396
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3626435737663175396
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Intelligent, scalable, distributed monitoring notification system.
 test_files:
+- features/cli.feature
 - features/events.feature
 - features/events_check_names.feature
 - features/notification_rules.feature
 - features/notifications.feature
 - features/packaging-lintian.feature
+- features/rollup.feature
+- features/steps/cli_steps.rb
 - features/steps/events_steps.rb
 - features/steps/flapjack-netsaint-parser_steps.rb
 - features/steps/notifications_steps.rb
 - features/steps/packaging-lintian_steps.rb
 - features/steps/time_travel_steps.rb
+- features/support/daemons.rb
 - features/support/env.rb
 - features/support/silent_system.rb
 - spec/lib/flapjack/coordinator_spec.rb