You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by as...@apache.org on 2009/02/13 10:15:18 UTC
svn commit: r744048 - in /buildr/trunk: .gitignore rakelib/doc.rake
rakelib/rspec.rake
Author: assaf
Date: Fri Feb 13 09:15:17 2009
New Revision: 744048
URL: http://svn.apache.org/viewvc?rev=744048&view=rev
Log:
Separated _site (directory) and site (whole enchilada) tasks. Using _site, _print and _reports temporary directories.
Modified:
buildr/trunk/.gitignore
buildr/trunk/rakelib/doc.rake
buildr/trunk/rakelib/rspec.rake
Modified: buildr/trunk/.gitignore
URL: http://svn.apache.org/viewvc/buildr/trunk/.gitignore?rev=744048&r1=744047&r2=744048&view=diff
==============================================================================
--- buildr/trunk/.gitignore (original)
+++ buildr/trunk/.gitignore Fri Feb 13 09:15:17 2009
@@ -1,10 +1,11 @@
pkg
failed
-reports
+buildr.pdf
rdoc
-site
-print
-snapshot
-stage
-release
+_reports
+_site
+_print
+_snapshot
+_stage
+_release
tmp
Modified: buildr/trunk/rakelib/doc.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=744048&r1=744047&r2=744048&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Fri Feb 13 09:15:17 2009
@@ -50,46 +50,53 @@
collection = Docter.collection(spec.name).using('doc/site.toc.yaml').include('doc/pages', 'LICENSE', 'CHANGELOG')
# TODO: Add coverage reports when we get them to run.
- template = Docter.template('doc/site.haml').
- include('doc/css', 'doc/images', 'doc/scripts', 'reports/coverage', 'reports/specs.html', 'rdoc', 'print/buildr.pdf')
+ template = Docter.template('doc/site.haml').include('doc/css', 'doc/images', 'doc/scripts', 'rdoc')
desc 'Run Docter server on port 3000'
Docter::Rake.serve 'docter', collection, template, :port=>3000
- desc 'Generate Web site in directory site'
- Docter::Rake.generate 'site', collection, template
-
- Docter::Rake.generate 'print',
+ Docter::Rake.generate '_print',
Docter.collection(spec.name).using('doc/print.toc.yaml').include('doc/pages'),
Docter.template('doc/print.haml').include('doc/css', 'doc/images'), :one_page
- file('print/buildr.pdf'=>'print') do |task|
- mkpath 'site'
- sh 'prince', 'print/index.html', '-o', task.name, '--media=print' do |ok, res|
+ file('buildr.pdf'=>'_print') do |task|
+ sh 'prince', '_print/index.html', '-o', task.name, '--media=print' do |ok, res|
fail 'Failed to create PDF, see errors above' unless ok
end
end
- task 'site'=>'print/buildr.pdf' do
- cp 'print/buildr.pdf', 'site'
+
+ desc 'Generate Web site in directory site'
+ Docter::Rake.generate '_site', collection, template
+
+ task '_site/buildr.pdf'=>'buildr.pdf' do
+ cp 'buildr.pdf', '_site'
+ end
+ task '_site/specs.html'=>'_reports/specs.html' do
+ cp '_reports/specs.html', '_site'
+ end
+ task '_site/coverage'=>'_reports/coverage' do
+ cp '_reports/coverage', '_site'
end
- task 'site' do
+ task 'site'=>['_site', '_site/buildr.pdf', '_site/specs.html', '_site/coverage'] do
print 'Checking that we have site documentation, RDoc and PDF ... '
- fail 'No PDF generated, you need to install PrinceXML!' unless File.exist?('site/buildr.pdf')
- fail 'No RDocs in site directory' unless File.exist?('site/rdoc/files/lib/buildr_rb.html')
- fail 'No site documentation in site directory' unless File.exist?('site/index.html')
- fail 'No specifications site directory' unless File.exist?('site/specs.html')
+ fail 'No PDF generated, you need to install PrinceXML!' unless File.exist?('_site/buildr.pdf')
+ fail 'No RDocs in site directory' unless File.exist?('_site/rdoc/files/lib/buildr_rb.html')
+ fail 'No site documentation in site directory' unless File.exist?('_site/index.html')
+ fail 'No specifications in site directory' unless File.exist?('_site/specs.html')
+ fail 'No coverage report in site directory' unless File.exist?('_site/coverage')
puts 'OK'
end
desc 'Produce PDF'
- task 'pdf'=>'print/buildr.pdf' do |task|
- sh 'open', 'print/buildr.pdf'
+ task 'pdf'=>'_print/buildr.pdf' do |task|
+ sh 'open', '_print/buildr.pdf'
end
task 'clobber' do
- rm_rf 'print'
- rm_rf 'site'
+ rm_rf '_site'
+ rm_rf '_print'
+ rm_rf 'buildr.pdf'
end
rescue LoadError
Modified: buildr/trunk/rakelib/rspec.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/rspec.rake?rev=744048&r1=744047&r2=744048&view=diff
==============================================================================
--- buildr/trunk/rakelib/rspec.rake (original)
+++ buildr/trunk/rakelib/rspec.rake Fri Feb 13 09:15:17 2009
@@ -17,19 +17,19 @@
begin
require 'spec/rake/spectask'
- directory 'reports'
+ directory '_reports'
task 'clobber' do
rm_f 'failed'
- rm_rf 'reports'
+ rm_rf '_reports'
end
desc 'Run all specs'
- Spec::Rake::SpecTask.new('spec'=>'reports') do |task|
+ Spec::Rake::SpecTask.new('spec'=>'_reports') do |task|
task.spec_files = Dir['spec/**/*_spec.rb']
- task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:reports/specs.html --loadby mtime --backtrace}
+ task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:_reports/specs.html --loadby mtime --backtrace}
task.spec_opts << '--colour' if $stdout.isatty
end
- file 'reports/specs.html'=>'spec'
+ file '_reports/specs.html'=>'spec'
desc 'Run all failed examples from previous run'
Spec::Rake::SpecTask.new('failed') do |task|
@@ -40,15 +40,15 @@
# TODO: Horribly broken! Fix some other time.
desc 'Run RSpec and generate Spec and coverage reports (slow)'
- Spec::Rake::SpecTask.new('coverage'=>'reports') do |task|
+ Spec::Rake::SpecTask.new('coverage'=>'_reports') do |task|
task.spec_files = Dir['spec/**/*_spec.rb']
- task.spec_opts = %W{--format progress --format failing_examples:failed --format html:reports/specs.html --backtrace}
+ task.spec_opts = %W{--format progress --format failing_examples:failed --format html:_reports/specs.html --backtrace}
task.spec_opts << '--colour' if $stdout.isatty
task.rcov = true
- task.rcov_dir = 'reports/coverage'
+ task.rcov_dir = '_reports/coverage'
task.rcov_opts << '--exclude / --include-file ^lib --text-summary'
end
- file 'reports/coverage'=>'coverage'
+ file '_reports/coverage'=>'coverage'
# Useful for testing with JRuby when using Ruby and vice versa.
namespace 'spec' do