xli-dtr 0.0.5 → 1.0.0

data/CHANGES

@@ -1,5 +1,12 @@
 = DTR Changelog
 
+== release 1.0.0
+* support synchronizing codebase
+* lookup agents by broadcast
+* group agents for different project or environment usage
+* no need launch dtr rinda server anymore
+* agents log would be output into master process log
+
 == release 0.0.4
 * added timeout for running test more stable
   the default timeout is 60 sec, can be changed by environment variable 'RUN_TEST_TIMEOUT'

data/README.rdoc

@@ -0,0 +1,208 @@
+= DTR -- Distributed Test Runner
+
+Supporting DTR version: 1.x.x
+
+This package contains DTR, a distributed test runner program for decreasing 
+time of running ruby tests, only supporting Test::Unit ruby testing framework
+currently.
+
+DTR has the following features:
+
+* Run tests in mutli processes or on distributed machines.
+
+* Hot plug distributed agents.
+
+* Synchronizing codebase between agent and master processes.
+
+* Runtime injection, all tests run in same environment.
+
+DTR works in two parts: Runner Agent and DTR Master.
+
+* Runner Agent is a DRb service hosting on distributed machines to run tests. For using 'fork' to create runner process, Runner Agent can't run on Windows directly. Requisites for running agent: Unix/Linux based OS System for forking sub-process; 'unzip' command for extracting codebase package.
+
+* DTR Master is the process finding runner service to run tests and collect test results. It works by loading 'dtr/test_unit_injection.rb' with all test files or defining a DTR::TestTask in your rake file. Requisites for running master: 'zip' command for creating codebase package.
+
+DTR (version >= 1.0.0) supports synchronizing codebase by a DTR::PackageTask defined in your rake tasks. The DTR::PackageTask is a similar task with Rake::PackageTask, the following is a simple example:
+
+  require 'dtr/raketasks'
+  DTR::PackageTask.new do |p|
+    p.package_files.include("**/*")
+    p.package_files.exclude('tmp/**/*')
+    p.package_files.exclude('log/*')
+  end
+
+The DTR::TestTask will create a DTR::PackageTask for you directly, and you can specify package_files too.
+
+  DTR::TestTask.new do |t|
+    t.test_files = FileList['test/*_test.rb']
+    t.processes = 2
+    t.package_files.include('**/*.rb')
+    t.package_files.exclude('tmp/**/*')
+    t.package_files.exclude('log/*')
+  end
+
+Note: Exclude('log/*') only excludes all files inside 'log' directory except 'log' directory itself.
+
+== Rails plugin
+
+For Rails project, you just need copy dtr project directory into your project plugins directory. There are dtr tasks defined for you to run tests within dtr grid, which prefer you have 'config/database.yml.dtr' for setting up database. The test task is 'dtr:test'. 
+
+Your project directory name would be the default group name of dtr agents. You can specify an environment variable named 'DTR_GROUP' to change the group name. By default, dtr tasks would lookup the broadcast ip by 'ifconfig' command. If it doesn't work for you, you can specify an environment variable named 'BROADCAST_IP' to overwrite it.
+
+== Download
+
+The latest version of DTR can be found at
+
+* http://github.com/xli/dtr/tree/master
+
+== GEM Installation
+
+=== Last stable version from rubyforge.org
+
+Download and install DTR with the following.
+
+   gem install --remote dtr
+
+=== Last version on github master branch
+
+Run the following if you haven't already:
+
+  gem sources -a http://gems.github.com
+
+Install the gem:
+
+  sudo gem install xli-dtr
+
+== Running the DTR Test Suite
+
+If you wish to run the unit and functional tests that come with DTR:
+
+* CD into the top project directory of dtr.
+* Type the following:
+
+   rake # You need a version of rake installed
+
+== Simple Example
+
+Start DTR agent with providing 1 runner in group 'mysql-firefox' as follows:
+
+  dtr -r runner1 -g mysql-firefox
+
+Type "dtr --help" for an up-to-date option summary.
+Invoking <tt>dtr</tt> without any options causes dtr to show help too.
+
+Most of time your project test suite need setup environment before run tests, you
+can set setup command by option '--setup', for example:
+
+  dtr -r runner1,runner2 --setup "rake db:test:prepare"
+
+You also can specify DTR_AGENT_ENV_SETUP_CMD in your master process environment to let all agents
+that are not started with '--setup' option specified to setup all agents environment.
+
+At last, you need define a DTR::TestTask:
+
+  require 'dtr'
+
+  ENV['DTR_AGENT_ENV_SETUP_CMD'] = 'rake db:test:prepare'
+  DTR.broadcast_list = ['broadcast_ip']
+  DTR.group = 'mysql-firefox'
+
+  DTR::TestTask.new do |t|
+    t.test_files = FileList['test/**/*_test.rb']
+    t.processes = 0 # don't start agent in local machine, default is 1, so we reset to 0 here.
+    t.package_files.include("Rakefile")
+    t.package_files.include("app/**/*")
+    t.package_files.include("db/migrate/**/*")
+    t.package_files.include("config/**/*")
+    t.package_files.include("lib/**/*")
+    t.package_files.include("vendor/**/*")
+    t.package_files.include("test/**/*")
+  end
+
+The default task name is 'dtr', and it also creates package tasks you need for packaging files need for running test.
+More details about DTR::TestTask and DTR::PackageTask, see the API doc:
+
+  ri DTR::TestTask
+  ri DTR::PackageTask
+
+Notes: 
+  * DTR broadcast_list and group configuration would be cached in the directory. Name of configuration file is '.dtr_env_pstore'.
+  * For packaging codebase, DTR::PackageTask creates tasks: dtr_package, dtr_clobber_package and dtr_repackage; DTR Master just simply run a command 'rake dtr_repackage' to create the package and run 'rake dtr_clobber_package' to clean package. So make sure there are those tasks under root namespace in your rake tasks.
+
+== Run tests in multi-processes on one machine
+
+For running Runner in multi-processes.
+The following is the test task example in the rake file:
+
+  require 'dtr/raketasks'
+
+  DTR::TestTask.new do |t|
+    t.test_files = FileList['test/*test.rb']
+    t.processes = 2 #default is 1
+  end
+
+== Credits
+
+[<b>Josh Price</b>] For fixing tests packer in release 0.0.1.
+
+[<b>Wang Pengchao</b>] For sharing lots of ideas and code contributions.
+
+[<b>Barrow H Kwan</b>] For patch of specifying DTR Rinda server port (version 0.0.x) and testing DTR new version.
+
+[<b>Mingle team</b>(http://studios.thoughtworks.com/mingle-project-intelligence)] For making all these happen.
+
+== License
+
+DTR is available under an Apache License Version 2.
+
+== Support
+
+Feel free to submit commits or feature requests.
+For other information, feel free to contact mailto:iam@li-xiao.com.
+
+== Usage
+
+DTR agent command is invoked from the command line using:
+
+  dtr [<em>options</em> ...]
+
+=== Options are:
+
+  -p, --port PORT                  Port number of DTR agent listening. Default is 7788.
+  -g, --group GROUP_NAME           If you have several DTR grids working for different project or environment, you should group your agents in different names for different usages. Default is none.
+  -r runner1_name,runner2_name     Start DTR test runner agent with unique runner names.
+  -a, --broadcast_address ADDRESS  Specify broadcast address for looking up dtr agent service, e.g. 192.168.255.255. Default is 'localhost'. DTR master and monitor would need this.
+  -i, --setup COMMAND              Set command for initializing test runner test environment, e.g. 'rake db:test:prepare'. Default is do nothing. You also can specify DTR_AGENT_ENV_SETUP_CMD in your master process environment to let all agents setup same environment.
+  -d DIRECTORY                     Specify a directory as agent launching & working directory.
+      --working_directory
+  -m, --monitor                    Monitor the status of the dtr agents and master processes. Used for testing your dtr grid environment. CAUTION! monitoring agents causes all idle agents hang on by the monitor process.
+  -v, --version                    Show version
+  -h, --help                       Show this help doc
+
+  Notes: 
+    * DTR would always add 'localhost' into broadcast list.
+    * Agent start by specifying runners by -r option, every runner would be started in different process for running test. e.g. dtr -r runner1,runner2
+    * DTR master environment options:
+      * DTR_MASTER_ENV: this variable would be copied into agent process for sharing info between master and agents. Normally used in agent setup environment command.
+      * DTR_AGENT_ENV_SETUP_CMD: this variable would be applied as agent setup environment command when agent have no setup environment command specified by --setup option.
+      * DTR_LOG_LEVEL: master process logger level, e.g. ENV['DTR_LOG_LEVEL'] = Logger::DEBUG. Agent process logs would be output in master process log file, so setting this option also changes agent logger level.
+      * DTR_RUNNER_NAME: this environment variable would be provided in runner process for test environment to get the runner name to setup, e.g. setting up database configuration.
+
+Type "dtr --help" for an up-to-date option summary.
+
+= Other stuff
+
+Author: Li Xiao <iam@li-xiao.com>
+
+Requires: Ruby 1.8.6 or later
+
+License: Copyright 2007-2008 by Li Xiao.
+         Released under an Apache License 2.  See the LICENSE file
+         included in the distribution.
+
+== Warranty
+
+This software is provided "as is" and without any express or
+implied warranties, including, without limitation, the implied
+warranties of merchantibility and fitness for a particular
+purpose.

data/Rakefile

@@ -63,51 +63,28 @@ Rake::TestTask.new(:test_functionals) do |t|
   t.verbose = false
 end
 
-begin
-  require 'rcov/rcovtask'
-
-  Rcov::RcovTask.new do |t|
-    t.libs << "test"
-    t.rcov_opts = [
-      '-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report',
-    ]
-    t.test_files = FileList[
-      'test/*test.rb'
-    ]
-    t.output_dir = 'coverage'
-    t.verbose = true
-  end
-rescue LoadError
-  # No rcov available
-end
-
 directory 'testdata'
 [:test_units].each do |t|
   task t => ['testdata']
 end
 
-# CVS Tasks ----------------------------------------------------------
-
-# Install DTR using the standard install.rb script.
-
-desc "Install the application"
-task :install do
-  ruby "install.rb"
+task :monitor do
+  DTR.monitor
 end
 
+# CVS Tasks ----------------------------------------------------------
+
 # Create a task to build the RDOC documentation tree.
 
 rd = Rake::RDocTask.new("rdoc") { |rdoc|
   rdoc.rdoc_dir = 'html'
-#  rdoc.template = 'kilmer'
-#  rdoc.template = 'css2'
-  rdoc.template = 'doc/jamis.rb'
+  rdoc.template = 'html'
   rdoc.title    = "DTR -- Distributed Test Runner"
   rdoc.options << '--line-numbers' << '--inline-source' <<
-    '--main' << 'README' <<
+    '--main' << 'README.rdoc' <<
     '--title' <<  '"DTR -- Distributed Test Runner' 
-  rdoc.rdoc_files.include('README', 'LICENSE.txt', 'TODO', 'CHANGES')
-  rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
+  rdoc.rdoc_files.include('README.rdoc', 'LICENSE.txt', 'TODO', 'CHANGES')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 }
 
 # ====================================================================
@@ -117,6 +94,48 @@ rd = Rake::RDocTask.new("rdoc") { |rdoc|
 if ! defined?(Gem)
   puts "Package Target requires RubyGEMs"
 else
+  Dir.glob(File.dirname(__FILE__) + "/testdata/**/log").each do |log_dir|
+    FileUtils.rm_rf(log_dir)
+  end
+
+  gem_content = <<-GEM
+Gem::Specification.new do |spec|
+  spec.name = 'dtr'
+  spec.version = "1.0.0"
+  spec.summary = "DTR is a distributed test runner to run tests on distributed computers for decreasing build time."
+
+  #### Dependencies and requirements.
+  spec.files = #{(Dir.glob("lib/**/*.rb") + ["bin/dtr", "CHANGES", "dtr.gemspec", "lib", "LICENSE.TXT", "Rakefile", "README.rdoc", "TODO"]).inspect}
+
+  spec.test_files = #{(Dir.glob("test/**/*.rb") + Dir.glob("testdata/**/*")).inspect}
+
+  #### Load-time details: library and application (you will need one or both).
+
+  spec.require_path = 'lib'                         # Use these for libraries.
+
+  spec.bindir = "bin"                               # Use these for applications.
+  spec.executables = ["dtr"]
+  spec.default_executable = "dtr"
+
+  #### Documentation and testing.
+
+  spec.has_rdoc = true
+  spec.extra_rdoc_files = #{rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a.inspect}
+  spec.rdoc_options = #{rd.options.inspect}
+
+  #### Author and project details.
+
+  spec.author = "Li Xiao"
+  spec.email = "iam@li-xiao.com"
+  spec.homepage = "http://github.com/xli/dtr/tree/master"
+  spec.rubyforge_project = "dtr"
+end
+GEM
+  File.open(File.dirname(__FILE__) + '/dtr.gemspec', 'w') do |f|
+    f.write(gem_content)
+  end
+
+  #build gem package same steps with github
   File.open(File.dirname(__FILE__) + '/dtr.gemspec') do |f|
     data = f.read
     spec = nil
@@ -193,33 +212,11 @@ file "TAGS" => RUBY_FILES do
   sh "#{TAGS} #{RUBY_FILES}", :verbose => false
 end
 
-# --------------------------------------------------------------------
-# Creating a release
-
 task :update_site do
   puts %x[scp -r html/* lixiao@rubyforge.org:/var/www/gforge-projects/dtr/]
 end
 
-task :c1 do
-  DTR.launch_agent(['c1'], nil)
-end
-
-task :c3 do
-  DTR.launch_agent(['c1', 'c2', 'c3'], nil)
-end
-task :c10 do
-  DTR.launch_agent(['c1', 'c2', 'c3', 'c4', 'c5', 'c6', 'c7', 'c8', 'c9', 'c10'], nil)
-end
-
-task :c2 do
-  DTR_AGENT_OPTIONS[:runners] = ['c1', 'c2']
-  DTR_AGENT_OPTIONS[:agent_env_setup_cmd] = nil
-  Dir.chdir('testdata') do
-    DTR.start_agent
-  end
-end
-
-Rake::TestTask.new(:dtr) do |t|
+Rake::TestTask.new(:dtr_injected) do |t|
   t.libs.unshift DTR.lib_path
   t.test_files = FileList['dtr/test_unit_injection.rb', 'testdata/*.rb']
   t.warning = true
@@ -228,14 +225,8 @@ end
 
 require 'dtr/raketasks'
 
-DTR::TestTask.new :mt do |t|
+DTR::TestTask.new do |t|
   t.test_files = FileList['testdata/*.rb']
-  t.processes = 2
-end
-
-DTR::PackageTask.new do |p|
-  p.package_files.include("**/*")
-  p.package_files.exclude("tmp")
-  p.package_files.exclude("log")
+  t.processes = 0
+  t.package_files.include('**/*')
 end
-

data/TODO

@@ -3,21 +3,12 @@
 Send suggestions for this list to iam@li-xiao.com
 
 === To Do
-  clean Process.fork and rescue Exception inside and its log
-  change to use zip instead of tar for easy use dtr master in windows
-  add a test for problem of injecting dtr early
-  master process log doesn't have time label in mingle
-  sleep in test would cause yelling delayed? add a test for it
-  auto mkdir log&tmp for agent?
-  update help doc
-  should trigger started on runner in agent runner, for some tools is using this hook(e.g. inbrowser_test)
-  
-  ???? agent brain should wakeup when worker is dead
-  problem: when agent can't find test files, drb can't undump test object, the error would be: undefined method `run' for #<DRb::DRbUnknown:0x318800>
-     * tell Master this error that agent can't know what's item sent from Master
-  
-  monitor dtr rinda server status
-  monitor acceptance test
-  
+
+=== TBD for next release
+  should trigger started notification on test runner in agent Herald, for some tools are using this hook(e.g. inbrowser_test) to setup test environment.
+  agent should wakeup when worker is dead, so that it could be picked up by another master process
+  auto prepare database for each runner, so that run tests in multi-processes could be easy setup.
+  provide a way to monitor agent runner efficiency
+  use system instead of fork to launch sub process in agent, which makes dtr support windows and jruby
   
 (moved DONE list to CHANGES file)

data/bin/dtr

@@ -11,12 +11,13 @@ end
 NOTES = <<-NOTES
 ----------------
 Notes: 
-  * The default value of broadcast address is 'localhost'.
-  * Runners specified by -r option will be started in different processes by the runner agent.
+  * DTR would always add 'localhost' into broadcast list.
+  * Agent start by specifying runners by -r option, every runner would be started in different process for running test. e.g. dtr -r runner1,runner2
   * DTR master environment options:
-    * DTR_MASTER_ENV: this variable would be copied into runner process for sharing info between master and agents
-    * DTR_AGENT_ENV_SETUP_CMD: this variable would be applied as agent setup environment command when agent have no setup environment command specified.
-    * DTR_LOG_LEVEL: master process logger level, e.g. ENV['DTR_LOG_LEVEL'] = Logger::DEBUG
+    * DTR_MASTER_ENV: this variable would be copied into agent process for sharing info between master and agents. Normally used in agent setup environment command.
+    * DTR_AGENT_ENV_SETUP_CMD: this variable would be applied as agent setup environment command when agent have no setup environment command specified by --setup option.
+    * DTR_LOG_LEVEL: master process logger level, e.g. ENV['DTR_LOG_LEVEL'] = Logger::DEBUG. Agent process logs would be output in master process log file, so setting this option also changes agent logger level.
+    * DTR_RUNNER_NAME: this environment variable would be provided in runner process for test environment to get the runner name to setup, e.g. setting up database configuration.
 
 DTR is a distributed test runner program for decreasing time of running ruby tests based on ruby 'test/unit' package.
 For additional information, see http://dtr.rubyforge.org/
@@ -26,41 +27,41 @@ opts = OptionParser.new do |opts|
   opts.banner = "DTR usage: #{$0} [options]"
   opts.separator ""
   opts.separator "Synopsis:"
-  opts.separator "dtr -r runner1_name,runner2_name"
+  opts.separator "dtr -g group_name -r runner1_name,runner2_name"
   opts.separator "dtr -a broadcast_ip -m"
   opts.separator ""
   opts.separator "Options:"
   
-  opts.on_tail("-m", "--monitor", "Monitor the status of the dtr agents.") do
-    DTR.monitor
+  opts.on_tail("-m", "--monitor", "Monitor the status of the dtr agents and master processes. Used for testing your dtr grid environment. CAUTION! monitoring agents causes all idle agents hang on by the monitor process.") do
+    $monitor = true
   end
 
-  opts.on("-p", "--port PORT",  "Port number of DTR rinda server. Default is 3344.") do |port|
-    DTR.port = port
+  opts.on("-p", "--port PORT",  "Port number of DTR agent listening. Default is 7788.") do |port|
+    DTR.agent_listen_port = port
+  end
+  
+  opts.on("-g", "--group GROUP_NAME",  "If you have several DTR grids working for different project or environment, you should group your agents in different names for different usages. Default is none.") do |group_name|
+    DTR.group = group_name
   end
   
   opts.on("-r runner1_name,runner2_name", Array, "Start DTR test runner agent with unique runner names.") do |names|
     DTR_AGENT_OPTIONS[:runners] = names.collect{|name| name.untaint}
   end
   
-  opts.on("-a", "--broadcast_address ADDRESS", "Specify broadcast address for looking up dtr rinda server, e.g. 192.168.255.255. Default is 'localhost'.") do |address|
+  opts.on("-a", "--broadcast_address ADDRESS", "Specify broadcast address for looking up dtr agent service, e.g. 192.168.255.255. Default is 'localhost'. DTR master and monitor would need this.") do |address|
     if (!address.nil?) && (!address.empty?)
       DTR.broadcast_list = [address]
     end
   end
 
-  opts.on("-i", "--setup COMMAND", "Set command for initializing test runner test environment, e.g. 'rake db:test:prepare'. Default is do nothing.") do |command|
+  opts.on("-i", "--setup COMMAND", "Set command for initializing test runner test environment, e.g. 'rake db:test:prepare'. Default is do nothing. You also can specify DTR_AGENT_ENV_SETUP_CMD in your master process environment to let all agents setup same environment.") do |command|
     DTR_AGENT_OPTIONS[:agent_env_setup_cmd] = command.untaint
   end
 
-  opts.on_tail("-d", "--debug", "output debug log") do
-    DTR.logger.log_level = Logger::DEBUG
-  end
-
-  opts.on_tail("-b", "--be_silent", "Only show error messages") do
-    DTR.logger.log_level = Logger::ERROR
+  opts.on("-d", "--working_directory DIRECTORY", "Specify a directory as agent launching & working directory.") do |dir|
+    DTR_AGENT_OPTIONS[:launching_dir] = dir
   end
-
+  
   opts.on_tail("-v", "--version", "Show version") do
     puts "dtr, version " + DTRVERSION
   end
@@ -80,6 +81,11 @@ if no_argv
   puts NOTES
 end
 
+if $monitor
+  DTR.monitor
+end
 if DTR_AGENT_OPTIONS[:runners] && !DTR_AGENT_OPTIONS[:runners].empty?
-  DTR.start_agent
+  Dir.chdir(DTR_AGENT_OPTIONS[:launching_dir] || '.') do
+    DTR.start_agent
+  end
 end

data/dtr.gemspec

@@ -1,18 +1,13 @@
 Gem::Specification.new do |spec|
   spec.name = 'dtr'
-  spec.version = "0.0.5"
+  spec.version = "1.0.0"
   spec.summary = "DTR is a distributed test runner to run tests on distributed computers for decreasing build time."
 
   #### Dependencies and requirements.
+  spec.files = ["lib/dtr/agent/brain.rb", "lib/dtr/agent/herald.rb", "lib/dtr/agent/runner.rb", "lib/dtr/agent/sync_codebase.rb", "lib/dtr/agent/sync_logger.rb", "lib/dtr/agent/test_case.rb", "lib/dtr/agent/test_unit.rb", "lib/dtr/agent/worker.rb", "lib/dtr/agent/working_env_ext.rb", "lib/dtr/agent.rb", "lib/dtr/facade.rb", "lib/dtr/master.rb", "lib/dtr/monitor.rb", "lib/dtr/raketasks.rb", "lib/dtr/shared/adapter.rb", "lib/dtr/shared/configuration.rb", "lib/dtr/shared/message_decorator.rb", "lib/dtr/shared/ruby_ext.rb", "lib/dtr/shared/service/agent.rb", "lib/dtr/shared/service/file.rb", "lib/dtr/shared/service/rinda.rb", "lib/dtr/shared/service/runner.rb", "lib/dtr/shared/service/working_env.rb", "lib/dtr/shared/service.rb", "lib/dtr/shared/sync_codebase/copiable_package.rb", "lib/dtr/shared/sync_codebase/master_ext.rb", "lib/dtr/shared/sync_codebase/package.rb", "lib/dtr/shared/sync_codebase/sync_service.rb", "lib/dtr/shared/sync_codebase.rb", "lib/dtr/shared/sync_logger.rb", "lib/dtr/shared/utils/cmd.rb", "lib/dtr/shared/utils/env_store.rb", "lib/dtr/shared/utils/logger.rb", "lib/dtr/shared/utils.rb", "lib/dtr/shared/working_env.rb", "lib/dtr/shared.rb", "lib/dtr/test_unit/drb_test_runner.rb", "lib/dtr/test_unit/injection.rb", "lib/dtr/test_unit/test_case_injection.rb", "lib/dtr/test_unit/test_suite_injection.rb", "lib/dtr/test_unit/testrunnermediator_injection.rb", "lib/dtr/test_unit/thread_safe_test_result.rb", "lib/dtr/test_unit/worker_club.rb", "lib/dtr/test_unit.rb", "lib/dtr/test_unit_injection.rb", "lib/dtr.rb", "bin/dtr", "CHANGES", "dtr.gemspec", "lib", "LICENSE.TXT", "Rakefile", "README.rdoc", "TODO"]
 
-  #s.requirements << ""
-  # p Dir.glob("lib/**/*.rb") + ["bin/dtr", "CHANGES", "dtr.gemspec", "install.rb", "lib", "LICENSE.TXT", "Rakefile", "README", "TODO"]
-  # puts '------------'
-  # p Dir.glob("test/**/*.rb") + Dir.glob("testdata/**/*")
-  
-  spec.files =  ["lib/dtr/agent/brain.rb", "lib/dtr/agent/herald.rb", "lib/dtr/agent/runner.rb", "lib/dtr/agent/sync_codebase.rb", "lib/dtr/agent/sync_logger.rb", "lib/dtr/agent/test_unit.rb", "lib/dtr/agent/worker.rb", "lib/dtr/agent/working_env_ext.rb", "lib/dtr/agent.rb", "lib/dtr/master.rb", "lib/dtr/monitor.rb", "lib/dtr/raketasks.rb", "lib/dtr/shared/adapter.rb", "lib/dtr/shared/configuration.rb", "lib/dtr/shared/message_decorator.rb", "lib/dtr/shared/ruby_ext.rb", "lib/dtr/shared/service/agent.rb", "lib/dtr/shared/service/file.rb", "lib/dtr/shared/service/rinda.rb", "lib/dtr/shared/service/runner.rb", "lib/dtr/shared/service/working_env.rb", "lib/dtr/shared/service.rb", "lib/dtr/shared/sync_codebase/codebase.rb", "lib/dtr/shared/sync_codebase/master_ext.rb", "lib/dtr/shared/sync_codebase/package.rb", "lib/dtr/shared/sync_codebase/sync_service.rb", "lib/dtr/shared/sync_codebase.rb", "lib/dtr/shared/sync_logger.rb", "lib/dtr/shared/utils/cmd.rb", "lib/dtr/shared/utils/env_store.rb", "lib/dtr/shared/utils/logger.rb", "lib/dtr/shared/utils.rb", "lib/dtr/shared/working_env.rb", "lib/dtr/shared.rb", "lib/dtr/test_unit/drb_test_runner.rb", "lib/dtr/test_unit/injection.rb", "lib/dtr/test_unit/test_case_injection.rb", "lib/dtr/test_unit/testrunnermediator_injection.rb", "lib/dtr/test_unit/thread_safe_test_result.rb", "lib/dtr/test_unit/worker_club.rb", "lib/dtr/test_unit.rb", "lib/dtr/test_unit_injection.rb", "lib/dtr.rb", "bin/dtr", "CHANGES", "dtr.gemspec", "install.rb", "lib", "LICENSE.TXT", "Rakefile", "README", "TODO"]
+  spec.test_files = ["test/acceptance/agent_working_env_test.rb", "test/acceptance/dtr_package_task_test.rb", "test/acceptance/general_test.rb", "test/acceptance/raketasks_test.rb", "test/acceptance/sync_codebase_test.rb", "test/acceptance/sync_logger_test.rb", "test/agent_helper.rb", "test/logger_stub.rb", "test/test_helper.rb", "test/unit/adapter_test.rb", "test/unit/configuration_test.rb", "test/unit/facade_test.rb", "test/unit/logger_test.rb", "test/unit/test_unit_test.rb", "test/unit/working_env_test.rb", "testdata/a_failed_test_case.rb", "testdata/a_file_system_test_case.rb", "testdata/a_test_case.rb", "testdata/a_test_case2.rb", "testdata/an_error_test_case.rb", "testdata/another_project", "testdata/another_project/passed_test_case.rb", "testdata/another_project/Rakefile", "testdata/hacked_run_method_test_case.rb", "testdata/is_required_by_a_test.rb", "testdata/lib", "testdata/lib/lib_test_case.rb", "testdata/package_task_test_rakefile", "testdata/Rakefile", "testdata/raketasks", "testdata/raketasks/Rakefile", "testdata/raketasks/success_test_case.rb", "testdata/scenario_test_case.rb", "testdata/setup_agent_env_test_case.rb", "testdata/sleep_3_secs_test_case.rb", "testdata/verify_dir_pwd", "testdata/verify_dir_pwd/Rakefile", "testdata/verify_dir_pwd/verify_dir_pwd_test_case.rb"]
 
-  spec.test_files = ["test/acceptance/agent_working_env_test.rb", "test/acceptance/dtr_package_task_test.rb", "test/acceptance/general_test.rb", "test/acceptance/sync_codebase_test.rb", "test/acceptance/sync_logger_test.rb", "test/agent_helper.rb", "test/logger_stub.rb", "test/test_helper.rb", "test/unit/adapter_test.rb", "test/unit/test_unit_test.rb", "test/unit/working_env_test.rb", "testdata/a_failed_test_case.rb", "testdata/a_file_system_test_case.rb", "testdata/a_test_case.rb", "testdata/a_test_case2.rb", "testdata/an_error_test_case.rb", "testdata/another_project", "testdata/another_project/passed_test_case.rb", "testdata/another_project/Rakefile", "testdata/is_required_by_a_test.rb", "testdata/lib", "testdata/lib/lib_test_case.rb", "testdata/package_task_test_rakefile", "testdata/Rakefile", "testdata/scenario_test_case.rb", "testdata/setup_agent_env_test_case.rb", "testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process", "testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/Rakefile", "testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/verify_dir_pwd_test_case.rb"]
   #### Load-time details: library and application (you will need one or both).
 
   spec.require_path = 'lib'                         # Use these for libraries.
@@ -23,7 +18,9 @@ Gem::Specification.new do |spec|
 
   #### Documentation and testing.
 
-  spec.has_rdoc = false
+  spec.has_rdoc = true
+  spec.extra_rdoc_files = ["README.rdoc", "LICENSE.txt", "TODO", "CHANGES"]
+  spec.rdoc_options = ["--line-numbers", "--inline-source", "--main", "README.rdoc", "--title", "\"DTR -- Distributed Test Runner"]
 
   #### Author and project details.
 
@@ -31,4 +28,4 @@ Gem::Specification.new do |spec|
   spec.email = "iam@li-xiao.com"
   spec.homepage = "http://github.com/xli/dtr/tree/master"
   spec.rubyforge_project = "dtr"
-end
+end

data/lib/dtr/agent/brain.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,23 +22,26 @@ module DTR
         raise 'No runner? What can I do for you?' if runner_names.blank?
         @runner_names = runner_names
         @agent_env_setup_cmd = agent_env_setup_cmd
-        DTR.info ""
-        DTR.info "--------------------beautiful line--------------------------"
-        DTR.info "=> Agent environment setup cmd: #{@agent_env_setup_cmd}"
-        DTR.info "=> Runner names: #{@runner_names.join(', ')}"
+        DTR.info {""}
+        DTR.info {"--------------------beautiful line--------------------------"}
+        DTR.info {"=> Agent environment setup command: #{@agent_env_setup_cmd}"}
+        DTR.info {"=> Runner names: #{@runner_names.join(', ')}"}
+        DTR.info {"=> Broadcast list: #{DTR.configuration.broadcast_list.inspect}"}
+        DTR.info {"=> Listening port: #{DTR.configuration.agent_listen_port}"}
+        DTR.info {"=> Group: #{DTR.configuration.group}"}
       end
 
       def hypnotize
         loop do
           if wakeup?
             DTR.info {"Agent brain wakes up"}
-            work(wakeup_worker)
+            work(DTR.fork_process { Worker.new(@runner_names, @agent_env_setup_cmd).launch })
             DTR.info {"Agent brain is going to sleep"}
           end
         end
-      rescue Exception => e
-        DTR.info {"Agent brain is stopped by Exception => #{e.class.name}, message => #{e.message}"}
-        DTR.debug {e.backtrace.join("\n")}
+      rescue Interrupt, SystemExit, SignalException
+      ensure
+        relax
       end
 
       def work(worker)
@@ -47,19 +50,7 @@ module DTR
         end
       ensure
         DTR.info {"Killing worker"}
-        Process.kill 'TERM', worker
-      end
-      
-      def wakeup_worker
-        Process.fork do
-          begin
-            Worker.new(@runner_names, @agent_env_setup_cmd).launch
-          rescue Interrupt, SystemExit, SignalException
-          rescue Exception => e
-            DTR.error {"Worker is stopped by Exception => #{e.class.name}, message => #{e.message}"}
-            DTR.debug {e.backtrace.join("\n")}
-          end
-        end
+        DTR.kill_process worker
       end
     end
   end