buildrizpack 0.1 → 0.2

data/README.rdoc

@@ -12,49 +12,121 @@ This plugin provides a one-stop solution for packaging, distributing and deployi
 
   gem install BuildrIzPack
 
-== Useages
+It has been tested using jruby-1.6.5, ruby-1.8.7-p358 and ruby-1.9.3-p125.
+Running "rake spec" with rubies 1.8.7 and 1.9.2 failed with the message "Failed to download org.jruby:jruby-complete:jar:1.5.4,". This problem should be fixed once buildr 1.4.7 will be out.
 
-There are the following different useages.
+== Usage
 
 1. Include one or more files and let the BuildrIzPack build a simple installer, where you may choose the installation path. Default langues is 'eng'. The locales accepts an array of locale-identifiers (3-letters ISO code) 
-
 2. Specifiy a IzPack installer-XML via the the input methods
 3. Specify the XML-content of the various elements of the IzPack installation
 
-===  Example 1
+===  Example 1: Simple, defaults
 
 include one or more files and let the BuildrIzPack build a simple installer
 
   require 'buildrizpack'
-  Buildr::write "myProject/src/main/java/Hello.java", "public class Hello {}"
-  define 'myProject' do
+  Buildr::write "example_1/src/main/java/Hello.java", "public class Hello {}"
+  define 'example_1', :version => '0.9.8' do
     package(:jar)
     package(:izpack).locales = ['eng', 'fra', 'deu']
     package(:izpack).include(package(:jar))
   end
 
-=== Example 2
+=== Example 2: Using  a IzPack installer-XML
 
 Specifiy a IzPack installer-XML via the the input methods
 
   require 'buildrizpack'
-  define 'myProject' do
+  define 'example_2', :version => '0.9.8' do
+    myInstXml = path_to(:target, 'myInstaller.xml')
+    xm = Builder::XmlMarkup.new(:target=>File.open(myInstXml, 'w+'), :indent => 2)
+    xm.instruct!
+    xm.installation('version'=>'1.0') {
+      xm.tag!('info') { xm.appversion(project.version); xm.appname(project.name) }
+      xm.guiprefs('width' => '400', 'height' => '400', 'resizable' => 'no')
+      xm.panels { |x| xm.panel('classname' => 'InstallPanel') }
+      xm.locale { |x| xm.langpack('iso3'=>'eng') }
+      xm.packs {
+      xm.pack('name' => 'main', 'required' => 'yes') {
+	xm.description("my first and only pack for #{project.name}")
+	xm.file('src'=> myInstXml, 'targetdir' =>'$INSTALL_PATH')
+	  }
+	}
+    }
+    xm.target!().close
     package(:jar)
     # It is you responsability to specify correctly all dependencies!!
-    package(:izpack).input = path_to(:sources, :main, :ressources, 'myInstaller.xml')
+    package(:izpack).input = myInstXml
     package(:izpack)
   end
 
-=== Example 3
 
-Specify the XML-content
+=== Example 3: A more realistic example. Specifies installer.xml, dependencies and integration checks
+
+This example is closer to what you will probably need for a full blown application.
 
   require 'buildrizpack'
-  Buildr::write "myProject/src/main/java/Hello.java", "public class Hello {}"
-  define 'myProject' do
+  define 'example_3', :version => '0.9.8' do
+    myJavaFile = "example_3/src/main/java/Hello.java"
+    myFirstTextFile = path_to(:target)+"/1_5.txt"
+    mySecondTxtFile = path_to(:target)+"/3_7.txt"
+    myInstXml = path_to(:target, 'myInstaller.xml')
+    myInstaller = _('deploy/myInstaller.jar')
+    Buildr::write myJavaFile, "public class Hello {}" if !File.exists?(myJavaFile)
     package(:jar)
-    package(:izpack).locales = ['eng', 'fra', 'deu']
-    package(:izpack).include(package(:jar))
+    
+    # :file attribute must appear on the first call to package(:izpack) or it will have no effet
+    package(:izpack, :file => myInstaller).locales = ['eng', 'fra', 'deu']
+
+    # we create file task for each file to be packed
+    file(myFirstTextFile) do Buildr.write(myFirstTextFile, "This is file 1_5.txt") end
+    file(mySecondTxtFile) do Buildr.write(mySecondTxtFile, "This is file 3_7.txt") end
+
+    # Use the BuildrIzPack::Pack to pack some files
+    pack = BuildrIzPack::Pack.new('myPackName', 'myPack description')
+    pack.addFile(myInstXml)
+    pack.addFile(package(:jar).to_s)
+    pack.addFile(myFirstTextFile)
+    pack.addFile(mySecondTxtFile, "$INSTALL_PATH/another_name")
+
+    # Create a custom installer.xml as there are just too many options to find a simple,
+    # less complex, easy to use abstraction. And XmlMarkup is easy to read & create!
+    file(myInstXml => [package(:jar).to_s, myFirstTextFile, mySecondTxtFile]) do
+      xm = Builder::XmlMarkup.new(:target=>File.open(myInstXml, 'w+'), :indent => 2)
+      xm.instruct!
+      xm.installation('version'=>'1.0') {
+      xm.tag!('info') { xm.appversion(project.version); xm.appname(project.name) }
+      xm.guiprefs('width' => '400', 'height' => '400', 'resizable' => 'no')
+      xm.panels { |x| xm.panel('classname' => 'InstallPanel') }
+      xm.locale { |x| xm.langpack('iso3'=>'eng') }
+	xm.packs {
+	  pack.emitIzPackXML(xm)
+	    }
+      }
+      xm.target!().close
+    end
+
+    # Specify an explizit dependency to the installer.xml file
+    package(:izpack).input = myInstXml
+    file(package(:izpack).to_s => myInstXml)
+    package(:izpack)
+
+    # It is always a good idea to check whether your buildr project had the desired effect.
+    # Therefore I love to add some integration tests like
+    check package(:izpack), 'checks, whether IzPack installer works correctly' do
+      File.should exist(myJavaFile)
+      File.should exist(myInstXml)
+      File.should exist(myInstaller)
+      content = IO.readlines(myInstXml).join('')
+      content.should match(/installation/)
+      content.should match(/\$INSTALL_PATH\/another_name/)
+      content.should match(/pack name="myPackName"/)
+      content.should match(/<description>myPack description<\/description>/)
+      content.should match(/target="\$INSTALL_PATH\/plugins\/1_5.txt"/)
+      content.should match(/target="\$INSTALL_PATH\/another_name"/)
+    end
+
   end
 
 == Living On the Edge
@@ -73,8 +145,11 @@ which changes might have broken your build.  To run all the test cases:
 
   rake spec
 
+(Works only with ruby-1.8.7 not with jruby or ruby 1.9)
 If you have any questions or suggestions for improvements you may reach me via E-Mail to mail:niklaus.giger@member.fsf.org
 
+A continuos integration setup can be found under http://ngiger.dyndns.org/jenkins/job/buildrizpack/.
+
 
 == License
 

data/Rakefile

@@ -14,7 +14,7 @@
 # the License.
 
 # To work-around a bug with gemcutter: http://stackoverflow.com/questions/4932881/gemcutter-rake-build-now-throws-undefined-method-write-for-syckemitter
-require 'psych' unless RUBY_PLATFORM[/java/]
+require 'psych' unless RUBY_PLATFORM[/java/] or /1.8.\d/.match(RUBY_VERSION)
 
 # We need JAVA_HOME for most things (setup, spec, etc).
 unless ENV['JAVA_HOME']

data/buildrizpack.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildrizpack'
-  spec.version        = '0.1'
+  spec.version        = '0.2'
   spec.author         = 'Niklaus Giger'
   spec.email          = "niklaus.giger@member.fsf.org"
   spec.homepage       = "http://buildr.apache.org/"
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.description    = <<-TEXT
 A buildr plugin contributing a new packaging method to package your project as a IzPack installer.
 TEXT
-  #spec.rubyforge_project  = 'buildrizpack'
+  spec.rubyforge_project  = 'buildrizpack'
   # Rakefile needs to create spec for both platforms (ruby and java), using the
   # $platform global variable.  In all other cases, we figure it out from RUBY_PLATFORM.
   spec.platform       = $platform || RUBY_PLATFORM[/java/] || 'ruby'
@@ -42,12 +42,13 @@ TEXT
   spec.add_dependency 'net-ssh',              '2.0.23'
   spec.add_dependency 'net-sftp',             '2.0.4'
   spec.add_dependency 'rubyzip',              '0.9.4'
-  spec.add_dependency 'highline',             '1.6.2'
+  spec.add_dependency 'highline',             '1.5.1'
   spec.add_dependency 'json_pure',            '1.4.3'
   spec.add_dependency 'rubyforge',            '2.0.3'
   spec.add_dependency 'hoe',                  '2.3.3'
-  spec.add_dependency 'rjb',                  '1.3.7' if spec.platform.to_s == 'x86-mswin32' || spec.platform.to_s == 'ruby'
-  spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.2'
+  spec.add_dependency 'rjb',                  '1.3.3' if spec.platform.to_s == 'ruby'
+  spec.add_dependency 'rjb',                  '1.3.2' if spec.platform.to_s == 'x86-mswin32'
+  spec.add_dependency 'atoulme-Antwrap',      '0.7.1'
   spec.add_dependency 'diff-lcs',             '1.1.2'
   spec.add_dependency 'rspec-expectations',   '2.1.0'
   spec.add_dependency 'rspec-mocks',          '2.1.0'
@@ -57,24 +58,21 @@ TEXT
   spec.add_dependency 'minitar',              '0.5.3'
   spec.add_dependency 'jruby-openssl',        '>= 0.7' if spec.platform.to_s == 'java'
 
-  # The documentation is currently not generated whe building via jruby
-  unless spec.platform.to_s == 'java'
-    spec.add_development_dependency 'jekyll', '0.11.0'
-    spec.add_development_dependency 'RedCloth', '4.2.9'
-    spec.add_development_dependency 'jekylltask', '1.1.0'
-    spec.add_development_dependency 'rdoc', '3.8'
-    spec.add_development_dependency 'rcov', '0.9.9'
-  end
+  spec.add_development_dependency 'rdoc', '>=3.8'
+  spec.add_development_dependency 'rcov', '0.9.9'
 
   spec.add_development_dependency 'ci_reporter', '1.6.3'
-  spec.add_development_dependency 'debugger'
+  spec.add_development_dependency 'sdoc'
+#  spec.add_development_dependency 'psych',        	      '>=1.3.0' if spec.platform.to_s != 'java' and !/1.8.\d/.match(RUBY_VERSION)
+#  spec.add_development_dependency 'debugger'
   spec.add_development_dependency 'readline-ffi'
+  spec.add_development_dependency 'pygmentize'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'win32console' if spec.platform.to_s == 'x86-mswin32'
   spec.add_development_dependency 'rubyforge'
 
   # signing key and certificate chain
-  spec.signing_key = '/media/Keys/gem-private_key.pem'
+  spec.signing_key = '/mnt/Keys/gem-private_key.pem' if false
   spec.cert_chain  = ['gem-public_cert.pem']
  end

data/lib/buildrizpack/package.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-
+# :include:../../README.rdoc
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with this
 # work for additional information regarding copyright ownership.  The ASF
@@ -19,6 +19,45 @@ require "rexml/document"
 include REXML
 
 module BuildrIzPack
+  
+  # A simple helper class to create a single pack
+  #
+  class Pack
+    # The path to be used by the IzPack-installer for this pack. Defaults to 
+    attr_reader :defaultPath
+    # A hast of the files to be packed (src => installpath)
+    attr_reader :files
+    # A more elaborate description of the pack
+    attr_reader :description
+    # Attributes of the pack. a hash of name => value, eg. 'require' => 'yes'
+    attr_reader :attributes
+    # Initialize an IzPack-Pack by name, description.
+    # :attributes: Attributes of the pack, a Hash, eg. { 'required' => 'yes' }
+    def initialize(name, description, attributes = {}, defaultPath = '$INSTALL_PATH/plugins')
+      @description = description
+      @attributes = attributes
+      @attributes['name'] = name 
+      @files = Hash.new
+      @defaultPath = defaultPath
+      @attributes['required'] =  'no' if !@attributes['required'] 
+    end
+    
+    # Add a single file to the pack
+    def addFile(src, dest=nil)
+      orig = dest
+      dest = File.join(@defaultPath, File.basename(src)) if !dest
+      @files[src] = dest
+    end
+    
+    # collect the XML representation for the pack using an XMLMarkup object
+    def emitIzPackXML(xm)
+      # raise "xm must be an Builder::XmlMarkup object, but is #{xm.class}" if xm.class != Builder::XmlMarkup
+      xm.pack(@attributes) {
+        xm.description(@description)
+        @files.each{ |src, dest|  xm.singlefile('src'=> src, 'target' =>dest) }
+      }
+    end
+  end
 
   class IzPackTask < Buildr::ArchiveTask
     
@@ -60,17 +99,7 @@ module BuildrIzPack
     
     attr_accessor :packaging, :properties, :variables, :dynamicvariables, :conditions, :installerrequirements,:resources,
                         :listeners, :jar, :native
-    # Adds the filePaths to a given pack. 
-    #
-    # * May be called several times for the same package 
-    #
-    # * +packName+ - the name of the destination pack, if it is a Hash, then it must point to a hash of attributes for the pack
-    # * +filePaths+ -  May be a single filename or an array of filenames
-    # * +description+ - Description of the pack
-    # * +destination+ - IzPack will copy the files at installation time to this directory/file. 
-    # 
-    def addToPack(packName, filePaths, description=packName, destination='')
-    end
+
     # The ArchiveTask class delegates this method
     # so we can create the archive.
     # the file_map is the result of the computations of the include and exclude filters.
@@ -86,7 +115,7 @@ module BuildrIzPack
       @locales ||= ['eng']
       @panels  ||= ['TargetPanel', 'InstallPanel']
       @packs   ||= 
-      raise "You must include at least one file to create an izPack installer" if file_map.size == 0 and !File.exists?(@input)
+      raise "You must include at least one file to create an izPack installer" if file_map.size == 0 and !File.exists?(@input) 
       izPackArtifact = Buildr.artifact( "org.codehaus.izpack:izpack-standalone-compiler:jar:#{@izpackVersion}")
       doc = nil
       if !File.exists?(@input)
@@ -96,7 +125,7 @@ module BuildrIzPack
       end
       Buildr.ant('izpack-ant') do |x|
 	izPackArtifact.invoke
-	msg = "Generating izpack aus #{File.expand_path(@input)} #{File.size(@input)}"
+	msg = "Generating izpack aus #{File.expand_path(@input)}"
 	trace msg
 	if properties
 	  properties.each{ |name, value|

data/lib/buildrizpack/package.rb~

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-
+# :include:../../README.rdoc
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with this
 # work for additional information regarding copyright ownership.  The ASF
@@ -19,6 +19,45 @@ require "rexml/document"
 include REXML
 
 module BuildrIzPack
+  
+  # A simple helper class to create a single pack
+  #
+  class Pack
+    # The path to be used by the IzPack-installer for this pack. Defaults to 
+    attr_reader :defaultPath
+    # A hast of the files to be packed (src => installpath)
+    attr_reader :files
+    # A more elaborate description of the pack
+    attr_reader :description
+    # Attributes of the pack. a hash of name => value, eg. 'require' => 'yes'
+    attr_reader :attributes
+    # Initialize an IzPack-Pack by name, description.
+    # :attributes: Attributes of the pack, a Hash, eg. { 'required' => 'yes' }
+    def initialize(name, description, attributes = {}, defaultPath = '$INSTALL_PATH/plugins')
+      @description = description
+      @attributes = attributes
+      @attributes['name'] = name 
+      @files = Hash.new
+      @defaultPath = defaultPath
+      @attributes['required'] =  'no' if !@attributes['required'] 
+    end
+    
+    # Add a single file to the pack
+    def addFile(src, dest=nil)
+      orig = dest
+      dest = File.join(@defaultPath, File.basename(src)) if !dest
+      @files[src] = dest
+    end
+    
+    # collect the XML representation for the pack using an XMLMarkup object
+    def emitIzPackXML(xm)
+      # raise "xm must be an Builder::XmlMarkup object, but is #{xm.class}" if xm.class != Builder::XmlMarkup
+      xm.pack(@attributes) {
+        xm.description(@description)
+        @files.each{ |src, dest|  xm.singlefile('src'=> src, 'target' =>dest) }
+      }
+    end
+  end
 
   class IzPackTask < Buildr::ArchiveTask
     
@@ -60,17 +99,7 @@ module BuildrIzPack
     
     attr_accessor :packaging, :properties, :variables, :dynamicvariables, :conditions, :installerrequirements,:resources,
                         :listeners, :jar, :native
-    # Adds the filePaths to a given pack. 
-    #
-    # * May be called several times for the same package 
-    #
-    # * +packName+ - the name of the destination pack, if it is a Hash, then it must point to a hash of attributes for the pack
-    # * +filePaths+ -  May be a single filename or an array of filenames
-    # * +description+ - Description of the pack
-    # * +destination+ - IzPack will copy the files at installation time to this directory/file. 
-    # 
-    def addToPack(packName, filePaths, description=packName, destination='')
-    end
+
     # The ArchiveTask class delegates this method
     # so we can create the archive.
     # the file_map is the result of the computations of the include and exclude filters.
@@ -86,12 +115,12 @@ module BuildrIzPack
       @locales ||= ['eng']
       @panels  ||= ['TargetPanel', 'InstallPanel']
       @packs   ||= 
-      raise "You must include at least one file to create an izPack installer" if file_map.size == 0 and !File.exists?(@input)
+      raise "You must include at least one file to create an izPack installer" if file_map.size == 0 and !File.exists?(@input) 
       izPackArtifact = Buildr.artifact( "org.codehaus.izpack:izpack-standalone-compiler:jar:#{@izpackVersion}")
       doc = nil
       if !File.exists?(@input)
-	# genInstaller(Builder::XmlMarkup.new(:target=>$stdout, :indent => 2), file_map)
 	genInstaller(Builder::XmlMarkup.new(:target=>File.open(@input, 'w+'), :indent => 2), file_map)
+	# genInstaller(Builder::XmlMarkup.new(:target=>$stdout, :indent => 2), file_map)
 	# genInstaller(Builder::XmlMarkup.new(:target=>File.open('/home/niklaus/tmp2.xml', 'w+'), :indent => 2), file_map)
       end
       Buildr.ant('izpack-ant') do |x|

data/rakelib/checks.rake

@@ -15,7 +15,7 @@
 
 
 desc "Check that source files contain the Apache license"
-task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
+task :license=>FileList["**/*.{rb,rake,gemspec,buildfile}", 'Rakefile'] do |task|
   puts "Checking that files contain the Apache license ... "
   required = task.prerequisites.select { |fn| File.file?(fn) }
   missing = required.reject { |fn|

data/{spec/spec_helpers.rb~ → rakelib/checks.rake~}

@@ -13,19 +13,16 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-unless defined?(SpecHelpers)
-  module SandboxHook
-
-    def SandboxHook.included(spec_helpers)
-      # For testing we use the gem requirements specified on the buildr4osgi.gemspec
-      spec = Gem::Specification.load(File.expand_path('../buildrizpack.gemspec', File.dirname(__FILE__)))
-      spec.dependencies.each { |dep| gem dep.name, dep.version_requirements.to_s }
-      # Make sure to load from these paths first, we don't want to load any
-      # code from Gem library.
-      $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
-      require 'buildrizpack'
-    end
-  end
-  require File.join(File.dirname(__FILE__), "/../buildr/spec/spec_helpers.rb")
 
+desc "Check that source files contain the Apache license"
+task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
+  puts "Checking that files contain the Apache license ... "
+  required = task.prerequisites.select { |fn| File.file?(fn) }
+  missing = required.reject { |fn|
+    comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
+      map { |match| match.compact }.flatten.join("\n")
+    comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/
+  }
+  fail "#{missing.join(', ')} missing Apache License, please add it before making a release!" unless missing.empty?
+  puts "[x] Source files contain the Apache license"
 end

data/rakelib/doc.rake

@@ -13,111 +13,33 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-if !RUBY_PLATFORM[/java/]
-  gem 'rdoc'
-  require 'rdoc/task'
-  desc "Creates a symlink to rake's lib directory to support combined rdoc generation"
-  file "rake/lib" do
-    rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, "rake.rb") }
-    mkdir_p "rake"
-    File.symlink(rake_path, "rake/lib")
-  end
-
-  desc "Generate RDoc documentation in rdoc/"
-  RDoc::Task.new :rdoc do |rdoc|
-    rdoc.rdoc_dir = 'rdoc'
-    rdoc.title = spec.name
-    rdoc.options = spec.rdoc_options.clone
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.include spec.extra_rdoc_files
-
-    # include rake source for better inheritance rdoc
-    rdoc.rdoc_files.include('rake/lib/**.rb')
-  end
-  task :rdoc => ["rake/lib"]
-
-  begin
-    require 'jekylltask'
-    module TocFilter
-      def toc(input)
-        output = "<ol class=\"toc\">"
-        input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).each do |entry|
-          id = (entry[1][/^id=(['"])(.*)\1$/, 2] rescue nil)
-          title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
-          if id
-            output << %{<li><a href="##{id}">#{title}</a></li>}
-          else
-            output << %{<li>#{title}</li>}
-          end
-        end
-        output << "</ol>"
-        output
-      end
-    end
-    Liquid::Template.register_filter(TocFilter)
-
-    desc "Generate Buildr documentation in _site/"
-    JekyllTask.new :jekyll do |task|
-      task.source = 'doc'
-      task.target = '_site'
-    end
-
-  rescue LoadError
-    puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running bundler"
-  end
-
-  if `pygmentize -V`.empty?
-    puts "Buildr uses the Pygments python library. You can install it by running 'sudo easy_install Pygments'"
-  end
+gem 'rdoc'
+require 'rdoc/task'
+desc "Creates a symlink to rake's lib directory to support combined rdoc generation"
+file "rake/lib" do
+  rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, "rake.rb") }
+  mkdir_p "rake"
+  File.symlink(rake_path, "rake/lib")
+end
 
-  desc "Generate Buildr documentation as buildr.pdf"
-  file 'buildr.pdf'=>'_site' do |task|
-    pages = File.read('_site/preface.html').scan(/<li><a href=['"]([^'"]+)/).flatten.map { |f| "_site/#{f}" }
-    sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
-  end
+desc "Generate RDoc documentation in rdoc/"
+RDoc::Task.new :rdoc do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = spec.name
+  rdoc.options = spec.rdoc_options.clone
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include spec.extra_rdoc_files
 
-  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|
-      htaccess << %Q{
-<FilesMatch "CHANGELOG">
-ForceType 'text/plain; charset=UTF-8'
-</FilesMatch>
-}
-    end
-    cp 'buildr.pdf', '_site'
-    fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
-    puts 'OK'
-  end
+  # include rake source for better inheritance rdoc
+  rdoc.rdoc_files.include('rake/lib/**.rb')
+end
+task :rdoc => ["rake/lib"]
 
-# Publish prerequisites to Web site.
-  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"
-  end
+if `pygmentize -V`.empty?
+  puts "Buildr uses the Pygments python library. You can install it by running 'sudo easy_install Pygments'"
+end
 
-# Update HTML + PDF documentation (but not entire site; no specs, coverage, etc.)
-  task 'publish-doc' => ['buildr.pdf', '_site'] do
-    cp 'buildr.pdf', '_site'
-    target = "people.apache.org:/www/#{spec.name}.apache.org/"
-    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"
-  end
 
-  task :clobber do
-    rm_rf '_site'
-    rm_f 'buildr.pdf'
-    rm_f 'prince_errors.log'
-  end
+task :clobber do
+  rm_rf 'rdoc'
 end