flapjack 0.9.5 → 0.9.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9a77bb89c8999f6a11d0931654c29d4a6208a7d1
+  data.tar.gz: c9521efb2b1aa33e615efdecc288c51f90b887b6
+SHA512:
+  metadata.gz: eb0351065fe36a2e797fac51f027fcc9e2582d773da07c0c961f21e0903a263ce2e903dcb7aee73e6ed7dd9a92328d7ac038f51c5a2ab8b39116a3adb71c3f21
+  data.tar.gz: 350d40dd04d845138c71bc08fec42b2633f871b145db7acd10f9a083f9aaae32ee73e8d5073bb577a8ca690fcbb1a516941e370a903a04af3a5e2f2589fded05

data/.rspec

@@ -2,9 +2,3 @@
 --format Fuubar
 --format html
 --out tmp/spec.html
---require ./spec/support/uncolored_doc_formatter.rb
---format UncoloredDocFormatter
---out tmp/spec_doc.txt
---require ./spec/support/profile_all_formatter.rb
---format ProfileAllFormatter
---out tmp/spec_profile.txt

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
-rvm:
-  - "1.9.3"
-  - "2.0"
-  - "2.1"
-env:
-  - ENTITIES=10 INTERVAL=120
-gemfile:
-  - Gemfile
+matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: Gemfile-ruby1.9
+      script:  "bundle exec rspec spec && bundle exec cucumber features"
+      env: BUNDLE_GEMFILE=Gemfile-ruby1.9
+    - rvm: '2.0'
+      gemfile: Gemfile
+      script: "bundle exec rspec spec && bundle exec cucumber features"
+    - rvm: '2.1'
+      gemfile: Gemfile
+      script: "bundle exec rspec spec && bundle exec cucumber features"
 services:
   - redis-server
 before_script:
@@ -14,4 +18,3 @@ before_script:
 before_install:
   - git submodule update --init --recursive
   - gem install bundler
-script: bundle exec rspec spec && bundle exec cucumber features

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 0.9.6 - 2014-10-21
+- Feature: make 0.9 compatible with new event mirroring logic in 1.2 (fixes #687) #688 (@ali-graham, @jessereynolds)
+
 # 0.9.5 - 2014-10-08
 - Bug: fix api_url handling in the web ui (@jessereynolds)
 

data/Gemfile

@@ -20,6 +20,9 @@ group :test do
   gem 'guard-cucumber'
   gem 'fuubar'
   gem 'simplecov', :require => false
-  gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools
-  gem 'perftools.rb'
+
+ if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
+    gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
+    gem 'perftools.rb'
+  end
 end

data/Gemfile-ruby1.9

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gemspec :name => 'flapjack'
+
+group :development do
+  gem 'ruby-prof'
+end
+
+group :test do
+  gem 'rspec', '~> 3.0.0.beta1'
+  gem 'cucumber'
+  gem 'delorean'
+  gem 'rack-test'
+  gem 'async_rack_test', '>= 0.0.5'
+  gem 'resque_spec'
+  gem 'webmock'
+  gem 'guard'
+  gem 'rb-fsevent'
+  gem 'guard-rspec'
+  gem 'guard-cucumber'
+  gem 'fuubar'
+  gem 'simplecov', :require => false
+
+ if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
+    gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
+    gem 'perftools.rb'
+  end
+end

data/Gemfile-ruby1.9.lock

@@ -0,0 +1,227 @@
+PATH
+  remote: .
+  specs:
+    flapjack (0.9.6)
+      activesupport (~> 3.2.14)
+      blather (~> 0.8.3)
+      chronic
+      chronic_duration
+      dante
+      em-http-request
+      em-resque
+      em-synchrony (~> 1.0.2)
+      eventmachine (~> 1.0.0)
+      hiredis
+      ice_cube
+      mail
+      oj (>= 2.9.0)
+      rack-fiber_pool
+      rake
+      rbtrace
+      redis (~> 3.0.6)
+      resque (~> 1.23.0)
+      sinatra
+      thin (~> 1.6.1)
+      tzinfo (~> 1.0.1)
+      tzinfo-data
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.6)
+    async_rack_test (0.0.5)
+    blather (0.8.8)
+      activesupport (>= 2.3.11)
+      eventmachine (>= 1.0.0)
+      girl_friday
+      niceogiri (~> 1.0)
+      nokogiri (~> 1.5, >= 1.5.6)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chronic (0.10.2)
+    chronic_duration (0.10.6)
+      numerizer (~> 0.1.1)
+    coderay (1.1.0)
+    connection_pool (1.2.0)
+    cookiejar (0.3.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    cucumber (1.3.17)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    daemons (1.1.9)
+    dante (0.2.0)
+    debugger-ruby_core_source (1.3.5)
+    delorean (2.1.0)
+      chronic
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    em-hiredis (0.1.1)
+      hiredis (~> 0.4.0)
+    em-http-request (1.1.2)
+      addressable (>= 2.3.4)
+      cookiejar
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-resque (1.1.1)
+      em-hiredis (~> 0.1.0)
+      em-synchrony (~> 1.0.0)
+      resque (~> 1.2)
+    em-socksify (0.3.0)
+      eventmachine (>= 1.0.0.beta.4)
+    em-synchrony (1.0.3)
+      eventmachine (>= 1.0.0.beta.1)
+    eventmachine (1.0.3)
+    ffi (1.9.6)
+    formatador (0.2.5)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    girl_friday (0.11.2)
+      connection_pool (~> 1.0)
+      rubinius-actor
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-cucumber (1.4.1)
+      cucumber (>= 1.2.0)
+      guard (>= 1.1.0)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hiredis (0.4.5)
+    hitimes (1.2.2)
+    http_parser.rb (0.6.0)
+    i18n (0.6.11)
+    ice_cube (0.12.1)
+    listen (2.7.11)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.4.2)
+    mini_portile (0.6.0)
+    msgpack (0.5.9)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    niceogiri (1.1.2)
+      nokogiri (~> 1.5)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    numerizer (0.1.1)
+    oj (2.10.3)
+    perftools.rb (2.0.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-fiber_pool (0.9.3)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rbtrace (0.4.5)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
+    redis (3.0.7)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.23.1)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque_spec (0.16.0)
+      resque (>= 1.19.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+      rspec-mocks (>= 3.0.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    rubinius-actor (0.0.2)
+      rubinius-core-api
+    rubinius-core-api (0.0.1)
+    ruby-prof (0.15.1)
+    ruby-progressbar (1.6.0)
+    safe_yaml (1.0.4)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.6.0)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    trollop (2.0)
+    tzinfo (1.0.1)
+    tzinfo-data (1.2014.8)
+      tzinfo (>= 1.0.0)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    webmock (1.19.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  async_rack_test (>= 0.0.5)
+  cucumber
+  debugger-ruby_core_source (>= 1.3.4)
+  delorean
+  flapjack!
+  fuubar
+  guard
+  guard-cucumber
+  guard-rspec
+  perftools.rb
+  rack-test
+  rb-fsevent
+  resque_spec
+  rspec (~> 3.0.0.beta1)
+  ruby-prof
+  simplecov
+  webmock

data/lib/flapjack/data/event.rb

@@ -3,6 +3,8 @@
 require 'oj'
 require 'flapjack/data/tag_set'
 
+require 'flapjack/data/migration'
+
 module Flapjack
   module Data
     class Event
@@ -78,24 +80,27 @@ module Flapjack
                      :events_archive_maxage => (3 * 60 * 60) }
         options  = defaults.merge(opts)
 
-        archive_dest = nil
+        archive_dest  = nil
         base_time_str = Time.now.utc.strftime("%Y%m%d%H")
 
         if options[:archive_events]
           archive_dest = "events_archive:#{base_time_str}"
+          unless @previous_base_time_str == base_time_str
+            Flapjack::Data::Migration.purge_expired_archive_index(:redis => redis)
+          end
+          @previous_base_time_str = base_time_str
           if options[:block]
             raw = redis.brpoplpush(queue, archive_dest, 0)
           else
             raw = redis.rpoplpush(queue, archive_dest)
             return unless raw
           end
+          redis.sadd("known_events_archive_keys", archive_dest)
+        elsif options[:block]
+          raw = redis.brpop(queue, 0)[1]
         else
-          if options[:block]
-            raw = redis.brpop(queue, 0)[1]
-          else
-            raw = redis.rpop(queue)
-            return unless raw
-          end
+          raw = redis.rpop(queue)
+          return unless raw
         end
         parsed = parse_and_validate(raw, :logger => options[:logger])
         if parsed.nil?

data/lib/flapjack/data/migration.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+module Flapjack
+  module Data
+    class Migration
+
+      def self.refresh_archive_index(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        archive_keys = redis.keys('events_archive:*')
+        if archive_keys.empty?
+          redis.del('known_events_archive_keys')
+          return
+        end
+
+        grouped_keys = archive_keys.group_by do |ak|
+          (redis.llen(ak) > 0) ? 'add' : 'remove'
+        end
+
+        {'remove' => :srem, 'add' => :sadd}.each_pair do |k, cmd|
+          next unless grouped_keys.has_key?(k) && !grouped_keys[k].empty?
+          redis.send(cmd, 'known_events_archive_keys', grouped_keys[k])
+        end
+      end
+
+      def self.purge_expired_archive_index(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        return unless redis.exists('known_events_archive_keys')
+
+        redis.smembers('known_events_archive_keys').each do |ak|
+          redis.srem('known_events_archive_keys', ak) unless redis.exists(ak)
+        end
+      end
+
+    end
+  end
+end

data/lib/flapjack/redis_pool.rb

@@ -10,14 +10,18 @@ require 'redis'
 
 require 'em-synchrony/connection_pool'
 
+require 'flapjack/data/migration'
+
 module Flapjack
   class RedisPool < EventMachine::Synchrony::ConnectionPool
 
     def initialize(opts = {})
       config = opts.delete(:config)
-      @size = opts[:size] || 5
+      @size  = opts[:size] || 5
       super(:size => @size) {
-        ::Redis.new(config)
+        redis = ::Redis.new(config)
+        Flapjack::Data::Migration.refresh_archive_index(:redis => redis)
+        redis
       }
     end
 

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end
 

data/spec/lib/flapjack/coordinator_spec.rb

@@ -33,7 +33,7 @@ describe Flapjack::Coordinator do
       and_return(processor)
 
     expect(EM).to receive(:stop)
-    expect(EM::Synchrony).to receive(:sleep).and_return {
+    expect(EM::Synchrony).to receive(:sleep) {
       fc.instance_variable_set('@received_signals', ['INT'])
     }
 
@@ -102,7 +102,7 @@ describe Flapjack::Coordinator do
       and_return(notifier)
 
     expect(EM).to receive(:stop)
-    expect(EM::Synchrony).to receive(:sleep).and_return {
+    expect(EM::Synchrony).to receive(:sleep) {
       fc.instance_variable_set('@received_signals', ['INT'])
     }
 
@@ -136,7 +136,7 @@ describe Flapjack::Coordinator do
       and_return(processor)
 
     expect(EM).to receive(:stop)
-    expect(EM::Synchrony).to receive(:sleep).and_return {
+    expect(EM::Synchrony).to receive(:sleep) {
       fc.instance_variable_set('@received_signals', ['INT'])
     }
 

data/spec/lib/flapjack/data/event_spec.rb

@@ -22,11 +22,18 @@ describe Flapjack::Data::Event do
                       'tags'     => ['dev'] }
   }
 
+  before(:each) do
+    Flapjack::Data::Event.instance_variable_set('@previous_base_time_str', nil)
+  end
+
   context 'class' do
 
     it "returns the next event (blocking, archiving)" do
       expect(mock_redis).to receive(:brpoplpush).
         with('events', /^events_archive:/, 0).and_return(event_data.to_json)
+      expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+      expect(mock_redis).to receive(:sadd).
+        with('known_events_archive_keys', /^events_archive:/)
       expect(mock_redis).to receive(:expire)
 
       result = Flapjack::Data::Event.next('events', :block => true,
@@ -46,6 +53,9 @@ describe Flapjack::Data::Event do
     it "returns the next event (non-blocking, archiving)" do
       expect(mock_redis).to receive(:rpoplpush).
         with('events', /^events_archive:/).and_return(event_data.to_json)
+      expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+      expect(mock_redis).to receive(:sadd).
+        with('known_events_archive_keys', /^events_archive:/)
       expect(mock_redis).to receive(:expire)
 
       result = Flapjack::Data::Event.next('events', :block => false,
@@ -66,6 +76,9 @@ describe Flapjack::Data::Event do
       bad_event_json = '{{{'
       expect(mock_redis).to receive(:brpoplpush).
         with('events', /^events_archive:/, 0).and_return(bad_event_json)
+      expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+      expect(mock_redis).to receive(:sadd).
+        with('known_events_archive_keys', /^events_archive:/)
       expect(mock_redis).to receive(:multi)
       expect(mock_redis).to receive(:lrem).with(/^events_archive:/, 1, bad_event_json)
       expect(mock_redis).to receive(:lpush).with(/^events_rejected:/, bad_event_json)
@@ -94,6 +107,9 @@ describe Flapjack::Data::Event do
         bad_event_data = event_data.clone
         bad_event_data.delete(required_key)
         bad_event_json = bad_event_data.to_json
+        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+        expect(mock_redis).to receive(:sadd).
+          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
         expect(mock_redis).to receive(:multi)
@@ -126,6 +142,9 @@ describe Flapjack::Data::Event do
         bad_event_json = bad_event_data.to_json
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
+        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+        expect(mock_redis).to receive(:sadd).
+          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:multi)
         expect(mock_redis).to receive(:lrem).with(/^events_archive:/, 1, bad_event_json)
         expect(mock_redis).to receive(:lpush).with(/^events_rejected:/, bad_event_json)
@@ -156,6 +175,9 @@ describe Flapjack::Data::Event do
         bad_event_data = event_data.clone
         bad_event_data[optional_key] = {'hello' => 'there'}
         bad_event_json = bad_event_data.to_json
+        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+        expect(mock_redis).to receive(:sadd).
+          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
         expect(mock_redis).to receive(:multi)
@@ -188,6 +210,9 @@ describe Flapjack::Data::Event do
       it "it matches case-insensitively for #{key} (archiving)" do
         case_event_data = event_data.clone
         case_event_data[key] = event_data[key].upcase
+        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+        expect(mock_redis).to receive(:sadd).
+          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(case_event_data.to_json)
         expect(mock_redis).to receive(:expire)
@@ -214,6 +239,9 @@ describe Flapjack::Data::Event do
       it "it accepts an event with a numeric #{key} key (archiving)" do
         num_event_data = event_data.clone
         num_event_data[key] = event_data[key].to_i.to_s
+        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+        expect(mock_redis).to receive(:sadd).
+          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(num_event_data.to_json)
         expect(mock_redis).to receive(:expire)
@@ -240,6 +268,9 @@ describe Flapjack::Data::Event do
         bad_event_json = bad_event_data.to_json
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
+        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
+        expect(mock_redis).to receive(:sadd).
+          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:multi)
         expect(mock_redis).to receive(:lrem).with(/^events_archive:/, 1, bad_event_json)
         expect(mock_redis).to receive(:lpush).with(/^events_rejected:/, bad_event_json)

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

@@ -174,7 +174,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
     expect(EventMachine::Synchrony).to receive(:sleep).with(5).exactly(1).times
     expect(EventMachine::Synchrony).to receive(:sleep).with(2).exactly(3).times
-    expect(fj).to receive(:connect).exactly(4).times.and_return {
+    expect(fj).to receive(:connect).exactly(4).times {
       attempts +=1
       raise StandardError.new unless attempts > 3
     }

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

@@ -182,7 +182,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
 
     EM.synchrony do
       ret = fp.send(:send_pagerduty_event, evt)
-      expect { ret }.not_to be_nil
+      expect(ret).not_to be_nil
       expect(ret).to eq([200, nil])
       EM.stop
     end

data/spec/lib/flapjack/redis_pool_spec.rb

@@ -12,6 +12,7 @@ describe Flapjack::RedisPool do
         redis
       }
       expect(::Redis).to receive(:new).exactly(redis_count).times.and_return(*redis_conns)
+      expect(Flapjack::Data::Migration).to receive(:refresh_archive_index).exactly(redis_count).times
 
       frp = Flapjack::RedisPool.new(:size => redis_count)
 

data/tasks/benchmarks.rake

@@ -94,6 +94,10 @@ namespace :benchmarks do
   # - time to failure varies evenly between 1 hour and 1 month
   # - time to recovery varies evenly between 10 seconds and 1 week
   task :benchmark do
+    unless RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
+      # Flapjack doesn't support 1.8 or below, so just checking for 1.9 is OK
+      raise "perftools.rb doesn't work on Ruby 2.0 or greater"
+    end
 
     num_checks_per_entity = (ENV['CHECKS_PER_ENTITY'] || 5).to_i
     num_entities          = (ENV['ENTITIES'] || 100).to_i

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.9.5
-  prerelease: 
+  version: 0.9.6
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,358 +10,314 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-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
         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: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !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
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !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: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
 - !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
         version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.23.0
 - !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: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !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
         version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !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
         version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.14
 - !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
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !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: rbtrace
   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: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Flapjack is a distributed monitoring notification system that provides
@@ -381,14 +336,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile-ruby1.9
+- Gemfile-ruby1.9.lock
 - Guardfile
 - LICENCE
 - README.md
@@ -437,6 +394,7 @@ files:
 - lib/flapjack/data/entity_check.rb
 - lib/flapjack/data/event.rb
 - lib/flapjack/data/message.rb
+- lib/flapjack/data/migration.rb
 - lib/flapjack/data/notification.rb
 - lib/flapjack/data/notification_rule.rb
 - lib/flapjack/data/semaphore.rb
@@ -595,8 +553,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/erb_view_helper.rb
 - spec/support/jsonapi_helper.rb
-- spec/support/profile_all_formatter.rb
-- spec/support/uncolored_doc_formatter.rb
 - tasks/benchmarks.rake
 - tasks/events.rake
 - tasks/profile.rake
@@ -621,33 +577,26 @@ files:
 homepage: http://flapjack.io/
 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: 3444506708991125351
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3444506708991125351
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Intelligent, scalable, distributed monitoring notification system.
 test_files:
 - features/cli.feature
@@ -719,5 +668,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/erb_view_helper.rb
 - spec/support/jsonapi_helper.rb
-- spec/support/profile_all_formatter.rb
-- spec/support/uncolored_doc_formatter.rb

data/spec/support/profile_all_formatter.rb

@@ -1,44 +0,0 @@
-require 'rspec/core/formatters/base_formatter'
-
-class ProfileAllFormatter < RSpec::Core::Formatters::BaseFormatter
-
-  def initialize(output)
-    super(output)
-    @example_times = []
-  end
-
-  def start(count)
-    super(count)
-    @output.puts "Profiling enabled."
-  end
-
-  def example_started(example)
-    super(example)
-    @time = ((Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now)
-  end
-
-  def example_passed(example)
-    @example_times << [
-      example_group.description,
-      example.description,
-      ((Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now) - @time
-    ]
-    super(example)
-  end
-
-  def start_dump
-    super
-    @output.puts "\n\nExample times:\n"
-
-    @example_times = @example_times.sort_by do |description, example, time|
-      time
-    end.reverse
-
-    @example_times.each do |description, example, time|
-      @output.print sprintf("%.7f", time)
-      @output.puts " #{description} #{example}"
-    end
-    @output.flush
-  end
-
-end

data/spec/support/uncolored_doc_formatter.rb

@@ -1,9 +0,0 @@
-require 'rspec/core/formatters/documentation_formatter'
-
-class UncoloredDocFormatter < RSpec::Core::Formatters::DocumentationFormatter
-
-  def color(text, color_code)
-    text
-  end
-
-end