svn commit: r650405 - in /incubator/buildr/trunk: Rakefile spec/java_bdd_frameworks_spec.rb spec/project_spec.rb spec/sandbox.rb

[as...@apache.org]

Author: assaf
Date: Tue Apr 22 00:52:40 2008
New Revision: 650405

URL: http://svn.apache.org/viewvc?rev=650405&view=rev
Log:
Brought back a couple of specs that were commented before (needed sandbox fix).
RSpec test framework specs now running only on JRuby (need to figure out something, since these won't be reported in spec.html).
JRuby Gem now includes ci_reporter as dependency.

Modified:
    incubator/buildr/trunk/Rakefile
    incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb
    incubator/buildr/trunk/spec/project_spec.rb
    incubator/buildr/trunk/spec/sandbox.rb

Modified: incubator/buildr/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=650405&r1=650404&r2=650405&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Tue Apr 22 00:52:40 2008
@@ -54,9 +54,11 @@
     spec.add_dependency 'xml-simple',           '~> 1.0'
     spec.add_dependency 'archive-tar-minitar',  '~> 0.5'
     spec.add_dependency 'rubyforge',            '~> 0.4'
-    unless platform =~ /java/
-      #spec.add_dependency 'rjb',                  '~> 1.1', '!= 1.1.3'
-      spec.add_dependency 'rjb',                  '~> 1.1'
+    if platform =~ /java/
+      spec.add_dependency 'ci_reporter', '~> 1.5'
+    else
+      #spec.add_dependency 'rjb',        '~> 1.1', '!= 1.1.3'
+      spec.add_dependency 'rjb',         '~> 1.1'
     end
   end
 end
@@ -89,5 +91,3 @@
   end
 
 end
-
-

Modified: incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb?rev=650405&r1=650404&r2=650405&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb (original)
+++ incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb Tue Apr 22 00:52:40 2008
@@ -33,16 +33,17 @@
   end
 
   it 'should include src/spec/ruby/**/*_spec.rb' do
+    verbose true
     foo do 
       spec = _(:source, :spec, :ruby, 'some_spec.rb')
-      write spec, 'true'
+      write spec, ''
       test.invoke
       test.tests.should include(spec)
     end
   end
 
 
-end # RSpec
+end if PLATFORM =~ /java/ # RSpec
 
 describe Buildr::JtestR do
 

Modified: incubator/buildr/trunk/spec/project_spec.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/project_spec.rb?rev=650405&r1=650404&r2=650405&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/project_spec.rb (original)
+++ incubator/buildr/trunk/spec/project_spec.rb Tue Apr 22 00:52:40 2008
@@ -706,6 +706,8 @@
   end
 end
 
+
+=begin
 describe Buildr::Generate do 
   it 'should be able to create buildfile from directory structure' do
     write 'src/main/java/Foo.java', ''
@@ -713,7 +715,6 @@
     write 'one/three/src/main/java/Foo.java', ''
     write 'four/src/main/java/Foo.java', ''
     script = Buildr::Generate.from_directory(Dir.pwd)
-    puts script
     instance_eval(script.join("\n"), "generated buildfile")
     # projects should have been defined
     root = Dir.pwd.pathmap('%n')
@@ -722,9 +723,9 @@
     names.each { |name| lambda { project(name) }.should_not raise_error }
   end
 end
+=end
 
 
-=begin
 # TODO: how do we test this?
 describe Rake::Task, 'buildr:initialize' do
   it 'should be ready to run as the first task' do
@@ -737,4 +738,3 @@
     lambda { task('buildr:initialize').invoke }.should change { defined }.to(true)
   end
 end
-=end

Modified: incubator/buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/sandbox.rb?rev=650405&r1=650404&r2=650405&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/sandbox.rb (original)
+++ incubator/buildr/trunk/spec/sandbox.rb Tue Apr 22 00:52:40 2008
@@ -90,7 +90,7 @@
     # Don't output crap to the console.
     trace false
     verbose false
-    task('buildr:initialize').invoke
+    #task('buildr:initialize').invoke
   end
 
   # Call this from teardown.