Author: assaf
Date: Fri Apr 25 00:59:24 2008
New Revision: 651524
URL: http://svn.apache.org/viewvc?rev=651524&view=rev
Log:
Fixed the way rsync is handled, tested staging tasks
Modified:
incubator/buildr/trunk/rakelib/apache.rake
incubator/buildr/trunk/rakelib/release.rake
incubator/buildr/trunk/rakelib/rspec.rake
incubator/buildr/trunk/rakelib/stage.rake
Modified: incubator/buildr/trunk/rakelib/apache.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/apache.rake?rev=651524&r1=651523&r2=651524&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/apache.rake (original)
+++ incubator/buildr/trunk/rakelib/apache.rake Fri Apr 25 00:59:24 2008
@@ -82,7 +82,7 @@
target = args.incubating ?
"people.apache.org:/www/incubator.apache.org/#{spec.name}" :
"people.apache.org:/www/#{spec.name}.apache.org"
puts 'Uploading Apache Web site ...'
- sh 'rsync', '--progress', 'published/distro/site/', target
+ sh 'rsync', '--progress', '--recursive', '--delete',
'published/distro/site/', target
puts 'Done'
end
Modified: incubator/buildr/trunk/rakelib/release.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/release.rake?rev=651524&r1=651523&r2=651524&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/release.rake (original)
+++ incubator/buildr/trunk/rakelib/release.rake Fri Apr 25 00:59:24 2008
@@ -17,7 +17,7 @@
file 'published' do |task, args|
mkpath task.name
puts "Populating published directory from #{args.staging} ..."
- sh 'rsync', '--progress', "#{args.staging}/", 'published'
+ sh 'rsync', '--progress', '--recursive', "#{args.staging}/", 'published'
puts 'Done'
end
Modified: incubator/buildr/trunk/rakelib/rspec.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/rspec.rake?rev=651524&r1=651523&r2=651524&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/rspec.rake (original)
+++ incubator/buildr/trunk/rakelib/rspec.rake Fri Apr 25 00:59:24 2008
@@ -62,21 +62,6 @@
sh 'jruby -S rake spec'
end
- task 'prepare'=>'spec' do
- print 'Checking we have specs report .... '
- fail 'No specifications in reports directory!' unless
File.exist?('reports/specs.html')
- puts 'OK'
- end
- task 'prepare'=>RUBY_PLATFORM =~ /java/ ? 'ruby' : 'jruby'
- # TODO: Add Rcov when we get it implemented.
-=begin
- task 'prepare'=>'rcov' do
- print 'Checking we have coverage report .... '
- fail 'No coverage in reports directory!' unless
File.exist?('reports/coverage')
- puts 'OK'
- end
-=end
-
end
task 'setup' do
@@ -85,10 +70,12 @@
rescue LoadError
puts 'Please run rake setup to install RSpec'
- task 'release:check' do
+ task 'stage:check' do
fail 'Please run rake setup to install RSpec'
end
end
-task 'release:prepare'=>'spec:prepare'
+task 'stage:prepare'=>'spec'
+task 'stage:prepare'=>RUBY_PLATFORM =~ /java/ ? 'spec:ruby' : 'spec:jruby'
+# TODO: Add Rcov when we get it implemented.
Modified: incubator/buildr/trunk/rakelib/stage.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/stage.rake?rev=651524&r1=651523&r2=651524&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/stage.rake (original)
+++ incubator/buildr/trunk/rakelib/stage.rake Fri Apr 25 00:59:24 2008
@@ -36,7 +36,7 @@
# stage:upload moves the stage directory to the staging server.
task 'upload' do |task, args|
puts "Uploading staged directory to #{args.staging} ..."
- sh 'rsync', '--progress', 'staged/', args.staging
+ sh 'rsync', '--progress', '--recursive', 'staged/', args.staging
puts 'Done'
end
end
