buildr 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.1.1 (5/16/2007)
+* Changed: Test case class names must end with Test, TestCase, Suite or 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 fixes. (Credit Paul Brown)
+* Fixed: You can now run rake test:<name> from any directory, and it will find just the right test cases.
+
 1.1.0 (5/13/2007)
 * Added: Proxy setting for downloading from remote repositories (use repositories.proxy = ...).
 * Added: projects task to list all the projects you can build.

data/lib/buildr.rb

@@ -32,7 +32,7 @@ end
 
 
 module Buildr
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end
 
 $LOAD_PATH.unshift __DIR__
@@ -71,5 +71,3 @@ Dir["#{Dir.pwd}/tasks/*.rake"].each do |file|
     $LOADED_FEATURES << file
   end
 end
-
-

data/lib/java/ant.rb

@@ -68,8 +68,6 @@ module Buildr
 
   end
 
-  class Project
-    include Ant
-  end
+  include Ant
 
 end

data/lib/java/java.rb

@@ -92,9 +92,8 @@ module Buildr
       # :call-seq:
       #   home() => path
       #
-      # Returns JAVA_HOME, fails if JAVA_HOME not set. Returns nil for OS/X, we just assume Java is in the path.
+      # Returns JAVA_HOME, fails if JAVA_HOME not set.
       def home()
-        return nil if darwin?
         @home ||= ENV["JAVA_HOME"] or fail "Are we forgetting something? JAVA_HOME not set."
       end
 
@@ -321,9 +320,8 @@ module Buildr
       #   path_to_bin(cmd?) => path
       #
       # Returns the path to the specified Java command (with no argument to java itself).
-      # Uses JAVA_HOME if set, otherwise assumes the command is accessible from the path.
       def path_to_bin(name = "java")
-        home ? File.join(home, "bin", name) : File.join("bin", name)
+        File.join(home, "bin", name)
       end
 
   protected

data/lib/java/test.rb

@@ -98,11 +98,15 @@ module Buildr
 
     private
 
+      def test_finding_pattern()
+        "*{Test,TestCase,Suite,TestSuite}"
+      end
+
       def test_cases()
         unless @cases
           @cases = @paths.map do |path|
             base = Pathname.new(path.to_s)
-            FileList["#{path}/**/*.class"].
+            FileList["#{path}/**/#{test_finding_pattern}.class"].
               map { |file| Pathname.new(file).relative_path_from(base).to_s.ext("").gsub(File::SEPARATOR, ".") }.
               select { |name| @include.any? { |pattern| File.fnmatch(pattern, name) } }.
               reject { |name| @exclude.any? { |pattern| File.fnmatch(pattern, name) } }
@@ -318,9 +322,18 @@ module Buildr
   # will run the test case class com.example.MyTest, if found in the current project.
   rule /^test:.*$/ do |task|
     test = task.name.scan(/test:(.*)/)[0][0]
+    # Glob if no glob pattern used.
     test = "*#{test}*" unless test =~ /\*/
-    Project.local_projects.map { |project| project.test }.
-      each { |task| task.junit.instance_eval { @include = [test] ; @exclude.clear } }.each(&:invoke)
+    if test =~ /\{.+\}/
+      # Unfortunately, fnmatch doesn't do {foo,bar}, so we have to expand those ourselves.
+      tests = test[/\{.+\}/][1...-1].split(",").map { |name| test.sub(/\{.+\}/, name) }
+    else
+      tests = [test]
+    end
+    # Since the test case may reside in a sub-project, we need to set the include/exclude pattern on
+    # all sub-projects, but only invoke test on the local project.
+    Project.projects.each { |project| project.test.junit.instance_eval { @include = tests ; @exclude.clear } }
+    Project.local_projects.each { |project| project.test.invoke }
   end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-05-13 00:00:00 -07:00
+  version: 1.1.1
+date: 2007-05-16 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib