god 0.3.0 → 0.4.0

data/test/test_handlers_kqueue_handler.rb

@@ -1,12 +1,16 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestHandlersKqueueHandler < Test::Unit::TestCase
-  def test_register_process
-    KQueueHandler.expects(:monitor_process).with(1234, 2147483648)
-    KQueueHandler.register_process(1234, [:proc_exit])
-  end
+if God::EventHandler.event_system == "kqueue"
+  
+  class TestHandlersKqueueHandler < Test::Unit::TestCase
+    def test_register_process
+      KQueueHandler.expects(:monitor_process).with(1234, 2147483648)
+      KQueueHandler.register_process(1234, [:proc_exit])
+    end
   
-  def test_events_mask
-    assert_equal 2147483648, KQueueHandler.events_mask([:proc_exit])
+    def test_events_mask
+      assert_equal 2147483648, KQueueHandler.events_mask([:proc_exit])
+    end
   end
+  
 end

data/test/test_hub.rb

@@ -7,6 +7,7 @@ class TestHub < Test::Unit::TestCase
     
     God.watch do |w|
       w.name = 'foo'
+      w.start = 'bar'
       w.interval = 10
     end
     
@@ -139,6 +140,23 @@ class TestHub < Test::Unit::TestCase
     end
   end
   
+  def test_handle_poll_should_use_overridden_transition
+    c = Conditions::Tries.new
+    c.times = 1
+    c.transition = :start
+    c.prepare
+    
+    m = Metric.new(@watch, {true => :up})
+    Hub.attach(c, m)
+    
+    @watch.expects(:move).with(:start)
+    
+    no_stdout do
+      t = Hub.handle_poll(c)
+      t.join
+    end
+  end
+  
   # handle_event
   
   def test_handle_event_should_move

data/test/test_logger.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestLogger < Test::Unit::TestCase
+  def setup
+    @log = God::Logger.new
+  end
+  
+  # log
+  
+  def test_log
+    @log.expects(:info).with("qux")
+    
+    no_stdout do
+      @log.log(stub(:name => 'foo'), :info, "qux")
+    end
+    
+    assert_equal 1, @log.logs.size
+    assert_instance_of Time, @log.logs['foo'][0][0]
+    assert_match(/qux/, @log.logs['foo'][0][1])
+  end
+  
+  # watch_log_since
+  
+  def test_watch_log_since
+    t1 = Time.now
+    
+    no_stdout do
+      @log.log(stub(:name => 'foo'), :info, "one")
+      @log.log(stub(:name => 'foo'), :info, "two")
+    end
+    
+    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
+    
+    out = @log.watch_log_since('foo', t2)
+    
+    assert_no_match(/one/, out)
+    assert_no_match(/two/, out)
+    assert_match(/three/, out)
+  end
+  
+  # regular methods
+  
+  def test_fatal
+    no_stdout do
+      @log.fatal('foo')
+    end
+    assert_equal 0, @log.logs.size
+  end
+end

data/test/test_process.rb

@@ -12,14 +12,134 @@ module God
   end
 end
 
-class TestProcess < Test::Unit::TestCase
+class TestProcessChild < Test::Unit::TestCase
   def setup
-    @p = God::Process.new(:name => 'foo', :pid_file => 'blah.pid')
+    God.internal_init
+    @p = God::Process.new
+    @p.name = 'foo'
     @p.stubs(:test).returns true # so we don't try to mkdir_p
     Process.stubs(:detach) # because we stub fork
   end
   
+  # valid?
+  
+  def test_valid_should_return_true_if_auto_daemonized_and_log
+    @p.start = 'qux'
+    @p.log = 'bar'
+    
+    assert @p.valid?
+  end
+  
+  def test_valid_should_return_true_if_auto_daemonized_and_no_stop
+    @p.start = 'qux'
+    @p.log = 'bar'
+    
+    assert @p.valid?
+  end
+  
+  def test_valid_should_return_true_if_uid_exists
+    @p.start = 'qux'
+    @p.log = 'bar'
+    @p.uid = 'root'
+    
+    assert @p.valid?
+  end
+  
+  def test_valid_should_return_true_if_uid_does_not_exists
+    @p.start = 'qux'
+    @p.log = 'bar'
+    @p.uid = 'foobarbaz'
+    
+    no_stdout do
+      assert !@p.valid?
+    end
+  end
+  
+  def test_valid_should_return_true_if_gid_exists
+    @p.start = 'qux'
+    @p.log = 'bar'
+    @p.gid = 'wheel'
+    
+    assert @p.valid?
+  end
+  
+  def test_valid_should_return_true_if_gid_does_not_exists
+    @p.start = 'qux'
+    @p.log = 'bar'
+    @p.gid = 'foobarbaz'
+    
+    no_stdout do
+      assert !@p.valid?
+    end
+  end
+end
+
+class TestProcessDaemon < Test::Unit::TestCase
+  def setup
+    God.internal_init
+    @p = God::Process.new
+    @p.name = 'foo'
+    @p.pid_file = 'blah.pid'
+    @p.stubs(:test).returns true # so we don't try to mkdir_p
+    Process.stubs(:detach) # because we stub fork
+  end
+  
+  # alive?
+  
+  def test_alive_should_call_system_process_exists
+    File.expects(:read).with('blah.pid').returns('1234')
+    System::Process.any_instance.expects(:exists?).returns(false)
+    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
+  end
+  
+  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
+  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
+    assert_equal File.join(God.pid_file_directory, 'foo.pid'), @p.default_pid_file
+  end
+  
+  # call_action
   # These actually excercise call_action in the back at this point - Kev
+  
   def test_call_action_with_string_should_fork_exec 
     @p.start = "do something"
     IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
@@ -34,15 +154,12 @@ class TestProcess < Test::Unit::TestCase
     @p.start = cmd
     @p.call_action(:start)
   end
-
-  def test_default_pid_file
-    assert_equal File.join(God.pid_file_directory, 'foo.pid'), @p.default_pid_file
-  end
   
   def test_call_action_without_pid_should_write_pid
     # Only for start, restart
     [:start, :restart].each do |action|
-      @p = God::Process.new(:name => 'foo')
+      @p = God::Process.new
+      @p.name = 'foo'
       @p.stubs(:test).returns true
       IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
       @p.expects(:fork)
@@ -63,18 +180,19 @@ class TestProcess < Test::Unit::TestCase
     @p.call_action(:stop)
   end
   
-  def test_call_action_should_mkdir_p_if_pid_file_dir_existence_test_fails
-    @p.pid_file = nil
-    IO.expects(:pipe).returns([StringIO.new('1234'), StringIO.new])
-    @p.expects(:fork)
-    Process.expects(:waitpid)
-    @p.expects(:test).returns(false, true)
-    FileUtils.expects(:mkdir_p).with(God.pid_file_directory)
-    File.expects(:open)
-    @p.start = "starting"
-    @p.call_action(:start)
+  def test_call_action_with_invalid_command_class_should_raise
+    @p.start = 5
+    @p.stop = 'baz'
+    
+    assert @p.valid?
+    
+    assert_raise NotImplementedError do
+      @p.call_action(:start)
+    end
   end
   
+  # start!/stop!/restart!
+  
   def test_start_stop_restart_bang
     [:start, :stop, :restart].each do |x|
       @p.expects(:call_action).with(x)

data/test/test_registry.rb

@@ -6,7 +6,8 @@ class TestRegistry < Test::Unit::TestCase
   end
   
   def test_add
-    foo = God::Process.new(:name => 'foo')
+    foo = God::Process.new
+    foo.name = 'foo'
     God.registry.add(foo)
     assert_equal 1, God.registry.size
     assert_equal foo, God.registry['foo']

data/test/test_server.rb

@@ -9,17 +9,48 @@ class TestServer < Test::Unit::TestCase
 
   def test_should_start_a_drb_server
     DRb.expects(:start_service)
-    Server.new
+    no_stdout do
+      Server.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) }
-    server = Server.new('host', 'port')
+    no_stdout do
+      server = Server.new('host', 'port')
+    end
   end
 
-  def test_should_forward_foreign_method_calls_to_meddle
-    server = Server.new
+  def test_should_forward_foreign_method_calls_to_god
+    server = nil
+    no_stdout do
+      server = Server.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
+    end
+    assert server.ping
+  end
 end

data/test/test_timeline.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestTimeline < Test::Unit::TestCase
   def setup
-    @timeline = Conditions::Timeline.new(5)
+    @timeline = Timeline.new(5)
   end
   
   def test_new_should_be_empty
@@ -14,11 +14,23 @@ class TestTimeline < Test::Unit::TestCase
       @timeline.push(i)
     end
     
-    assert_equal [10, 9, 8, 7, 6], @timeline
+    assert_equal [6, 7, 8, 9, 10], @timeline
   end
   
   def test_clear_should_clear_array
     @timeline.push(1)
     assert_equal [], @timeline.clear
   end
+  
+  # def test_benchmark
+  #   require 'benchmark'
+  # 
+  #   count = 1_000_000
+  # 
+  #   t = Timeline.new(10)
+  # 
+  #   Benchmark.bmbm do |x|
+  #     x.report("go") { count.times { t.push(5) } }
+  #   end
+  # end
 end

data/test/test_watch.rb

@@ -41,6 +41,13 @@ class TestWatch < Test::Unit::TestCase
     assert_equal @watch.mutex, @watch.mutex
   end
   
+  # valid?
+  
+  def test_valid?
+    God::Process.any_instance.expects(:valid?)
+    @watch.valid?
+  end
+  
   # behavior
   
   def test_behavior_should_record_behavior

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-08-17 00:00:00 -07:00
+  version: 0.4.0
+date: 2007-09-10 00:00:00 -07:00
 summary: Like monit, only awesome
 require_paths: 
 - lib
@@ -43,20 +43,24 @@ files:
 - lib/god.rb
 - lib/god/behavior.rb
 - lib/god/behaviors/clean_pid_file.rb
+- lib/god/behaviors/notify_when_flapping.rb
 - lib/god/condition.rb
 - lib/god/conditions/always.rb
 - lib/god/conditions/cpu_usage.rb
+- lib/god/conditions/degrading_lambda.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/timeline.rb
+- lib/god/conditions/tries.rb
+- lib/god/dependency_graph.rb
 - lib/god/errors.rb
 - lib/god/event_handler.rb
 - lib/god/event_handlers/dummy_handler.rb
 - lib/god/event_handlers/kqueue_handler.rb
 - lib/god/event_handlers/netlink_handler.rb
 - lib/god/hub.rb
+- lib/god/logger.rb
 - lib/god/metric.rb
 - lib/god/process.rb
 - lib/god/registry.rb
@@ -64,6 +68,7 @@ files:
 - lib/god/server.rb
 - lib/god/sugar.rb
 - lib/god/system/process.rb
+- lib/god/timeline.rb
 - lib/god/timer.rb
 - lib/god/watch.rb
 - test/configs/child_events/child_events.god
@@ -72,17 +77,26 @@ files:
 - test/configs/child_polls/simple_server.rb
 - test/configs/daemon_events/daemon_events.god
 - test/configs/daemon_events/simple_server.rb
+- test/configs/daemon_polls/daemon_polls.god
+- test/configs/daemon_polls/simple_server.rb
+- test/configs/degrading_lambda/degrading_lambda.god
+- test/configs/degrading_lambda/tcp_server.rb
 - test/configs/real.rb
+- test/configs/running_load/running_load.god
+- test/configs/stress/simple_server.rb
+- test/configs/stress/stress.god
 - test/configs/test.rb
 - test/helper.rb
 - test/suite.rb
 - test/test_behavior.rb
 - test/test_condition.rb
 - test/test_conditions_process_running.rb
+- test/test_dependency_graph.rb
 - test/test_event_handler.rb
 - test/test_god.rb
 - test/test_handlers_kqueue_handler.rb
 - test/test_hub.rb
+- test/test_logger.rb
 - test/test_metric.rb
 - test/test_process.rb
 - test/test_registry.rb
@@ -97,10 +111,13 @@ test_files:
 - test/test_behavior.rb
 - test/test_condition.rb
 - test/test_conditions_process_running.rb
+- test/test_conditions_tries.rb
+- test/test_dependency_graph.rb
 - test/test_event_handler.rb
 - test/test_god.rb
 - test/test_handlers_kqueue_handler.rb
 - test/test_hub.rb
+- test/test_logger.rb
 - test/test_metric.rb
 - test/test_process.rb
 - test/test_registry.rb
@@ -132,5 +149,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.3.0
     version: