flapjack 1.0.0rc3 → 1.0.0rc5

data/features/cli.feature

@@ -8,8 +8,8 @@ Feature: command line utility
     Given a file named "flapjack_cfg.yaml" with:
 """
 test:
-  pid_file: tmp/cucumber_cli/flapjack_d.pid
-  log_file: tmp/cucumber_cli/flapjack_d.log
+  pid_dir: tmp/cucumber_cli/
+  log_dir: tmp/cucumber_cli/
   redis:
     db: 14
   processor:
@@ -20,8 +20,8 @@ test:
     And a file named "flapjack_cfg_d.yaml" with:
 """
 test:
-  pid_file: tmp/cucumber_cli/flapjack_d.pid
-  log_file: tmp/cucumber_cli/flapjack_d.log
+  pid_dir: tmp/cucumber_cli/
+  log_dir: tmp/cucumber_cli/
   redis:
     db: 14
   processor:
@@ -53,7 +53,7 @@ test:
     Then flapjack should stop within 15 seconds
 
   Scenario: Starting, status and stopping flapjack, daemonized
-    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start -d`
+    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start`
     Then flapjack should start within 15 seconds
     When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server status`
     Then the exit status should be 0
@@ -62,7 +62,7 @@ test:
     Then flapjack should stop within 15 seconds
 
   Scenario: Starting, restarting and stopping flapjack, daemonized
-    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start -d`
+    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start`
     Then flapjack should start within 15 seconds
     When I restart flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server restart`
     Then flapjack should restart within 15 seconds
@@ -76,6 +76,8 @@ test:
     Given a file named "flapjack_cfg.yaml" with:
 """
 test:
+  pid_dir: tmp/cucumber_cli/
+  log_dir: tmp/cucumber_cli/
   redis:
     db: 14
   processor:
@@ -85,5 +87,3 @@ test:
     # TODO how to test for config file change?
     When I stop flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server stop`
     Then flapjack should stop within 15 seconds
-
-

data/features/cli_flapjack-nagios-receiver.feature

@@ -1,28 +1,22 @@
 @process
-Feature: flapjack-nagios-receiver command line
+Feature: nagios-receiver command line
   As a systems administrator
-  I should be able to manage flapjack-nagios-receiver
+  I should be able to manage nagios-receiver
   From the command line
 
   Background:
     Given a fifo named "tmp/cucumber_cli/nagios_perfdata.fifo" exists
-    And   a file named "flapjack-nagios-receiver.yaml" with:
+    And   a file named "nagios-receiver.yaml" with:
 """
 test:
+  pid_dir: "tmp/cucumber_cli/"
+  log_dir: "tmp/cucumber_cli/"
   redis:
     db: 14
   nagios-receiver:
     fifo: "tmp/cucumber_cli/nagios_perfdata.fifo"
-"""
-    And a file named "flapjack-nagios-receiver_d.yaml" with:
-"""
-test:
-  redis:
-    db: 14
-  nagios-receiver:
-    fifo: "tmp/cucumber_cli/nagios_perfdata.fifo"
-    pid_file: "tmp/cucumber_cli/flapjack-nagios-receiver_d.pid"
-    log_file: "tmp/cucumber_cli/flapjack-nagios-receiver_d.log"
+    pid_dir: "tmp/cucumber_cli/"
+    log_dir: "tmp/cucumber_cli/"
 """
 
   Scenario: Running with --help shows usage information
@@ -31,36 +25,34 @@ test:
     And  the output should contain "[-f arg|--fifo arg]"
     And  the output should contain "receiver nagios start [-d|--daemonize]"
 
-  Scenario: Starting flapjack-nagios-receiver
-    When I start flapjack-nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver.yaml receiver start --no-daemonize`
-    Then flapjack-nagios-receiver should start within 15 seconds
+  Scenario: Starting nagios-receiver
+    When I start nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver start --no-daemonize`
+    Then nagios-receiver should start within 15 seconds
 
-  Scenario: Stopping flapjack-nagios-receiver via SIGINT
-    When I start flapjack-nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver.yaml receiver nagios start --no-daemonize`
-    Then flapjack-nagios-receiver should start within 15 seconds
-    When I send a SIGINT to the flapjack-nagios-receiver process
-    Then flapjack-nagios-receiver should stop within 15 seconds
+  Scenario: Stopping nagios-receiver via SIGINT
+    When I start nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios start --no-daemonize`
+    Then nagios-receiver should start within 15 seconds
+    When I send a SIGINT to the nagios-receiver process
+    Then nagios-receiver should stop within 15 seconds
 
-  Scenario: Starting, status, and stopping flapjack-nagios-receiver, daemonized
-    When I start flapjack-nagios-receiver (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios start -d`
-    Then flapjack-nagios-receiver should start within 15 seconds
-    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios status`
+  Scenario: Starting, status, and stopping nagios-receiver, daemonized
+    When I start nagios-receiver (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios start -d`
+    Then nagios-receiver should start within 15 seconds
+    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios status`
     Then the exit status should be 0
     And  the output should contain "nagios-receiver is running"
-    When I stop flapjack-nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios stop`
-    Then flapjack-nagios-receiver should stop within 15 seconds
+    When I stop nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios stop`
+    Then nagios-receiver should stop within 15 seconds
 
-  Scenario: Starting, restarting and stopping flapjack-nagios-receiver, daemonized
-    When I start flapjack-nagios-receiver (daemonised) (via bundle exec) with `flapjack  -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios start -d`
-    Then flapjack-nagios-receiver should start within 15 seconds
-    When I restart flapjack-nagios-receiver (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios restart`
-    Then flapjack-nagios-receiver should restart within 15 seconds
-    When I stop flapjack-nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios stop`
-    Then flapjack-nagios-receiver should stop within 15 seconds
+  Scenario: Starting, restarting and stopping nagios-receiver, daemonized
+    When I start nagios-receiver (daemonised) (via bundle exec) with `flapjack  -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios start -d`
+    Then nagios-receiver should start within 15 seconds
+    When I restart nagios-receiver (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios restart`
+    Then nagios-receiver should restart within 15 seconds
+    When I stop nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios stop`
+    Then nagios-receiver should stop within 15 seconds
 
   Scenario: Getting status when stopped
-    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml receiver nagios status`
+    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios status`
     Then the exit status should not be 0
     And  the output should contain "nagios-receiver is not running"
-
-

data/features/cli_flapper.feature

@@ -4,42 +4,54 @@ Feature: Flapper command line
   I should be able to manage flapper
   From the command line
 
+  Background:
+    Given a file named "flapjack_cfg.yaml" with:
+"""
+test:
+  pid_dir: tmp/cucumber_cli/
+  log_dir: tmp/cucumber_cli/
+  redis:
+    db: 14
+  processor:
+    enabled: yes
+    logger:
+      level: warn
+"""
+
   Scenario: Running with --help shows usage information
-    When I run `bundle exec bin/flapjack flapper --help`
+    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper --help`
     Then the exit status should be 0
     And  the output should contain "Artificial service that oscillates up and down"
     And  the output should contain "[-b arg|--bind-ip arg]"
 
   Scenario: Starting flapper
-    When I start flapper (via bundle exec) with `flapjack flapper start --no-daemonize`
+    When I start flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start --no-daemonize`
     Then flapper should start within 15 seconds
 
   Scenario: Stopping flapper via SIGINT
-    When I start flapper (via bundle exec) with `flapjack flapper start --no-daemonize`
+    When I start flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start --no-daemonize`
     Then flapper should start within 15 seconds
     When I send a SIGINT to the flapper process
     Then flapper should stop within 15 seconds
 
   Scenario: Starting, status, and stopping flapper, daemonized
-    When I start flapper (daemonised) (via bundle exec) with `flapjack flapper start -d -p tmp/cucumber_cli/flapper_d.pid -l tmp/cucumber_cli/flapper_d.log`
+    When I start flapper (daemonised) (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start -d -p tmp/cucumber_cli/flapper.pid -l tmp/cucumber_cli/flapper.log`
     Then flapper should start within 15 seconds
-    When I run `bundle exec bin/flapjack flapper status -p tmp/cucumber_cli/flapper_d.pid`
+    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper status -p tmp/cucumber_cli/flapper.pid`
     Then the exit status should be 0
     And  the output should contain "flapper is running"
-    When I stop flapper (via bundle exec) with `flapjack flapper stop -p tmp/cucumber_cli/flapper_d.pid`
+    When I stop flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper stop -p tmp/cucumber_cli/flapper.pid`
     Then flapper should stop within 15 seconds
 
   Scenario: Starting, restarting and stopping flapper, daemonized
-    When I start flapper (daemonised) (via bundle exec) with `flapjack flapper start -d -p tmp/cucumber_cli/flapper_d.pid -l tmp/cucumber_cli/flapper_d.log`
+    When I start flapper (daemonised) (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start -d -p tmp/cucumber_cli/flapper.pid -l tmp/cucumber_cli/flapper.log`
     Then flapper should start within 15 seconds
-    When I restart flapper (daemonised) (via bundle exec) with `flapjack flapper restart -p tmp/cucumber_cli/flapper_d.pid -l tmp/cucumber_cli/flapper_d.log`
+    When I restart flapper (daemonised) (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper restart -p tmp/cucumber_cli/flapper.pid -l tmp/cucumber_cli/flapper.log`
     Then flapper should restart within 15 seconds
-    When I stop flapper (via bundle exec) with `flapjack flapper stop -p tmp/cucumber_cli/flapper_d.pid`
+    When I stop flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper stop -p tmp/cucumber_cli/flapper.pid`
     Then flapper should stop within 15 seconds
 
   Scenario: Getting status when stopped
-    When I run `bundle exec bin/flapjack flapper status -p tmp/cucumber_cli/flapper_d.pid`
+    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper status -p tmp/cucumber_cli/flapper.pid`
     Then the exit status should not be 0
     And  the output should contain "flapper is not running"
-
-

data/features/cli_simulate-failed-check.feature

@@ -16,13 +16,13 @@ test:
   Scenario: Running with --help shows usage information
     When I run `bundle exec bin/flapjack simulate --help`
     Then the exit status should be 0
-    And  the output should contain "Generate streams of events in various states"
+    And  the output should contain "Simulates a check by creating a stream of events for Flapjack"
     And  the output should contain "-k arg|--check arg"
 
   Scenario: Running simulate-failed-check with no arguments exits uncleanly and shows usage
     When I run `bundle exec bin/flapjack simulate`
     Then the exit status should not be 0
-    And  the output should contain "Generate streams of events in various states"
+    And  the output should contain "Simulates a check by creating a stream of events for Flapjack"
 
   Scenario: Simulate a failed check
     When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/simulate-failed-check.yaml simulate fail -t 0 -i 0.1 -e 'test' -k 'PING'`

data/features/notifications.feature

@@ -12,6 +12,13 @@ Feature: notifications
     Then an SMS notification for entity 'example.com' should be queued for the user
     And an email notification for entity 'example.com' should not be queued for the user
 
+  @resque
+  Scenario: Queue an SNS notification
+    Given the user wants to receive SNS notifications for entity 'example.com'
+    When an event notification is generated for entity 'example.com'
+    Then an SNS notification for entity 'example.com' should be queued for the user
+    And an email notification for entity 'example.com' should not be queued for the user
+
   @resque
   Scenario: Queue an email notification
     Given the user wants to receive email notifications for entity 'example.com'
@@ -39,11 +46,21 @@ Feature: notifications
     When the SMS notification handler runs successfully
     Then the user should receive an SMS notification
 
+  Scenario: Send a queued SNS notification
+    Given a user SNS notification has been queued for entity 'example.com'
+    When the SNS notification handler runs successfully
+    Then the user should receive an SNS notification
+
   Scenario: Handle a failure to send a queued SMS notification
     Given a user SMS notification has been queued for entity 'example.com'
     When the SMS notification handler fails to send an SMS
     Then the user should not receive an SMS notification
 
+  Scenario: Handle a failure to send a queued SNS notification
+    Given a user SNS notification has been queued for entity 'example.com'
+    When the SNS notification handler fails to send an SMS
+    Then the user should not receive an SNS notification
+
   Scenario: Send a queued email notification
     Given a user email notification has been queued for entity 'example.com'
     When the email notification handler runs successfully
@@ -52,4 +69,4 @@ Feature: notifications
   Scenario: Handle a failure to send a queued email notification
     Given a user email notification has been queued for entity 'example.com'
     When the email notification handler fails to send an email
-    Then the user should not receive an email notification
+    Then the user should not receive an email notification

data/features/steps/cli_steps.rb

@@ -24,7 +24,7 @@ When /^I ((?:re)?start|stop) (\S+)( \(daemonised\))?( \(via bundle exec\))? with
   case start_stop_restart
   when 'start'
     @process_h = spawn_process(command,
-                  :daemon_pidfile => (daemonise.nil? || daemonise.empty?) ? nil : "tmp/cucumber_cli/#{exe}_d.pid")
+                  :daemon_pidfile => (daemonise.nil? || daemonise.empty?) ? nil : "tmp/cucumber_cli/#{exe}.pid")
   when 'stop', 'restart'
     @daemons_output << `#{command}`
     @daemons_exit_status << $?
@@ -88,7 +88,7 @@ Then /^(\S+) should ((?:re)?start|stop) within (\d+) seconds$/ do |exe, start_st
   when 'restart'
     read_pid = nil
     while attempts < max_attempts
-      time_and_pid = time_and_pid_from_file("tmp/cucumber_cli/#{exe}_d.pid")
+      time_and_pid = time_and_pid_from_file("tmp/cucumber_cli/#{exe}.pid")
       read_pid = time_and_pid.last
       break if read_pid != pid
       attempts += 1; sleep 0.1

data/features/steps/notifications_steps.rb

@@ -26,6 +26,18 @@ Given /^the user wants to receive SMS notifications for entity '([\w\.\-]+)'$/ d
                              :redis => @redis )
 end
 
+Given /^the user wants to receive SNS notifications for entity '([\w\.\-]+)'$/ do |entity|
+  add_contact( 'id'         => '0999',
+               'first_name' => 'John',
+               'last_name'  => 'Smith',
+               'email'      => 'johns@example.dom',
+               'media'      => {'sns' => 'arn:aws:sns:us-east-1:698519295917:My-Topic'} )
+  Flapjack::Data::Entity.add({'id'       => '5000',
+                              'name'     => entity,
+                              'contacts' => ["0999"]},
+                              :redis => @redis )
+end
+
 Given /^the user wants to receive email notifications for entity '([\w\.\-]+)'$/ do |entity|
   add_contact( 'id'         => '0999',
                'first_name' => 'John',
@@ -87,6 +99,11 @@ Then /^an SMS notification for entity '([\w\.\-]+)' should be queued for the use
   expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
 end
 
+Then /^an SNS notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
+  queue = ResqueSpec.peek('sns_notifications')
+  expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
+end
+
 Then /^an email notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
   queue = ResqueSpec.peek('email_notifications')
   expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
@@ -119,6 +136,23 @@ Given /^a user SMS notification has been queued for entity '([\w\.\-]+)'$/ do |e
                        'duration'           => 45}
 end
 
+Given /^a user SNS notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
+  Flapjack::Data::Entity.add({'id'   => '5000',
+                              'name' => entity},
+                             :redis => @redis )
+  @sms_notification = {'notification_type'  => 'problem',
+                       'contact_first_name' => 'John',
+                       'contact_last_name'  => 'Smith',
+                       'state'              => 'critical',
+                       'summary'            => 'Socket timeout after 10 seconds',
+                       'time'               => Time.now.to_i,
+                       'event_id'           => "#{entity}:ping",
+                       'address'            => 'arn:aws:sns:us-east-1:698519295917:My-Topic',
+                       'id'                 => 1,
+                       'state_duration'     => 30,
+                       'duration'           => 45}
+end
+
 Given /^a user email notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
   Flapjack::Data::Entity.add({'id'   => '5001',
                               'name' => entity},
@@ -150,6 +184,20 @@ When /^the SMS notification handler runs successfully$/ do
   Flapjack::Gateways::SmsMessagenet.perform(@sms_notification)
 end
 
+When /^the SNS notification handler runs successfully$/ do
+  @request = stub_request(:post, /amazonaws\.com/)
+
+  Flapjack::Gateways::AwsSns.instance_variable_set('@config', {
+    'access_key' => "AKIAIOSFODNN7EXAMPLE",
+    'secret_key' => "secret"
+  })
+  Flapjack::Gateways::AwsSns.instance_variable_set('@redis', @redis)
+  Flapjack::Gateways::AwsSns.instance_variable_set('@logger', @logger)
+  Flapjack::Gateways::AwsSns.start
+
+  Flapjack::Gateways::AwsSns.perform(@sms_notification)
+end
+
 When /^the SMS notification handler fails to send an SMS$/ do
   @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_DEFAULT_URL)}/).to_return(:status => [500, "Internal Server Error"])
   Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
@@ -160,6 +208,19 @@ When /^the SMS notification handler fails to send an SMS$/ do
   Flapjack::Gateways::SmsMessagenet.perform(@sms_notification)
 end
 
+When /^the SNS notification handler fails to send an SMS$/ do
+  @request = stub_request(:post, /amazonaws\.com/).to_return(:status => [500, "Internal Server Error"])
+  Flapjack::Gateways::AwsSns.instance_variable_set('@config', {
+    'access_key' => "AKIAIOSFODNN7EXAMPLE",
+    'secret_key' => "secret"
+  })
+  Flapjack::Gateways::AwsSns.instance_variable_set('@redis', @redis)
+  Flapjack::Gateways::AwsSns.instance_variable_set('@logger', @logger)
+  Flapjack::Gateways::AwsSns.start
+
+  Flapjack::Gateways::AwsSns.perform(@sms_notification)
+end
+
 When /^the email notification handler runs successfully$/ do
   Resque.redis = @redis
   Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525}})
@@ -203,6 +264,11 @@ Then /^the user should receive an SMS notification$/ do
   expect(Flapjack::Gateways::SmsMessagenet.instance_variable_get('@sent')).to eq(1)
 end
 
+Then /^the user should receive an SNS notification$/ do
+  expect(@request).to have_been_requested
+  expect(Flapjack::Gateways::AwsSns.instance_variable_get('@sent')).to eq(1)
+end
+
 Then /^the user should receive an email notification$/ do
   expect(Flapjack::Gateways::Email.instance_variable_get('@sent')).to eq(1)
 end
@@ -212,6 +278,11 @@ Then /^the user should not receive an SMS notification$/ do
   expect(Flapjack::Gateways::SmsMessagenet.instance_variable_get('@sent')).to eq(0)
 end
 
+Then /^the user should not receive an SNS notification$/ do
+  expect(@request).to have_been_requested
+  expect(Flapjack::Gateways::AwsSns.instance_variable_get('@sent')).to eq(0)
+end
+
 Then /^the user should not receive an email notification$/ do
   expect(Flapjack::Gateways::Email.instance_variable_get('@sent')).to eq(0)
 end

data/features/support/env.rb

@@ -162,6 +162,7 @@ Before('@notifier') do
     :redis_config => redis_opts,
     :config => {'email_queue' => 'email_notifications',
                 'sms_queue' => 'sms_notifications',
+                'sns_queue' => 'sns_notifications',
                 'default_contact_timezone' => 'America/New_York'})
   @notifier_redis = @notifier.instance_variable_get('@redis')
 end
@@ -188,15 +189,15 @@ After('@process') do
   ['tmp/cucumber_cli/flapjack_cfg.yaml',
    'tmp/cucumber_cli/flapjack_cfg.yaml.bak',
    'tmp/cucumber_cli/flapjack_cfg_d.yaml',
-   'tmp/cucumber_cli/flapjack_d.log',
-   'tmp/cucumber_cli/flapjack_d.pid',
+   'tmp/cucumber_cli/flapjack.log',
+   'tmp/cucumber_cli/flapjack.pid',
    'tmp/cucumber_cli/nagios_perfdata.fifo',
-   'tmp/cucumber_cli/flapjack-nagios-receiver_d.pid',
-   'tmp/cucumber_cli/flapjack-nagios-receiver_d.log',
+   'tmp/cucumber_cli/flapjack-nagios-receiver.pid',
+   'tmp/cucumber_cli/flapjack-nagios-receiver.log',
    'tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml',
    'tmp/cucumber_cli/flapjack-nagios-receiver.yaml',
-   'tmp/cucumber_cli/flapper_d.pid',
-   'tmp/cucumber_cli/flapper_d.log',
+   'tmp/cucumber_cli/flapper.pid',
+   'tmp/cucumber_cli/flapper.log',
    'tmp/cucumber_cli/flapjack-populator.yaml',
    'tmp/cucumber_cli/flapjack-populator-contacts.json',
    'tmp/cucumber_cli/flapjack-populator-entities.json',

data/flapjack.gemspec

@@ -34,11 +34,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'blather', '~> 0.8.3'
   gem.add_dependency 'chronic'
   gem.add_dependency 'chronic_duration'
+  gem.add_dependency 'terminal-table'
   gem.add_dependency 'activesupport', '~> 3.2.14'
   gem.add_dependency 'ice_cube'
   gem.add_dependency 'tzinfo', '~> 1.0.1'
   gem.add_dependency 'tzinfo-data'
   gem.add_dependency 'rbtrace'
   gem.add_dependency 'rake'
-  gem.add_dependency 'gli'
+  gem.add_dependency 'gli', '= 2.12.0'
+  gem.add_dependency 'nokogiri', '= 1.6.2.1'
 end