rake 0.5.4 → 0.6.0

data/CHANGES

@@ -1,5 +1,29 @@
 = Rake Changelog
 
+== PreVersion 0.5.5
+
+* Fixed file creation bug in the unit tests (caused infinite loop on
+  windows).
+* Fixed bug where session based functional tests were run under
+  windows.
+* Fixed bug in directory tasks so that updating a directory will not
+  retrigger file tasks depending on the directory (see
+  FileCreationTask and EarlyTime).
+* Added egrep to FileList
+* ruby command now runs same ruby version as rake.
+* Added investigation to task object. (suggested by Martin Fowler)
+* Added ruby_opts to the test task to allow arbitrary ruby options to
+  be passed to the test script. (Greg Fast)
+* Fixed the test loader to ignore options. (Greg Fast)
+* Moved Task, FileTask, FileCreationTask and RakeApp into the Rake
+  module namespace.  Old style namespace behavior can be invoked via
+  the --classic-namespace option. (requested by Kelly Felkins).
+* GemTask is now sensitive to the gem platform (Masao Mutoh).
+* A non-existing file prerequisite will no longer cause an exception
+  (Philipp Neubeck).
+* Multiple prerequisites on Rake rules now allowed (initial patch
+  supplied by Stuart Jansen).
+
 == Version 0.5.4
 
 * Added double quotes to the test runner.

data/README

@@ -1,5 +1,7 @@
 = RAKE -- Ruby Make 
 
+Supporting Rake version: 0.6
+
 This package contains Rake, a simple ruby build program with
 capabilities similar to make.
 
@@ -13,9 +15,11 @@ Rake has the following features:
 
 * Rake supports rule patterns to sythesize implicit tasks.
 
-* Rake is lightweight.  It can be distributed with other projects as a
-  single file.  Projects that depend upon rake do not require that
-  rake be installed on target systems.
+*  Flexible FileLists that act like arrays but know about manipulating
+   file names and paths.
+
+* A library of prepackaged tasks to make building rakefiles easier.
+
 
 == Download
 
@@ -23,12 +27,6 @@ The latest version of rake can be found at
 
 * http://rubyforge.org/project/showfiles.php?group_id=50
 
-Online Resources can be found at ...
-
-* Online Rake Documentation: http://rake.rubyforge.org
-* Rake Project Page: http://rubyforge.org/projects/rake
-* Rake Project Wiki: http://rake.rubyforge.org/wiki/wiki.pl
-
 == Installation
 
 === Normal Installation
@@ -45,7 +43,20 @@ Download and install  rake with the following.
 
    gem install --remote rake
 
-== Roadmap
+== Online Resources
+
+== Rake References
+
+* Rake Documentation Home: http://docs.rubyrake.org
+* Rake Project Page: http://rubyforge.org/projects/rake
+* Rake API Documents: http://rake.rubyforge.org
+
+== Presentations and Articles about Rake
+
+* Jim Weirich\u2019s 2003 RubyConf presentation: http://onestepback.org/articles/buildingwithrake/
+* Martin Fowler\u2019s article on Rake: http://martinfowler.com/articles/rake.html
+
+=== Road Map
 
 * If you want to see how to invoke rake to build your projects, read on.
 * If you want to see the format of a Rakefile, see
@@ -55,7 +66,6 @@ Download and install  rake with the following.
 * If you want to see a glossary of terms, see
   doc/glossary.rdoc[http://rake.rubyforge.org/files/doc/glossary_rdoc.html].
 
-
 == Simple Example
 
 Once installed, you can run rake as follows ...
@@ -136,6 +146,13 @@ Options are:
     during the execution of the <b>rake</b> command.  You can access
     the value by using ENV['<em>name</em>'].
 
+[<tt>--classic-namespace</tt> (-n)]
+    Import the Task, FileTask, and FileCreateTask into the top-level
+    scope to be compatible with older versions of Rake.  Alternatively
+    you can include the line <code>require
+    'rake/classic_namespace'</code> in your Rakefile to get the
+    classic behavior.
+
 [<tt>--dry-run</tt> (-n)]
     Do a dry run.  Print the tasks invoked and executed, but do not
     actually execute any of the actions.

data/Rakefile

@@ -20,7 +20,9 @@ CLEAN.include('**/*.o')
 CLOBBER.include('doc/example/main', 'testdata')
 CLOBBER.include('test/data/**/temp_*')
 CLOBBER.include('test/data/chains/play.*')
-
+CLOBBER.include('test/data/file_creation_task/build')
+CLOBBER.include('test/data/file_creation_task/src')
+CLOBBER.include('TAGS')
 
 def announce(msg='')
   STDERR.puts msg
@@ -50,10 +52,11 @@ task :default => :alltests
 
 # Test Tasks ---------------------------------------------------------
 
-task :a => :alltests
-task :f => :funtests
-task :u => :unittests
-task :c => :contribtests
+task :ta => :alltests
+task :tf => :funtests
+task :tu => :unittests
+task :tc => :contribtests
+task :test => :unittests
 
 Rake::TestTask.new(:alltests) do |t|
   t.test_files = FileList[
@@ -62,7 +65,7 @@ Rake::TestTask.new(:alltests) do |t|
     'test/fun*.rb'
   ]
   t.warning = true
-  t.verbose = false
+  t.verbose = true
 end
 
 Rake::TestTask.new(:unittests) do |t|
@@ -88,13 +91,6 @@ directory 'testdata'
   task t => ['testdata']
 end
 
-# Abbreviations
-
-task :a => [:alltests]
-task :u => [:unittests]
-task :f => [:funtests]
-task :c => [:contribtests]
-
 # CVS Tasks ----------------------------------------------------------
 
 # Install rake using the standard install.rb script.
@@ -128,6 +124,9 @@ PKG_FILES = FileList[
   'bin/**/*', 
   'lib/**/*.rb', 
   'test/**/*.rb',
+  'test/**/*.rf',
+  'test/**/*.mf',
+  'test/**/Rakefile',
   'doc/**/*'
 ]
 PKG_FILES.exclude('doc/example/*.o')
@@ -184,9 +183,13 @@ else
     s.email = "jim@weirichhouse.org"
     s.homepage = "http://rake.rubyforge.org"
     s.rubyforge_project = "rake"
+    if ENV['CERT_DIR']
+      s.signing_key = File.join(ENV['CERT_DIR'], 'gem-private_key.pem')
+      s.cert_chain  = [File.join(ENV['CERT_DIR'], 'gem-public_cert.pem')]
+    end
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  package_task = Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_zip = true
     pkg.need_tar = true
   end
@@ -239,28 +242,14 @@ load "publish.rf" if File.exist? "publish.rf"
 
 # Support Tasks ------------------------------------------------------
 
-def egrep(pattern)
-  Dir['**/*.rb'].each do |fn|
-    count = 0
-    open(fn) do |f|
-      while line = f.gets
-	count += 1
-	if line =~ pattern
-	  puts "#{fn}:#{count}:#{line}"
-	end
-      end
-    end
-  end
-end
-
 desc "Look for TODO and FIXME tags in the code"
 task :todo do
-  egrep /#.*(FIXME|TODO|TBD)/
+  FileList['**/*.rb'].egrep /#.*(FIXME|TODO|TBD)/
 end
 
 desc "Look for Debugging print lines"
 task :dbg do
-  egrep /\bDBG|\bbreakpoint\b/
+  FileList['**/*.rb'].egrep /\bDBG|\bbreakpoint\b/
 end
 
 desc "List all ruby files"
@@ -359,3 +348,6 @@ task :tag => [:prerelease] do
   end
 end
 
+# Require experimental XForge/Metaproject support.
+
+load 'xforge.rf' if File.exist?('xforge.rf')

data/bin/rake

@@ -4,5 +4,5 @@ rescue LoadError
   require 'rubygems'
   require_gem 'rake'
 end
-RakeApp.new.run
+Rake::Application.new.run
 

data/doc/jamis.rb

@@ -182,30 +182,39 @@ h3, h4, h5, h6 {
 
 CSS
 
-BODY = <<HTML
+XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+}
+
+HEADER = XHTML_PREAMBLE + <<ENDHEADER
 <html>
   <head>
     <title>%title%</title>
     <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
     <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
 
-    <script type="text/javascript" language="JavaScript">
-      <!--
+    <script language="JavaScript" type="text/javascript">
+    // <![CDATA[
+
         function toggleSource( id )
         {
           var elem
           var link
 
-          if( document.all )
+          if( document.getElementById )
+          {
+            elem = document.getElementById( id )
+            link = document.getElementById( "l_" + id )
+          }
+          else if ( document.all )
           {
             elem = eval( "document.all." + id )
             link = eval( "document.all.l_" + id )
           }
           else
-          {
-            elem = document.getElementById( id )
-            link = document.getElementById( "l_" + id )
-          }
+            return false;
 
           if( elem.style.display == "block" )
           {
@@ -223,89 +232,12 @@ BODY = <<HTML
         {
           window.open( url, "SOURCE_CODE", "width=400,height=400,scrollbars=yes" )
         }
-      //-->
+      // ]]>
     </script>
   </head>
 
   <body>
-!INCLUDE! <!-- banner header -->
-
-  <div id="content">
-IF:diagram
-  <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center">
-    %diagram%
-  </td></tr></table>
-ENDIF:diagram
-
-IF:description
-  <div class="description">%description%</div>
-ENDIF:description
-
-IF:requires
-  <div class="sectiontitle">Required Files</div>
-  <ul>
-START:requires
-  <li>HREF:aref:name:</li>
-END:requires
-  </ul>
-ENDIF:requires
-
-IF:methods
-  <div class="sectiontitle">Methods</div>
-  <ul>
-START:methods
-  <li>HREF:aref:name:</li>
-END:methods
-  </ul>
-ENDIF:methods
-
-IF:constants
-  <div class="sectiontitle">Constants</div>
-  <table border='0' cellpadding='5'>
-START:constants
-  <tr valign='top'>
-    <td class="attr-name">%name%</td>
-    <td>=</td>
-    <td class="attr-value">%value%</td>
-  </tr>
-IF:desc
-  <tr valign='top'>
-    <td>&nbsp;</td>
-    <td colspan="2" class="attr-desc">%desc%</td>
-  </tr>
-ENDIF:desc
-END:constants
-  </table>
-ENDIF:constants
-
-IF:attributes
-  <div class="sectiontitle">Attributes</div>
-  <table border='0' cellpadding='5'>
-START:attributes
-  <tr valign='top'>
-    <td class='attr-rw'>
-IF:rw
-[%rw%]
-ENDIF:rw
-    </td>
-    <td class='attr-name'>%name%</td>
-    <td class='attr-desc'>%a_desc%</td>
-  </tr>
-END:attributes
-  </table>
-ENDIF:attributes
-
-IF:classlist
-  <div class="sectiontitle">Classes and Modules</div>
-  %classlist%
-ENDIF:classlist
-
-!INCLUDE! <!-- method descriptions -->
-
-    </div>
-  </body>
-</html>
-HTML
+ENDHEADER
 
 FILE_PAGE = <<HTML
 <table border='0' cellpadding='0' cellspacing='0' width="100%" class='banner'>
@@ -374,6 +306,44 @@ HTML
 ###################################################################
 
 METHOD_LIST = <<HTML
+  <div id="content">
+IF:diagram
+  <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center">
+    %diagram%
+  </td></tr></table>
+ENDIF:diagram
+
+IF:description
+  <div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+  <div class="sectiontitle">Required Files</div>
+  <ul>
+START:requires
+  <li>HREF:aref:name:</li>
+END:requires
+  </ul>
+ENDIF:requires
+
+IF:toc
+  <div class="sectiontitle">Contents</div>
+  <ul>
+START:toc
+  <li><a href="#%href%">%secname%</a></li>
+END:toc
+  </ul>
+ENDIF:toc
+
+IF:methods
+  <div class="sectiontitle">Methods</div>
+  <ul>
+START:methods
+  <li>HREF:aref:name:</li>
+END:methods
+  </ul>
+ENDIF:methods
+
 IF:includes
 <div class="sectiontitle">Included Modules</div>
 <ul>
@@ -383,6 +353,57 @@ END:includes
 </ul>
 ENDIF:includes
 
+START:sections
+IF:sectitle
+<div class="sectiontitle"><a nem="%secsequence%">%sectitle%</a></div>
+IF:seccomment
+<div class="description">
+%seccomment%
+</div>
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:classlist
+  <div class="sectiontitle">Classes and Modules</div>
+  %classlist%
+ENDIF:classlist
+
+IF:constants
+  <div class="sectiontitle">Constants</div>
+  <table border='0' cellpadding='5'>
+START:constants
+  <tr valign='top'>
+    <td class="attr-name">%name%</td>
+    <td>=</td>
+    <td class="attr-value">%value%</td>
+  </tr>
+IF:desc
+  <tr valign='top'>
+    <td>&nbsp;</td>
+    <td colspan="2" class="attr-desc">%desc%</td>
+  </tr>
+ENDIF:desc
+END:constants
+  </table>
+ENDIF:constants
+
+IF:attributes
+  <div class="sectiontitle">Attributes</div>
+  <table border='0' cellpadding='5'>
+START:attributes
+  <tr valign='top'>
+    <td class='attr-rw'>
+IF:rw
+[%rw%]
+ENDIF:rw
+    </td>
+    <td class='attr-name'>%name%</td>
+    <td class='attr-desc'>%a_desc%</td>
+  </tr>
+END:attributes
+  </table>
+ENDIF:attributes
+
 IF:method_list
 START:method_list
 IF:methods
@@ -415,8 +436,8 @@ END:aka
 ENDIF:aka
 IF:sourcecode
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('%aref%-source')" id="l_%aref%-source">show source</a> ]</p>
-  <div id="%aref%-source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('%aref%_source')" id="l_%aref%_source">show source</a> ]</p>
+  <div id="%aref%_source" class="dyn-source">
 <pre>
 %sourcecode%
 </pre>
@@ -428,14 +449,28 @@ END:methods
 ENDIF:methods
 END:method_list
 ENDIF:method_list
+END:sections
+</div>
 HTML
 
-=begin
-=end
+FOOTER = <<ENDFOOTER
+  </body>
+</html>
+ENDFOOTER
+
+BODY = HEADER + <<ENDBODY
+  !INCLUDE! <!-- banner header -->
+
+  <div id="bodyContent">
+    #{METHOD_LIST}
+  </div>
+
+  #{FOOTER}
+ENDBODY
 
 ########################## Source code ##########################
 
-SRC_PAGE = <<HTML
+SRC_PAGE = XHTML_PREAMBLE + <<HTML
 <html>
 <head><title>%title%</title>
 <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
@@ -467,7 +502,7 @@ FR_INDEX_BODY = <<HTML
 !INCLUDE!
 HTML
 
-FILE_INDEX = <<HTML
+FILE_INDEX = XHTML_PREAMBLE + <<HTML
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
@@ -494,6 +529,7 @@ FILE_INDEX = <<HTML
   a {
     color: #00F;
     text-decoration: none;
+    white-space: nowrap;
   }
   a:hover {
     color: #77F;
@@ -516,8 +552,8 @@ HTML
 CLASS_INDEX = FILE_INDEX
 METHOD_INDEX = FILE_INDEX
 
-INDEX = <<HTML
-<html>
+INDEX = XHTML_PREAMBLE + <<HTML
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>%title%</title>
   <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
@@ -549,16 +585,7 @@ ENDIF:inline_source
 </html>
 HTML
 
-# and a blank page to use as a target
-BLANK = %{
-<html><body bgcolor="white"></body></html>
-}
-
-def write_extra_pages
-  template = TemplatePage.new(BLANK)
-  File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
-end
-
 end
 end
 
+