svn commit: r820488 - in /buildr/trunk: CHANGELOG lib/buildr/groovy/bdd.rb spec/groovy/bdd_spec.rb

[bo...@apache.org]

Author: boisvert
Date: Wed Sep 30 22:58:35 2009
New Revision: 820488

URL: http://svn.apache.org/viewvc?rev=820488&view=rev
Log:
BUILDR-181: Upgrade to easyb 0.9 (Joel Muzzerall)

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/groovy/bdd.rb
    buildr/trunk/spec/groovy/bdd_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=820488&r1=820487&r2=820488&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Sep 30 22:58:35 2009
@@ -11,6 +11,7 @@
 * Change: Upgraded to rubyforge-1.0.5 and net-ssh 2.0.15
 * Change: Monkey-Patched FileUtils::sh on JRuby to use POSIX `system`
 * Change: Updated to Rake 0.8.7, RSpec 1.2.6 and JRuby-openssl 0.5.1.
+* Change: Updated to easyb 0.9 (Joel Muzzerall)
 * Fixed:  BUILDR-23 Support for setting file mode when packaging (Ittay Dror).
 * Fixed:  BUILDR-278 tasks/*.rake files are loaded after the buildfile (Rhett Sutphin)
 * Fixed:  BUILDR-282 release goal should not strip leading '0' digits from version numbers.

Modified: buildr/trunk/lib/buildr/groovy/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/groovy/bdd.rb?rev=820488&r1=820487&r2=820488&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/groovy/bdd.rb (original)
+++ buildr/trunk/lib/buildr/groovy/bdd.rb Wed Sep 30 22:58:35 2009
@@ -23,7 +23,7 @@
   # 
   # This framework will search in your project for:
   #   src/spec/groovy/**/*Story.groovy
-  #   src/spec/groovy/**/*Behavior.groovy
+  #   src/spec/groovy/**/*Specification.groovy
   #
   # Support the following options:
   # * :format -- Report format :txt or :xml, default is :txt
@@ -33,8 +33,8 @@
     @lang = :groovy
     @bdd_dir = :spec
 
-    VERSION = "0.7"
-    TESTS_PATTERN = [ /(Story|Behavior).groovy$/ ]
+    VERSION = "0.9"
+    TESTS_PATTERN = [ /(Story|Specification).groovy$/ ]
     OPTIONS = [:format, :properties, :java_args]
 
     class << self
@@ -50,7 +50,7 @@
 
       def applies_to?(project) #:nodoc:
         %w{
-          **/*Behaviour.groovy **/*Behavior.groovy **/*Story.groovy
+          **/*Specification.groovy **/*Story.groovy
         }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
       end
 
@@ -78,7 +78,7 @@
         raise "Invalid format #{options[:format]} expected one of :txt :xml"
       end
     
-      cmd_args = [ 'org.disco.easyb.SpecificationRunner' ]
+      cmd_args = [ 'org.disco.easyb.BehaviorRunner' ]
       cmd_options = { :properties => options[:properties],
                       :java_args => options[:java_args],
                       :classpath => dependencies }

Modified: buildr/trunk/spec/groovy/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/groovy/bdd_spec.rb?rev=820488&r1=820487&r2=820488&view=diff
==============================================================================
--- buildr/trunk/spec/groovy/bdd_spec.rb (original)
+++ buildr/trunk/spec/groovy/bdd_spec.rb Wed Sep 30 22:58:35 2009
@@ -31,11 +31,11 @@
 
   it 'should apply to a project having EasyB sources' do
     define('one', :base_dir => 'one') do
-      write _('src/spec/groovy/SomeBehaviour.groovy'), 'true;'
+      write _('src/spec/groovy/SomeSpecification.groovy'), 'true;'
       Buildr::Groovy::EasyB.applies_to?(self).should be_true
     end
     define('two', :base_dir => 'two') do
-      write _('src/test/groovy/SomeBehaviour.groovy'), 'true;'
+      write _('src/test/groovy/SomeSpecification.groovy'), 'true;'
       Buildr::Groovy::EasyB.applies_to?(self).should be_false
     end
     define('three', :base_dir => 'three') do
@@ -54,14 +54,14 @@
 
   it 'should select a java compiler if java sources are found' do
     foo do
-      write _('src/spec/java/SomeBehavior.java'), 'public class SomeBehavior {}'
+      write _('src/spec/java/SomeSpecification.java'), 'public class SomeSpecification {}'
       test.compile.language.should eql(:java)
     end
   end
   
-  it 'should include src/spec/groovy/*Behavior.groovy' do
+  it 'should include src/spec/groovy/*Specification.groovy' do
     foo do 
-      spec = _('src/spec/groovy/SomeBehavior.groovy')
+      spec = _('src/spec/groovy/SomeSpecification.groovy')
       write spec, 'true'
       test.invoke
       test.tests.should include(spec)
@@ -77,4 +77,4 @@
     end
   end
   
-end # EasyB
\ No newline at end of file
+end # EasyB