You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2012/10/07 08:02:22 UTC
svn commit: r1395222 - in /buildr/trunk/rakelib: all-in-one.rake doc.rake
release.rake stage.rake
Author: donaldp
Date: Sun Oct 7 06:02:21 2012
New Revision: 1395222
URL: http://svn.apache.org/viewvc?rev=1395222&view=rev
Log:
Whitespace and quote cleanup
Modified:
buildr/trunk/rakelib/all-in-one.rake
buildr/trunk/rakelib/doc.rake
buildr/trunk/rakelib/release.rake
buildr/trunk/rakelib/stage.rake
Modified: buildr/trunk/rakelib/all-in-one.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/all-in-one.rake?rev=1395222&r1=1395221&r2=1395222&view=diff
==============================================================================
--- buildr/trunk/rakelib/all-in-one.rake (original)
+++ buildr/trunk/rakelib/all-in-one.rake Sun Oct 7 06:02:21 2012
@@ -22,34 +22,21 @@ task 'all-in-one' => 'all-in-one:all-in-
namespace 'all-in-one' do
- version = "1.6.7"
+ version = '1.6.7'
jruby_distro = "jruby-bin-#{version}.tar.gz"
url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
dir = "jruby-#{version}"
- task "all-in-one" => [:gem,
- # Prepare to run
- :prepare,
- # Download and extract JRuby
- :download_and_extract,
- # Cleanup JRuby distribution
- :clean_dist,
- # Install Buildr gem and dependencies
- :install_dependencies,
- # Add Buildr executables/scripts
- :add_execs,
- # Package distribution
- :package
- ]
+ task 'all-in-one' => %w(gem prepare download_and_extract clean_dist install_dependencies add_execs package)
desc 'Prepare to run'
- task :prepare do
+ task 'prepare' do
mkpath '_all-in-one'
cd '_all-in-one'
end
desc 'Download and extract JRuby'
- task :download_and_extract do
+ task 'download_and_extract' do
unless File.exist?(jruby_distro)
puts "Downloading JRuby from #{url} ..."
require 'open-uri'
Modified: buildr/trunk/rakelib/doc.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=1395222&r1=1395221&r2=1395222&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Sun Oct 7 06:02:21 2012
@@ -33,7 +33,7 @@ RDoc::Task.new :rdoc do |rdoc|
# include rake source for better inheritance rdoc
rdoc.rdoc_files.include('rake/lib/**.rb')
end
-task :rdoc => %w(rake/lib)
+task 'rdoc' => %w(rake/lib)
require 'jekylltask'
module TocFilter
@@ -48,14 +48,14 @@ module TocFilter
output << %{<li>#{title}</li>}
end
end
- output << "</ol>"
+ output << '</ol>'
output
end
end
Liquid::Template.register_filter(TocFilter)
desc 'Generate Buildr documentation in _site/'
-JekyllTask.new :jekyll do |task|
+JekyllTask.new 'jekyll' do |task|
task.source = 'doc'
task.target = '_site'
end
@@ -70,15 +70,15 @@ file 'buildr.pdf' => '_site' do |task|
sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
end
-desc "Build a copy of the Web site in the ./_site"
-task :site => ['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr.pdf'] do
+desc 'Build a copy of the Web site in the ./_site'
+task 'site' => ['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr.pdf'] do
cp_r 'rdoc', '_site'
fail 'No RDocs in site directory' unless File.exist?('_site/rdoc/lib/buildr_rb.html')
cp '_reports/specs.html', '_site'
cp_r '_reports/coverage', '_site'
fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
cp 'CHANGELOG', '_site'
- open("_site/.htaccess", "w") do |htaccess|
+ open('_site/.htaccess', 'w') do |htaccess|
htaccess << %Q{
<FilesMatch "CHANGELOG">
ForceType 'text/plain; charset=UTF-8'
@@ -91,12 +91,12 @@ ForceType 'text/plain; charset=UTF-8'
end
# Publish prerequisites to Web site.
-task 'publish' => :site do
+task 'publish' => 'site' do
target = "people.apache.org:/www/#{spec.name}.apache.org/"
puts "Uploading new site to #{target} ..."
sh 'rsync', '--progress', '--recursive', '--delete', '_site/', target
sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
- puts "Done"
+ puts 'Done'
end
# Update HTML + PDF documentation (but not entire site; no specs, coverage, etc.)
@@ -106,7 +106,7 @@ task 'publish-doc' => %w(buildr.pdf _sit
puts "Uploading new site to #{target} ..."
sh 'rsync', '--progress', '--recursive', '_site/', target # Note: no --delete
sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
- puts "Done"
+ puts 'Done'
end
task 'clobber' do
Modified: buildr/trunk/rakelib/release.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/release.rake?rev=1395222&r1=1395221&r2=1395222&view=diff
==============================================================================
--- buildr/trunk/rakelib/release.rake (original)
+++ buildr/trunk/rakelib/release.rake Sun Oct 7 06:02:21 2012
@@ -14,7 +14,7 @@
# the License.
-task :release do
+task 'release' do
# First, we need to get all the staged files from Apache to _release.
mkpath '_release'
lambda do
@@ -98,7 +98,7 @@ task :release do
File.open 'CHANGELOG', 'w' do |file|
file.write modified
end
- puts "[X] Updated CHANGELOG and added entry for next release"
+ puts '[X] Updated CHANGELOG and added entry for next release'
end.call
@@ -156,5 +156,4 @@ The Apache Buildr Team
end
-
task('clobber') { rm_rf '_release' }
Modified: buildr/trunk/rakelib/stage.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/stage.rake?rev=1395222&r1=1395221&r2=1395222&view=diff
==============================================================================
--- buildr/trunk/rakelib/stage.rake (original)
+++ buildr/trunk/rakelib/stage.rake Sun Oct 7 06:02:21 2012
@@ -210,8 +210,6 @@ The following changes were made since #{
puts '[X] Created release vote email template in ''vote-email.txt'''
puts email
end.call
-
end
-
task('clobber') { rm_rf '_staged' }