flapjack 0.6.43 → 0.6.44

data/spec/lib/flapjack/{pagerduty_spec.rb → gateways/pagerduty_spec.rb}

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 require 'yajl/json_gem'
 
-require 'flapjack/pagerduty'
+require 'flapjack/gateways/pagerduty'
 
-describe Flapjack::Pagerduty, :redis => true do
+describe Flapjack::Gateways::Pagerduty, :redis => true do
 
   let(:config) { {'queue'    => 'pagerduty_notifications'} }
 
@@ -14,16 +14,16 @@ describe Flapjack::Pagerduty, :redis => true do
     redis = mock('redis')
     redis.should_receive(:rpush).with(config['queue'], %q{{"notification_type":"shutdown"}})
 
-    fp = Flapjack::Pagerduty.new
+    fp = Flapjack::Gateways::Pagerduty.new
     Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
     fp.add_shutdown_event(:redis => redis)
   end
 
   it "doesn't look for acknowledgements if this search is already running" do
-    @redis.set(Flapjack::Pagerduty::SEM_PAGERDUTY_ACKS_RUNNING, 'true')
+    @redis.set(Flapjack::Gateways::Pagerduty::SEM_PAGERDUTY_ACKS_RUNNING, 'true')
 
-    fp = Flapjack::Pagerduty.new
+    fp = Flapjack::Gateways::Pagerduty.new
     Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
     fp.instance_variable_set("@redis_timer", @redis)
@@ -33,7 +33,7 @@ describe Flapjack::Pagerduty, :redis => true do
   end
 
   it "looks for acknowledgements if the search is not already running" do
-    fp = Flapjack::Pagerduty.new
+    fp = Flapjack::Gateways::Pagerduty.new
     Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
     fp.instance_variable_set("@redis_timer", @redis)
@@ -72,7 +72,7 @@ describe Flapjack::Pagerduty, :redis => true do
        to_return(:status => 200, :body => response.to_json, :headers => {})
 
     EM.synchrony do
-      fp = Flapjack::Pagerduty.new
+      fp = Flapjack::Gateways::Pagerduty.new
       Flapjack::RedisPool.should_receive(:new)
       fp.bootstrap(:config => config)
 
@@ -89,7 +89,7 @@ describe Flapjack::Pagerduty, :redis => true do
   end
 
   it "creates acknowledgements when pagerduty acknowledgements are found" do
-    fp = Flapjack::Pagerduty.new
+    fp = Flapjack::Gateways::Pagerduty.new
     Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
 
@@ -119,7 +119,7 @@ describe Flapjack::Pagerduty, :redis => true do
     redis.should_receive(:del).with('sem_pagerduty_acks_running')
     redis.should_receive(:empty!)
 
-    fp = Flapjack::Pagerduty.new
+    fp = Flapjack::Gateways::Pagerduty.new
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fp.bootstrap(:config => config)
 
@@ -147,7 +147,7 @@ describe Flapjack::Pagerduty, :redis => true do
       with(:body => body).to_return(:status => 200, :body => '{"status":"success"}', :headers => {})
 
     EM.synchrony do
-      fp = Flapjack::Pagerduty.new
+      fp = Flapjack::Gateways::Pagerduty.new
       Flapjack::RedisPool.should_receive(:new)
       fp.bootstrap(:config => config)
 
@@ -170,7 +170,7 @@ describe Flapjack::Pagerduty, :redis => true do
 
     EM.synchrony do
 
-      fp = Flapjack::Pagerduty.new
+      fp = Flapjack::Gateways::Pagerduty.new
       Flapjack::RedisPool.should_receive(:new)
       fp.bootstrap(:config => config)
 

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/gateways/sms'
+
+describe Flapjack::Gateways::Sms do
+
+end

data/spec/lib/flapjack/{web_spec.rb → gateways/web_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
-require 'flapjack/web'
+require 'flapjack/gateways/web'
 
 # TODO move the rest of the redis operations down to data models, then this
 # test won't need read/write redis data
 
-describe Flapjack::Web, :sinatra => true, :redis => true do
+describe Flapjack::Gateways::Web, :sinatra => true, :redis => true do
 
   def app
-    Flapjack::Web
+    Flapjack::Gateways::Web
   end
 
   let(:entity_name)     { 'example.com'}
@@ -19,7 +19,7 @@ describe Flapjack::Web, :sinatra => true, :redis => true do
 
   before(:each) do
     Flapjack::RedisPool.should_receive(:new).and_return(@redis)
-    Flapjack::Web.bootstrap(:config => {})
+    Flapjack::Gateways::Web.bootstrap(:config => {})
   end
 
   def expect_stats

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.43
+  version: 0.6.44
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -329,7 +329,6 @@ executables:
 - flapjack-populator
 - flapper
 - flapper-control
-- install-flapjack-systemwide
 extensions: []
 extra_rdoc_files: []
 files:
@@ -350,7 +349,6 @@ files:
 - bin/flapjack-populator
 - bin/flapper
 - bin/flapper-control
-- bin/install-flapjack-systemwide
 - config.ru
 - dist/etc/default/flapjack-notifier
 - dist/etc/default/flapjack-workers
@@ -372,9 +370,7 @@ files:
 - features/notifications.feature
 - features/packaging-lintian.feature
 - features/steps/events_steps.rb
-- features/steps/flapjack-importer_steps.rb
 - features/steps/flapjack-netsaint-parser_steps.rb
-- features/steps/flapjack-worker_steps.rb
 - features/steps/notifications_steps.rb
 - features/steps/packaging-lintian_steps.rb
 - features/steps/time_travel_steps.rb
@@ -382,12 +378,8 @@ files:
 - features/support/silent_system.rb
 - flapjack.gemspec
 - lib/flapjack.rb
-- lib/flapjack/api.rb
-- lib/flapjack/api/entity_check_presenter.rb
-- lib/flapjack/api/entity_presenter.rb
 - lib/flapjack/checks/http_content
 - lib/flapjack/checks/ping
-- lib/flapjack/cli/worker_manager.rb
 - lib/flapjack/configuration.rb
 - lib/flapjack/coordinator.rb
 - lib/flapjack/daemonizing.rb
@@ -406,64 +398,32 @@ files:
 - lib/flapjack/filters/ok.rb
 - lib/flapjack/filters/scheduled_maintenance.rb
 - lib/flapjack/filters/unscheduled_maintenance.rb
-- lib/flapjack/inifile.rb
-- lib/flapjack/jabber.rb
-- lib/flapjack/notification/email.rb
-- lib/flapjack/notification/email/alert.html.haml
-- lib/flapjack/notification/email/alert.text.erb
-- lib/flapjack/notification/sms.rb
-- lib/flapjack/notification/sms/messagenet.rb
-- lib/flapjack/notifier_engine.rb
-- lib/flapjack/notifiers/mailer/init.rb
-- lib/flapjack/notifiers/mailer/mailer.rb
-- lib/flapjack/notifiers/xmpp/init.rb
-- lib/flapjack/notifiers/xmpp/xmpp.rb
-- lib/flapjack/oobetet.rb
-- lib/flapjack/pagerduty.rb
+- lib/flapjack/gateways/api.rb
+- lib/flapjack/gateways/api/entity_check_presenter.rb
+- lib/flapjack/gateways/api/entity_presenter.rb
+- lib/flapjack/gateways/base.rb
+- lib/flapjack/gateways/email.rb
+- lib/flapjack/gateways/email/alert.html.haml
+- lib/flapjack/gateways/email/alert.text.erb
+- lib/flapjack/gateways/jabber.rb
+- lib/flapjack/gateways/oobetet.rb
+- lib/flapjack/gateways/pagerduty.rb
+- lib/flapjack/gateways/sms.rb
+- lib/flapjack/gateways/sms/messagenet.rb
+- lib/flapjack/gateways/web.rb
+- lib/flapjack/gateways/web/views/_css.haml
+- lib/flapjack/gateways/web/views/_nav.haml
+- lib/flapjack/gateways/web/views/check.haml
+- lib/flapjack/gateways/web/views/contact.haml
+- lib/flapjack/gateways/web/views/contacts.haml
+- lib/flapjack/gateways/web/views/index.haml
+- lib/flapjack/gateways/web/views/self_stats.haml
 - lib/flapjack/patches.rb
 - lib/flapjack/pikelet.rb
 - lib/flapjack/rack_logger.rb
 - lib/flapjack/redis_pool.rb
 - lib/flapjack/utility.rb
 - lib/flapjack/version.rb
-- lib/flapjack/web.rb
-- lib/flapjack/web/views/_css.haml
-- lib/flapjack/web/views/_nav.haml
-- lib/flapjack/web/views/check.haml
-- lib/flapjack/web/views/contact.haml
-- lib/flapjack/web/views/contacts.haml
-- lib/flapjack/web/views/index.haml
-- lib/flapjack/web/views/self_stats.haml
-- spec.old/check_sandbox/echo
-- spec.old/check_sandbox/sandboxed_check
-- spec.old/configs/flapjack-notifier-couchdb.ini
-- spec.old/configs/flapjack-notifier.ini
-- spec.old/configs/recipients.ini
-- spec.old/helpers.rb
-- spec.old/inifile_spec.rb
-- spec.old/mock-notifiers/mock/init.rb
-- spec.old/mock-notifiers/mock/mock.rb
-- spec.old/notifier-directories/spoons/testmailer/init.rb
-- spec.old/notifier_application_spec.rb
-- spec.old/notifier_filters_spec.rb
-- spec.old/notifier_options_multiplexer_spec.rb
-- spec.old/notifier_options_spec.rb
-- spec.old/notifier_spec.rb
-- spec.old/notifiers/mailer_spec.rb
-- spec.old/notifiers/xmpp_spec.rb
-- spec.old/persistence/datamapper_spec.rb
-- spec.old/persistence/mock_persistence_backend.rb
-- spec.old/simple.ini
-- spec.old/spec.opts
-- spec.old/test-filters/blocker.rb
-- spec.old/test-filters/mock.rb
-- spec.old/transports/beanstalkd_spec.rb
-- spec.old/transports/mock_transport.rb
-- spec.old/worker_application_spec.rb
-- spec.old/worker_options_spec.rb
-- spec/lib/flapjack/api/entity_check_presenter_spec.rb
-- spec/lib/flapjack/api/entity_presenter_spec.rb
-- spec/lib/flapjack/api_spec.rb
 - spec/lib/flapjack/coordinator_spec.rb
 - spec/lib/flapjack/data/contact_spec.rb
 - spec/lib/flapjack/data/entity_check_spec.rb
@@ -479,15 +439,18 @@ files:
 - spec/lib/flapjack/filters/ok_spec.rb
 - spec/lib/flapjack/filters/scheduled_maintenance_spec.rb
 - spec/lib/flapjack/filters/unscheduled_maintenance_spec.rb
-- spec/lib/flapjack/jabber_spec.rb
-- spec/lib/flapjack/notification/email_spec.rb
-- spec/lib/flapjack/notification/sms_spec.rb
-- spec/lib/flapjack/oobetet_spec.rb
-- spec/lib/flapjack/pagerduty_spec.rb
+- spec/lib/flapjack/gateways/api/entity_check_presenter_spec.rb
+- spec/lib/flapjack/gateways/api/entity_presenter_spec.rb
+- spec/lib/flapjack/gateways/api_spec.rb
+- spec/lib/flapjack/gateways/email_spec.rb
+- 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_spec.rb
+- spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
-- spec/lib/flapjack/web_spec.rb
 - spec/spec_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
@@ -517,12 +480,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2640261595995146614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2640261595995146614
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -534,17 +503,12 @@ test_files:
 - features/notifications.feature
 - features/packaging-lintian.feature
 - features/steps/events_steps.rb
-- features/steps/flapjack-importer_steps.rb
 - features/steps/flapjack-netsaint-parser_steps.rb
-- features/steps/flapjack-worker_steps.rb
 - features/steps/notifications_steps.rb
 - features/steps/packaging-lintian_steps.rb
 - features/steps/time_travel_steps.rb
 - features/support/env.rb
 - features/support/silent_system.rb
-- spec/lib/flapjack/api/entity_check_presenter_spec.rb
-- spec/lib/flapjack/api/entity_presenter_spec.rb
-- spec/lib/flapjack/api_spec.rb
 - spec/lib/flapjack/coordinator_spec.rb
 - spec/lib/flapjack/data/contact_spec.rb
 - spec/lib/flapjack/data/entity_check_spec.rb
@@ -560,15 +524,18 @@ test_files:
 - spec/lib/flapjack/filters/ok_spec.rb
 - spec/lib/flapjack/filters/scheduled_maintenance_spec.rb
 - spec/lib/flapjack/filters/unscheduled_maintenance_spec.rb
-- spec/lib/flapjack/jabber_spec.rb
-- spec/lib/flapjack/notification/email_spec.rb
-- spec/lib/flapjack/notification/sms_spec.rb
-- spec/lib/flapjack/oobetet_spec.rb
-- spec/lib/flapjack/pagerduty_spec.rb
+- spec/lib/flapjack/gateways/api/entity_check_presenter_spec.rb
+- spec/lib/flapjack/gateways/api/entity_presenter_spec.rb
+- spec/lib/flapjack/gateways/api_spec.rb
+- spec/lib/flapjack/gateways/email_spec.rb
+- 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_spec.rb
+- spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
-- spec/lib/flapjack/web_spec.rb
 - spec/spec_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb

data/bin/install-flapjack-systemwide

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-
-# 28 05 2009
-# Lindsay Holmwood <lindsay@holmwood.id.au>
-# 
-# Copies various scripts to appropriate places so Flapjack can be 
-# started as a daemon. 
-# 
-# I abhor these sort of scripts. It's only a stopgap until Flapjack
-# gets packaged properly.
-# 
-# If you would like to package, please let me know! Patches welcome.
-# 
-
-unless ENV["USERNAME"] == "root"
-	puts 'You need to be root to run this script'
-	exit 1
-end
-
-# prompt/warn the user what is about to happen
-puts "This script sets up Flapjack to run as a daemon. Specifically it: "
-puts
-puts "  * installs init scripts and configs into /etc"
-puts "  * sets up /var/run/flapjack "
-puts "  * sets Flapjack to run on boot"
-puts 
-puts "It will prompt you if it wants to overwrite an existing file."
-puts 
-print "Do you want to continue? [y/n] "
-continue = gets.strip
-puts 
-
-unless continue == "y"
-  puts "Exiting."
-  exit 
-end
-
-# setup
-system("mkdir -p /var/run/flapjack")
-system("chmod a+rw /var/run/flapjack")
-
-etc_path=`gem contents auxesis-flapjack |grep etc`.split.first.gsub(/etc\/.+/, 'etc').strip
-system("cp -aiv #{etc_path}/* /etc")
-
-# set sequence number to 50 so beanstalkd has a chance to boot
-system("update-rc.d flapjack-workers defaults 50")
-system("update-rc.d flapjack-executive defaults 50")
-
-puts 
-puts "Setup complete!"
-puts 
-puts "You will want to customise:"
-puts "  * /etc/flapjack/recipients.yaml"
-puts "  * /etc/flapjack/flapjack-executive.yaml"
-puts 
-puts ".examples of these files exist in /etc/flapjack/'
-
-

data/features/steps/flapjack-importer_steps.rb

@@ -1,109 +0,0 @@
-When /^I run "([^"]*)" with the following arguments:$/ do |script, table|
-  @arguments = []
-  table.hashes.each do |attrs|
-    @arguments << attrs["argument"]
-  end
-
-  command = "bin/#{script} #{@arguments.join(' ')}"
-
-  @output = `#{command}`
-  $?.exitstatus.should == 0
-end
-
-Then /^I should see a batch of checks in the output$/ do
-  @data["batches"].should_not be_nil
-  @data["batches"].size.should > 0
-
-  @data["batches"].each do |batch|
-    batch["checks"].should_not be_nil
-    batch["checks"].size.should > 0
-
-    batch["checks"].each do |check|
-      check["id"].should_not be_nil
-      check["command"].should_not be_nil
-    end
-  end
-end
-
-Then /^I should see a batch of checks with relationships in the output$/ do
-  @data["batches"].should_not be_nil
-  @data["batches"].size.should > 0
-
-  @data["batches"].each do |batch|
-    batch["checks"].should_not be_nil
-    batch["checks"].size.should > 0
-
-    batch["checks"].each do |check|
-      check.key?("parent_id").should be_true
-      check.key?("child_id").should be_true
-    end
-  end
-end
-
-Given /^no file exists at "([^"]*)"$/ do |filename|
-  FileUtils.rm_f(filename).should be_true
-end
-
-Then /^I should see valid JSON in "([^"]*)"$/ do |filename|
-  lambda {
-    file = File.new(filename, 'r')
-    parser = Yajl::Parser.new
-    @data = parser.parse(file)
-  }.should_not raise_error
-end
-
-Given /^I run the importer$/ do
-  pending # express the regexp above with the code you wish you had
-end
-
-Given /^the necessary checks and relationships are created$/ do
-  pending # express the regexp above with the code you wish you had
-end
-
-Then /^the latest batch of checks should be in the work queue$/ do
-  pending # express the regexp above with the code you wish you had
-end
-
-Then /^I should see "([^"]*)" in the output$/ do |regex|
-  @output.should =~ /#{regex}/i
-end
-
-Given /^beanstalkd is running$/ do
-  system("which beanstalkd > /dev/null 2>&1").should be_true
-
-  command = "beanstalkd"
-  @beanstalk = spawn_daemon(command)
-
-  # So beanstalkd has a moment to catch its breath.
-  sleep 0.5
-end
-
-Given /^there are no jobs on the "([^"]*)" beanstalkd queue$/ do |queue_name|
-  @queue = Beanstalk::Connection.new('localhost:11300', queue_name)
-  100.times { @queue.put('foo') }
-  until @queue.stats["current-jobs-ready"] == 0
-    job = @queue.reserve
-    job.delete
-  end
-end
-
-Then /^there should be several jobs on the "([^"]*)" beanstalkd queue$/ do |queue_name|
-  @queue = Beanstalk::Connection.new('localhost:11300', queue_name)
-  @queue.stats["current-jobs-ready"].should > 0
-end
-
-
-Then /^I should see a valid JSON batch in "([^"]*)"$/ do |filename|
-  lambda {
-    file = File.new(filename, 'r')
-    parser = Yajl::Parser.new
-    @data = parser.parse(file)
-  }.should_not raise_error
-
-  @data["checks"].size.should > 0
-  @data["checks"].each do |check|
-    %w(id command interval).each do |attr|
-      check[attr].should_not be_nil
-    end
-  end
-end