buildr 1.3.2 → 1.3.3

data/CHANGELOG

@@ -1,3 +1,64 @@
+1.3.3 (2008-10-08)
+* Added:  JtestR support. Implemented pending jtestr specs.
+* Added:  Growl notifications (OS X only).
+* Added:  error, info and trace methods.
+* Added:  Release task support for alternative SVN repository layout
+          (e.g., http://my.repo.org/trunk/foo).
+* Added:  BUILDR-128 Emma support
+* Added:  BUILDR-135. Extracted reusable replacement logic into Filter::Mapper
+* Added:  BUILDR-148 It is now possible to set the version of various 3rd
+          party libraries from the build.yml file.  Supported libraries
+          include Ant and the various test and BDD frameworks.
+* Change: Error reporting now shows 'buildr aborted!' (used to say rake),
+          more of the stack trace without running --trace, and when running
+          with supported terminal, error message is red.
+* Change: Eclipse task updated to documented Scala plugin requirements
+          (http://www.scala-lang.org/node/94)
+* Change: Buildr.application.buildfile returns a task instead of a String.
+* Change: BUILDR-104 Buildr::group has :under and :version, but not :type.
+          Now it has :type too (Lacton).
+* Change: BUILDR-139 Incremental test run.
+* Change: BUILDR-141 Removed NEXT_VERSION from release task.
+* Change: BUILDR-148 ant-junit no longer included in root classpath, but
+          specified during taskdef.
+* Change: BUILDR-153 To customize the SVN tag used by the release task, set
+          Release.tag_name to either the tag value or a proc that takes the
+          version number and return the desired tag.
+* Fixed:  Should not display "(in `pwd`, development)" when using --quiet.
+* Fixed:  Release task's regexp to find either THIS_VERSION and VERSION_NUMBER.
+* Fixed:  BUILDR-106 download(artifact(...)=>url) broken in certain cases
+          (Lacton).
+* Fixed:  BUILDR-108 Trace to explain why a compile is done (Lacton).
+* Fixed:  BUILDR-109 Failure of "Buildr::Filter should respond to :include and
+          use these inclusion patterns" (Lacton).
+* Fixed:  BUILDR-110 Error creating buildfile from POM when missing plugin
+          configuration (Geoffrey Ruscoe).
+* Fixed:  BUILDR-112 Using a user gem repository with 'rake setup' (Lacton).
+* Fixed:  BUILDR-114 Hash.from_java_properties does not behave
+          like java.util.Properties (Lacton).
+* Fixed:  BUILDR-116: TestTask should include the main compile target in its
+          dependencies, even when using non standard directories (Lacton).
+* Fixed:  BUILDR-117 Shared directory for both code and resources produces 
+          duplicate Eclipse classpath entries (Nathan Hamblen)
+* Fixed:  BUILDR-119 Eclipse task does not accept test resource folders
+          (Lacton)
+* Fixed:  BUILDR-122: eclipse task should not check for directory existence
+* Fixed:  BUILDR-123: eclipse task should honor ResourceTask's target directory
+* Fixed:  BUILDR-124 unzip(...).from_path does not work correctly without
+          include (Rhett Sutphin).
+* Fixed:  BUILDR-126  Tests options are shared between unrelated projects when
+          using #options instead of #using (Lacton).
+* Fixed:  BUILDR-129. Modifying a project manifest should not alter it's
+          parent project manifest.
+* Fixed:  BUILDR-137 JRuby 1.1.3 and Buildr 1.3.2 don't appear to work
+          (on Windows).
+* Fixed:  BUILDR-138 ScalaTest premature use of Buildr::Repositories
+          inconsistent with customizing locations.
+* Fixed:  BUILDR-152 Project.task fails when task name starts with a colon.
+* Fixed:  BUILDR-157 Tasks library not loaded from a submodule. 
+* Docs:   BUILDR-111 Troubleshoot tip when Buildr's bin directory shows up in
+          RUBYLIB (Geoffrey Ruscoe).
+
 1.3.2 (2008-07-18)
 * Added: --prereqs command line argument to show all tasks and their
 dependencies. You can also follow with regular expression to narrow down the
@@ -18,7 +79,8 @@ load Pageant DLLs when running on JRuby/Windows.
 * Fixed: BUILDR-89 JUnit (and all other Java frameworks) no longer include
 abstract classes.
 * Fixed: BUILDR-90 Installing from source doesn't work with JRuby.
-* Fixed: BUILDR-91 When doing a release, buildr should spawn the same version of buildr
+* Fixed: BUILDR-91 When doing a release, buildr should spawn the same version
+of buildr
 * Fixed: BUILDR-92 IDEA 7x: add resources directories to classpath.
 * Fixed: BUILDR-95: Only download Scala test framework artifacts when required
 * Fixed: BUILDR-100 Directory structure documentation needs updating.
@@ -398,7 +460,7 @@ will come in due time (and it's not always necessary anyway).
 buildr/jdepend)
 * Added: Cobertura test coverage tasks, reporting both html and xml. (Requires
 buildr/cobertura)
-* Changed: tools_jar now returns empty array on OS/X, part of the ongoing
+* Changed: tools_jar now returns empty array on OS X, part of the ongoing
 Write Once/Test Everywere effort. (Credit Paul Brown)
 * Fixed: Work around keep_alive bug in Net::HTTP.
 (http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/10818)
@@ -408,7 +470,7 @@ Write Once/Test Everywere effort. (Credit Paul Brown)
 TestSuite.
 * Changed: You can now run rake test:{foo,bar} to match against either foo or
 bar (requires \{..\} on UNIX).
-* Changed: JAVA_HOME now required on all platforms, along with more OS/X
+* Changed: JAVA_HOME now required on all platforms, along with more OS X
 fixes. (Credit Paul Brown)
 * Fixed: You can now run rake test:<name> from any directory, and it will find
 just the right test cases.
@@ -436,7 +498,7 @@ projects on a project instead.
 * Fixed: Local directory tasks now work from any directory in the project.
 * Fixed: Artifacts no longer created with timestamp from server.
 * Fixed: Buildr no longer fails when run without tools.jar or JAVA_HOME
-(OS/X). (Credit Lyle Johnson)
+(OS X). (Credit Lyle Johnson)
 * Fixed: Manifest gets EOL to keep EOF company. (Credit Tommy Knowlton)
 * Fixed: Compile tasks clean after themselves when target directory changed.
 (Credit Lyle Johnson)

data/{README → README.rdoc}

@@ -20,7 +20,7 @@ Make sure to set JAVA_HOME environment variable first, then:
 
   gem install buildr
 
-(Use sudo for Linux and OS/X)
+(Use sudo for Linux and OS X)
 
 More installation and setup instructions available online
 http://incubator.apache.org/buildr/
@@ -35,13 +35,9 @@ http://incubator.apache.org/buildr/
 
 === Mailing list
 
-* Users: buildr-user@incubator.apache.org (subscribe:
-buildr-user-subscribe@incubator.apache.org, archive:
-http://mail-archives.apache.org/mod_mbox/incubator-buildr-user/
+Users: http://mail-archives.apache.org/mod_mbox/incubator-buildr-user/
 
-* Developers: buildr-dev@incubator.apache.org (subscribe:
-buildr-dev-subscribe@incubator.apache.org, archive:
-http://mail-archives.apache.org/mod_mbox/incubator-buildr-dev/
+Developers: http://mail-archives.apache.org/mod_mbox/incubator-buildr-dev/
 
 Create your own Buildfile and start living the life!
 
@@ -83,7 +79,7 @@ point to your JDK distribution.  Next, use Ruby Gem to install Buildr:
 
 When prompted for a platform, select ruby.
 
-=== OS/X
+=== OS X
 
 Leopard includes the latest version of Ruby, if you are using Tiger or an older
 release, we recommend re-installing the latest:
@@ -106,6 +102,10 @@ You can check the latest sources from SVN:
 Or browse the SVN repository online:
 http://svn.apache.org/repos/asf/incubator/buildr
 
+If you prefer Git, a Git fork is available from http://github.com/vic/buildr/tree/master:
+
+  git clone git://github.com/vic/buildr.git
+
 To install Buildr locally from source:
 
   cd buildr
@@ -117,17 +117,30 @@ which changes might have broken your build.  To run all the test cases:
   rake spec
 
 
-== Disclaimer
-
-:include:DISCLAIMER
-
-
 == License
 
-:include:LICENSE
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with this
+work for additional information regarding copyright ownership.  The ASF
+licenses this file to you 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
 
-== Notice
+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.
 
-:include:NOTICE
 
+== Disclaimer
+
+Apache Buildr is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
+all newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized in
+a manner consistent with other successful ASF projects. While incubation status
+is not necessarily a reflection of the completeness or stability of the code,
+it does indicate that the project has yet to be fully endorsed by the ASF.

data/Rakefile

@@ -16,28 +16,19 @@
 
 require 'rake/gempackagetask'
 
-def spec(platform = nil)
-  @specs ||= {}
-  platform ||= RUBY_PLATFORM =~ /java/ ? 'java' : 'ruby'
-  @specs[platform] ||= begin
-    spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
-    spec.platform = platform
-    if platform =~ /java/
-      spec.add_dependency 'jruby-openssl', '0.2'
-      spec.add_dependency 'ci_reporter', '1.5.1' # must come after builder dependency
-    else
-      # Place first on the dependency list, otherwise AntWrap picks the latest RJB.
-      spec.dependencies.unshift Gem::Dependency.new('rjb', '1.1.2')
-    end
-    spec
-  end
+def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
+  @specs ||= ['ruby', 'java'].inject({}) { |hash, platform|
+    $platform = platform
+    hash.update(platform=>Gem::Specification.load('buildr.gemspec'))
+  }
+  @specs[platform]
 end
 
 
 desc 'Compile Java libraries used by Buildr'
 task 'compile' do
   puts 'Compiling Java libraries ...'
-  sh Config::CONFIG['ruby_install_name'], '-Ilib', '-Iaddon', 'bin/buildr', 'compile'
+  sh File.expand_path('_buildr'), '--buildfile=buildr.buildfile', 'compile'
   puts 'OK'
 end
 file Rake::GemPackageTask.new(spec).package_dir=>'compile'
@@ -52,10 +43,10 @@ end
 ENV['incubating'] = 'true'
 ENV['staging'] = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
 
-task 'apache:license'=>spec.files
-#task('apache:license').prerequisites.exclude( ..not ASL.. )
+task('apache:license').enhance FileList[spec.files].exclude('.class', '.png', '.jar', '.tif', '.textile', '.icns',
+   'README', 'LICENSE', 'CHANGELOG', 'DISCLAIMER', 'NOTICE', 'etc/KEYS', 'etc/git-svn-authors')
 
-task 'spec:check' do
+task 'stage:check' do
   print 'Checking that we have JRuby, Scala and Groovy available ... '
   fail 'Full testing requires JRuby!' unless which('jruby')
   fail 'Full testing requires Scala!' unless which('scala')
@@ -63,4 +54,9 @@ task 'spec:check' do
   puts 'OK'
 end
 
-
+task 'stage:check' do
+  # Dependency check for the other platform, i.e. if making a release with Ruby,
+  # run dependency checks with JRuby. (Also, good opportunity to upgrade other
+  # platform's dependencies)
+  sh RUBY_PLATFORM =~ /java/ ? 'ruby' : 'jruby -S rake setup dependency'
+end

data/_buildr

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you 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.
+
+# Run buildr from source, specifically for testing stuff without doing a rake install.
+# The _BUILDR_RB environment variable can be used to set the path to the ruby/jruby executable.
+# For example to use jruby:
+#   export _BUILDR_RB=/path/to/jruby
+
+start = Time.now
+require 'rubygems'
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib') << File.join(File.dirname(__FILE__), 'addon')
+spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
+spec.dependencies.each do |dep|
+  gem dep.name, dep.version_requirements.to_s
+end
+require 'buildr'
+Buildr.application.run
+if verbose
+  elapsed = Time.now - start
+  real = []
+  real << ("%ih" % (elapsed / 3600)) if elapsed >= 3600
+  real << ("%im" % ((elapsed / 60) % 60)) if elapsed >= 60
+  real << ("%.3fs" % (elapsed % 60))
+  puts $terminal.color("Completed in #{real.join}", :green)
+end

data/addon/buildr/cobertura.rb

@@ -42,7 +42,7 @@ module Buildr
     class << self
 
       REQUIRES = ["net.sourceforge.cobertura:cobertura:jar:1.9", "log4j:log4j:jar:1.2.9",
-        "asm:asm:jar:2.2.1", "asm:asm-tree:jar:2.2.1", "oro:oro:jar:2.0.8"]
+        "asm:asm:jar:2.2.1", "asm:asm-tree:jar:2.2.1", "oro:oro:jar:2.0.8"] unless const_defined?('REQUIRES')
 
       def requires()
         @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
@@ -125,47 +125,57 @@ module Buildr
         cobertura = project.cobertura
         
         namespace 'cobertura' do
-          # Instrumented bytecode goes in a different directory. This task creates before running the test
-          # cases and monitors for changes in the generate bytecode.
-          instrumented = project.file(cobertura.instrumented_dir => file(project.compile.target)) do |task|
-            mkdir_p task.to_s, :verbose => false
-            unless project.compile.sources.empty?
-              puts "Instrumenting classes with cobertura data file #{cobertura.data_file}"
-              Buildr.ant "cobertura" do |ant|
-                ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-                ant.send "cobertura-instrument", :todir=>task.to_s, :datafile=>cobertura.data_file do
-                  includes, excludes = cobertura.includes, cobertura.excludes
-                  
-                  classes_dir = project.compile.target.to_s
-                  if includes.empty? && excludes.empty? 
-                    ant.fileset :dir => classes_dir do 
-                      ant.include :name => "**/*.class"
-                    end
-                  else
-                    includes = [//] if includes.empty?
-                    Dir.glob(File.join(classes_dir, "**/*.class")) do |cls|
-                      cls_name = cls.gsub(/#{classes_dir}\/?|\.class$/, '').gsub('/', '.')
-                      if includes.any? { |p| p === cls_name } && !excludes.any? { |p| p === cls_name }
-                        ant.fileset :file => cls
+          unless project.compile.target.nil?
+            # Instrumented bytecode goes in a different directory. This task creates before running the test
+            # cases and monitors for changes in the generate bytecode.
+            instrumented = project.file(cobertura.instrumented_dir => project.compile.target) do |task|
+              mkdir_p task.to_s, :verbose => false
+              unless project.compile.sources.empty?
+                info "Instrumenting classes with cobertura data file #{cobertura.data_file}"
+                Buildr.ant "cobertura" do |ant|
+                  ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
+                  ant.send "cobertura-instrument", :todir=>task.to_s, :datafile=>cobertura.data_file do
+                    includes, excludes = cobertura.includes, cobertura.excludes
+                    
+                    classes_dir = project.compile.target.to_s
+                    if includes.empty? && excludes.empty? 
+                      ant.fileset :dir => classes_dir do 
+                        ant.include :name => "**/*.class"
+                      end
+                    else
+                      includes = [//] if includes.empty?
+                      Dir.glob(File.join(classes_dir, "**/*.class")) do |cls|
+                        cls_name = cls.gsub(/#{classes_dir}\/?|\.class$/, '').gsub('/', '.')
+                        if includes.any? { |p| p === cls_name } && !excludes.any? { |p| p === cls_name }
+                          ant.fileset :file => cls
+                        end
                       end
                     end
                   end
                 end
               end
+              touch task.to_s, :verbose=>false
             end
-            touch task.to_s, :verbose=>false
-          end
-
-          task 'instrument' => instrumented
-          [:xml, :html].each do |format|
-            task format => ['instrument', 'test'] do 
-              puts "Creating test coverage reports in #{cobertura.report_to(format)}"
-              Buildr.ant "cobertura" do |ant|
-                ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-                ant.send "cobertura-report", :format=>format, 
-                         :destdir=>cobertura.report_to(format), :datafile=>cobertura.data_file do
-                  cobertura.sources.flatten.each do |src|
-                    ant.fileset(:dir=>src.to_s) if File.exist?(src.to_s)
+            
+            task 'instrument' => instrumented
+            
+            # We now have two target directories with bytecode. It would make sense to remove compile.target
+            # and add instrumented instead, but apparently Cobertura only creates some of the classes, so
+            # we need both directories and instrumented must come first.
+            project.test.dependencies.unshift cobertura.instrumented_dir
+            project.test.with Cobertura.requires
+            project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = cobertura.data_file
+            
+            [:xml, :html].each do |format|
+              task format => ['instrument', 'test'] do 
+                info "Creating test coverage reports in #{cobertura.report_to(format)}"
+                Buildr.ant "cobertura" do |ant|
+                  ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
+                  ant.send "cobertura-report", :format=>format, 
+                    :destdir=>cobertura.report_to(format), :datafile=>cobertura.data_file do
+                    cobertura.sources.flatten.each do |src|
+                      ant.fileset(:dir=>src.to_s) if File.exist?(src.to_s)
+                    end
                   end
                 end
               end
@@ -174,13 +184,6 @@ module Buildr
           
         end
 
-        # We now have two target directories with bytecode. It would make sense to remove compile.target
-        # and add instrumented instead, but apparently Cobertura only creates some of the classes, so
-        # we need both directories and instrumented must come first.
-        project.test.dependencies.unshift cobertura.instrumented_dir
-        project.test.with Cobertura.requires
-        project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = cobertura.data_file
-        
         project.clean do
           rm_rf [cobertura.report_to, cobertura.data_file, cobertura.instrumented_dir], :verbose=>false
         end
@@ -199,7 +202,8 @@ module Buildr
         Buildr.projects.each do |project|
           project.cobertura.data_file = data_file
           project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = data_file
-          project.task('cobertura:instrument').invoke
+          instrument_task ="#{project.name}:cobertura:instrument"
+          task(instrument_task).invoke if Rake::Task.task_defined?(instrument_task)
         end
       end
       
@@ -207,7 +211,7 @@ module Buildr
         report_target = report_to(format)
         desc "Run the test cases and produce code coverage reports in #{report_target}"
         task format => ["instrument", "test"] do
-          puts "Creating test coverage reports in #{report_target}"
+          info "Creating test coverage reports in #{report_target}"
           Buildr.ant "cobertura" do |ant|
             ant.taskdef :classpath=>requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
             ant.send "cobertura-report", :destdir=>report_target, :format=>format, :datafile=>data_file do

data/addon/buildr/emma.rb

@@ -0,0 +1,238 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you 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.
+
+
+require 'buildr/java'
+
+
+module Buildr
+
+  # Provides the <code>emma:html</code> and <code>emma:xml</code> tasks.
+  # Require explicitly using <code>require "buildr/emma"</code>.
+  #
+  # You can generate emma reports for a single project 
+  # using the project name as prefix:
+  #
+  #   project_name:emma:html
+  #
+  # You can also specify which classes to include/exclude from instrumentation by 
+  # passing a class name regexp to the <code>emma.include</code> or 
+  # <code>emma.exclude</code> methods. 
+  # 
+  #   define 'someModule' do 
+  #      emma.include 'some.package.*'
+  #      emma.exclude 'some.foo.util.SimpleUtil'
+  #   end
+  module Emma
+
+    class << self
+
+      REQUIRES = ['emma:emma_ant:jar:2.0.5312', 'emma:emma:jar:2.0.5312'] unless const_defined?('REQUIRES')
+
+      def requires()
+        @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
+      end
+
+      def report_to format=nil
+        File.expand_path('reports/emma')
+      end
+
+      def data_file()
+        File.join(report_to, 'coverage.es')
+      end
+
+      def ant
+          Buildr.ant 'emma' do |ant|
+            ant.taskdef :classpath=>requires.join(File::PATH_SEPARATOR), :resource=>'emma_ant.properties'
+            ant.emma :verbosity=>(Buildr.application.options.trace ? 'verbose' : 'warning') do
+              yield ant
+            end
+          end
+      end
+    end
+    
+    class EmmaConfig # :nodoc:
+      
+      def initialize(project)
+        @project = project
+      end
+      
+      attr_reader :project
+      private :project
+
+      attr_writer :metadata_file, :coverage_file, :instrumented_dir, :report_dir
+      
+      def coverage_file
+        @coverage_file ||= File.join(report_dir, 'coverage.ec')
+      end
+
+      def metadata_file
+        @metadata_file ||= File.join(report_dir, 'coverage.em')
+      end
+
+      def instrumented_dir
+        @instrumented_dir ||= project.path_to(:target, :instrumented, :classes)
+      end
+
+      def report_dir
+        @report_dir ||= project.path_to(:reports, :emma)
+      end
+      
+      def report_to format
+        report_dir
+      end
+
+      # :call-seq:
+      #   project.emma.include(*classPatterns)
+      #
+      def include(*classPatterns)
+        includes.push(*classPatterns)
+        self
+      end
+      
+      def includes
+        @includeClasses ||= []
+      end
+
+      # :call-seq:
+      #   project.emma.exclude(*classPatterns)
+      #
+      def exclude(*classPatterns)
+        excludes.push(*classPatterns)
+        self
+      end
+
+      def excludes
+        @excludeClasses ||= []
+      end
+
+      def sources
+        project.compile.sources
+      end
+    end
+
+    module EmmaExtension # :nodoc:
+      include Buildr::Extension
+
+      def emma
+        @emma_config ||= EmmaConfig.new(self)
+      end
+
+      after_define do |project|
+        emma = project.emma
+        
+        namespace 'emma' do
+          unless project.compile.target.nil?
+            # Instrumented bytecode goes in a different directory. This task creates before running the test
+            # cases and monitors for changes in the generate bytecode.
+            instrumented = project.file(emma.instrumented_dir => project.compile.target) do |task|
+              unless project.compile.sources.empty?
+                info "Instrumenting classes with emma metadata file #{emma.metadata_file}"
+                Emma.ant do |ant|
+                  ant.instr :instrpath=>project.compile.target.to_s, :destdir=>task.to_s, :metadatafile=>emma.metadata_file do
+                    ant.filter :includes=>emma.includes.join(', ') unless emma.includes.empty?
+                    ant.filter :excludes=>emma.excludes.join(', ') unless emma.excludes.empty?
+                  end
+                end
+                touch task.to_s, :verbose=>false
+              end
+            end
+            
+            task 'instrument' => instrumented
+            
+            # We now have two target directories with bytecode.
+            project.test.dependencies.unshift emma.instrumented_dir
+            project.test.with Emma.requires
+            project.test.options[:properties]["emma.coverage.out.file"] = emma.coverage_file
+            
+            [:xml, :html].each do |format|
+              task format => ['instrument', 'test'] do
+                missing_required_files = [emma.metadata_file, emma.coverage_file].reject { |f| File.exist?(f) }
+                if missing_required_files.empty?
+                  info "Creating test coverage reports in #{emma.report_dir}"
+                  mkdir_p emma.report_dir, :verbose=>false
+                  Emma.ant do |ant|
+                    ant.report do
+                      ant.infileset :file=>emma.metadata_file
+                      ant.infileset :file=>emma.coverage_file
+                      ant.send format, :outfile=>File.join(emma.report_to(format),"coverage.#{format}")
+                      ant.sourcepath do
+                        emma.sources.flatten.each do |src|
+                          ant.dirset(:dir=>src.to_s) if File.exist?(src.to_s)
+                        end
+                      end
+                    end
+                  end
+                else
+                  info "No test coverage report for #{project}. Missing: #{missing_required_files.join(', ')}"
+                end
+              end
+            end
+          end
+        end
+
+        project.clean do
+          rm_rf [emma.report_dir, emma.coverage_file, emma.metadata_file, emma.instrumented_dir], :verbose=>false
+        end
+        
+      end
+      
+    end
+
+    class Buildr::Project
+      include EmmaExtension
+    end
+
+    namespace "emma" do
+
+      Project.local_task('instrument') { |name| "Instrumenting #{name}" }
+      
+      [:xml, :html].each do |format|
+        desc "Run the test cases and produce code coverage reports in #{format}"
+        task format => ['instrument', 'test'] do
+          info "Creating test coverage reports in #{format}"
+          mkdir_p report_to(format), :verbose=>false
+          Emma.ant do |ant|
+            ant.merge :outfile=>data_file do
+              Buildr.projects.each do |project|
+                [project.emma.metadata_file, project.emma.coverage_file].each do |data_file|
+                  ant.fileset :file=>data_file if File.exist?(data_file)
+                end
+              end
+            end
+            ant.report do
+              ant.infileset :file=>data_file
+              ant.send format, :outfile=>File.join(report_to(format), "coverage.#{format}")
+              ant.sourcepath do
+                Buildr.projects.map(&:emma).map(&:sources).flatten.map(&:to_s).each do |src|
+                  ant.dirset :dir=>src if File.exist?(src)
+                end    
+              end
+            end
+          end
+        end
+      end
+      
+      task :clean do
+        rm_rf [report_to, data_file], :verbose=>false
+      end
+      end
+
+    task :clean do
+      task('emma:clean').invoke if Dir.pwd == Rake.application.original_dir
+    end
+
+  end
+end