flapjack 0.7.28 → 0.7.29

data/spec/lib/flapjack/gateways/{sms_messagenet.spec.rb → sms_messagenet_spec.rb}

@@ -10,7 +10,7 @@ describe Flapjack::Gateways::SmsMessagenet, :logger => true do
                  }
                }
 
-  let(:time) { Time.now }
+  let(:time) { Time.new(2013, 10, 31, 13, 45) }
 
   let(:time_str) { Time.at(time).strftime('%-d %b %H:%M') }
 
@@ -24,15 +24,18 @@ describe Flapjack::Gateways::SmsMessagenet, :logger => true do
                    'time'               => time.to_i,
                    'address'            => '555-555555',
                    'event_id'           => 'example.com:ping',
-                   'id'                 => '123456789'
+                   'id'                 => '123456789',
+                   'duration'           => 55,
+                   'state_duration'     => 23
                   }
                 }
 
   it "sends an SMS message" do
     req = stub_request(:get, "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage").
-      with(:query => {'PhoneNumber' => '555-555555',
-                      'Username' => 'user', 'Pwd' => 'password',
-                      'PhoneMessage' => "RECOVERY: 'ping' on example.com is OK at #{time_str}, smile"}).
+      with(:query => {'PhoneNumber'  => '555-555555',
+                      'Username'     => 'user',
+                      'Pwd'          => 'password',
+                      'PhoneMessage' => "Recovery: 'ping' on example.com is OK at #{time_str}, smile"}).
       to_return(:status => 200)
 
     EM.synchrony do
@@ -51,12 +54,13 @@ describe Flapjack::Gateways::SmsMessagenet, :logger => true do
       'Liberty, and dedicated to the proposition that all men are created equal.')
 
     req = stub_request(:get, "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage").
-      with(:query => {'PhoneNumber' => '555-555555',
-                      'Username' => 'user', 'Pwd' => 'password',
-                      'PhoneMessage' => "RECOVERY: 'ping' on example.com is " +
-                      "OK at #{time_str}, Four score and seven years ago " +
-                      'our fathers brought forth on this continent, a new ' +
-                      'nation, conceived i...'}).
+      with(:query => {'PhoneNumber'  => '555-555555',
+                      'Username'     => 'user',
+                      'Pwd'          => 'password',
+                      'PhoneMessage' => "Recovery: 'ping' on example.com is " +
+                        "OK at #{time_str}, Four score and seven years ago " +
+                        'our fathers brought forth on this continent, a new ' +
+                        'nation, conceived i...'}).
       to_return(:status => 200)
 
     EM.synchrony do
@@ -82,4 +86,4 @@ describe Flapjack::Gateways::SmsMessagenet, :logger => true do
       "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage")
   end
 
-end
+end

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

@@ -36,7 +36,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   def expect_stats
     redis.should_receive(:dbsize).and_return(3)
     redis.should_receive(:keys).with('executive_instance:*').and_return(["executive_instance:foo-app-01"])
-    redis.should_receive(:hget).twice.and_return(Time.now.to_i - 60)
+    redis.should_receive(:hget).once.and_return(Time.now.to_i - 60)
     redis.should_receive(:hgetall).twice.and_return({'all' => '8001', 'ok' => '8002'},
       {'all' => '9001', 'ok' => '9002'})
     redis.should_receive(:llen).with('events')

data/spec/spec_helper.rb

@@ -24,19 +24,30 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 class MockLogger
-  attr_accessor :messages
+  attr_accessor :messages, :errors
 
   def initialize
     @messages = []
+    @errors   = []
   end
 
-  %w(debug info warn error fatal).each do |level|
+  %w(debug info warn).each do |level|
     class_eval <<-RUBY
       def #{level}(msg)
-        @messages << msg
+        @messages << '#{level.upcase}' + ': ' + msg
       end
     RUBY
   end
+
+  %w(error fatal).each do |level|
+    class_eval <<-ERRORS
+      def #{level}(msg)
+        @messages << '#{level.upcase}' + ': ' + msg
+        @errors   << '#{level.upcase}' + ': ' + msg
+      end
+    ERRORS
+  end
+
 end
 
 JsonSpec.configure do
@@ -61,6 +72,10 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
+  if !(ENV.keys & ['SHOW_LOGGER_ALL', 'SHOW_LOGGER_ERRORS']).empty?
+    config.formatter = :documentation
+  end
+
   config.around(:each, :redis => true) do |example|
     @redis = ::Redis.new(:db => 14, :driver => :ruby)
     @redis.flushdb
@@ -71,9 +86,16 @@ RSpec.configure do |config|
   config.around(:each, :logger => true) do |example|
     @logger = MockLogger.new
     example.run
-    #messages = @logger.messages.compact
-    #p "logger: " + messages.join(", ") unless messages.empty?
-    @logger.messages.clear
+
+    if ENV['SHOW_LOGGER_ALL']
+      puts @logger.messages.compact.join("\n")
+    end
+
+    if ENV['SHOW_LOGGER_ERRORS']
+      puts @logger.errors.compact.join("\n")
+    end
+
+    @logger.errors.clear
   end
 
   config.after(:each, :time => true) do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.28
-  prerelease: 
+  version: 0.7.29
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,44 +10,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,23 +57,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,55 +85,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,71 +141,62 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -232,7 +204,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -240,39 +211,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -280,7 +246,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -288,23 +253,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -312,7 +274,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -320,33 +281,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Flapjack is distributed monitoring notification system that provides
@@ -415,6 +372,7 @@ files:
 - lib/flapjack/checks/ping
 - lib/flapjack/configuration.rb
 - lib/flapjack/coordinator.rb
+- lib/flapjack/data/alert.rb
 - lib/flapjack/data/contact.rb
 - lib/flapjack/data/entity.rb
 - lib/flapjack/data/entity_check.rb
@@ -445,8 +403,11 @@ files:
 - lib/flapjack/gateways/email/rollup.text.erb
 - lib/flapjack/gateways/email/rollup_subject.text.erb
 - lib/flapjack/gateways/jabber.rb
+- lib/flapjack/gateways/jabber/alert.text.erb
+- lib/flapjack/gateways/jabber/rollup.text.erb
 - lib/flapjack/gateways/oobetet.rb
 - lib/flapjack/gateways/pagerduty.rb
+- lib/flapjack/gateways/pagerduty/alert.text.erb
 - lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/sms_messagenet/alert.text.erb
 - lib/flapjack/gateways/sms_messagenet/rollup.text.erb
@@ -508,7 +469,7 @@ files:
 - spec/lib/flapjack/gateways/jabber_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
-- spec/lib/flapjack/gateways/sms_messagenet.spec.rb
+- spec/lib/flapjack/gateways/sms_messagenet_spec.rb
 - spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb
@@ -547,33 +508,26 @@ 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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Intelligent, scalable, distributed monitoring notification system.
 test_files:
 - features/cli.feature
@@ -616,7 +570,7 @@ test_files:
 - spec/lib/flapjack/gateways/jabber_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
-- spec/lib/flapjack/gateways/sms_messagenet.spec.rb
+- spec/lib/flapjack/gateways/sms_messagenet_spec.rb
 - spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb