god 0.4.3 → 0.5.0

data/test/test_process.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/helper'
 
 module God
   class Process
-    def fork
-      raise "You forgot to stub fork"
-    end
+    # def fork
+    #   raise "You forgot to stub fork"
+    # end
     
     def exec(*args)
       raise "You forgot to stub exec"
@@ -19,6 +19,9 @@ class TestProcessChild < Test::Unit::TestCase
     @p.name = 'foo'
     @p.stubs(:test).returns true # so we don't try to mkdir_p
     Process.stubs(:detach) # because we stub fork
+    
+    ::Process::Sys.stubs(:setuid).returns(true)
+    ::Process::Sys.stubs(:setgid).returns(true)
   end
   
   # valid?
@@ -39,7 +42,7 @@ class TestProcessChild < Test::Unit::TestCase
   
   def test_valid_should_return_true_if_uid_exists
     @p.start = 'qux'
-    @p.log = 'bar'
+    @p.log = '/tmp/foo.log'
     @p.uid = 'root'
     
     assert @p.valid?
@@ -47,17 +50,19 @@ class TestProcessChild < Test::Unit::TestCase
   
   def test_valid_should_return_true_if_uid_does_not_exists
     @p.start = 'qux'
-    @p.log = 'bar'
+    @p.log = '/tmp/foo.log'
     @p.uid = 'foobarbaz'
     
     no_stdout do
-      assert !@p.valid?
+      no_stderr do
+        assert !@p.valid?
+      end
     end
   end
   
   def test_valid_should_return_true_if_gid_exists
     @p.start = 'qux'
-    @p.log = 'bar'
+    @p.log = '/tmp/foo.log'
     @p.gid = 'wheel'
     
     assert @p.valid?
@@ -65,15 +70,38 @@ class TestProcessChild < Test::Unit::TestCase
   
   def test_valid_should_return_true_if_gid_does_not_exists
     @p.start = 'qux'
-    @p.log = 'bar'
+    @p.log = '/tmp/foo.log'
     @p.gid = 'foobarbaz'
     
     no_stdout do
-      assert !@p.valid?
+      no_stderr do
+        assert !@p.valid?
+      end
+    end
+  end
+  
+  # call_action
+  
+  def test_call_action_should_write_pid
+    # Only for start, restart
+    [:start, :restart].each do |action|
+      @p.stubs(:test).returns true
+      IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
+      @p.expects(:fork)
+      Process.expects(:waitpid)
+      File.expects(:open).with(@p.default_pid_file, 'w')
+      @p.send("#{action}=", "run")
+      @p.call_action(action)
     end
   end
 end
 
+###############################################################################
+#
+# Daemon
+#
+###############################################################################
+
 class TestProcessDaemon < Test::Unit::TestCase
   def setup
     God.internal_init
@@ -92,17 +120,13 @@ class TestProcessDaemon < Test::Unit::TestCase
     assert !@p.alive?
   end
   
-  # valid?
-  
-  def test_valid_should_return_false_if_no_name
-    @p.name = nil
-    @p.start = 'bar'
-    @p.stop = 'baz'
-    no_stdout do
-      assert !@p.valid?
-    end
+  def test_alive_should_return_false_if_no_such_file
+    File.expects(:read).with('blah.pid').raises(Errno::ENOENT)
+    assert !@p.alive?
   end
   
+  # valid?
+  
   def test_valid_should_return_false_if_no_start
     @p.name = 'foo'
     @p.stop = 'baz'
@@ -120,17 +144,6 @@ class TestProcessDaemon < Test::Unit::TestCase
     end
   end
   
-  def test_valid_should_return_false_if_self_daemonized_and_log
-    @p.pid_file = 'foo'
-    @p.start = 'baz'
-    @p.stop = 'qux'
-    @p.log = 'bar'
-    
-    no_stdout do
-      assert !@p.valid?
-    end
-  end
-  
   # defaul_pid_file
   
   def test_default_pid_file
@@ -140,9 +153,8 @@ class TestProcessDaemon < Test::Unit::TestCase
   # call_action
   # These actually excercise call_action in the back at this point - Kev
   
-  def test_call_action_with_string_should_fork_exec 
+  def test_call_action_with_string_should_call_system
     @p.start = "do something"
-    IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
     @p.expects(:fork)
     Process.expects(:waitpid)
     @p.call_action(:start)
@@ -155,31 +167,6 @@ class TestProcessDaemon < Test::Unit::TestCase
     @p.call_action(:start)
   end
   
-  def test_call_action_without_pid_should_write_pid
-    # Only for start, restart
-    [:start, :restart].each do |action|
-      @p = God::Process.new
-      @p.name = 'foo'
-      @p.stubs(:test).returns true
-      IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
-      @p.expects(:fork)
-      Process.expects(:waitpid)
-      File.expects(:open).with(@p.default_pid_file, 'w')
-      @p.send("#{action}=", "run")
-      @p.call_action(action)
-    end
-  end
-  
-  def test_call_action_should_not_write_pid_for_stop
-    @p.pid_file = nil
-    IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
-    @p.expects(:fork)
-    Process.expects(:waitpid)
-    File.expects(:open).times(0)
-    @p.stop = "stopping"
-    @p.call_action(:stop)
-  end
-  
   def test_call_action_with_invalid_command_class_should_raise
     @p.start = 5
     @p.stop = 'baz'

data/test/{test_server.rb → test_socket.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestServer < Test::Unit::TestCase
+class TestSocket < Test::Unit::TestCase
   def setup
     silence_warnings do 
       Object.const_set(:DRb, stub_everything)
@@ -10,46 +10,32 @@ class TestServer < Test::Unit::TestCase
   def test_should_start_a_drb_server
     DRb.expects(:start_service)
     no_stdout do
-      Server.new
+      God::Socket.new
     end
   end
 
   def test_should_use_supplied_port_and_host
-    DRb.expects(:start_service).with { |uri, object| uri == "druby://host:port" && object.is_a?(Server) }
+    DRb.expects(:start_service).with { |uri, object| uri == "drbunix:///tmp/god.9999.sock" && object.is_a?(God::Socket) }
     no_stdout do
-      server = Server.new('host', 'port')
+      server = God::Socket.new(9999)
     end
   end
 
   def test_should_forward_foreign_method_calls_to_god
     server = nil
     no_stdout do
-      server = Server.new
+      server = God::Socket.new
     end
     God.expects(:send).with(:something_random)
     server.something_random
   end
   
-  def test_should_install_deny_all_by_default
-    ACL.expects(:new).with(%w{deny all})
-    no_stdout do
-      Server.new
-    end
-  end
-  
-  def test_should_install_pass_through_acl
-    ACL.expects(:new).with(%w{deny all allow 127.0.0.1 allow 0.0.0.0})
-    no_stdout do
-      Server.new(nil, 17165, %w{127.0.0.1 0.0.0.0})
-    end
-  end
-  
   # ping
   
   def test_ping_should_return_true
     server = nil
     no_stdout do
-      server = Server.new
+      server = God::Socket.new
     end
     assert server.ping
   end

data/test/test_task.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestTask < Test::Unit::TestCase
+  def setup
+    God.internal_init
+    @task = Task.new
+    @task.name = 'foo'
+    @task.valid_states = [:foo, :bar]
+    @task.initial_state = :foo
+    @task.interval = 5
+    @task.prepare
+  end
+  
+  # valid?
+  
+  def test_valid_should_return_false_if_no_name
+    @task.name = nil
+    no_stdout do
+      assert !@task.valid?
+    end
+  end
+  
+  def test_valid_should_return_false_if_no_valid_states
+    @task.valid_states = nil
+    no_stdout do
+      assert !@task.valid?
+    end
+  end
+  
+  def test_valid_should_return_false_if_no_initial_state
+    @task.initial_state = nil
+    no_stdout do
+      assert !@task.valid?
+    end
+  end
+  
+  # transition
+  
+  def test_transition_should_be_always_if_no_block_was_given
+    @task.transition(:foo, :bar)
+    
+    assert 1, @task.metrics.size
+    assert Conditions::Always, @task.metrics.keys.first.class
+  end
+  
+  # method_missing
+  
+  def test_method_missing_should_create_accessor_for_states
+    assert_nothing_raised do
+      @task.foo = 'testing'
+    end
+  end
+  
+  def test_method_missing_should_raise_for_non_states
+    assert_raise NoMethodError do
+      @task.baz = 5
+    end
+  end
+  
+  def test_method_missing_should_raise_for_non_setters
+    assert_raise NoMethodError do
+      @task.baz
+    end
+  end
+  
+  # action
+  
+  def test_action_should_send_string_commands_to_system
+    @task.foo = 'foo'
+    @task.expects(:system).with('foo')
+    no_stdout { @task.action(:foo, nil) }
+  end
+  
+  def test_action_should_cal_lambda_commands
+    @task.foo = lambda { }
+    @task.foo.expects(:call)
+    no_stdout { @task.action(:foo, nil) }
+  end
+  
+  def test_action_should_raise_not_implemented_on_non_string_or_lambda_action
+    assert_raise NotImplementedError do
+      @task.foo = 7
+      @task.action(:foo, nil)
+    end
+  end
+end

data/test/test_trigger.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestTrigger < Test::Unit::TestCase
+  def setup
+    Trigger.reset
+  end
+  
+  # base case
+  
+  def test_should_have_empty_triggers
+    assert_equal({}, Trigger.triggers)
+  end
+  
+  # register
+  
+  def test_register_should_add_condition_to_triggers
+    c = Condition.new
+    c.watch = stub(:name => 'foo')
+    Trigger.register(c)
+    
+    assert_equal({'foo' => [c]}, Trigger.triggers)
+  end
+  
+  def test_register_should_add_condition_to_triggers_twice
+    watch = stub(:name => 'foo')
+    c = Condition.new
+    c.watch = watch
+    Trigger.register(c)
+    
+    c2 = Condition.new
+    c2.watch = watch
+    Trigger.register(c2)
+    
+    assert_equal({'foo' => [c, c2]}, Trigger.triggers)
+  end
+  
+  # deregister
+  
+  def test_deregister_should_remove_condition_from_triggers
+    c = Condition.new
+    c.watch = stub(:name => 'foo')
+    Trigger.register(c)
+    Trigger.deregister(c)
+    
+    assert_equal({}, Trigger.triggers)
+  end
+  
+  # broadcast
+  
+  def test_broadcast_should_call_process_on_each_condition
+    c = Condition.new
+    c.watch = stub(:name => 'foo')
+    Trigger.register(c)
+    
+    c.expects(:process).with(:state_change, [:up, :start])
+    
+    Trigger.broadcast(c.watch, :state_change, [:up, :start])
+  end
+end

data/test/test_watch.rb

@@ -2,10 +2,12 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestWatch < Test::Unit::TestCase
   def setup
+    God.internal_init
     @watch = Watch.new
     @watch.name = 'foo'
     @watch.start = lambda { }
     @watch.stop = lambda { }
+    @watch.prepare
   end
   
   # new
@@ -31,8 +33,8 @@ class TestWatch < Test::Unit::TestCase
     end
   end
   
-  def test_new_should_have_nil_state
-    assert_equal nil, @watch.state
+  def test_new_should_have_unmonitored_state
+    assert_equal :unmonitored, @watch.state
   end
   
   # mutex
@@ -84,6 +86,13 @@ class TestWatch < Test::Unit::TestCase
     assert_equal 1, @watch.metrics[:init].size
   end
   
+  # lifecycle
+  
+  def test_lifecycle_should_create_and_record_a_metric_for_nil_start_state
+    @watch.lifecycle { }
+    assert_equal 1, @watch.metrics[nil].size
+  end
+  
   # start_if
   
   def test_start_if_should_place_a_metric_on_up_state
@@ -116,7 +125,7 @@ class TestWatch < Test::Unit::TestCase
   # unmonitor
   
   def test_unmonitor_should_move_to_nil
-    @watch.expects(:move).with(nil)
+    @watch.expects(:move).with(:unmonitored)
     @watch.unmonitor
   end
   
@@ -198,7 +207,7 @@ class TestWatch < Test::Unit::TestCase
     c = Conditions::FakePollCondition.new
     [:start, :stop].each do |cmd|
       @watch.expects(:call_action).with(c, cmd)
-      no_stdout { @watch.action(cmd, c) }
+      @watch.action(cmd, c)
     end
   end
   
@@ -206,14 +215,14 @@ class TestWatch < Test::Unit::TestCase
     c = Conditions::FakePollCondition.new
     @watch.expects(:call_action).with(c, :stop)
     @watch.expects(:call_action).with(c, :start)
-    no_stdout { @watch.action(:restart, c) }
+    @watch.action(:restart, c)
   end
   
   def test_action_should_restart_to_call_action_if_present
     @watch.restart = lambda { }
     c = Conditions::FakePollCondition.new
     @watch.expects(:call_action).with(c, :restart)
-    no_stdout { @watch.action(:restart, c) }
+    @watch.action(:restart, c)
   end
   
   # call_action
@@ -221,7 +230,23 @@ class TestWatch < Test::Unit::TestCase
   def test_call_action
     c = Conditions::FakePollCondition.new
     God::Process.any_instance.expects(:call_action).with(:start)
-    @watch.call_action(c, :start)
+    no_stdout { @watch.call_action(c, :start) }
+  end
+  
+  def test_call_action_should_call_before_start_when_behavior_has_that
+    @watch.behavior(:fake_behavior)
+    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) }
+  end
+  
+  def test_call_action_should_call_after_start_when_behavior_has_that
+    @watch.behavior(:fake_behavior)
+    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) }
   end
   
   # canonical_hash_form

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2007-09-10 00:00:00 -07:00
+  version: 0.5.0
+date: 2007-10-05 00:00:00 -07:00
 summary: Like monit, only awesome
 require_paths: 
 - lib
@@ -40,6 +40,7 @@ files:
 - ext/god/extconf.rb
 - ext/god/kqueue_handler.c
 - ext/god/netlink_handler.c
+- init/god
 - lib/god.rb
 - lib/god/behavior.rb
 - lib/god/behaviors/clean_pid_file.rb
@@ -48,11 +49,16 @@ files:
 - lib/god/conditions/always.rb
 - lib/god/conditions/cpu_usage.rb
 - lib/god/conditions/degrading_lambda.rb
+- lib/god/conditions/flapping.rb
+- lib/god/conditions/http_response_code.rb
 - lib/god/conditions/lambda.rb
 - lib/god/conditions/memory_usage.rb
 - lib/god/conditions/process_exits.rb
 - lib/god/conditions/process_running.rb
 - lib/god/conditions/tries.rb
+- lib/god/configurable.rb
+- lib/god/contact.rb
+- lib/god/contacts/email.rb
 - lib/god/dependency_graph.rb
 - lib/god/errors.rb
 - lib/god/event_handler.rb
@@ -64,19 +70,23 @@ files:
 - lib/god/metric.rb
 - lib/god/process.rb
 - lib/god/registry.rb
-- lib/god/reporter.rb
-- lib/god/server.rb
+- lib/god/socket.rb
 - lib/god/sugar.rb
 - lib/god/system/process.rb
+- lib/god/task.rb
 - lib/god/timeline.rb
 - lib/god/timer.rb
+- lib/god/trigger.rb
 - lib/god/watch.rb
 - test/configs/child_events/child_events.god
 - test/configs/child_events/simple_server.rb
 - test/configs/child_polls/child_polls.god
 - test/configs/child_polls/simple_server.rb
+- test/configs/contact/contact.god
+- test/configs/contact/simple_server.rb
 - test/configs/daemon_events/daemon_events.god
 - test/configs/daemon_events/simple_server.rb
+- test/configs/daemon_events/simple_server_stop.rb
 - test/configs/daemon_polls/daemon_polls.god
 - test/configs/daemon_polls/simple_server.rb
 - test/configs/degrading_lambda/degrading_lambda.god
@@ -85,12 +95,17 @@ files:
 - test/configs/running_load/running_load.god
 - test/configs/stress/simple_server.rb
 - test/configs/stress/stress.god
+- test/configs/task/logs/.placeholder
+- test/configs/task/task.god
 - test/configs/test.rb
 - test/helper.rb
 - test/suite.rb
 - test/test_behavior.rb
 - test/test_condition.rb
+- test/test_conditions_http_response_code.rb
 - test/test_conditions_process_running.rb
+- test/test_conditions_tries.rb
+- test/test_contact.rb
 - test/test_dependency_graph.rb
 - test/test_event_handler.rb
 - test/test_god.rb
@@ -100,18 +115,21 @@ files:
 - test/test_metric.rb
 - test/test_process.rb
 - test/test_registry.rb
-- test/test_reporter.rb
-- test/test_server.rb
+- test/test_socket.rb
 - test/test_sugar.rb
 - test/test_system_process.rb
+- test/test_task.rb
 - test/test_timeline.rb
 - test/test_timer.rb
+- test/test_trigger.rb
 - test/test_watch.rb
 test_files: 
 - test/test_behavior.rb
 - test/test_condition.rb
+- test/test_conditions_http_response_code.rb
 - test/test_conditions_process_running.rb
 - test/test_conditions_tries.rb
+- test/test_contact.rb
 - test/test_dependency_graph.rb
 - test/test_event_handler.rb
 - test/test_god.rb
@@ -121,12 +139,13 @@ test_files:
 - test/test_metric.rb
 - test/test_process.rb
 - test/test_registry.rb
-- test/test_reporter.rb
-- test/test_server.rb
+- test/test_socket.rb
 - test/test_sugar.rb
 - test/test_system_process.rb
+- test/test_task.rb
 - test/test_timeline.rb
 - test/test_timer.rb
+- test/test_trigger.rb
 - test/test_watch.rb
 rdoc_options: 
 - --main

data/lib/god/reporter.rb

@@ -1,25 +0,0 @@
-require 'drb'
-
-module God
-
-  class Reporter
-    def initialize(host = nil, port = nil)
-      @host = host
-      @port = port || 7777
-      @service = nil
-    end
-
-    def method_missing(*args, &block)
-      service.send(*args, &block)
-    end
-
-    private
-
-    def service
-      return @service if @service
-      DRb.start_service
-      @service = DRbObject.new(nil, "druby://#{@host}:#{@port}")
-    end
-  end
-
-end

data/lib/god/server.rb

@@ -1,37 +0,0 @@
-require 'drb'
-require 'drb/acl'
-
-# The God::Server oversees the DRb server which dishes out info on this God daemon.
-
-module God
-
-  class Server
-    attr_reader :host, :port
-
-    def initialize(host = nil, port = nil, allow = [])
-      @host = host
-      @port = port
-      @acl = %w{deny all} + allow.inject([]) { |acc, a| acc + ['allow', a] }
-      puts "Starting on #{@host}:#{@port}"
-      start
-    end
-
-    def ping
-      true
-    end
-    
-    def method_missing(*args, &block)
-      God.send(*args, &block)
-    end
-
-    private
-
-    def start
-      acl = ACL.new(@acl)
-      DRb.install_acl(acl)
-      
-      @drb ||= DRb.start_service("druby://#{@host}:#{@port}", self) 
-    end
-  end
-
-end

data/test/test_reporter.rb

@@ -1,18 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-class TestReporter < Test::Unit::TestCase
-
-  def test_should_create_a_drb_object
-    DRb.expects(:start_service)
-    DRbObject.expects(:new).with(nil, "druby://host:port").returns(stub(:anything => true))
-
-    Reporter.new('host', 'port').anything
-  end
-
-  def test_should_forward_unknown_methods_to_drb_object
-    Reporter.any_instance.expects(:service).returns(mock(:something_fake => true))
-    
-    reporter = Reporter.new('host', 'port')
-    reporter.something_fake
-  end
-end