svn commit: r698300 - in /incubator/buildr/trunk/lib/buildr: groovy.rb java/bdd.rb

[vb...@apache.org]

Author: vborja
Date: Tue Sep 23 12:13:30 2008
New Revision: 698300

URL: http://svn.apache.org/viewvc?rev=698300&view=rev
Log:
Moved things around: Scala specific code is now under buildr/scala and Buildr::Scala namespace. Likewise, Groovy specific code under buildr/groovy and Buildr::Groovy.
Also organized specs by topic(?), so spec/java is separate from spec/packaging and spec/scala.

Modified:
    incubator/buildr/trunk/lib/buildr/groovy.rb
    incubator/buildr/trunk/lib/buildr/java/bdd.rb

Modified: incubator/buildr/trunk/lib/buildr/groovy.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/groovy.rb?rev=698300&r1=698299&r2=698300&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/groovy.rb (original)
+++ incubator/buildr/trunk/lib/buildr/groovy.rb Tue Sep 23 12:13:30 2008
@@ -15,4 +15,4 @@
 
 
 require 'buildr/groovy/compiler'
-require 'buildr/groovy/bdd'
\ No newline at end of file
+require 'buildr/groovy/bdd'

Modified: incubator/buildr/trunk/lib/buildr/java/bdd.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/bdd.rb?rev=698300&r1=698299&r2=698300&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/bdd.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/bdd.rb Tue Sep 23 12:13:30 2008
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
+require 'yaml'
 require 'buildr/java/tests'
 
 module Buildr
@@ -24,6 +24,9 @@
     class << self
       attr_reader :lang, :bdd_dir
     end
+
+    @bdd_dir = :spec
+    @lang = :java
     attr_accessor :lang, :bdd_dir
 
     def initialize(task, options)
@@ -159,7 +162,7 @@
     VERSION = '0.3.1' unless const_defined?('VERSION')
     JTESTR_ARTIFACT = "org.jtestr:jtestr:jar:#{VERSION}"
     
-    REQUIRES = [JTESTR_ARTIFACT] + JUnit::REQUIRES + TestNG::REQUIRES
+    # REQUIRES = [JTESTR_ARTIFACT] + JUnit::REQUIRES + TestNG::REQUIRES
 
     # pattern for rspec stories
     STORY_PATTERN    = /_(steps|story)\.rb$/
@@ -169,11 +172,23 @@
     EXPECT_PATTERN   = /_expect\.rb$/
 
     TESTS_PATTERN = [STORY_PATTERN, TESTUNIT_PATTERN, EXPECT_PATTERN] + RSpec::TESTS_PATTERN
+
+    class << self
+
+      def version
+        Buildr.settings.build['jtestr'] || VERSION
+      end
+
+      def dependencies
+        @dependencies ||= Array(super) + ["org.jtestr:jtestr:jar:#{version}"]
+      end
     
-    def self.applies_to?(project) #:nodoc:
-      File.exist?(project.path_to(:source, bdd_dir, lang, 'jtestr_config.rb')) ||
-        Dir[project.path_to(:source, bdd_dir, lang, '**/*.rb')].any? { |f| TESTS_PATTERN.any? { |r| r === f } } ||
-        JUnit.applies_to?(project) || TestNG.applies_to?(project)
+      def applies_to?(project) #:nodoc:
+        File.exist?(project.path_to(:source, bdd_dir, lang, 'jtestr_config.rb')) ||
+          Dir[project.path_to(:source, bdd_dir, lang, '**/*.rb')].any? { |f| TESTS_PATTERN.any? { |r| r === f } } ||
+          JUnit.applies_to?(project) || TestNG.applies_to?(project)
+      end
+      
     end
 
     def initialize(task, options) #:nodoc: