dtr 0.0.4 → 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/LICENSE.txt

@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

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

@@ -1,6 +1,6 @@
 # Rakefile for DTR        -*- ruby -*-
 
-# Copyright 2007 by Li Xiao (swing1979@gmail.com)
+# Copyright 2007 by Li Xiao (iam@li-xiao.com)
 # All rights reserved.
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
@@ -48,82 +48,43 @@ end
 
 task :test_all => [:test_units, :tf]
 task :tu => :test_units
-task :tf => [:start_dtr_server, :start_dtr_runners, :test_functionals, :stop_dtr_runners, :stop_dtr_server]
+task :tf => [:test_functionals]
 task :test => :test_units
 
 Rake::TestTask.new(:test_units) do |t|
-  t.test_files = FileList['test/*test.rb']
+  t.test_files = FileList['test/unit/*_test.rb']
   t.warning = true
   t.verbose = false
 end
 
 Rake::TestTask.new(:test_functionals) do |t|
-  t.test_files = FileList['test/scenario*.rb']
-  t.warning = true
+  t.test_files = FileList['test/acceptance/*_test.rb']
+  t.warning = false
   t.verbose = false
 end
 
-task :start_dtr_server do
-  ruby "-I#{File.dirname(__FILE__) + "/lib"} #{File.dirname(__FILE__) + "/bin/dtr"} -s -D"
-end
-
-task :start_dtr_runners do
-  ruby "-I#{File.dirname(__FILE__) + "/lib"} #{File.dirname(__FILE__) + "/bin/dtr"} -r r1,r2,r3 -D"
-end
-
-task :stop_dtr_runners do
-  ruby "-I#{File.dirname(__FILE__) + "/lib"} #{File.dirname(__FILE__) + "/bin/dtr"} -R"
-end
-
-task :stop_dtr_server do
-  ruby "-I#{File.dirname(__FILE__) + "/lib"} #{File.dirname(__FILE__) + "/bin/dtr"} -S"
-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')
 }
 
 # ====================================================================
@@ -133,8 +94,52 @@ 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|
-    spec = eval(f.read)
+    data = f.read
+    spec = nil
+    Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
     package_task = Rake::GemPackageTask.new(spec) do |pkg|
       #pkg.need_zip = true
       #pkg.need_tar = true
@@ -176,11 +181,6 @@ task :lines do
   show_line("TOTAL", total_lines, total_code)
 end
 
-# Define an optional publish target in an external file.  If the
-# publish.rf file is not found, the publish targets won't be defined.
-
-load "publish.rf" if File.exist? "publish.rf"
-
 # Support Tasks ------------------------------------------------------
 
 RUBY_FILES = FileList['**/*.rb'].exclude('pkg')
@@ -212,162 +212,21 @@ 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 :noop
-
-desc "[rel, reuse, reltest] Make a new release"
-task :release => [
-  :prerelease,
-  :clobber,
-  :test_all,
-  :update_version,
-  :package,
-  :tag] do
-  
-  announce 
-  announce "**************************************************************"
-  announce "* Release #{$package_version} Complete."
-  announce "* Packages ready to upload."
-  announce "**************************************************************"
-  announce 
-end
-
-# Validate that everything is ready to go for a release.
-desc "[rel, reuse, reltest]"
-task :prerelease do |t, rel, reuse, reltest|
-  $package_version = rel
-  announce 
-  announce "**************************************************************"
-  announce "* Making RubyGem Release #{$package_version}"
-  announce "* (current version #{CURRENT_VERSION})"
-  announce "**************************************************************"
-  announce  
-
-  # Is a release number supplied?
-  unless rel
-    fail "Usage: rake release[X.Y.Z] [REUSE=tag_suffix]"
-  end
-
-  # Is the release different than the current release.
-  # (or is REUSE set?)
-  if $package_version == CURRENT_VERSION && ! reuse
-    fail "Current version is #{$package_version}, must specify REUSE=tag_suffix to reuse version"
-  end
-
-  # Are all source files checked in?
-  if reltest
-    announce "Release Task Testing, skipping checked-in file test"
-  else
-    announce "Checking for unchecked-in files..."
-    data = `svn st`
-    unless data =~ /^$/
-      abort "svn status is not clean ... do you have unchecked-in files?"
-    end
-    announce "No outstanding checkins found ... OK"
-  end
-end
-
-desc "[rel, reuse, reltest]"
-task :update_version => [:prerelease] do |t, rel, reuse, reltest|
-  if rel == CURRENT_VERSION
-    announce "No version change ... skipping version update"
-  else
-    announce "Updating DTR version to #{rel}"
-    open("lib/dtr.rb") do |dtrin|
-      open("lib/dtr.rb.new", "w") do |dtrout|
-        dtrin.each do |line|
-          if line =~ /^DTRVERSION\s*=\s*/
-            dtrout.puts "DTRVERSION = '#{rel}'"
-          else
-            dtrout.puts line
-          end
-        end
-      end
-    end
-    mv "lib/dtr.rb.new", "lib/dtr.rb"
-    if reltest
-      announce "Release Task Testing, skipping commiting of new version"
-    else
-      sh %{svn commit -m "Updated to version #{rel}" lib/dtr.rb} # "
-    end
-  end
-end
-
-desc "[rel, reuse, reltest] Tag all the CVS files with the latest release number (REL=x.y.z)"
-task :tag => [:prerelease] do |t, rel, reuse, reltest|
-  reltag = "REL_#{rel.gsub(/\./, '_')}"
-  reltag << reuse.gsub(/\./, '_') if reuse
-  announce "Tagging Repository with [#{reltag}]"
-  if reltest
-    announce "Release Task Testing, skipping CVS tagging"
-  else
-    sh %{svn copy svn+ssh://rubyforge.org/var/svn/dtr/trunk svn+ssh://rubyforge.org/var/svn/dtr/tags/#{reltag} -m 'Commiting release #{reltag}'}
-  end
-end
-
-desc "Install the jamis RDoc template"
-task :install_jamis_template do
-  require 'rbconfig'
-  dest_dir = File.join(Config::CONFIG['rubylibdir'], "rdoc/generators/template/html")
-  fail "Unabled to write to #{dest_dir}" unless File.writable?(dest_dir)
-  install "doc/jamis.rb", dest_dir, :verbose => true
-end
-
-task :c1 do
-  Dir.chdir('testdata') do
-    DTR.launch_runners(['c1'], nil)
-  end
-end
-
-task :c3 do
-  Dir.chdir('testdata') do
-    DTR.launch_runners(['c1', 'c2', 'c3'], nil)
-  end
-end
-task :c10 do
-  Dir.chdir('testdata') do
-    DTR.launch_runners(['c1', 'c2', 'c3', 'c4', 'c5', 'c6', 'c7', 'c8', 'c9', 'c10'], nil)
-  end
-end
-
-task :runners do
-  runners = DTR.runners
-  if runners.empty?
-    puts "No runner available!"
-  else
-    puts runners.collect{|r| r.name}.join(", ")
-  end
-end
-
-task :c2 do
-  DTROPTIONS[:names] = ['c1', 'c2']
-  DTROPTIONS[:setup] = nil
-  Dir.chdir('testdata') do
-    DTR.start_runners
-  end
-end
-
-task :server do
-  DTR.start_server
-end
-
-Rake::TestTask.new(:dtr) do |t|
-  t.libs << DTR.lib_path
-  t.test_files = FileList['dtr/inject_with_svn.rb', 'testdata/*.rb']
+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
   t.verbose = false
 end
 
 require 'dtr/raketasks'
 
-DTR::MPTask.new :mt do |t|
+DTR::TestTask.new do |t|
   t.test_files = FileList['testdata/*.rb']
-  t.processes = 2
+  t.processes = 0
+  t.package_files.include('**/*')
 end
-