god 0.13.3 → 0.13.4

data/Gemfile

@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
 gemspec
+
+gem 'redcarpet', '< 3.0.0'
+gem 'sanitize', '2.0.3'

data/History.txt

@@ -1,3 +1,11 @@
+== 0.13.4 / 2014-03-05
+  * Minor Enhancements
+    * Hipchat reporter (#162)
+    * Re-open log files on SIGUSR1 (#103)
+  * Bug fixes
+    * Send query params on webhook reporter (#160)
+    * Don't thow an exception when there are problems reading pid file (#164)
+
 == 0.13.3 / 2013-09-25
   * Minor Enhancements
     * Invoke commands for all watchers

data/doc/god.asciidoc

@@ -999,6 +999,29 @@ ssl       - A Boolean determining whether or not to use SSL
             (default: false).
 ```
 
+Hipchat
+~~~~~~~~
+
+Send a notice to a Hipchat room (http://hipchat.com).
+
+```ruby
+God::Contacts::Hipchat.defaults do |d|
+  ...
+end
+
+God.contact(:hipchat) do |c|
+  ...
+end
+```
+
+```
+token     - The String token used for authentication.
+room      - The String room name to which the message should be sent.
+ssl       - A Boolean determining whether or not to use SSL
+            (default: false).
+from      - The String representing who the message should be sent as.
+```
+
 Email
 ~~~~~
 

data/god.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'god'
-  s.version = '0.13.3'
-  s.date = '2013-09-25'
+  s.version = '0.13.4'
+  s.date = '2014-03-05'
 
   s.summary = "Process monitoring framework."
   s.description = "An easy to configure, easy to extend monitoring framework written in Ruby."
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
     lib/god/contacts/airbrake.rb
     lib/god/contacts/campfire.rb
     lib/god/contacts/email.rb
+    lib/god/contacts/hipchat.rb
     lib/god/contacts/jabber.rb
     lib/god/contacts/prowl.rb
     lib/god/contacts/scout.rb
@@ -154,6 +155,7 @@ Gem::Specification.new do |s|
     test/test_event_handler.rb
     test/test_god.rb
     test/test_handlers_kqueue_handler.rb
+    test/test_hipchat.rb
     test/test_jabber.rb
     test/test_logger.rb
     test/test_metric.rb

data/lib/god.rb

@@ -85,6 +85,7 @@ end
 
 require 'god/contact'
 load_contact(:campfire)
+load_contact(:hipchat)
 load_contact(:email)
 load_contact(:jabber)
 load_contact(:prowl)
@@ -157,7 +158,7 @@ end
 
 module God
   # The String version number for this package.
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 
   # The Integer number of lines of backlog to keep for the logger.
   LOG_BUFFER_SIZE_DEFAULT = 100

data/lib/god/cli/run.rb

@@ -83,6 +83,8 @@ module God
       def run_daemonized
         # trap and ignore SIGHUP
         Signal.trap('HUP') {}
+        # trap and log-reopen SIGUSR1
+        Signal.trap('USR1') { setup_logging }
 
         pid = fork do
           begin

data/lib/god/contacts/hipchat.rb

@@ -0,0 +1,117 @@
+# Send a notice to a Hipchat room (http://hipchat.com).
+#
+#  token     - The String token used for authentication.
+#  room      - The String room name to which the message should be sent.
+#  ssl       - A Boolean determining whether or not to use SSL
+#              (default: false).
+#  from      - The String representing who the message should be sent as.
+
+require 'net/http'
+require 'net/https'
+
+CONTACT_DEPS[:hipchat] = ['json']
+CONTACT_DEPS[:hipchat].each do |d|
+  require d
+end
+
+module Marshmallow
+  class Connection
+    def initialize(options)
+      raise "Required option :token not set." unless options[:token]
+      @options = options
+    end
+
+    def base_url
+      scheme = @options[:ssl] ? 'https' : 'http'
+      "#{scheme}://api.hipchat.com/v1/rooms"
+    end
+
+    def find_room_id_by_name(room_name)
+      url = URI.parse("#{base_url}/list?format=json&auth_token=#{@options[:token]}")
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true if @options[:ssl]
+
+      req = Net::HTTP::Get.new(url.request_uri)
+      req.set_content_type('application/json')
+
+      res = http.request(req)
+      case res
+        when Net::HTTPSuccess
+          rooms = JSON.parse(res.body)
+          room = rooms['rooms'].select { |x| x['name'] == room_name }
+          rooms.empty? ? nil : room.first['room_id'].to_i
+        else
+          raise res.error!
+      end
+    end
+
+    def speak(room, message)
+      room_id = find_room_id_by_name(room)
+      puts "in spark: room_id = #{room_id}"
+      raise "No such room: #{room}." unless room_id
+
+      escaped_message = URI.escape(message)
+
+      url = URI.parse("#{base_url}/message?message_format=text&format=json&auth_token=#{@options[:token]}&from=#{@options[:from]}&room_id=#{room}&message=#{escaped_message}")
+      
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true if @options[:ssl]
+
+      req = Net::HTTP::Post.new(url.request_uri)
+      req.set_content_type('application/json')
+      res = http.request(req)
+      case res
+        when Net::HTTPSuccess
+          true
+        else
+          raise res.error!
+      end
+    end
+  end
+end
+
+module God
+  module Contacts
+
+    class Hipchat < Contact
+      class << self
+        attr_accessor :token, :room, :ssl, :from
+        attr_accessor :format
+      end
+
+      self.ssl = false
+
+      self.format = lambda do |message, time, priority, category, host|
+        "[#{time.strftime('%H:%M:%S')}] #{host} - #{message}"
+      end
+
+      attr_accessor :token, :room, :ssl, :from
+
+      def valid?
+        valid = true
+        valid &= complain("Attribute 'token' must be specified", self) unless arg(:token)
+        valid &= complain("Attribute 'room' must be specified", self) unless arg(:room)
+        valid &= complain("Attribute 'from' must be specified", self) unless arg(:from)
+        valid
+      end
+
+      def notify(message, time, priority, category, host)
+        body = Hipchat.format.call(message, time, priority, category, host)
+
+        conn = Marshmallow::Connection.new(
+          :token => arg(:token),
+          :ssl   => arg(:ssl),
+          :from  => arg(:from)
+        )
+
+        conn.speak(arg(:room), body)
+
+        self.info = "notified hipchat: #{arg(:room)}"
+      rescue Object => e
+        applog(nil, :info, "failed to notify hipchat: #{e.message}")
+        applog(nil, :debug, e.backtrace.join("\n"))
+      end
+    end
+
+  end
+end

data/lib/god/contacts/webhook.rb

@@ -47,10 +47,10 @@ module God
 
         case arg(:format)
           when :form
-            req = Net::HTTP::Post.new(uri.path)
+            req = Net::HTTP::Post.new(uri.request_uri)
             req.set_form_data(data)
           when :json
-            req = Net::HTTP::Post.new(uri.path)
+            req = Net::HTTP::Post.new(uri.request_uri)
             req.body = data.to_json
         end
 
@@ -63,7 +63,7 @@ module God
             self.info = "failed to send webhook to #{arg(:url)}: #{res.error!}"
         end
       rescue Object => e
-        applog(nil, :info, "failed to send email to #{arg(:url)}: #{e.message}")
+        applog(nil, :info, "failed to send webhook to #{arg(:url)}: #{e.message}")
         applog(nil, :debug, e.backtrace.join("\n"))
       end
 

data/lib/god/process.rb

@@ -210,13 +210,19 @@ module God
           applog(self, :info, "#{self.name} sent SIG#{@stop_signal}")
 
           # Poll to see if it's dead
+          pid_not_found = false
           @stop_timeout.times do
-            begin
-              ::Process.kill(0, pid)
-            rescue Errno::ESRCH
-              # It died. Good.
-              applog(self, :info, "#{self.name} process stopped")
-              return
+            if pid
+              begin
+                ::Process.kill(0, pid)
+              rescue Errno::ESRCH
+                # It died. Good.
+                applog(self, :info, "#{self.name} process stopped")
+                return
+              end
+            else
+              applog(self, :warn, "#{self.name} pid not found in #{self.pid_file}") unless pid_not_found
+              pid_not_found = true
             end
 
             sleep 1

data/test/configs/contact/contact.god

@@ -9,6 +9,16 @@
 #   c.name = 'tom4'
 # end
 
+# God::Contacts::Hipchat.defaults do |d|
+#   d.token = '9fb768e421975cc1c6ff3f4f8306f890cb46e24f'
+#   d.room = 'Notices'
+#   d.ssl = true
+# end
+#
+# God.contact(:hipchat) do |c|
+#   c.name = 'hip1'
+# end
+
 # God.contact(:email) do |c|
 #   c.name = 'tom'
 #   c.group = 'developers'

data/test/test_hipchat.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestHipchat < Test::Unit::TestCase
+  def setup
+    @hipchat = God::Contacts::Hipchat.new
+  end
+
+  def test_exists
+    God::Contacts::Hipchat
+  end
+
+  def test_notify
+    @hipchat.token = 'ee64d6e2337310af'
+    @hipchat.ssl = 'true'
+    @hipchat.room = 'testroom'
+    @hipchat.from = 'test'
+
+    time = Time.now
+    body = "[#{time.strftime('%H:%M:%S')}] host - msg"
+    Marshmallow::Connection.any_instance.expects(:speak).with('testroom', body)
+    @hipchat.notify('msg', time, 'prio', 'cat', 'host')
+  end
+end

data/test/test_webhook.rb

@@ -12,4 +12,11 @@ class TestWebhook < Test::Unit::TestCase
     @webhook.notify('msg', Time.now, 'prio', 'cat', 'host')
     assert_equal "sent webhook to http://example.com/switch", @webhook.info
   end
+
+  def test_notify_with_url_containing_query_parameters
+    @webhook.url = 'http://example.com/switch?api_key=123'
+    Net::HTTP::Post.expects(:new).with('/switch?api_key=123')
+
+    @webhook.notify('msg', Time.now, 'prio', 'cat', 'host')
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 35
+  prerelease: 
   segments: 
   - 0
   - 13
-  - 3
-  version: 0.13.3
+  - 4
+  version: 0.13.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -16,187 +17,214 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-25 00:00:00 -07:00
+date: 2014-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 6
         version: "1.6"
-  name: json
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
+  name: json
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  name: rake
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
+  name: rake
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 3
         - 10
         version: "3.10"
-  name: rdoc
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
+  name: rdoc
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 4
         - 0
         version: "4.0"
-  name: twitter
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
+  name: twitter
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 3
         version: "0.3"
-  name: prowly
-  requirement: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
+  name: prowly
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 5
         version: "0.5"
-  name: xmpp4r
-  requirement: *id006
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id006
+  name: xmpp4r
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
-  name: dike
-  requirement: *id007
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id007
+  name: dike
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
         version: "0.9"
-  name: rcov
-  requirement: *id008
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id008
+  name: rcov
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
-  name: daemons
-  requirement: *id009
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id009
+  name: daemons
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 10
         version: "0.10"
-  name: mocha
-  requirement: *id010
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id010
+  name: mocha
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 3
         - 1
         version: 1.3.1
-  name: gollum
-  requirement: *id011
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id011
+  name: gollum
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 3
         - 1
         - 7
         version: 3.1.7
-  name: airbrake
-  requirement: *id012
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id012
+  name: airbrake
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
-  name: nokogiri
-  requirement: *id013
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id013
+  name: nokogiri
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
@@ -204,14 +232,16 @@ dependencies:
         version: 2.3.10
     - - <
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 4
         - 0
         - 0
         version: 4.0.0
-  name: activesupport
-  requirement: *id014
   prerelease: false
+  requirement: *id014
+  name: activesupport
+  type: :development
 description: An easy to configure, easy to extend monitoring framework written in Ruby.
 email: god-rb@googlegroups.com
 executables: 
@@ -265,6 +295,7 @@ files:
 - lib/god/contacts/airbrake.rb
 - lib/god/contacts/campfire.rb
 - lib/god/contacts/email.rb
+- lib/god/contacts/hipchat.rb
 - lib/god/contacts/jabber.rb
 - lib/god/contacts/prowl.rb
 - lib/god/contacts/scout.rb
@@ -336,6 +367,7 @@ files:
 - test/test_event_handler.rb
 - test/test_god.rb
 - test/test_handlers_kqueue_handler.rb
+- test/test_hipchat.rb
 - test/test_jabber.rb
 - test/test_logger.rb
 - test/test_metric.rb
@@ -362,23 +394,27 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: god
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Process monitoring framework.
@@ -398,6 +434,7 @@ test_files:
 - test/test_event_handler.rb
 - test/test_god.rb
 - test/test_handlers_kqueue_handler.rb
+- test/test_hipchat.rb
 - test/test_jabber.rb
 - test/test_logger.rb
 - test/test_metric.rb