drake 0.8.7.0.2.4 → 0.9.0.0.3.0

data/CHANGES

@@ -1,6 +1,70 @@
-
 = Rake Changelog
 
+== Version 0.9.0
+
+* Rake now warns when the deprecated :needs syntax used.
+
+* Moved Rake DSL commands to top level ruby object 'main'.  Rake DSL
+  commands are no longer private methods in Object. (Suggested by
+  James M. Lawrence/quix)
+
+* Rake history is now UTF-8 encoded.
+
+* Rake now uses case-insensitive comparisons to find the Rakefile on Windows.
+  Based on patch by Roger Pack.
+
+* Rake now requires (instead of loads) files in the test task.  Patch by Cezary
+  Baginski.
+
+* Fixed typos.  Patches by Sean Scot August Moon and R.T. Lechow.
+
+* Rake now prints the Rakefile directory only when it's different from the
+  current directory.  Patch by Alex Chaffee.
+
+* Improved rakefile_location discovery on Windows.  Patch by James Tucker.
+
+* Rake now recognizes "Windows Server" as a windows system.  Patch by Matthias
+  Lüdtke
+
+* Rake::RDocTask is deprecated.  Use RDoc::Task from RDoc 2.4.2+ (require
+  'rdoc/task')
+
+* Rake::GemPackageTask is deprecated.  Use Gem::PackageTask (require
+  'rubygems/package_task')
+
+* Rake now outputs various messages to $stderr instead of $stdout.
+
+* Rake no longer emits warnings for Config.  Patch by Santiago Pastorino.
+
+* Removed Rake's DSL methods from the top level scope.  If you need to
+  call 'task :xzy' in your code, include Rake::DSL into your class, or
+  put the code in a Rake::DSL.environment do ... end block.
+
+* Split rake.rb into individual files.
+
+* Support for the --where (-W) flag for showing where a task is defined.
+
+* Fixed quoting in test task.
+  (http://onestepback.org/redmine/issues/show/44,
+  http://www.pivotaltracker.com/story/show/1223138)
+
+* Fixed the silent option parsing problem.
+  (http://onestepback.org/redmine/issues/show/47)
+
+* Fixed :verbose=>false flag on sh and ruby commands.
+
+* Rake command line options may be given by default in a RAKEOPT
+  environment variable.
+
+* Errors in Rake will now display the task invocation chain in effect
+  at the time of the error.
+
+* Accepted change by warnickr to not expand test patterns in shell
+  (allowing more files in the test suite).
+
+* Fixed that file tasks did not perform prereq lookups in scope
+  (Redmine #57).
+
 == Version 0.8.7
 
 * Fixed EXEEXT for JRuby on windows.
@@ -10,6 +74,10 @@
 * Minor fixes to the RDoc generation (removed dependency on darkfish
   and removed inline source option).
 
+== PreVersion 0.8.6
+
+* Now allow # comments to comment a task definition.
+
 == Version 0.8.5
 
 * Better support for the system command on Windows.
@@ -36,7 +104,7 @@
 * Fixed stray ARGV option problem that was interfering with
   Test::Unit::Runner.
 
-* Fixed default verbose mode (was accidently changed to false).  
+* Fixed default verbose mode (was accidently changed to false).
 
 * Removed reference to manage_gem to fix the warning produced by the
   gem package task.
@@ -49,7 +117,7 @@
   directory.
 
 * Added fix to handle ruby installations in directories with spaces in
-  their name.  
+  their name.
 
 == Version 0.8.2
 
@@ -66,7 +134,7 @@
   symbol/string differences. (Patch supplied by Edwin Pratomo)
 
 * Fixed bug with rules involving multiple source (Patch supplied by
-  Emanuel Inderm�hle)
+  Emanuel Indermühle)
 
 * Switched from getoptlong to optparse (patches supplied by Edwin
   Pratomo)
@@ -87,7 +155,7 @@
 
 * Changed from using Mutex to Monitor. Evidently Mutex causes thread
   join errors when Ruby is compiled with -disable-pthreads. (Patch
-  supplied by Ittay Dror) 
+  supplied by Ittay Dror)
 
 * Fixed bug in makefile parser that had problems with extra spaces in
   file task names. (Patch supplied by Ittay Dror)
@@ -142,14 +210,14 @@
 * Fixed some bugs where the application object was going to the global
   appliation instead of using its own data.
 * Added square and curly bracket patterns to FileList#include (Tilman
-  Sauerbeck). 
+  Sauerbeck).
 * Added plain filename support to rule dependents (suggested by Nobu
-  Nakada). 
+  Nakada).
 * Added pathmap support to rule dependents.
 * Added a 'tasks' method to a namespace to get a list of tasks
   associated with the namespace.
 * Fixed the method name leak from FileUtils (bug found by Glenn
-  Vanderburg). 
+  Vanderburg).
 * Added rake_extension to handle detection of extension collisions.
 * Added test for noop, bad_option and verbose flags to sh command.
 * Removed dependency on internal fu_xxx functions from FileUtils.
@@ -270,7 +338,7 @@
 * Fixed a bug that prevented the TESTOPTS flag from working with the
   revised for 1.8.2 test task.
 * Updated the docs on --trace to indicate that it also enables a full
-  backtrace on errors. 
+  backtrace on errors.
 
 == Version 0.4.14
 

data/{CHANGES.drake → CHANGES-drake}

@@ -1,9 +1,13 @@
 
 = Drake Changelog
 
-== Version 0.8.7.0.2.4
+== Version 0.9.0.0.3.0
 
-* Fix for kite-shaped dep graphs; based on a patch by Heath Kehoe.
+* option -j without a value now allowed == no limit on number of threads
+* improved --randomize[=SEED] option: auto-generates SEED if none given
+  (mirrors the randomizing functionality of minitest).
+* --version now reports 'drake'
+* update from mainline branch
 
 == Version 0.8.7.0.2.3
 

data/MIT-LICENSE

@@ -1,5 +1,7 @@
 Copyright (c) 2003, 2004 Jim Weirich
 
+Copyright (c) 2008-2011 James M. Lawrence
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including

data/{README → README.rdoc}

@@ -8,9 +8,9 @@ Run up to three tasks in parallel:
 
   % drake -j3
 
-or equivalently,
+Run as many tasks in parallel as the dependencies allow:
 
-  % drake --threads 3
+  % drake -j
 
 == Installation
 
@@ -18,13 +18,21 @@ or equivalently,
 
 == Notes
 
-See parallel.rdoc.
+Drake is fully compatible with Rake.  The code base is identical to
+that of Rake except for the addition of the -j option.
+
+For the purposes of this documentation, the 'rake' and 'drake'
+commands are interchangeable.  The drake gem will install the drake
+executable.  On your system you may alias or link drake to rake if
+desired.
+
+For more on parallelization with -j, see
+parallel.rdoc[http://quix.github.com/rake/files/doc/parallel_rdoc.html].
 
 == Links
 
-* Download: http://rubyforge.org/frs/?group_id=6530
-* Documentation: http://drake.rubyforge.org
-* Rubyforge home: http://rubyforge.org/projects/drake
+* Home: http://quix.github.com/rake
+* Feature Requests, Bug Reports: http://github.com/quix/rake/issues
 * Repository: http://github.com/quix/rake
 
 == Author
@@ -33,9 +41,9 @@ See parallel.rdoc.
 
 == License
 
-Copyright (c) 2003, 2004 Jim Weirich
+Copyright (c) 2003-2010 Jim Weirich
 
-Copyright (c) 2008 James M. Lawrence
+Copyright (c) 2008-2011 James M. Lawrence
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -56,9 +64,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-= RAKE -- Ruby Make -- <em>master branch</em>
+= RAKE -- Ruby Make -- <em>mainline branch</em>
 
-Supporting Rake version: 0.8.6
+Supporting Rake version: 0.8.7.
 
 This package contains Rake, a simple ruby build program with
 capabilities similar to make.
@@ -110,7 +118,7 @@ First, you must write a "Rakefile" file which contains the build rules. Here's
 a simple example:
 
   task :default => [:test]
-  
+
   task :test do
     ruby "test/unittest.rb"
   end
@@ -147,7 +155,6 @@ Type "rake --help" for all available options.
 * For a glossary of terms, see
   doc/glossary.rdoc[http://rake.rubyforge.org/files/doc/glossary_rdoc.html].
 
-
 == Development
 
 === Source Repository
@@ -161,6 +168,7 @@ http://github.com/jimweirich/rake. The public git clone URL is
 
 If you wish to run the unit and functional tests that come with Rake:
 
+* Install the 'flexmock' gem
 * Install the 'session' gem in order to run the functional tests.
 * CD into the top project directory of rake.
 * Type one of the following:
@@ -170,14 +178,16 @@ If you wish to run the unit and functional tests that come with Rake:
 
 === Issues and Bug Reports
 
-Bugs, features requests and other issues can be logged at
+Feature requests and bug reports can be made here
+
+* http://onestepback.org/cgi-bin/bugs.cgi?project=rake
 
-* http://onestepback.org/redmine/projects/show/rake
+No account is needed for posting requests.  Or you can send me an
+email (at jim dot weirich at gmail dot com)
 
-You will need an account to before you can post issues.  Register at
-http://onestepback.org/redmine/account/register.  Or you can send me
-an email (at jim dot weirich at gmail dot com)
+Issues and bug reports can be tracked here:
 
+* http://www.pivotaltracker.com/projects/28469
 
 == Online Resources
 
@@ -188,6 +198,8 @@ an email (at jim dot weirich at gmail dot com)
 * Rake API Documents: http://rake.rubyforge.org
 * Rake Source Code Repo:  http://github.com/jimweirich/rake
 * Rake Git Repo Clone URL: git://github.com/jimweirich/rake.git
+* Rake Issue Tracking: http://www.pivotaltracker.com/projects/28469
+* Rake Bug Reports: http://onestepback.org/cgi-bin/bugs.cgi?project=rake
 
 === Presentations and Articles about Rake
 
@@ -229,7 +241,7 @@ The Rake homepage is http://rake.rubyforge.org.  You can find the Rake
 RubyForge page at http://rubyforge.org/projects/rake.
 
 Feel free to submit commits or feature requests.  If you send a patch,
-remember to update the corresponding unit tests.  If fact, I prefer
+remember to update the corresponding unit tests.  In fact, I prefer
 new feature to be submitted in the form of new unit tests.
 
 For other information, feel free to ask on the ruby-talk mailing list

data/Rakefile

@@ -1,22 +1,34 @@
 # Rakefile for rake        -*- ruby -*-
 
 # Copyright 2003, 2004, 2005 by Jim Weirich (jim@weirichhouse.org)
+# Copyright 2008-2011 by James M. Lawrence (quixoticsycophant@gmail.com)
 # All rights reserved.
 
 # This file may be distributed under an MIT style license.  See
 # MIT-LICENSE for details.
 
-begin
-  require 'rubygems'
-  require 'rake/gempackagetask'
-rescue Exception
-  nil
+require 'rbconfig'
+require 'rubygems'
+
+system_rake = File.join RbConfig::CONFIG['rubylibdir'], 'rake.rb'
+
+# Use our rake, not the installed rake from system
+if $".include? system_rake then
+  exec Gem.ruby, '-Ilib', 'bin/rake', *ARGV
 end
+
+require 'rubygems/package_task'
+
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
-CLEAN.include('**/*.o', '*.dot', '**/.*.rbc')
+begin
+  gem 'rdoc'
+  require 'rdoc/task'
+rescue Gem::LoadError
+end
+
+CLEAN.include('**/*.o', '*.dot', '**/*.rbc')
 CLOBBER.include('doc/example/main', 'testdata')
 CLOBBER.include('test/data/**/temp_*')
 CLOBBER.include('test/data/chains/play.*')
@@ -34,7 +46,7 @@ end
 
 # Determine the current version of the software
 
-if `ruby -Ilib ./bin/drake --version` =~ /rake, version ([0-9.]+)$/
+if `ruby -Ilib ./bin/drake --version` =~ /rake, version ([0-9a-z.]+)$/
   CURRENT_VERSION = $1
 else
   CURRENT_VERSION = "0.0.0"
@@ -47,84 +59,100 @@ SRC_RB = FileList['lib/**/*.rb']
 # The default task is run if rake is given no explicit arguments.
 
 desc "Default Task"
-task :default => :test_all
-
-load 'Rakefile.drake'
+task :default => "test:all"
 
 # Test Tasks ---------------------------------------------------------
-task :dbg do |t|
-  puts "Arguments are: #{t.args.join(', ')}"
-end
 
 # Common Abbreviations ...
 
-task :ta => :test_all
-task :tf => :test_functional
-task :tu => :test_units
-task :tc => :test_contribs
-task :test => :test_units
-task :test_all => [:test_serial, :test_parallel]
-
-test_files = FileList[
-  'test/test*.rb',
-  'test/contrib/test*.rb',
-  'test/fun*.rb'
-]
-
-Rake::TestTask.new(:test_serial) do |t|
-  t.test_files = ['test/serial_setup.rb'] + test_files
-  t.warning = true
-  t.verbose = false
+task :ta => "test:all"
+task :tf => "test:functional"
+task :tu => "test:units"
+task :tc => "test:contribs"
+task :test => "test:units"
+
+module TestFiles
+  UNIT = FileList['test/lib/*_test.rb']
+  FUNCTIONAL = FileList['test/functional/*_test.rb']
+  CONTRIB = FileList['test/contrib/test*.rb']
+  TOP = FileList['test/*_test.rb']
+  ALL = TOP + UNIT + FUNCTIONAL + CONTRIB
 end
 
-Rake::TestTask.new(:test_parallel) do |t|
-  t.test_files = ['test/parallel_setup.rb'] + test_files
-  t.warning = true
-  t.verbose = false
-end
+namespace :test do
+  task :all => [:serial, :parallel]
 
-Rake::TestTask.new(:test_units) do |t|
-  t.test_files = FileList['test/test*.rb']
-  t.warning = true
-  t.verbose = false
-end
+  Rake::TestTask.new(:serial) do |t|
+    t.test_files = ['test/serial_setup.rb'] + TestFiles::ALL
+    t.libs << "."
+    t.warning = true
+  end
+  
+  Rake::TestTask.new(:parallel) do |t|
+    t.test_files = ['test/parallel_setup.rb'] + TestFiles::ALL
+    t.libs << "."
+    t.warning = true
+  end
 
-Rake::TestTask.new(:test_functional) do |t|
-  t.test_files = FileList['test/fun*.rb']
-  t.warning = true
-  t.verbose = false
-end
+  Rake::TestTask.new(:units) do |t|
+    t.test_files = TestFiles::UNIT
+    t.libs << "."
+    t.warning = true
+  end
+
+  Rake::TestTask.new(:functional) do |t|
+    t.test_files = TestFiles::FUNCTIONAL
+    t.libs << "."
+    t.warning = true
+  end
 
-Rake::TestTask.new(:test_contribs) do |t|
-  t.test_files = FileList['test/contrib/test*.rb']
-  t.warning = true
-  t.verbose = false
+  Rake::TestTask.new(:contribs) do |t|
+    t.test_files = TestFiles::CONTRIB
+    t.libs << "."
+    t.warning = true
+  end
 end
 
 begin
   require 'rcov/rcovtask'
+  IGNORE_COVERAGE_IN = FileList[
+    'lib/rake/rdoctask.rb',
+    'lib/rake/testtask.rb',
+    'lib/rake/packagetask.rb',
+    'lib/rake/clean.rb',
+  ]
+
+  unless File::ALT_SEPARATOR
+    IGNORE_COVERAGE_IN.include(
+      'lib/rake/alt_system.rb',
+      'lib/rake/win32.rb')
+  end
 
   Rcov::RcovTask.new do |t|
     t.libs << "test"
-    dot_rakes = 
     t.rcov_opts = [
       '-xRakefile', '-xrakefile', '-xpublish.rf',
-      '-xlib/rake/contrib', '-x/Library', 
+      '-xlib/rake/contrib', '-x/Library', '-x.rvm',
       '--text-report',
       '--sort coverage'
-    ] + FileList['rakelib/*.rake'].pathmap("-x%p")
+    ] + FileList['rakelib/*.rake'].pathmap("-x%p") +
+      IGNORE_COVERAGE_IN.map { |fn| "-x#{fn}" }
     t.test_files = FileList[
-      'test/test*.rb', 'test/functional.rb'
+      'test/lib/*_test.rb',
+      'test/contrib/*_test.rb',
+      'test/functional/*_test.rb'
     ]
     t.output_dir = 'coverage'
     t.verbose = true
   end
 rescue LoadError
-  puts "RCov is not available"
+  task :rcov do
+    puts "RCov is not available"
+  end
 end
 
 directory 'testdata'
-[:test_all, :test_units, :test_contribs, :test_functional].each do |t|
+["test:all", :test_units, :test_contribs, :test_functional].each do |t|
   task t => ['testdata']
 end
 
@@ -139,28 +167,24 @@ end
 
 # Create a task to build the RDOC documentation tree.
 
-begin
-  require 'darkfish-rdoc'
-  DARKFISH_ENABLED = true
-rescue LoadError => ex
-  DARKFISH_ENABLED = false
-end
-
 BASE_RDOC_OPTIONS = [
-  '--line-numbers',
-  '--main', 'README',
-  '--title', 'Drake: Distributed Rake',
+  '--line-numbers', '--show-hash',
+  '--main', 'README.rdoc',
+  '--title', 'Drake: Distributed Rake'
 ]
 
-rd = Rake::RDocTask.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.template = 'doc/jamis.rb'
-  rdoc.title    = "Drake: Distributed Rake"
-  rdoc.options = BASE_RDOC_OPTIONS.dup
-  rdoc.options << '-SHN' << '-f' << 'darkfish' if DARKFISH_ENABLED
-  rdoc.rdoc_files.include('README', 'MIT-LICENSE', 'TODO', 'CHANGES')
-  rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
-  rdoc.rdoc_files.exclude(/\bcontrib\b/)
+if defined?(RDoc::Task) then
+  RDoc::Task.new do |rdoc|
+    rdoc.rdoc_dir = 'html'
+    rdoc.title    = "Drake -- Distributed Rake"
+    rdoc.options = BASE_RDOC_OPTIONS.dup
+
+    rdoc.rdoc_files.include('README.rdoc', 'MIT-LICENSE', 'TODO', 'CHANGES', 'CHANGES-drake')
+    rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
+    rdoc.rdoc_files.exclude(/\bcontrib\b/)
+  end
+else
+  warn "RDoc 2.4.2+ is required to build documentation"
 end
 
 # ====================================================================
@@ -168,14 +192,15 @@ end
 # tar, zip and gem files.
 
 PKG_FILES = FileList[
+  '.gemtest',
   'install.rb',
   '[A-Z]*',
   'bin/drake', 
-  'lib/**/*.rb', 
+  'lib/**/*.rb',
   'test/**/*.rb',
   'test/**/*.rf',
   'test/**/*.mf',
-  'test/**/Rakefile*',
+  'test/**/Rakefile',
   'test/**/subdir',
   'doc/**/*'
 ]
@@ -187,22 +212,24 @@ if ! defined?(Gem)
   puts "Package Target requires RubyGEMs"
 else
   SPEC = Gem::Specification.new do |s|
-    
+
     #### Basic information.
 
     s.name = 'drake'
     s.version = $package_version
     s.summary = "A branch of Rake supporting automatic parallelizing of tasks."
     s.description = <<-EOF
-      Rake is a Make-like program implemented in Ruby. Tasks
-      and dependencies are specified in standard Ruby syntax. 
+      Drake is an auto-parallelizing branch of Rake, a Make-like program
+      implemented in Ruby. Tasks and dependencies are specified in standard
+      Ruby syntax.
     EOF
 
     #### Dependencies and requirements.
+    s.add_dependency('comp_tree', '>= 1.1.3')
 
-    s.add_dependency('comp_tree', '>= 0.7.3')
-    #s.add_dependency('log4r', '> 1.0.4')
-    #s.requirements << ""
+    s.required_rubygems_version = '>= 1.3.2'
+    s.add_development_dependency 'session', '~> 2.4'
+    s.add_development_dependency 'flexmock', '~> 0.8.11'
 
     #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
 
@@ -218,19 +245,25 @@ else
 
     s.bindir = "bin"                               # Use these for applications.
     s.executables = ["drake"]
-    s.default_executable = "drake"
 
     #### Documentation and testing.
 
-    s.has_rdoc = true
-    s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
+    s.extra_rdoc_files = FileList[
+      'README.rdoc',
+      'MIT-LICENSE',
+      'TODO',
+      'CHANGES',
+      'CHANGES-drake',
+      'doc/**/*.rdoc'
+    ]
+
     s.rdoc_options = BASE_RDOC_OPTIONS
 
     #### Author and project details.
 
     s.author = "James M. Lawrence"
     s.email = "quixoticsycophant@gmail.com"
-    s.homepage = "http://drake.rubyforge.org"
+    s.homepage = "http://quix.github.com/rake"
     s.rubyforge_project = "drake"
 #     if ENV['CERT_DIR']
 #       s.signing_key = File.join(ENV['CERT_DIR'], 'gem-private_key.pem')
@@ -238,7 +271,7 @@ else
 #     end
   end
 
-  package_task = Rake::GemPackageTask.new(SPEC) do |pkg|
+  Gem::PackageTask.new(SPEC) do |pkg|
     pkg.need_zip = true
     pkg.need_tar = true
   end
@@ -254,6 +287,8 @@ end
 
 # Misc tasks =========================================================
 
+load 'Rakefile-drake'
+
 def count_lines(filename)
   lines = 0
   codelines = 0
@@ -300,28 +335,13 @@ task :todo do
   RUBY_FILES.egrep(/#.*(FIXME|TODO|TBD)/)
 end
 
-desc "Look for Debugging print lines"
-task :dbg do
-  RUBY_FILES.egrep(/\bDBG|\bbreakpoint\b/)
-end
-
 desc "List all ruby files"
-task :rubyfiles do 
+task :rubyfiles do
   puts RUBY_FILES
   puts FileList['bin/*'].exclude('bin/*.rb')
 end
 task :rf => :rubyfiles
 
-desc "Create a TAGS file"
-task :tags => "TAGS"
-
-TAGS = 'xctags -e'
-
-file "TAGS" => RUBY_FILES do
-  puts "Makings TAGS"
-  sh "#{TAGS} #{RUBY_FILES}", :verbose => false
-end
-
 # --------------------------------------------------------------------
 # Creating a release
 
@@ -333,32 +353,31 @@ task :noop
 #plugin "release_manager"
 
 desc "Make a new release"
-task :release, :rel, :reuse, :reltest,
-  :needs => [
+task :release, [:rel, :reuse, :reltest] => [
     :prerelease,
     :clobber,
-    :test_all,
+    "test:all",
     :update_version,
     :package,
     :tag
   ] do
-  announce 
+  announce
   announce "**************************************************************"
   announce "* Release #{$package_version} Complete."
   announce "* Packages ready to upload."
   announce "**************************************************************"
-  announce 
+  announce
 end
 
 # Validate that everything is ready to go for a release.
 task :prerelease, :rel, :reuse, :reltest do |t, args|
   $package_version = args.rel
-  announce 
+  announce
   announce "**************************************************************"
   announce "* Making RubyGem Release #{$package_version}"
   announce "* (current version #{CURRENT_VERSION})"
   announce "**************************************************************"
-  announce  
+  announce
 
   # Is a release number supplied?
   unless args.rel
@@ -384,21 +403,20 @@ task :prerelease, :rel, :reuse, :reltest do |t, args|
   end
 end
 
-task :update_version, :rel, :reuse, :reltest,
-  :needs => [:prerelease] do |t, args|
+task :update_version, [:rel, :reuse, :reltest] => [:prerelease] do |t, args|
   if args.rel == CURRENT_VERSION
     announce "No version change ... skipping version update"
   else
     announce "Updating Rake version to #{args.rel}"
     open("lib/rake.rb") do |rakein|
       open("lib/rake.rb.new", "w") do |rakeout|
-	rakein.each do |line|
-	  if line =~ /^RAKEVERSION\s*=\s*/
-	    rakeout.puts "RAKEVERSION = '#{args.rel}'"
-	  else
-	    rakeout.puts line
-	  end
-	end
+        rakein.each do |line|
+          if line =~ /^RAKEVERSION\s*=\s*/
+            rakeout.puts "RAKEVERSION = '#{args.rel}'"
+          else
+            rakeout.puts line
+          end
+        end
       end
     end
     mv "lib/rake.rb.new", "lib/rake.rb"
@@ -411,8 +429,7 @@ task :update_version, :rel, :reuse, :reltest,
 end
 
 desc "Tag all the CVS files with the latest release number (REL=x.y.z)"
-task :tag, :rel, :reuse, :reltest,
-  :needs => [:prerelease] do |t, args|
+task :tag, [:rel, :reuse, :reltest] => [:prerelease] do |t, args|
   reltag = "REL_#{args.rel.gsub(/\./, '_')}"
   reltag << args.reuse.gsub(/\./, '_') if args.reuse
   announce "Tagging Repository with [#{reltag}]"
@@ -423,14 +440,6 @@ task :tag, :rel, :reuse, :reltest,
   end
 end
 
-desc "Install the jamis RDoc template"
-task :install_jamis_template do
-  require 'rbconfig'
-  dest_dir = File.join(Config::CONFIG['rubylibdir'], "rdoc/generators/template/html")
-  fail "Unabled to write to #{dest_dir}" unless File.writable?(dest_dir)
-  install "doc/jamis.rb", dest_dir, :verbose => true
-end
-
 # Require experimental XForge/Metaproject support.
 
 load 'xforge.rf' if File.exist?('xforge.rf')
@@ -439,3 +448,8 @@ desc "Where is the current directory.  This task displays\nthe current rake dire
 task :where_am_i do
   puts Rake.original_dir
 end
+
+task :failure => :really_fail
+task :really_fail do
+  fail "oops"
+end