god 0.10.1 → 0.11.0

data/test/configs/contact/contact.god

@@ -1,66 +1,84 @@
-God::Contacts::Email.message_settings = {:from => 'support@gravatar.com'}
+# God::Contacts::Campfire.defaults do |d|
+#   d.subdomain = 'github'
+#   d.token = '9fb768e421975cc1c6ff3f4f8306f890cb46e24f'
+#   d.room = 'Notices'
+#   d.ssl = true
+# end
+#
+# God.contact(:campfire) do |c|
+#   c.name = 'tom4'
+# end
 
-God::Contacts::Email.server_settings = {
-  :address => "smtp.aa.powerset.com",
-  :port => 25,
-  :domain => "powerset.com"
-}
+# God.contact(:email) do |c|
+#   c.name = 'tom'
+#   c.group = 'developers'
+#   c.to_email = 'tom@lepton.local'
+#   c.from_email = 'god@github.com'
+#   c.from_name = 'God'
+#   c.delivery_method = :sendmail
+# end
 
-God::Contacts::Twitter.settings = {
-  # this is for my 'mojombo2' twitter test account
-  # feel free to use it for testing your conditions
-  :username => 'mojombo@gmail.com',
-  :password  => 'gok9we3ot1av2e'
-}
+# God.contact(:email) do |c|
+#   c.name = 'tom'
+#   c.group = 'developers'
+#   c.to_email = 'tom@mojombo.com'
+#   c.from_email = 'god@github.com'
+#   c.from_name = 'God'
+#   c.server_host = 'smtp.rs.github.com'
+# end
 
-God.contact(:email) do |c|
-  c.name = 'tom'
-  c.email = 'tom@mojombo.com'
-  c.group = 'developers'
-end
+# God.contact(:prowl) do |c|
+#   c.name = 'tom3'
+#   c.apikey = 'f0fc8e1f3121672686337a631527eac2f1b6031c'
+#   c.group = 'developers'
+# end
 
-God.contact(:email) do |c|
-  c.name = 'vanpelt'
-  c.email = 'vanpelt@example.com'
-  c.group = 'developers'
-end
+# God.contact(:twitter) do |c|
+#   c.name = 'tom6'
+#   c.consumer_token = 'gOhjax6s0L3mLeaTtBWPw'
+#   c.consumer_secret = 'yz4gpAVXJHKxvsGK85tEyzQJ7o2FEy27H1KEWL75jfA'
+#   c.access_token = '17376380-qS391nCrgaP4HKXAmZtM38gB56xUXMhx1NYbjT6mQ'
+#   c.access_secret = 'uMwCDeU4OXlEBWFQBc3KwGyY8OdWCtAV0Jg5KVB0'
+# end
 
-God.contact(:email) do |c|
-  c.name = 'kevin'
-  c.email = 'kevin@example.com'
-  c.group = 'platform'
-end
+# God.contact(:scout) do |c|
+#   c.name = 'tom5'
+#   c.client_key = '583a51b5-acbc-2421-a830-b6f3f8e4b04e'
+#   c.plugin_id = '230641'
+# end
 
-God.contact(:twitter) do |c|
-  c.name      = 'tom2'
-  c.group     = 'developers'
-end
+# God.contact(:webhook) do |c|
+#   c.name = 'tom'
+#   c.url = "http://www.postbin.org/wk7guh"
+# end
 
-God.contact(:prowl) do |c|
-  c.name = 'tom3'
-  c.apikey = 'd31c1f31f7af0f69e263c2f12167263127eab608'
-  c.group = 'developers'
-end
+# God.contact(:jabber) do |c|
+#   c.name = 'tom'
+#   c.host = 'talk.google.com'
+#   c.to_jid = 'mojombo@jabber.org'
+#   c.from_jid = 'mojombo@gmail.com'
+#   c.password = 'secret'
+# end
 
 God.watch do |w|
   w.name = "contact"
   w.interval = 5.seconds
   w.start = "ruby " + File.join(File.dirname(__FILE__), *%w[simple_server.rb])
   w.log = "/Users/tom/contact.log"
-  
+
   # determine the state on startup
   w.transition(:init, { true => :up, false => :start }) do |on|
     on.condition(:process_running) do |c|
       c.running = true
     end
   end
-  
+
   # determine when process has finished starting
   w.transition([:start, :restart], :up) do |on|
     on.condition(:process_running) do |c|
       c.running = true
     end
-    
+
     # failsafe
     on.condition(:tries) do |c|
       c.times = 2
@@ -71,10 +89,10 @@ God.watch do |w|
   # start if process is not running
   w.transition(:up, :start) do |on|
     on.condition(:process_exits) do |c|
-      c.notify = {:contacts => ['tom2', 'tom3', 'foobar'], :priority => 1, :category => 'product'}
+      c.notify = {:contacts => ['tom'], :priority => 1, :category => 'product'}
     end
   end
-  
+
   # lifecycle
   w.lifecycle do |on|
     on.condition(:flapping) do |c|

data/test/test_campfire.rb

@@ -2,40 +2,22 @@ require File.dirname(__FILE__) + '/helper'
 require 'tinder'
 
 class TestCampfire < Test::Unit::TestCase
+  def setup
+    @campfire = God::Contacts::Campfire.new
+  end
+
   def test_exists
     God::Contacts::Campfire
   end
-  
-  # should notify
-  def test_campfire_delivery_method_for_notify
-    assert_nothing_raised do
-      
-      room = mock()
-      room.expects(:speak).returns(nil)
-      
-      g = God::Contacts::Campfire.new
-      God::Contacts::Campfire.format.expects(:call).with(:a,:e)
-      g.expects(:room).returns(room)
-      g.notify(:a, :b, :c, :d, :e)
-      assert_equal "notified campfire: ", g.info
-    end
-  end
-  
-  # should not establish a new connection because the older is alive
-  def test_campfire_room_method
-   assert_nothing_raised do
-     room = mock()
-     g = God::Contacts::Campfire.new
-     g.instance_variable_set(:@room,room)
-     assert_equal g.send(:room), room
-   end
-  end
-  
-  # should raise because the connections parameters have not been set
-  def test_campfire_delivery_method_for_notify_without_campfire_params
-    LOG.expects(:log).times(3) # 3 calls: 2 debug (credentials, backtrace) + 1 info (failed message)
-    g = God::Contacts::Campfire.new
-    g.notify(:a, :b, :c, :d, :e)
+
+  def test_notify
+    @campfire.subdomain = 'github'
+    @campfire.token = 'abc'
+    @campfire.room = 'danger'
+
+    time = Time.now
+    body = "[#{time.strftime('%H:%M:%S')}] host - msg"
+    Marshmallow::Connection.any_instance.expects(:speak).with('danger', body)
+    @campfire.notify('msg', time, 'prio', 'cat', 'host')
   end
-  
 end

data/test/test_email.rb

@@ -1,45 +1,34 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestEmail < Test::Unit::TestCase
-  def test_exists
-    God::Contacts::Email
+  def setup
+    God::Contacts::Email.to_email = 'dev@example.com'
+    God::Contacts::Email.from_email = 'god@example.com'
+    @email = God::Contacts::Email.new
   end
 
-  def test_unknown_delivery_method_for_notify
-    assert_nothing_raised do
-      God::Contacts::Email.any_instance.expects(:notify_smtp).never
-      God::Contacts::Email.any_instance.expects(:notify_sendmail).never
-      God::Contacts::Email.delivery_method = :foo_protocol
-      LOG.expects(:log).times(2)
- 
-      g = God::Contacts::Email.new
-      g.notify(:a, :b, :c, :d, :e)
-      assert_nil g.info
-    end
+  def test_validity_delivery
+    @email.delivery_method = :brainwaves
+    assert_equal false, @email.valid?
   end
 
   def test_smtp_delivery_method_for_notify
-    assert_nothing_raised do
-      God::Contacts::Email.any_instance.expects(:notify_sendmail).never
-      God::Contacts::Email.any_instance.expects(:notify_smtp).once.returns(nil)
-      God::Contacts::Email.delivery_method = :smtp
-      g = God::Contacts::Email.new
-      g.email = 'joe@example.com'
-      g.notify(:a, :b, :c, :d, :e)
-      assert_equal "sent email to joe@example.com", g.info
-    end
+    @email.delivery_method = :smtp
+
+    God::Contacts::Email.any_instance.expects(:notify_sendmail).never
+    God::Contacts::Email.any_instance.expects(:notify_smtp).once.returns(nil)
+
+    @email.notify('msg', Time.now, 'prio', 'cat', 'host')
+    assert_equal "sent email to dev@example.com via smtp", @email.info
   end
-  
+
   def test_sendmail_delivery_method_for_notify
-    assert_nothing_raised do
-      God::Contacts::Email.any_instance.expects(:notify_smtp).never
-      God::Contacts::Email.any_instance.expects(:notify_sendmail).once.returns(nil)
-      God::Contacts::Email.delivery_method = :sendmail
-      g = God::Contacts::Email.new
-      g.email = 'joe@example.com'
-      g.notify(:a, :b, :c, :d, :e)
-      assert_equal "sent email to joe@example.com", g.info
-    end
+    @email.delivery_method = :sendmail
+
+    God::Contacts::Email.any_instance.expects(:notify_smtp).never
+    God::Contacts::Email.any_instance.expects(:notify_sendmail).once.returns(nil)
+
+    @email.notify('msg', Time.now, 'prio', 'cat', 'host')
+    assert_equal "sent email to dev@example.com via sendmail", @email.info
   end
-  
 end

data/test/test_jabber.rb

@@ -4,33 +4,26 @@ require File.dirname(__FILE__) + '/helper'
 class TestJabber < Test::Unit::TestCase
 
   def setup
-    God::Contacts::Jabber.settings = { 
-      :jabber_id => 'test@example.com',
-      :password => 'pass'
-    }
     @jabber = God::Contacts::Jabber.new
-    @jabber.jabber_id = 'recipient@example.com'
   end
 
   def test_notify
-    assert_nothing_raised do
-      God::Contacts::Jabber.any_instance.expects(:connect!).once.returns(nil)
-      God::Contacts::Jabber.any_instance.expects(:send!).once.returns(nil)
-      @jabber.notify(:a, :b, :c, :d, :e)
-      assert_equal "sent jabber message to recipient@example.com", @jabber.info
-    end
+    @jabber.host = 'talk.google.com'
+    @jabber.from_jid = 'god@jabber.org'
+    @jabber.password = 'secret'
+    @jabber.to_jid = 'dev@jabber.org'
+
+    time = Time.now
+    body = God::Contacts::Jabber.format.call('msg', time, 'prio', 'cat', 'host')
+
+    assert_equal "Message: msg\nHost: host\nPriority: prio\nCategory: cat\n", body
+
+    Jabber::Client.any_instance.expects(:connect).with('talk.google.com', 5222)
+    Jabber::Client.any_instance.expects(:auth).with('secret')
+    Jabber::Client.any_instance.expects(:send)
+    Jabber::Client.any_instance.expects(:close)
+
+    @jabber.notify('msg', Time.now, 'prio', 'cat', 'host')
+    assert_equal "sent jabber message to dev@jabber.org", @jabber.info
   end
-  
-  # def test_live_notify
-  #   God::Contacts::Jabber.settings = { 
-  #     :jabber_id => 'real_user@example.com',
-  #     :password => 'pass'
-  #   }
-  #   recipient = "real_recipient@example.com"
-  #   
-  #   jabber = God::Contacts::Jabber.new
-  #   jabber.jabber_id = recipient
-  #   jabber.notify("Hello", Time.now, "Test", "Test", "localhost")
-  #   assert_equal "sent jabber message to #{recipient}", jabber.info
-  # end
 end

data/test/test_webhook.rb

@@ -1,17 +1,15 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestWebhook < Test::Unit::TestCase
-  def test_exists
-    God::Contacts::Webhook
+  def setup
+    @webhook = God::Contacts::Webhook.new
   end
 
   def test_notify
-    assert_nothing_raised do
-      g = God::Contacts::Webhook.new
-      g.hook_url = 'http://test/switch'
-      Net::HTTP.expects(:post_form)
-      g.notify(:a, :b, :c, :d, :e)
-      assert_equal "sent webhook to http://test/switch", g.info
-    end
+    @webhook.url = 'http://example.com/switch'
+    Net::HTTP.any_instance.expects(:request).returns(Net::HTTPSuccess.new('a', 'b', 'c'))
+
+    @webhook.notify('msg', Time.now, 'prio', 'cat', 'host')
+    assert_equal "sent webhook to http://example.com/switch", @webhook.info
   end
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 1
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -16,156 +11,95 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-07-01 00:00:00 -07:00
 default_executable: god
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 7
         version: 0.3.7
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: prowly
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tinder
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
-    - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id003
+        version: 0.2.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: xmpp4r
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
         version: 0.4.0
-  type: :development
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: dike
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
-  type: :development
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: snapshot
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
     - - <
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  type: :development
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
-  type: :development
-  version_requirements: *id007
+    version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 10
         version: 1.0.10
     - - <
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  type: :development
-  version_requirements: *id008
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
         version: 0.9.1
-  type: :development
-  version_requirements: *id009
+    version: 
 description: An easy to configure, easy to extend monitoring framework written in Ruby.
 email: god-rb@googlegroups.com
 executables: 
@@ -311,20 +245,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: god
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Process monitoring framework.