god 0.7.17 → 0.7.18

data/History.txt

@@ -1,3 +1,10 @@
+== 0.7.18 / 2009-09-09
+  * Minor Enhancements
+    * Better handling of unexpected exceptions in conditions
+    * Added support for running processes in a directory other than '/' [github.com/samhendley]
+  * Bug Fixes
+    * Generate an actual unique identifier for email contact [github.com/underley]
+
 == 0.7.17 / 2009-08-25
   * Bug Fixes
     * Fix the glob and directory config loading for -c option

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 17
+:patch: 18

data/god.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.17"
+  s.version = "0.7.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-08-25}
+  s.date = %q{2009-09-10}
   s.default_executable = %q{god}
   s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{tom@mojombo.com}
@@ -96,7 +96,7 @@ Gem::Specification.new do |s|
      "site/images/corner_green.gif",
      "site/images/corner_green.psd",
      "site/images/corner_pink.gif",
-     "site/images/god_logo1.gif",
+     "site/images/god_logo.png",
      "site/images/header_bg.gif",
      "site/images/header_bg.jpg",
      "site/images/red_dot.gif",

data/lib/god/contacts/email.rb

@@ -30,7 +30,7 @@ From: god <#{self.message_settings[:from]}>
 To: #{name} <#{email}>
 Subject: [god] #{message}
 Date: #{Time.now.httpdate}
-Message-Id: <unique.message.id.string@example.com>
+Message-Id: <#{rand(1000000000).to_s(36)}.#{$$}.#{self.message_settings[:from]}>
 
 Message: #{message}
 Host: #{host}

data/lib/god/driver.rb

@@ -167,7 +167,7 @@ module God
           rescue ThreadError => e
             # queue is empty
             break
-          rescue Exception => e
+          rescue Object => e
             message = format("Unhandled exception in driver loop - (%s): %s\n%s",
                              e.class, e.message, e.backtrace.join("\n"))
             applog(nil, :fatal, message)

data/lib/god/logger.rb

@@ -16,8 +16,8 @@ module God
     self.syslog ||= true
     
     # Instantiate a new Logger object
-    def initialize
-      super($stdout)
+    def initialize(io = $stdout)
+      super(io)
       self.logs = {}
       @mutex = Mutex.new
       @capture = nil

data/lib/god/process.rb

@@ -2,7 +2,8 @@ module God
   class Process
     WRITES_PID = [:start, :restart]
     
-    attr_accessor :name, :uid, :gid, :log, :log_cmd, :start, :stop, :restart, :unix_socket, :chroot, :env
+    attr_accessor :name, :uid, :gid, :log, :log_cmd, :start, :stop, :restart,
+                  :unix_socket, :chroot, :env, :dir
     
     def initialize
       self.log = '/dev/null'
@@ -25,13 +26,17 @@ module God
     
     def file_writable?(file)
       pid = fork do
-        uid_num = Etc.getpwnam(self.uid).uid if self.uid
-        gid_num = Etc.getgrnam(self.gid).gid if self.gid
+        begin
+          uid_num = Etc.getpwnam(self.uid).uid if self.uid
+          gid_num = Etc.getgrnam(self.gid).gid if self.gid
 
-        ::Dir.chroot(self.chroot) if self.chroot
-        ::Process.groups = [gid_num] if self.gid
-        ::Process::Sys.setgid(gid_num) if self.gid
-        ::Process::Sys.setuid(uid_num) if self.uid
+          ::Dir.chroot(self.chroot) if self.chroot
+          ::Process.groups = [gid_num] if self.gid
+          ::Process::Sys.setgid(gid_num) if self.gid
+          ::Process::Sys.setuid(uid_num) if self.uid
+        rescue ArgumentError, Errno::EPERM, Errno::ENOENT
+          exit(1)
+        end
 
         File.writable?(file_in_chroot(file)) ? exit(0) : exit(1)
       end
@@ -72,6 +77,17 @@ module God
         end
       end
       
+      # dir must exist and be a directory if specified
+      if self.dir
+        if !File.exist?(self.dir)
+          valid = false
+          applog(self, :error, "Specified directory '#{self.dir}' does not exist")
+        elsif !File.directory?(self.dir)
+          valid = false
+          applog(self, :error, "Specified directory '#{self.dir}' is not a directory")
+        end
+      end
+      
       # pid dir must exist if specified
       if !@tracking_pid && !File.exist?(File.dirname(self.pid_file))
         valid = false
@@ -107,12 +123,12 @@ module God
       if self.chroot
         if !File.directory?(self.chroot)
           valid = false
-          LOG.log(self, :error, "CHROOT directory '#{self.chroot}' does not exist")
+          applog(self, :error, "CHROOT directory '#{self.chroot}' does not exist")
         end
 
         if !File.exist?(File.join(self.chroot, '/dev/null'))
           valid = false
-          LOG.log(self, :error, "CHROOT directory '#{self.chroot}' does not contain '/dev/null'")
+          applog(self, :error, "CHROOT directory '#{self.chroot}' does not contain '/dev/null'")
         end
       end
       
@@ -275,7 +291,8 @@ module God
         ::Process.groups = [gid_num] if self.gid
         ::Process::Sys.setgid(gid_num) if self.gid
         ::Process::Sys.setuid(uid_num) if self.uid
-        Dir.chdir "/"
+        self.dir ||= '/'
+        Dir.chdir self.dir
         $0 = command
         STDIN.reopen "/dev/null"
         if self.log_cmd

data/lib/god/task.rb

@@ -318,7 +318,15 @@ module God
       metric = self.directory[condition]
       
       # run the test
-      result = condition.test
+      begin
+        result = condition.test
+      rescue Object => e
+        cname = condition.class.to_s.split('::').last
+        message = format("Unhandled exception in %s condition - (%s): %s\n%s",
+                         cname, e.class, e.message, e.backtrace.join("\n"))
+        applog(self, :error, message)
+        result = false
+      end
       
       # log
       messages = self.log_line(self, metric, condition, result)

data/lib/god/watch.rb

@@ -11,8 +11,8 @@ module God
     attr_accessor :grace, :start_grace, :stop_grace, :restart_grace
     
     extend Forwardable
-    def_delegators :@process, :name, :uid, :gid, :start, :stop, :restart,
-                              :name=, :uid=, :gid=, :start=, :stop=, :restart=,
+    def_delegators :@process, :name, :uid, :gid, :start, :stop, :restart, :dir,
+                              :name=, :uid=, :gid=, :start=, :stop=, :restart=, :dir=,
                               :pid_file, :pid_file=, :log, :log=, :log_cmd, :log_cmd=, :alive?, :pid,
                               :unix_socket, :unix_socket=, :chroot, :chroot=, :env, :env=, :signal
     # 

data/site/index.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>god - process and task monitoring done right</title>
+  <title>God - A Process Monitoring Framework in Ruby</title>
   <link href="stylesheets/layout.css" rel="stylesheet" type="text/css" />
   <script type="text/javascript" src="javascripts/code_highlighter.js"></script>
   <script type="text/javascript" src="javascripts/ruby.js"></script>
@@ -31,7 +31,7 @@
 		<h1>A Better Way to Monitor</h1>
 		<p>God is an easy to configure, easy to extend monitoring framework written in Ruby.</p>
 		<p>Keeping your server processes and tasks running should be a simple part of your deployment process. God aims to be the simplest, most powerful monitoring application available.</p>
-		<p style="text-align: right">Tom Preston-Werner<br />tom at rubyisawesome dot com</p>
+		<p style="text-align: right">Tom Preston-Werner<br /><a href="mailto:tom@mojombo.com">tom@mojombo.com</a></p>
 		<p style="text-align: right">Google Group: <a href="http://groups.google.com/group/god-rb">http://groups.google.com/group/god-rb</a></p>
 	</div>
 
@@ -47,7 +47,7 @@
 	</ul>
 	</div>
 	
-	<h1>Installation (v 0.7.13)</h1>
+	<h1>Installation (v 0.7.17)</h1>
 	<p>The best way to get god is via rubygems:</p>
 	<pre>$ sudo gem install god</pre>
 	
@@ -69,10 +69,10 @@
 	  <li>CentOS 4.5 (no events)</li>
 	</ul>
 
-	<h1>Finally, a Config File that Makes Sense</h1>
-	<p>The easiest way to understand how god will make your life better is by looking at a sample config file. The following configuration file is what I use at <a href="http://site.gravatar.com/">gravatar.com</a> to keep the mongrels running:</p>
+	<h1>Config Files are Ruby Code!</h1>
+	<p>The easiest way to understand how god will make your life better is by looking at a sample config file. The following configuration file is what I once used at <a href="http://site.gravatar.com/">gravatar.com</a> to keep the mongrels running:</p>
 	
-<pre><code class="ruby"># run with:  god -c /path/to/gravatar.god
+<pre><code class="ruby"># run with: god -c /path/to/mongrel.god -D
 # 
 # This is the actual config file used to keep the mongrels of
 # gravatar.com running.
@@ -207,7 +207,7 @@ end</code></pre>
   
 <p>The <code>:flapping</code> condition guards against the edge case wherein god rapidly starts or restarts your application. Things like server configuration changes or the unavailability of external services could make it impossible for my process to start. In that case, god will try to start my process over and over to no avail. The <code>:flapping</code> condition provides two levels of giving up on flapping processes. If I were to translate the options of the code above, it would be something like: If this watch is started or restarted five times withing 5 minutes, then unmonitor it...then after ten minutes, monitor it again to see if it was just a temporary problem; if the process is seen to be flapping five times within two hours, then give up completely.</p>
 
-<p>That's it! Simple, huh?</p>
+<p>That's it!</p>
 
 <!-- ------------------------------------------------------------------------- -->
 
@@ -462,13 +462,13 @@ God.load "/usr/local/conf/*.god"</code></pre>
 
 <h1>Getting Logs for a Single Watch</h1>
 
-<p>Sifting through the god logs for statements specific to a specific Watch can be frustrating when you have many of them. You can get the realtime logs for a single Watch via the command line:</p>
+<p>Sifting through the god logs for statements specific to a single Watch can be frustrating when you have many of them. You can get the realtime logs for a single Watch via the command line:</p>
 
 <pre>$ sudo god log local-3000</pre>
 
-<p>This will display the last 1000 lines of log for the 'local-3000' Watch and update every second with new log messages.</p>
+<p>This will display log output for the 'local-3000' Watch and update every second with new log messages.</p>
 
-<p>You can also supply a shorthand to the log command that will match one of your watches. If it happens to match several, the first match will be used:</p>
+<p>You can also supply a shorthand to the log command that will match one of your watches. If it happens to match several, the shortest match will be used:</p>
 
 <pre>$ sudo god log l3</pre>
 
@@ -536,7 +536,7 @@ end</code></pre>
 To: tom &lt;tom@example.com&gt;
 Subject: [god] mongrel-8600 [trigger] process exited (ProcessExits)
 
-Message: mongre-8600 [trigger] process exited (ProcessExits)
+Message: mongrel-8600 [trigger] process exited (ProcessExits)
 Host: candymountain.example.com
 Priority: 1
 Category: product</code></pre>
@@ -549,7 +549,7 @@ Category: product</code></pre>
 
 </div>
 <div id="footer">
-	<p>Brought to you by <a href="http://rubyisawesome.com/">Ruby is Awesome</a></p>
+	<p>Brought to you by <a href="http://tom.preston-werner.com/">Tom Preston-Werner</a></p>
 </div>
 
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

data/site/stylesheets/layout.css

@@ -23,7 +23,7 @@ a:active {
 	width: 307px;
 	height: 117px;
 	margin: 0 auto;
-	background: url(../images/god_logo1.gif);
+	background: url(../images/god_logo.png);
 }
 
 #content {
@@ -90,7 +90,7 @@ a:active {
 
 .columnleft {
 	float: left;
-	width: 325px;
+	width: 345px;
 	margin-bottom: 20px;
 }
 

data/test/configs/child_polls/child_polls.god

@@ -1,6 +1,6 @@
 God.watch do |w|
   w.name = 'child-polls'
-  w.start = File.join(GOD_ROOT, *%w[test configs child_polls simple_server.rb])
+  w.start = File.join(GOD_ROOT, *%w[test configs child_polls simple_server.rb]) + ' ' + ENV['RAILS_ENV']
   w.interval = 5
   w.grace = 2
   
@@ -34,4 +34,4 @@ God.watch do |w|
       c.retry_within = 5.minutes
     end
   end
-end
+end

data/test/helper.rb

@@ -6,17 +6,17 @@ require 'set'
 
 include God
 
-if Process.uid != 0
-  abort <<-EOF
-\n
-*********************************************************************
-*                                                                   *
-*               You need to run these tests as root                 *
-*           chroot and netlink (linux only) require it              *
-*                                                                   *
-*********************************************************************
-EOF
-end
+# if Process.uid != 0
+#   abort <<-EOF
+# \n
+# *********************************************************************
+# *                                                                   *
+# *               You need to run these tests as root                 *
+# *           chroot and netlink (linux only) require it              *
+# *                                                                   *
+# *********************************************************************
+# EOF
+# end
 
 begin
   require 'mocha'
@@ -90,19 +90,7 @@ ensure
   $VERBOSE = old_verbose
 end
 
-def no_stdout
-  old_stdout = $stdout.dup
-  $stdout.reopen(File.open((PLATFORM =~ /mswin/ ? "NUL" : "/dev/null"), 'w'))
-  yield
-  $stdout.reopen(old_stdout)
-end
-
-def no_stderr
-  old_stderr = $stderr.dup
-  $stderr.reopen(File.open((PLATFORM =~ /mswin/ ? "NUL" : "/dev/null"), 'w'))
-  yield
-  $stderr.reopen(old_stderr)
-end
+LOG.instance_variable_set(:@io, StringIO.new('/dev/null'))
 
 module Kernel
   def abort(text)

data/test/test_behavior.rb

@@ -13,9 +13,6 @@ class TestBehavior < Test::Unit::TestCase
   
   def test_complain
     Syslog.expects(:err).with('foo')
-    # Kernel.expects(:puts).with('foo')
-    no_stdout do
-      assert !Behavior.allocate.bypass.complain('foo')
-    end
+    assert !Behavior.allocate.bypass.complain('foo')
   end
 end

data/test/test_conditions_disk_usage.rb

@@ -7,20 +7,14 @@ class TestConditionsDiskUsage < Test::Unit::TestCase
     c = Conditions::DiskUsage.new
     c.mount_point = '/'
     c.watch = stub(:name => 'foo')
-    
-    no_stdout do
-      assert_equal false, c.valid?
-    end
+    assert_equal false, c.valid?
   end
   
   def test_valid_should_return_false_if_no_mount_point_given
     c = Conditions::DiskUsage.new
     c.above = 90
     c.watch = stub(:name => 'foo')
-    
-    no_stdout do
-      assert_equal false, c.valid?
-    end
+    assert_equal false, c.valid?
   end
   
   def test_valid_should_return_true_if_required_options_all_set

data/test/test_conditions_http_response_code.rb

@@ -26,14 +26,14 @@ class TestHttpResponseCode < Test::Unit::TestCase
     c = valid_condition do |cc|
       cc.code_is_not = 500
     end
-    no_stdout { assert !c.valid? }
+    assert !c.valid?
   end
   
   def test_valid_should_return_false_if_no_host_set
     c = valid_condition do |cc|
       cc.host = nil
     end
-    no_stdout { assert !c.valid? }
+    assert !c.valid?
   end
   
   # test

data/test/test_conditions_process_running.rb

@@ -5,12 +5,8 @@ class TestConditionsProcessRunning < Test::Unit::TestCase
     [true, false].each do |r|
       c = Conditions::ProcessRunning.new
       c.running = r
-    
       c.stubs(:watch).returns(stub(:pid => 99999999, :name => 'foo'))
-    
-      # no_stdout do
-        assert_equal !r, c.test
-      # end
+      assert_equal !r, c.test
     end
   end
   

data/test/test_conditions_tries.rb

@@ -6,7 +6,7 @@ class TestConditionsTries < Test::Unit::TestCase
   def test_valid_should_return_false_if_times_not_set
     c = Conditions::Tries.new
     c.watch = stub(:name => 'foo')
-    no_stdout { assert !c.valid? }
+    assert !c.valid?
   end
 end
 

data/test/test_god.rb

@@ -164,9 +164,7 @@ class TestGod < Test::Unit::TestCase
     God.running = true
     
     assert_nothing_raised do
-      no_stdout do
-        God.watch { |w| w.name = 'foo'; w.start = 'bar' }
-      end
+      God.watch { |w| w.name = 'foo'; w.start = 'bar' }
     end
   end
   
@@ -177,26 +175,20 @@ class TestGod < Test::Unit::TestCase
     w = God.watches['bar']
     w.state = :up
     w.expects(:unmonitor)
-    no_stdout do
-      God.unwatch(w)
-    end
+    God.unwatch(w)
   end
   
   def test_unwatch_should_unregister_watch
     God.watch { |w| w.name = 'bar'; w.start = 'bar' }
     w = God.watches['bar']
     w.expects(:unregister!)
-    no_stdout do
-      God.unwatch(w)
-    end
+    God.unwatch(w)
   end
   
   def test_unwatch_should_remove_same_name_watches
     God.watch { |w| w.name = 'bar'; w.start = 'bar' }
     w = God.watches['bar']
-    no_stdout do
-      God.unwatch(w)
-    end
+    God.unwatch(w)
     assert_equal 0, God.watches.size
   end
   
@@ -207,9 +199,7 @@ class TestGod < Test::Unit::TestCase
       w.group = 'test'
     end
     w = God.watches['bar']
-    no_stdout do
-      God.unwatch(w)
-    end
+    God.unwatch(w)
     assert !God.groups[w.group].include?(w)
   end
   
@@ -239,28 +229,22 @@ class TestGod < Test::Unit::TestCase
   end
   
   def test_contact_should_abort_on_no_name
-    no_stdout do
-      assert_abort do
-        God.contact(:fake_contact) { |c| }
-      end
+    assert_abort do
+      God.contact(:fake_contact) { |c| }
     end
   end
   
   def test_contact_should_abort_on_duplicate_contact_name
     God.contact(:fake_contact) { |c| c.name = 'tom' }
-    no_stdout do
-      assert_nothing_raised do
-        God.contact(:fake_contact) { |c| c.name = 'tom' }
-      end
+    assert_nothing_raised do
+      God.contact(:fake_contact) { |c| c.name = 'tom' }
     end
   end
   
   def test_contact_should_abort_on_contact_with_same_name_as_group
     God.contact(:fake_contact) { |c| c.name = 'tom'; c.group = 'devs' }
-    no_stdout do
-      assert_nothing_raised do
-        God.contact(:fake_contact) { |c| c.name = 'devs' }
-      end
+    assert_nothing_raised do
+      God.contact(:fake_contact) { |c| c.name = 'devs' }
     end
   end
   
@@ -422,9 +406,7 @@ class TestGod < Test::Unit::TestCase
       end
     EOF
     
-    no_stdout do
-      God.running_load(code, '/foo/bar.god')
-    end
+    God.running_load(code, '/foo/bar.god')
     
     assert_equal 1, God.watches.size
   end
@@ -438,9 +420,7 @@ class TestGod < Test::Unit::TestCase
     EOF
     
     Watch.any_instance.expects(:monitor)
-    no_stdout do
-      God.running_load(code, '/foo/bar.god')
-    end
+    God.running_load(code, '/foo/bar.god')
   end
   
   def test_running_load_should_not_monitor_new_watches_with_autostart_false
@@ -453,9 +433,7 @@ class TestGod < Test::Unit::TestCase
     EOF
     
     Watch.any_instance.expects(:monitor).never
-    no_stdout do
-      God.running_load(code, '/foo/bar.god')
-    end
+    God.running_load(code, '/foo/bar.god')
   end
   
   def test_running_load_should_return_array_of_affected_watches
@@ -467,9 +445,7 @@ class TestGod < Test::Unit::TestCase
     EOF
     
     w = nil
-    no_stdout do
-      w, e = *God.running_load(code, '/foo/bar.god')
-    end
+    w, e = *God.running_load(code, '/foo/bar.god')
     assert_equal 1, w.size
     assert_equal 'foo', w.first
   end
@@ -482,9 +458,7 @@ class TestGod < Test::Unit::TestCase
       end
     EOF
     
-    no_stdout do
-      God.running_load(code, '/foo/bar.god')
-    end
+    God.running_load(code, '/foo/bar.god')
     assert_equal 0, God.pending_watches.size
   end
   
@@ -527,9 +501,7 @@ class TestGod < Test::Unit::TestCase
   
   def test_start_should_get_and_join_timer
     God.watch { |w| w.name = 'foo'; w.start = 'bar' }
-    no_stdout do
-      God.start
-    end
+    God.start
   end
   
   # at_exit

data/test/test_logger.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestLogger < Test::Unit::TestCase
   def setup
-    @log = God::Logger.new
+    @log = God::Logger.new(StringIO.new('/dev/null'))
   end
   
   # log
@@ -11,9 +11,7 @@ class TestLogger < Test::Unit::TestCase
     @log.watch_log_since('foo', Time.now)
     @log.expects(:info).with("qux")
     
-    no_stdout do
-      @log.log(stub(:name => 'foo'), :info, "qux")
-    end
+    @log.log(stub(:name => 'foo'), :info, "qux")
     
     assert_equal 1, @log.logs.size
     assert_instance_of Time, @log.logs['foo'][0][0]
@@ -22,10 +20,7 @@ class TestLogger < Test::Unit::TestCase
   
   def test_log_should_send_to_syslog
     Syslog.expects(:crit).with('foo')
-    
-    no_stdout do
-      @log.log(stub(:name => 'foo'), :fatal, "foo")
-    end
+    @log.log(stub(:name => 'foo'), :fatal, "foo")
   end
   
   # watch_log_since
@@ -35,18 +30,14 @@ class TestLogger < Test::Unit::TestCase
     
     @log.watch_log_since('foo', t1)
     
-    no_stdout do
-      @log.log(stub(:name => 'foo'), :info, "one")
-      @log.log(stub(:name => 'foo'), :info, "two")
-    end
+    @log.log(stub(:name => 'foo'), :info, "one")
+    @log.log(stub(:name => 'foo'), :info, "two")
     
     assert_match(/one.*two/m, @log.watch_log_since('foo', t1))
     
     t2 = Time.now
     
-    no_stdout do
-      @log.log(stub(:name => 'foo'), :info, "three")
-    end
+    @log.log(stub(:name => 'foo'), :info, "three")
     
     out = @log.watch_log_since('foo', t2)
     
@@ -58,9 +49,7 @@ class TestLogger < Test::Unit::TestCase
   # regular methods
   
   def test_fatal
-    no_stdout do
-      @log.fatal('foo')
-    end
+    @log.fatal('foo')
     assert_equal 0, @log.logs.size
   end
 end

data/test/test_process.rb

@@ -53,11 +53,7 @@ class TestProcessChild < Test::Unit::TestCase
     @p.log = '/tmp/foo.log'
     @p.uid = 'foobarbaz'
     
-    no_stdout do
-      no_stderr do
-        assert !@p.valid?
-      end
-    end
+    assert !@p.valid?
   end
   
   def test_valid_should_return_true_if_gid_exists
@@ -73,21 +69,37 @@ class TestProcessChild < Test::Unit::TestCase
     @p.log = '/tmp/foo.log'
     @p.gid = 'foobarbaz'
     
-    no_stdout do
-      no_stderr do
-        assert !@p.valid?
-      end
-    end
+    assert !@p.valid?
+  end
+
+  def test_valid_should_return_true_if_dir_exists
+    @p.start = 'qux'
+    @p.log = '/tmp/foo.log'
+    @p.dir = '/tmp'
+
+    assert @p.valid?
+  end
+
+  def test_valid_should_return_false_if_dir_does_not_exists
+    @p.start = 'qux'
+    @p.log = '/tmp/foo.log'
+    @p.dir = '/tmp/doesnotexist'
+
+    assert !@p.valid?
+  end
+
+  def test_valid_should_return_false_if_dir_is_not_a_dir
+    @p.start = 'qux'
+    @p.log = '/tmp/foo.log'
+    @p.dir = '/etc/passwd'
+
+    assert !@p.valid?
   end
 
   def test_valid_should_return_false_with_bogus_chroot
     @p.chroot = '/bogusroot'
 
-    no_stdout do
-      no_stderr do
-        assert !@p.valid?
-      end
-    end
+    assert !@p.valid?
   end
 
   def test_valid_should_return_true_with_chroot_and_valid_log
@@ -152,18 +164,7 @@ class TestProcessDaemon < Test::Unit::TestCase
   def test_valid_should_return_false_if_no_start
     @p.name = 'foo'
     @p.stop = 'baz'
-    no_stdout do
-      assert !@p.valid?
-    end
-  end
-  
-  def test_valid_should_return_false_if_self_daemonized_and_no_stop
-    @p.start = 'bar'
-    @p.pid_file = 'foo'
-    
-    no_stdout do
-      assert !@p.valid?
-    end
+    assert !@p.valid?
   end
   
   # pid

data/test/test_socket.rb

@@ -9,23 +9,17 @@ class TestSocket < Test::Unit::TestCase
 
   def test_should_start_a_drb_server
     DRb.expects(:start_service)
-    no_stdout do
-      God::Socket.new
-    end
+    God::Socket.new
   end
 
   def test_should_use_supplied_port_and_host
     DRb.expects(:start_service).with { |uri, object| uri == "drbunix:///tmp/god.9999.sock" && object.is_a?(God::Socket) }
-    no_stdout do
-      server = God::Socket.new(9999)
-    end
+    server = God::Socket.new(9999)
   end
 
   def test_should_forward_foreign_method_calls_to_god
     server = nil
-    no_stdout do
-      server = God::Socket.new
-    end
+    server = God::Socket.new
     God.expects(:send).with(:something_random)
     server.something_random
   end
@@ -34,9 +28,7 @@ class TestSocket < Test::Unit::TestCase
   
   def test_ping_should_return_true
     server = nil
-    no_stdout do
-      server = God::Socket.new
-    end
+    server = God::Socket.new
     assert server.ping
   end
 end

data/test/test_task.rb

@@ -15,23 +15,17 @@ class TestTask < Test::Unit::TestCase
   
   def test_valid_should_return_false_if_no_name
     @task.name = nil
-    no_stdout do
-      assert !@task.valid?
-    end
+    assert !@task.valid?
   end
   
   def test_valid_should_return_false_if_no_valid_states
     @task.valid_states = nil
-    no_stdout do
-      assert !@task.valid?
-    end
+    assert !@task.valid?
   end
   
   def test_valid_should_return_false_if_no_initial_state
     @task.initial_state = nil
-    no_stdout do
-      assert !@task.valid?
-    end
+    assert !@task.valid?
   end
   
   # transition
@@ -69,14 +63,14 @@ class TestTask < Test::Unit::TestCase
     @task.foo = 'foo'
     Thread.current.stubs(:==).returns(true)
     @task.expects(:system).with('foo')
-    no_stdout { @task.action(:foo, nil) }
+    @task.action(:foo, nil)
   end
   
   def test_action_should_call_lambda_commands
     @task.foo = lambda { }
     Thread.current.stubs(:==).returns(true)
     @task.foo.expects(:call)
-    no_stdout { @task.action(:foo, nil) }
+    @task.action(:foo, nil)
   end
   
   def test_action_should_raise_not_implemented_on_non_string_or_lambda_action
@@ -142,10 +136,7 @@ class TestTask < Test::Unit::TestCase
     
     c.expects(:test).returns(false)
     @task.driver.expects(:schedule)
-    
-    no_stdout do
-      @task.handle_poll(c)
-    end
+    @task.handle_poll(c)
   end
   
   def test_handle_poll_change_should_move
@@ -158,10 +149,7 @@ class TestTask < Test::Unit::TestCase
     
     c.expects(:test).returns(true)
     @task.expects(:move).with(:up)
-    
-    no_stdout do
-      @task.handle_poll(c)
-    end
+    @task.handle_poll(c)
   end
   
   def test_handle_poll_should_use_overridden_transition
@@ -175,10 +163,7 @@ class TestTask < Test::Unit::TestCase
     @task.directory[c] = m
     
     @task.expects(:move).with(:start)
-    
-    no_stdout do
-      @task.handle_poll(c)
-    end
+    @task.handle_poll(c)
   end
   
   def test_handle_poll_should_notify_if_triggering
@@ -192,10 +177,7 @@ class TestTask < Test::Unit::TestCase
     
     c.expects(:test).returns(true)
     @task.expects(:notify)
-    
-    no_stdout do
-      @task.handle_poll(c)
-    end
+    @task.handle_poll(c)
   end
   
   def test_handle_poll_should_not_notify_if_not_triggering
@@ -209,10 +191,21 @@ class TestTask < Test::Unit::TestCase
     
     c.expects(:test).returns(false)
     @task.expects(:notify).never
+    @task.handle_poll(c)
+  end
+  
+  def test_handle_poll_unexpected_exception_should_reschedule
+    c = Conditions::FakePollCondition.new
+    c.watch = @task
+    c.interval = 10
     
-    no_stdout do
-      @task.handle_poll(c)
-    end
+    m = Metric.new(@task, {true => :up})
+    @task.directory[c] = m
+    
+    c.expects(:test).raises(StandardError)
+    @task.driver.expects(:schedule)
+    
+    @task.handle_poll(c)
   end
   
   # handle_event
@@ -225,10 +218,7 @@ class TestTask < Test::Unit::TestCase
     @task.directory[c] = m
     
     @task.expects(:move).with(:up)
-    
-    no_stdout do
-      @task.handle_event(c)
-    end
+    @task.handle_event(c)
   end
   
   def test_handle_event_should_notify_if_triggering
@@ -240,10 +230,7 @@ class TestTask < Test::Unit::TestCase
     @task.directory[c] = m
     
     @task.expects(:notify)
-    
-    no_stdout do
-      @task.handle_event(c)
-    end
+    @task.handle_event(c)
   end
   
   def test_handle_event_should_not_notify_if_no_notify_set
@@ -254,9 +241,6 @@ class TestTask < Test::Unit::TestCase
     @task.directory[c] = m
     
     @task.expects(:notify).never
-    
-    no_stdout do
-      @task.handle_event(c)
-    end
+    @task.handle_event(c)
   end
 end

data/test/test_watch.rb

@@ -143,7 +143,7 @@ class TestWatch < Test::Unit::TestCase
     
     metric.expects(:disable).never
     
-    no_stdout { @watch.move(:init) }
+    @watch.move(:init)
   end
   
   def test_move_should_clean_up_from_state_if_not_nil
@@ -162,11 +162,11 @@ class TestWatch < Test::Unit::TestCase
       end
     end
     
-    no_stdout { @watch.move(:init) }
+    @watch.move(:init)
     
     metric.expects(:disable)
     
-    no_stdout { @watch.move(:up) }
+    @watch.move(:up)
   end
   
   def test_move_should_call_action
@@ -175,7 +175,7 @@ class TestWatch < Test::Unit::TestCase
     
     @watch.expects(:action).with(:start)
     
-    no_stdout { @watch.move(:start) }
+    @watch.move(:start)
   end
   
   def test_move_should_move_to_up_state_if_no_start_or_restart_metric
@@ -184,7 +184,7 @@ class TestWatch < Test::Unit::TestCase
     
     [:start, :restart].each do |state|
       @watch.expects(:action)
-      no_stdout { @watch.move(state) }
+      @watch.move(state)
       assert_equal :up, @watch.state
     end
   end
@@ -207,7 +207,7 @@ class TestWatch < Test::Unit::TestCase
     
     metric.expects(:enable)
     
-    no_stdout { @watch.move(:init) }
+    @watch.move(:init)
   end
   
   # action
@@ -248,7 +248,7 @@ class TestWatch < Test::Unit::TestCase
   def test_call_action
     c = Conditions::FakePollCondition.new
     God::Process.any_instance.expects(:call_action).with(:start)
-    no_stdout { @watch.call_action(c, :start) }
+    @watch.call_action(c, :start)
   end
   
   def test_call_action_should_call_before_start_when_behavior_has_that
@@ -256,7 +256,7 @@ class TestWatch < Test::Unit::TestCase
     c = Conditions::FakePollCondition.new
     God::Process.any_instance.expects(:call_action).with(:start)
     Behaviors::FakeBehavior.any_instance.expects(:before_start)
-    no_stdout { @watch.call_action(c, :start) }
+    @watch.call_action(c, :start)
   end
   
   def test_call_action_should_call_after_start_when_behavior_has_that
@@ -264,7 +264,7 @@ class TestWatch < Test::Unit::TestCase
     c = Conditions::FakePollCondition.new
     God::Process.any_instance.expects(:call_action).with(:start)
     Behaviors::FakeBehavior.any_instance.expects(:after_start)
-    no_stdout { @watch.call_action(c, :start) }
+    @watch.call_action(c, :start)
   end
   
   # canonical_hash_form

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.17
+  version: 0.7.18
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: god
 dependencies: []
 
@@ -102,7 +102,7 @@ files:
 - site/images/corner_green.gif
 - site/images/corner_green.psd
 - site/images/corner_pink.gif
-- site/images/god_logo1.gif
+- site/images/god_logo.png
 - site/images/header_bg.gif
 - site/images/header_bg.jpg
 - site/images/red_dot.gif