god 0.13.6 → 0.13.7

data/History.txt

@@ -1,3 +1,12 @@
+== 0.13.7 / 2015-08-19
+  * Bug fixes
+    * Fixed slack integration (#217)
+    * Update twitter gem to support newer rubies (#219)
+    * Make stop_all work with newer rubies (#209)
+    * Don't start more DRb servers than necessary
+  * Minor Enhancements
+    * Allow uid and gid to be specified as an integer (#202)
+
 == 0.13.6 / 2015-02-21
   * Minor Enhancements
     * sensu notifier (#199)

data/Rakefile

@@ -48,8 +48,17 @@ task :default => :test
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
+  file_list = FileList['test/**/test_*.rb']
+  file_list = file_list.exclude("test/test_god_system.rb")
+  test.test_files = file_list
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:system_test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_god_system.rb'
   test.verbose = true
 end
 

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.6'
-  s.date = '2015-03-21'
+  s.version = '0.13.7'
+  s.date = '2015-10-19'
 
   s.summary = "Process monitoring framework."
   s.description = "An easy to configure, easy to extend monitoring framework written in Ruby."
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest')
   s.add_development_dependency('rdoc', '~> 3.10')
-  s.add_development_dependency('twitter', '~> 4.0')
+  s.add_development_dependency('twitter', '~> 5.0')
   s.add_development_dependency('prowly', '~> 0.3')
   s.add_development_dependency('xmpp4r', '~> 0.5')
   s.add_development_dependency('dike', '~> 0.0.3')
@@ -146,6 +146,7 @@ Gem::Specification.new do |s|
     test/configs/task/logs/.placeholder
     test/configs/task/task.god
     test/configs/test.rb
+    test/configs/usr1_trapper.rb
     test/helper.rb
     test/suite.rb
     test/test_airbrake.rb
@@ -162,6 +163,7 @@ Gem::Specification.new do |s|
     test/test_email.rb
     test/test_event_handler.rb
     test/test_god.rb
+    test/test_god_system.rb
     test/test_handlers_kqueue_handler.rb
     test/test_hipchat.rb
     test/test_jabber.rb

data/lib/god.rb

@@ -161,7 +161,7 @@ end
 
 module God
   # The String version number for this package.
-  VERSION = '0.13.6'
+  VERSION = '0.13.7'
 
   # The Integer number of lines of backlog to keep for the logger.
   LOG_BUFFER_SIZE_DEFAULT = 100
@@ -490,8 +490,8 @@ module God
   def self.stop_all
     self.watches.sort.each do |name, w|
       Thread.new do
+        w.action(:stop)
         w.unmonitor if w.state != :unmonitored
-        w.action(:stop) if w.alive?
       end
     end
 

data/lib/god/cli/command.rb

@@ -12,7 +12,6 @@ module God
 
       def setup
         # connect to drb unix socket
-        DRb.start_service("druby://127.0.0.1:0")
         @server = DRbObject.new(nil, God::Socket.socket(@options[:port]))
 
         # ping server to ensure that it is responsive

data/lib/god/contacts/slack.rb

@@ -19,7 +19,7 @@ module God
 
     class Slack < Contact
       class << self
-        attr_accessor :account, :token, :channel, :notify_channel, :format, :username, :emoji
+        attr_accessor :url, :channel, :notify_channel, :format, :username, :emoji
       end
 
       self.channel        = "#general"
@@ -28,12 +28,11 @@ module God
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'account' must be specified", self) unless arg(:account)
-        valid &= complain("Attribute 'token' must be specified", self) unless arg(:token)
+        valid &= complain("Attribute 'url' must be specified", self) unless arg(:url)
         valid
       end
 
-      attr_accessor :account, :token, :channel, :notify_channel, :format, :username, :emoji
+      attr_accessor :url, :channel, :notify_channel, :format, :username, :emoji
 
       def text(data)
         text = ""
@@ -63,7 +62,7 @@ module God
       end
 
       def api_url
-        URI.parse("https://#{arg(:account)}.slack.com/services/hooks/incoming-webhook?token=#{arg(:token)}")
+        URI.parse arg(:url)
       end
 
       def request(text)
@@ -96,5 +95,4 @@ module God
     end
 
   end
-end
-
+end

data/lib/god/process.rb

@@ -30,9 +30,15 @@ module God
     def file_writable?(file)
       pid = fork do
         begin
-          uid_num = Etc.getpwnam(self.uid).uid if self.uid
-          gid_num = Etc.getgrnam(self.gid).gid if self.gid
-          gid_num = Etc.getpwnam(self.uid).gid if self.gid.nil? && self.uid
+          if self.uid
+            user_method = self.uid.is_a?(Integer) ? :getpwuid : :getpwnam
+            uid_num = Etc.send(user_method, self.uid).uid
+            gid_num = Etc.send(user_method, self.uid).gid
+          end
+          if self.gid
+            group_method = self.gid.is_a?(Integer) ? :getgrgid : :getgrnam
+            gid_num = Etc.send(group_method, self.gid).gid
+          end
 
           ::Dir.chroot(self.chroot) if self.chroot
           ::Process.groups = [gid_num] if gid_num

data/lib/god/socket.rb

@@ -78,7 +78,6 @@ module God
         applog(nil, :info, "Started on #{DRb.uri}")
       rescue Errno::EADDRINUSE
         applog(nil, :info, "Socket already in use")
-        DRb.start_service
         server = DRbObject.new(nil, self.socket)
 
         begin
@@ -95,8 +94,15 @@ module God
       end
 
       if File.exists?(self.socket_file)
-        uid = Etc.getpwnam(@user).uid if @user
-        gid = Etc.getgrnam(@group).gid if @group
+        if @user
+          user_method = @user.is_a?(Integer) ? :getpwuid : :getpwnam
+          uid = Etc.send(user_method, @user).uid
+          gid = Etc.send(user_method, @user).gid
+        end
+        if @group
+          group_method = @group.is_a?(Integer) ? :getgrgid : :getgrnam
+          gid = Etc.send(group_method, @group).gid
+        end
 
         File.chmod(Integer(@perm), socket_file) if @perm
         File.chown(uid, gid, socket_file) if uid or gid

data/test/configs/usr1_trapper.rb

@@ -0,0 +1,10 @@
+#! /usr/bin/env ruby
+
+Signal.trap 'USR1' do
+  puts "can't stop won't stop"
+end
+
+loop do
+  puts 'server'
+  sleep 1
+end

data/test/test_god_system.rb

@@ -0,0 +1,201 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestGodSystem < MiniTest::Test
+  def assert_watch_running(watch_name)
+    assert_equal true, God.watches[watch_name].alive?
+  end
+
+  def with_god_cleanup
+    old_terminate = God.method(:terminate)
+    # necessary cuz actual god terminate will do exit(0) will stops tests
+    God.class_eval do
+      def self.terminate
+        FileUtils.rm_f(self.pid) if self.pid
+        self.server.stop if self.server
+      end
+    end
+    begin
+      yield
+    ensure
+      God.stop_all
+      God.terminate # use our monkeypatched terminate
+      God.watches.each do |name, w|
+        w.stop_signal = 'KILL'
+        w.action(:stop)
+      end
+      God.inited = false
+      God.terminate_timeout = ::God::TERMINATE_TIMEOUT_DEFAULT
+      God.internal_init # reset config, set running to false, etc.
+      # set termiante back to old method, for other tests
+      God.define_singleton_method(:terminate, old_terminate)
+    end
+  end
+
+  def test_start_running
+    with_god_cleanup do
+      God.start
+      assert_equal(God.running, true)
+    end
+  end
+
+  def test_add_watch
+    with_god_cleanup do
+      God.start
+      God.watch do |w|
+        w.name = 'add_watch'
+        w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+      end
+      assert God.watches['add_watch'] != nil
+    end
+  end
+
+  def test_start_watch
+    with_god_cleanup do
+      God.start
+      God.watch do |w|
+        w.name = 'start_watch'
+        w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+      end
+      God.watches['start_watch'].action(:start)
+      sleep 2
+      assert_equal true, God.watches['start_watch'].alive?
+    end
+  end
+
+  def test_start_watch
+    with_god_cleanup do
+      God.start
+      God.watch do |w|
+        w.name = 'start_watch'
+        w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+      end
+      God.watches['start_watch'].action(:start)
+      sleep 2
+      assert_equal true, God.watches['start_watch'].alive?
+    end
+  end
+
+  def test_stop_all_with_one
+    with_god_cleanup do
+      God.start
+      God.watch do |w|
+        w.name = 'start_watch'
+        w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+      end
+      God.watches['start_watch'].action(:start)
+      sleep 2
+      assert_equal true, God.watches['start_watch'].alive?
+      God.stop_all
+      assert_equal false, God.watches.any? { |name, w| w.alive? }
+    end
+  end
+
+  # default 10s timeout will expire before SIGKILL sent
+  def test_stop_all_with_non_killing_signal_long_timeout
+    with_god_cleanup do
+      God.start
+      God.watch do |w|
+        w.name = 'long_timeout'
+        w.stop_signal = 'USR1'
+        w.stop_timeout = ::God::STOP_TIMEOUT_DEFAULT + 1
+        w.start = File.join(GOD_ROOT, *%w[test configs usr1_trapper.rb])
+      end
+      God.watches['long_timeout'].action(:start)
+      sleep 2
+      assert_equal true, God.watches['long_timeout'].alive?
+      God.stop_all
+      assert_watch_running('long_timeout')
+    end
+  end
+
+  # use short timeout to send SIGKILL before 10s timeout
+  def test_stop_all_with_non_killing_signal_short_timeout
+    with_god_cleanup do
+      God.start
+      God.watch do |w|
+        w.name = 'short_timeout'
+        w.stop_signal = 'USR1'
+        w.stop_timeout = ::God::STOP_TIMEOUT_DEFAULT - 1
+        w.start = File.join(GOD_ROOT, *%w[test configs usr1_trapper.rb])
+      end
+      God.watches['short_timeout'].action(:start)
+      sleep 2
+      assert_equal true, God.watches['short_timeout'].alive?
+      God.stop_all
+      assert_equal false, God.watches.any? { |name, w| w.alive? }
+    end
+  end
+
+  # should be able to stop many simple watches within default timeout
+  def test_stop_all_with_many_watches
+    with_god_cleanup do
+      God.start
+      20.times do |i|
+        God.watch do |w|
+          w.name = "many_watches_#{i}"
+          w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+        end
+        God.watches["many_watches_#{i}"].action(:start)
+      end
+      while true do
+        all_running = God.watches.select{ |name, w| name =~ /many_watches_/ }.all?{ |name, w| w.alive? }
+        size = God.watches.size
+        break if all_running && size >= 20
+        sleep 2
+      end
+      God.stop_all
+      assert_equal false, God.watches.any? { |name, w| w.alive? }
+    end
+  end
+
+  # should be able to stop many simple watches within short timeout
+  def test_stop_all_with_many_watches_short_timeout
+    with_god_cleanup do
+      God.start
+      God.terminate_timeout = 1
+      100.times do |i|
+        God.watch do |w|
+          w.name = "tons_of_watches_#{i}"
+          w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+          w.keepalive
+        end
+        God.watches["tons_of_watches_#{i}"].action(:start)
+      end
+      while true do
+        all_running = God.watches.select{ |name, w| name =~ /tons_of_watches_/ }.all?{ |name, w| w.alive? }
+        size = God.watches.size
+        break if all_running && size >= 100
+        sleep 2
+      end
+      God.stop_all
+      assert_equal false, God.watches.any? { |name, w| w.alive? }
+    end
+  end
+
+  def test_god_terminate_with_many_watches_short_timeout
+    with_god_cleanup do
+      God.start
+      God.terminate_timeout = 1
+      100.times do |i|
+        God.watch do |w|
+          w.name = "tons_of_watches_#{i}"
+          w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+          w.keepalive
+        end
+        God.watches["tons_of_watches_#{i}"].action(:start)
+      end
+      while true do
+        all_running = God.watches.select{ |name, w| name =~ /tons_of_watches_/ }.all?{ |name, w| w.alive? }
+        size = God.watches.size
+        break if all_running && size >= 100
+        sleep 2
+      end
+      begin
+        God::CLI::Command.new('terminate', {port: 17165}, [])
+      rescue SystemExit
+      ensure
+        assert_equal false, God.watches.any? { |name, w| w.alive? }
+      end
+    end
+  end
+end

data/test/test_slack.rb

@@ -3,8 +3,9 @@ require File.dirname(__FILE__) + '/helper'
 class TestSlack < Minitest::Test
   def setup
     @slack = God::Contacts::Slack.new
-    @slack.account = "foo"
-    @slack.token = "foo"
+
+    # new slack webhook url contains three random 'tokens' with length of 9, 9 and 24 characters
+    @slack.url = "https://hooks.slack.com/services/ABCABCABC/DEFDEFDEF/ABCDEFABCDEFABCDEFABCDEF"
 
     @sample_data = {
       :message => "a sample message",
@@ -16,7 +17,7 @@ class TestSlack < Minitest::Test
   end
 
   def test_api_url
-    assert_equal "https://foo.slack.com/services/hooks/incoming-webhook?token=foo", @slack.api_url.to_s
+    assert_equal @slack.url, @slack.api_url.to_s
   end
 
   def test_notify

metadata

@@ -1,309 +1,312 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: god
-version: !ruby/object:Gem::Version 
-  hash: 39
+version: !ruby/object:Gem::Version
+  version: 0.13.7
   prerelease: 
-  segments: 
-  - 0
-  - 13
-  - 6
-  version: 0.13.6
 platform: ruby
-authors: 
+authors:
 - Tom Preston-Werner
 - Kevin Clark
 - Eric Lindvall
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-03-21 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
-  prerelease: false
-  requirement: *id001
+date: 2015-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   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"
   prerelease: false
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: minitest
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
   prerelease: false
-  requirement: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
   name: twitter
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
   prerelease: false
-  requirement: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
   name: prowly
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
   prerelease: false
-  requirement: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
   name: xmpp4r
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
   prerelease: false
-  requirement: *id008
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: dike
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
   prerelease: false
-  requirement: *id009
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
   name: daemons
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
   prerelease: false
-  requirement: *id010
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: mocha
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
   prerelease: false
-  requirement: *id011
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
   name: gollum
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 403
-        segments: 
-        - 0
-        - 99
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.99.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 413
-        segments: 
-        - 0
-        - 99
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.99.7
-  prerelease: false
-  requirement: *id012
-  name: mustache
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 1
-        - 7
-        version: 3.1.7
-  prerelease: false
-  requirement: *id013
+      - !ruby/object:Gem::Version
+        version: 0.99.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.99.7
+- !ruby/object:Gem::Dependency
   name: airbrake
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :development
   prerelease: false
-  requirement: *id014
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 3
-        - 10
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.10
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 4
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 4.0.0
-  prerelease: false
-  requirement: *id015
-  name: activesupport
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id016
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.10
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
   name: statsd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.7.0
-  prerelease: false
-  requirement: *id017
-  name: i18n
   type: :development
-description: An easy to configure, easy to extend monitoring framework written in Ruby.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+description: An easy to configure, easy to extend monitoring framework written in
+  Ruby.
 email: god-rb@googlegroups.com
-executables: 
+executables:
 - god
-extensions: 
+extensions:
 - ext/god/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - Announce.txt
 - Gemfile
 - History.txt
@@ -406,6 +409,7 @@ files:
 - test/configs/task/logs/.placeholder
 - test/configs/task/task.god
 - test/configs/test.rb
+- test/configs/usr1_trapper.rb
 - test/helper.rb
 - test/suite.rb
 - test/test_airbrake.rb
@@ -422,6 +426,7 @@ files:
 - test/test_email.rb
 - test/test_event_handler.rb
 - test/test_god.rb
+- test/test_god_system.rb
 - test/test_handlers_kqueue_handler.rb
 - test/test_hipchat.rb
 - test/test_jabber.rb
@@ -442,42 +447,33 @@ files:
 - test/test_trigger.rb
 - test/test_watch.rb
 - test/test_webhook.rb
-has_rdoc: true
 homepage: http://god.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: god
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 2
 summary: Process monitoring framework.
-test_files: 
+test_files:
 - test/test_airbrake.rb
 - test/test_behavior.rb
 - test/test_campfire.rb
@@ -492,6 +488,7 @@ test_files:
 - test/test_email.rb
 - test/test_event_handler.rb
 - test/test_god.rb
+- test/test_god_system.rb
 - test/test_handlers_kqueue_handler.rb
 - test/test_hipchat.rb
 - test/test_jabber.rb