flapjack 0.7.34 → 0.7.35

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

@@ -21,9 +21,6 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
       set :raise_errors, true
       set :show_exceptions, false
     }
-    Flapjack::Gateways::Web.instance_variable_get('@middleware').delete_if {|m|
-      m[0] == Rack::FiberPool
-    }
   end
 
   before(:each) do
@@ -40,6 +37,8 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     redis.should_receive(:hgetall).twice.and_return({'all' => '8001', 'ok' => '8002'},
       {'all' => '9001', 'ok' => '9002'})
     redis.should_receive(:llen).with('events')
+    redis.should_receive(:zrange).with('current_entities', 0, -1).and_return(['foo-app-01.example.com'])
+    redis.should_receive(:zrange).with('current_checks:foo-app-01.example.com', 0, -1, {:withscores => true}).and_return([['ping', 1382329923.0]])
   end
 
   def expect_check_stats
@@ -87,7 +86,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
 
-    get '/checks_all'
+    aget '/checks_all'
     last_response.should be_ok
   end
 
@@ -106,7 +105,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
-    get '/checks_failing'
+    aget '/checks_failing'
     last_response.should be_ok
   end
 
@@ -117,7 +116,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     expect_check_stats
     expect_entity_stats
 
-    get '/self_stats'
+    aget '/self_stats'
     last_response.should be_ok
   end
 
@@ -152,7 +151,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
 
-    get "/check?entity=#{entity_name_esc}&check=ping"
+    aget "/check?entity=#{entity_name_esc}&check=ping"
     last_response.should be_ok
     # TODO test instance variables set to appropriate values
   end
@@ -161,7 +160,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name_esc, :redis => redis).and_return(nil)
 
-    get "/check?entity=#{entity_name_esc}&check=ping"
+    aget "/check?entity=#{entity_name_esc}&check=ping"
     last_response.should be_not_found
   end
 
@@ -170,7 +169,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
 
-    get "/check?entity=#{entity_name_esc}"
+    aget "/check?entity=#{entity_name_esc}"
     last_response.should be_not_found
   end
 
@@ -185,7 +184,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
       with(entity_name, 'ping', :summary => "", :duration => (4 * 60 * 60),
            :acknowledgement_id => '1234', :redis => redis)
 
-    post "/acknowledgements/#{entity_name_esc}/ping?acknowledgement_id=1234"
+    apost "/acknowledgements/#{entity_name_esc}/ping?acknowledgement_id=1234"
     last_response.status.should == 302
   end
 
@@ -208,7 +207,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     entity_check.should_receive(:create_scheduled_maintenance).
       with(start_time.to_i, duration, :summary => summary)
 
-    post "/scheduled_maintenances/#{entity_name_esc}/ping?"+
+    apost "/scheduled_maintenances/#{entity_name_esc}/ping?"+
       "start_time=1+day+ago&duration=30+minutes&summary=wow"
 
     last_response.status.should == 302
@@ -227,14 +226,14 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
     entity_check.should_receive(:end_scheduled_maintenance).with(start_time)
 
-    delete "/scheduled_maintenances/#{entity_name_esc}/ping?start_time=#{start_time}"
+    adelete "/scheduled_maintenances/#{entity_name_esc}/ping?start_time=#{start_time}"
     last_response.status.should == 302
   end
 
   it "shows a list of all known contacts" do
     Flapjack::Data::Contact.should_receive(:all)
 
-    get "/contacts"
+    aget "/contacts"
     last_response.should be_ok
   end
 
@@ -248,7 +247,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with('0362', :redis => redis).and_return(contact)
 
-    get "/contacts/0362"
+    aget "/contacts/0362"
     last_response.should be_ok
   end
 

data/spec/spec_helper.rb

@@ -48,6 +48,14 @@ class MockLogger
     ERRORS
   end
 
+  %w(debug info warn error fatal).each do |level|
+    class_eval <<-LEVELS
+      def #{level}?
+        true
+      end
+    LEVELS
+  end
+
 end
 
 JsonSpec.configure do
@@ -104,5 +112,6 @@ RSpec.configure do |config|
 
   config.include ErbViewHelper, :erb_view => true
   config.include Rack::Test::Methods, :sinatra => true
+  config.include AsyncRackTest::Methods, :sinatra => true
   config.include JsonSpec::Helpers, :json => true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.34
+  version: 0.7.35
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -406,8 +406,6 @@ files:
 - features/support/silent_system.rb
 - flapjack.gemspec
 - lib/flapjack.rb
-- lib/flapjack/checks/http_content
-- lib/flapjack/checks/ping
 - lib/flapjack/configuration.rb
 - lib/flapjack/coordinator.rb
 - lib/flapjack/data/alert.rb
@@ -456,7 +454,6 @@ files:
 - lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-25-25.png
 - lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-25-40.png
 - lib/flapjack/gateways/web/public/img/flapjack-2013-vertical-transparent-300-386.png
-- lib/flapjack/gateways/web/public/img/flapjack-favicon-32-16.ico
 - lib/flapjack/gateways/web/public/img/flapjack-favicon-64-32-24-16.ico
 - lib/flapjack/gateways/web/public/img/flapjack-transparent-300.png
 - lib/flapjack/gateways/web/public/img/flapjack-transparent-350-400.png
@@ -561,7 +558,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2860293635329435962
+      hash: -1407852540467172414
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -570,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2860293635329435962
+      hash: -1407852540467172414
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/flapjack/checks/http_content

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'open-uri'
-
-page = ARGV[0]
-string = ARGV[1]
-
-exit 2 unless page && string
-
-body = open(page).read
-if body =~  /#{string}/
-  exit 0
-else
-  exit 2
-end

data/lib/flapjack/checks/ping

@@ -1,10 +0,0 @@
-#!/bin/sh 
-
-ping -c 3 $1
-retval=$?
-
-if [ "$retval" != 0 ]; then 
-  exit 2
-else
-  exit 0
-fi