autobuild 0.5.1 → 0.6

data/doc/files/test/test_config_interpolation_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jan 25 21:45:14 CET 2006</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>
@@ -74,7 +74,7 @@
 
       <div class="name-list">
       test/unit&nbsp;&nbsp;
-      autobuild/config-interpolator&nbsp;&nbsp;
+      autobuild/loaders/config-interpolator&nbsp;&nbsp;
       yaml&nbsp;&nbsp;
       stringio&nbsp;&nbsp;
       </div>

data/doc/files/test/test_config_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jan 25 21:45:14 CET 2006</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>
@@ -76,7 +76,7 @@
       test/unit&nbsp;&nbsp;
       <a href="tools_rb.html">test/tools</a>&nbsp;&nbsp;
       autobuild/options&nbsp;&nbsp;
-      autobuild/config&nbsp;&nbsp;
+      autobuild/loaders/config&nbsp;&nbsp;
       </div>
     </div>
 

data/doc/files/test/test_import_cvs_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Dec 09 07:42:31 CET 2005</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>

data/doc/files/test/test_import_svn_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Dec 09 07:42:31 CET 2005</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>

data/doc/files/test/test_import_tar_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Dec 09 07:42:31 CET 2005</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>

data/doc/files/test/test_subcommand_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jan 25 21:45:14 CET 2006</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>
@@ -76,7 +76,7 @@
       test/unit&nbsp;&nbsp;
       <a href="tools_rb.html">test/tools</a>&nbsp;&nbsp;
       autobuild/options&nbsp;&nbsp;
-      autobuild/config&nbsp;&nbsp;
+      autobuild/loaders/config&nbsp;&nbsp;
       tmpdir&nbsp;&nbsp;
       fileutils&nbsp;&nbsp;
       </div>

data/doc/files/test/tools_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Dec 09 07:42:31 CET 2005</td>
+      <td>Wed Feb 08 14:39:03 CET 2006</td>
     </tr>
     </table>
   </div>

data/doc/fr_class_index.html

@@ -20,43 +20,6 @@
 <div id="index">
   <h1 class="section-bar">Classes</h1>
   <div id="index-entries">
-    <a href="classes/Autobuild.html">Autobuild</a><br />
-    <a href="classes/Autobuild/Autotools.html">Autobuild::Autotools</a><br />
-    <a href="classes/Autobuild/CVSImporter.html">Autobuild::CVSImporter</a><br />
-    <a href="classes/Autobuild/CommandNotFound.html">Autobuild::CommandNotFound</a><br />
-    <a href="classes/Autobuild/Config.html">Autobuild::Config</a><br />
-    <a href="classes/Autobuild/ConfigException.html">Autobuild::ConfigException</a><br />
-    <a href="classes/Autobuild/Exception.html">Autobuild::Exception</a><br />
-    <a href="classes/Autobuild/GenomModule.html">Autobuild::GenomModule</a><br />
-    <a href="classes/Autobuild/Import.html">Autobuild::Import</a><br />
-    <a href="classes/Autobuild/Importer.html">Autobuild::Importer</a><br />
-    <a href="classes/Autobuild/ImporterPackage.html">Autobuild::ImporterPackage</a><br />
-    <a href="classes/Autobuild/Interpolator.html">Autobuild::Interpolator</a><br />
-    <a href="classes/Autobuild/MailReporter.html">Autobuild::MailReporter</a><br />
-    <a href="classes/Autobuild/Options.html">Autobuild::Options</a><br />
-    <a href="classes/Autobuild/Package.html">Autobuild::Package</a><br />
-    <a href="classes/Autobuild/PackageException.html">Autobuild::PackageException</a><br />
-    <a href="classes/Autobuild/Reporter.html">Autobuild::Reporter</a><br />
-    <a href="classes/Autobuild/Reporting.html">Autobuild::Reporting</a><br />
-    <a href="classes/Autobuild/SVNImporter.html">Autobuild::SVNImporter</a><br />
-    <a href="classes/Autobuild/SourceTreeTask.html">Autobuild::SourceTreeTask</a><br />
-    <a href="classes/Autobuild/StdoutReporter.html">Autobuild::StdoutReporter</a><br />
-    <a href="classes/Autobuild/SubcommandFailed.html">Autobuild::SubcommandFailed</a><br />
-    <a href="classes/Autobuild/Subprocess.html">Autobuild::Subprocess</a><br />
-    <a href="classes/Autobuild/Subprocess/Failed.html">Autobuild::Subprocess::Failed</a><br />
-    <a href="classes/Autobuild/TarImporter.html">Autobuild::TarImporter</a><br />
-    <a href="classes/Autobuild/UndefinedVariable.html">Autobuild::UndefinedVariable</a><br />
-    <a href="classes/Hash.html">Hash</a><br />
-    <a href="classes/RMail.html">RMail</a><br />
-    <a href="classes/RMail/Message.html">RMail::Message</a><br />
-    <a href="classes/TC_AttrDefval.html">TC_AttrDefval</a><br />
-    <a href="classes/TC_CVSImport.html">TC_CVSImport</a><br />
-    <a href="classes/TC_Config.html">TC_Config</a><br />
-    <a href="classes/TC_ConfigInterpolation.html">TC_ConfigInterpolation</a><br />
-    <a href="classes/TC_SVNImport.html">TC_SVNImport</a><br />
-    <a href="classes/TC_Subcommand.html">TC_Subcommand</a><br />
-    <a href="classes/TC_TarImporter.html">TC_TarImporter</a><br />
-    <a href="classes/TestTools.html">TestTools</a><br />
   </div>
 </div>
 </body>

data/doc/fr_file_index.html

@@ -20,31 +20,7 @@
 <div id="index">
   <h1 class="section-bar">Files</h1>
   <div id="index-entries">
-    <a href="files/lib/autobuild/config-interpolator_rb.html">lib/autobuild/config-interpolator.rb</a><br />
-    <a href="files/lib/autobuild/config_rb.html">lib/autobuild/config.rb</a><br />
-    <a href="files/lib/autobuild/environment_rb.html">lib/autobuild/environment.rb</a><br />
-    <a href="files/lib/autobuild/exceptions_rb.html">lib/autobuild/exceptions.rb</a><br />
-    <a href="files/lib/autobuild/import/cvs_rb.html">lib/autobuild/import/cvs.rb</a><br />
-    <a href="files/lib/autobuild/import/svn_rb.html">lib/autobuild/import/svn.rb</a><br />
-    <a href="files/lib/autobuild/import/tar_rb.html">lib/autobuild/import/tar.rb</a><br />
-    <a href="files/lib/autobuild/importer_rb.html">lib/autobuild/importer.rb</a><br />
-    <a href="files/lib/autobuild/options_rb.html">lib/autobuild/options.rb</a><br />
-    <a href="files/lib/autobuild/package_rb.html">lib/autobuild/package.rb</a><br />
-    <a href="files/lib/autobuild/packages/autotools_rb.html">lib/autobuild/packages/autotools.rb</a><br />
-    <a href="files/lib/autobuild/packages/genom_rb.html">lib/autobuild/packages/genom.rb</a><br />
-    <a href="files/lib/autobuild/packages/import_rb.html">lib/autobuild/packages/import.rb</a><br />
-    <a href="files/lib/autobuild/reporting_rb.html">lib/autobuild/reporting.rb</a><br />
-    <a href="files/lib/autobuild/subcommand_rb.html">lib/autobuild/subcommand.rb</a><br />
-    <a href="files/lib/autobuild/timestamps_rb.html">lib/autobuild/timestamps.rb</a><br />
-    <a href="files/test/base_rb.html">test/base.rb</a><br />
-    <a href="files/test/test_attr_defval_rb.html">test/test_attr_defval.rb</a><br />
-    <a href="files/test/test_config_rb.html">test/test_config.rb</a><br />
-    <a href="files/test/test_config_interpolation_rb.html">test/test_config_interpolation.rb</a><br />
-    <a href="files/test/test_import_cvs_rb.html">test/test_import_cvs.rb</a><br />
-    <a href="files/test/test_import_svn_rb.html">test/test_import_svn.rb</a><br />
-    <a href="files/test/test_import_tar_rb.html">test/test_import_tar.rb</a><br />
-    <a href="files/test/test_subcommand_rb.html">test/test_subcommand.rb</a><br />
-    <a href="files/test/tools_rb.html">test/tools.rb</a><br />
+    <a href="files/README.html">README</a><br />
   </div>
 </div>
 </body>

data/doc/fr_method_index.html

@@ -20,123 +20,6 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Autobuild/Reporting.html#M000098"><< (Autobuild::Reporting)</a><br />
-    <a href="classes/Autobuild/Package.html#M000087">[] (Autobuild::Package)</a><br />
-    <a href="classes/RMail/Message.html#M000033">add_file (RMail::Message)</a><br />
-    <a href="classes/Autobuild/Package.html#M000091">all (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/Package.html#M000094">build (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000070">build (Autobuild::Autotools)</a><br />
-    <a href="classes/TestTools.html#M000031">build_config (TestTools)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000065">buildstamp (Autobuild::Autotools)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000079">cachedir (Autobuild::TarImporter)</a><br />
-    <a href="classes/Autobuild/Config.html#M000040">check_backward_compatibility (Autobuild::Config)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000082">checkout (Autobuild::TarImporter)</a><br />
-    <a href="classes/TestTools.html#M000030">clean (TestTools)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000069">configure (Autobuild::Autotools)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000109">cpp_options (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild/Import.html#M000046">cvs (Autobuild::Import)</a><br />
-    <a href="classes/Autobuild/Options.html#M000058">default (Autobuild::Options)</a><br />
-    <a href="classes/Autobuild/MailReporter.html#M000060">default_mail (Autobuild::MailReporter)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000111">depends_on (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild/Package.html#M000089">depends_on (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/Package.html#M000086">each (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/Interpolator.html#M000055">each_interpolation (Autobuild::Interpolator)</a><br />
-    <a href="classes/Autobuild/Reporting.html#M000099">each_log (Autobuild::Reporting)</a><br />
-    <a href="classes/Hash.html#M000020">each_recursive (Hash)</a><br />
-    <a href="classes/Autobuild/Reporting.html#M000097">error (Autobuild::Reporting)</a><br />
-    <a href="classes/Autobuild/StdoutReporter.html#M000072">error (Autobuild::StdoutReporter)</a><br />
-    <a href="classes/Autobuild/MailReporter.html#M000062">error (Autobuild::MailReporter)</a><br />
-    <a href="classes/Autobuild/Reporter.html#M000074">error (Autobuild::Reporter)</a><br />
-    <a href="classes/Autobuild/Package.html#M000093">factory (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/Exception.html#M000104">fatal? (Autobuild::Exception)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000108">genomstamp (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000112">get_provides (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000110">get_requires (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild.html#M000038">get_stamp (Autobuild)</a><br />
-    <a href="classes/Autobuild/Importer.html#M000057">import (Autobuild::Importer)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000071">install (Autobuild::Autotools)</a><br />
-    <a href="classes/Autobuild/Package.html#M000085">installstamp (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/ImporterPackage.html#M000115">installstamp (Autobuild::ImporterPackage)</a><br />
-    <a href="classes/Autobuild/Interpolator.html#M000053">interpolate (Autobuild::Interpolator)</a><br />
-    <a href="classes/Autobuild/Interpolator.html#M000051">interpolate (Autobuild::Interpolator)</a><br />
-    <a href="classes/Hash.html#M000019">keys_to_sym (Hash)</a><br />
-    <a href="classes/Autobuild/Config.html#M000041">load (Autobuild::Config)</a><br />
-    <a href="classes/Autobuild/PackageException.html#M000059">mail? (Autobuild::PackageException)</a><br />
-    <a href="classes/Autobuild/SubcommandFailed.html#M000100">mail? (Autobuild::SubcommandFailed)</a><br />
-    <a href="classes/Autobuild/Exception.html#M000103">mail? (Autobuild::Exception)</a><br />
-    <a href="classes/Autobuild/CVSImporter.html#M000049">modulename (Autobuild::CVSImporter)</a><br />
-    <a href="classes/Autobuild/Package.html#M000092">name2target (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000080">new (Autobuild::TarImporter)</a><br />
-    <a href="classes/Autobuild/CVSImporter.html#M000048">new (Autobuild::CVSImporter)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000066">new (Autobuild::Autotools)</a><br />
-    <a href="classes/Autobuild/SVNImporter.html#M000050">new (Autobuild::SVNImporter)</a><br />
-    <a href="classes/Autobuild/Package.html#M000088">new (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/Interpolator.html#M000052">new (Autobuild::Interpolator)</a><br />
-    <a href="classes/Autobuild/UndefinedVariable.html#M000083">new (Autobuild::UndefinedVariable)</a><br />
-    <a href="classes/Autobuild/ImporterPackage.html#M000116">new (Autobuild::ImporterPackage)</a><br />
-    <a href="classes/Autobuild/MailReporter.html#M000061">new (Autobuild::MailReporter)</a><br />
-    <a href="classes/Autobuild/Exception.html#M000105">new (Autobuild::Exception)</a><br />
-    <a href="classes/Autobuild/SubcommandFailed.html#M000101">new (Autobuild::SubcommandFailed)</a><br />
-    <a href="classes/Autobuild/Subprocess/Failed.html#M000044">new (Autobuild::Subprocess::Failed)</a><br />
-    <a href="classes/Autobuild/Importer.html#M000056">new (Autobuild::Importer)</a><br />
-    <a href="classes/Autobuild/Subprocess.html#M000042">nice= (Autobuild::Subprocess)</a><br />
-    <a href="classes/Autobuild.html#M000034">pathvar (Autobuild)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000067">prepare (Autobuild::Autotools)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000107">prepare (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild/ImporterPackage.html#M000117">prepare (Autobuild::ImporterPackage)</a><br />
-    <a href="classes/Autobuild/Package.html#M000090">provides (Autobuild::Package)</a><br />
-    <a href="classes/Autobuild/GenomModule.html#M000113">regen_targets (Autobuild::GenomModule)</a><br />
-    <a href="classes/Autobuild/Autotools.html#M000068">regen_targets (Autobuild::Autotools)</a><br />
-    <a href="classes/Autobuild/Reporting.html#M000095">report (Autobuild::Reporting)</a><br />
-    <a href="classes/Autobuild/Subprocess.html#M000043">run (Autobuild::Subprocess)</a><br />
-    <a href="classes/Autobuild/MailReporter.html#M000064">send_mail (Autobuild::MailReporter)</a><br />
-    <a href="classes/TC_TarImporter.html#M000008">setup (TC_TarImporter)</a><br />
-    <a href="classes/TC_SVNImport.html#M000005">setup (TC_SVNImport)</a><br />
-    <a href="classes/TC_Subcommand.html#M000021">setup (TC_Subcommand)</a><br />
-    <a href="classes/TC_CVSImport.html#M000026">setup (TC_CVSImport)</a><br />
-    <a href="classes/TC_ConfigInterpolation.html#M000015">setup (TC_ConfigInterpolation)</a><br />
-    <a href="classes/TC_Config.html#M000001">setup (TC_Config)</a><br />
-    <a href="classes/Autobuild.html#M000037">source_tree (Autobuild)</a><br />
-    <a href="classes/Autobuild/Reporting.html#M000096">success (Autobuild::Reporting)</a><br />
-    <a href="classes/Autobuild/StdoutReporter.html#M000073">success (Autobuild::StdoutReporter)</a><br />
-    <a href="classes/Autobuild/MailReporter.html#M000063">success (Autobuild::MailReporter)</a><br />
-    <a href="classes/Autobuild/Reporter.html#M000075">success (Autobuild::Reporter)</a><br />
-    <a href="classes/Autobuild/Import.html#M000045">svn (Autobuild::Import)</a><br />
-    <a href="classes/Autobuild/Import.html#M000047">tar (Autobuild::Import)</a><br />
-    <a href="classes/TC_CVSImport.html#M000027">teardown (TC_CVSImport)</a><br />
-    <a href="classes/TC_ConfigInterpolation.html#M000016">teardown (TC_ConfigInterpolation)</a><br />
-    <a href="classes/TC_TarImporter.html#M000009">teardown (TC_TarImporter)</a><br />
-    <a href="classes/TC_SVNImport.html#M000006">teardown (TC_SVNImport)</a><br />
-    <a href="classes/TC_Config.html#M000002">teardown (TC_Config)</a><br />
-    <a href="classes/TC_Subcommand.html#M000022">teardown (TC_Subcommand)</a><br />
-    <a href="classes/TestTools.html#M000029">tempdir (TestTools)</a><br />
-    <a href="classes/TC_AttrDefval.html#M000024">test_basic (TC_AttrDefval)</a><br />
-    <a href="classes/TC_CVSImport.html#M000028">test_cvs (TC_CVSImport)</a><br />
-    <a href="classes/TC_AttrDefval.html#M000025">test_defval_notshared (TC_AttrDefval)</a><br />
-    <a href="classes/TC_ConfigInterpolation.html#M000018">test_interpolation (TC_ConfigInterpolation)</a><br />
-    <a href="classes/TC_Config.html#M000003">test_keys_to_sym (TC_Config)</a><br />
-    <a href="classes/TC_ConfigInterpolation.html#M000017">test_match (TC_ConfigInterpolation)</a><br />
-    <a href="classes/TC_Subcommand.html#M000023">test_subcommand (TC_Subcommand)</a><br />
-    <a href="classes/TC_SVNImport.html#M000007">test_svn (TC_SVNImport)</a><br />
-    <a href="classes/TC_TarImporter.html#M000010">test_tar_mode (TC_TarImporter)</a><br />
-    <a href="classes/TC_TarImporter.html#M000013">test_tar_remote (TC_TarImporter)</a><br />
-    <a href="classes/TC_TarImporter.html#M000014">test_tar_remote_notfound (TC_TarImporter)</a><br />
-    <a href="classes/TC_TarImporter.html#M000011">test_tar_valid_url (TC_TarImporter)</a><br />
-    <a href="classes/TC_Config.html#M000004">test_value_type (TC_Config)</a><br />
-    <a href="classes/Autobuild/SourceTreeTask.html#M000114">timestamp (Autobuild::SourceTreeTask)</a><br />
-    <a href="classes/Autobuild/SubcommandFailed.html#M000102">to_s (Autobuild::SubcommandFailed)</a><br />
-    <a href="classes/Autobuild/UndefinedVariable.html#M000084">to_s (Autobuild::UndefinedVariable)</a><br />
-    <a href="classes/Autobuild/Exception.html#M000106">to_s (Autobuild::Exception)</a><br />
-    <a href="classes/Autobuild.html#M000039">touch_stamp (Autobuild)</a><br />
-    <a href="classes/Autobuild.html#M000036">tree_timestamp (Autobuild)</a><br />
-    <a href="classes/TestTools.html#M000032">untar (TestTools)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000081">update (Autobuild::TarImporter)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000077">update_cache (Autobuild::TarImporter)</a><br />
-    <a href="classes/Autobuild.html#M000035">update_environment (Autobuild)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000078">url= (Autobuild::TarImporter)</a><br />
-    <a href="classes/Autobuild/TarImporter.html#M000076">url_to_mode (Autobuild::TarImporter)</a><br />
-    <a href="classes/Autobuild/Interpolator.html#M000054">value_of (Autobuild::Interpolator)</a><br />
-    <a href="classes/TC_TarImporter.html#M000012">web_server (TC_TarImporter)</a><br />
   </div>
 </div>
 </body>

data/doc/index.html

@@ -19,6 +19,6 @@
         <frame src="fr_class_index.html"  name="Classes" />
         <frame src="fr_method_index.html" name="Methods" />
     </frameset>
-    <frame src="files/lib/autobuild/importer_rb.html" name="docwin" />
+    <frame src="files/README.html" name="docwin" />
 </frameset>
 </html>

data/lib/autobuild.rb

@@ -0,0 +1,3 @@
+require 'autobuild/config'
+require 'autobuild/reporting'
+require 'autobuild/package'

data/lib/autobuild/config.rb

@@ -1,174 +1,108 @@
-require 'yaml'
-require 'pathname'
-
-require 'autobuild/config-interpolator'
-require 'autobuild/reporting'
-require 'autobuild/package'
-require 'autobuild/importer'
-
-class Hash
-    def keys_to_sym
-        inject(Hash.new) do |h, sample|
-            k, v = sample[0], sample[1]
-            if v.respond_to?(:keys_to_sym)
-                h[k.to_sym] = v.keys_to_sym
-            else
-                h[k.to_sym] = v
-            end
-            h
-        end
-    end
+require 'optparse'
+require 'rake'
+require 'singleton'
 
-    def each_recursive(&p)
-        each { |k, v|
-            yield(k, v)
-            if v.respond_to?(:each_recursive)
-                v.each_recursive(&p)
-            end
-        }
-    end
+def Autobuild(&script)
+    Autobuild.send(:module_eval, &script)
 end
 
-module Autobuild::Config
-    def self.check_backward_compatibility(config)
-        if config.has_key?('autobuild-config')
-            puts 'WARNING: the \'autobuild-config\' block is now named \'autobuild\''
-        end
-        config.each_recursive { |k, v|
-            if k == 'common-config'
-                puts 'WARNING: the \'common-config\' blocks are now named \'common\''
-            end
-        }
-        if config["autobuild"] && config["autobuild"]["clean-log"]
-            puts 'WARNING: the \'clean-log\' option is now named \'clean_log\''
+module Autobuild
+    class << self
+        %w{ nice srcdir prefix
+            verbose debug do_update do_build
+            daemonize clean_log }.each do |name|
+            attr_accessor name
         end
-    end
-
-    def self.load(conffile, user_options = Options.nil)
-        case conffile
-        when Hash
-            config = conffile
-        else
-            data = YAML.load(conffile)
-            config = Interpolator.interpolate(data)
-        end
-
-        check_backward_compatibility(config)
-        config = config.keys_to_sym
-        if !config[:autobuild]
-            raise ConfigException, "no toplevel autobuild config block"
-        end
-
-        # Merge user_options into the autobuild block
-        autobuild_config = config[:autobuild]
-        default_options = Options.default
-        user_options.each_pair { |sym, value|
-            if !value.nil?
-                autobuild_config[sym] = value
-            elsif !autobuild_config.has_key?(sym)
-                autobuild_config[sym] = default_options.send(sym)
-            end
-        }
-
-        $verbose = $VERBOSE = autobuild_config[:verbose]
-        $trace = $DEBUG   = autobuild_config[:debug]
 
-        get_autobuild_config(config)
-        get_package_config(config)
+        attr_reader :programs
+        attr_writer :logdir
+    end
+    DEFAULT_OPTIONS = { :nice => 0,
+        :srcdir => nil, :prefix => nil, :logdir => nil,
+        :verbose => false, :debug => false, :do_build => true, :do_update => true, 
+        :daemonize => false }
+
+    @programs = Hash.new
+    DEFAULT_OPTIONS.each do |name, value|
+        send("#{name}=", value)
     end
 
-    def self.get_autobuild_config(config)
-        $PROGRAMS = (config[:programs] or "make")
-        
-        autobuild = config[:autobuild]
-        $SRCDIR   = File.expand_path(autobuild[:srcdir], Dir.pwd)
-        $PREFIX   = File.expand_path(autobuild[:prefix], Dir.pwd)
-        $LOGDIR   = File.expand_path(autobuild[:logdir]   || "autobuild/log",   $PREFIX)
-        $CACHEDIR = File.expand_path(autobuild[:cachedir] || "autobuild/cache", $PREFIX)
-
-        FileUtils.mkdir_p $SRCDIR if !File.directory?($SRCDIR)
-        FileUtils.mkdir_p $LOGDIR if !File.directory?($LOGDIR)
-        if autobuild[:clean_log]
-            puts "Cleaning log dir #{$LOGDIR}"
-            FileUtils.rm_rf Dir.glob("#{$LOGDIR}/*.log")
-        end
+    @mail = Hash.new
+    class << self
+	attr_reader :mail
+        def logdir; @logdir || "#{prefix}/log" end
 
-        FileUtils.mkdir_p $CACHEDIR if !File.directory?($CACHEDIR)
-
-        if autobuild[:mail]
-            if autobuild[:mail].respond_to?(:[])
-                mail_config = autobuild[:mail]
-            elsif autobuild[:mail].respond_to?(:to_str)
-                Hash[:to => autobuild[:mail].to_str]
-            elsif autobuild[:mail] == true
-                mail_config = {}
-            else
-                raise ConfigException, "mail configuration should be either a option hash or a string"
-            
+        def clean_log!
+            Reporting.each_log do |file|
+                FileUtils.rm_f file
             end
-            Reporting << MailReporter.new(mail_config)
         end
-        $UPDATE = autobuild[:update]
-        $NICE   = autobuild[:nice]
-
-        autobuild[:environment].to_a.each { |k, v|
-            ENV[k.to_s] = v.to_a.join(':')
-        }
-    end
 
-    def self.add_package(name, config)
-        # Get the package type
-        package_type = config[:type].to_sym
-        require "autobuild/packages/#{package_type}"
-
-        # Build the importer object, if there is one
-        import_type = config[:import]
-        if import_type
-            require "autobuild/import/#{import_type}"
-            if !config.has_key?(:source)
-                raise ConfigException, "missing 'source' option in the '#{name}' package description"
-            end
-
-            config[:import] = Import.method(import_type).call(config[:source], config)
+        # Get a given program, using its name as default value
+        def tool(name)
+            programs[name.to_sym] || programs[name.to_s] || name.to_s
         end
 
-        # Set the default dir if needed
-        config[:srcdir] ||= name.to_s
-        config[:prefix] ||= name.to_s
+        # Gets autobuild options from the command line
+        # and returns the remaining elements
+        def commandline(args)
+            parser = OptionParser.new do |opts|
+                opts.separator "Path specification"
+                opts.on("--srcdir PATH", "sources are installed in PATH") do |@srcdir| end
+                opts.on("--prefix PATH", "built packages are installed in PATH") do |@prefix|
+                    logdir = "#{prefix}/autobuild"
+                end
+                opts.on("--logdir PATH", "logs are saved in PATH (default: <prefix>/autobuild)") do |@logdir| end
+
+                opts.separator ""
+                opts.separator "General behaviour"
+                opts.on('--nice NICE', Integer, 'nice the subprocesses to the given value') do |@nice| end
+                opts.on("-h", "--help", "Show this message") do
+                    puts opts
+                    exit
+                end
+                opts.on("--[no-]daemon", "go into daemon mode") do |@daemonize| end
+                opts.on("--[no-]update", "update already checked-out sources") do |@do_update| end
+                opts.on("--[no-]build",  "only prepare packages, do not build them") do |@do_build| end 
+
+                opts.separator ""
+                opts.separator "Program output"
+                opts.on("--[no-]verbose", "display output of commands on stdout") do |@verbose| end
+                opts.on("--[no-]debug", "verbose information (for debugging purposes)") do |@debug| end
+
+                opts.separator ""
+		opts.separator "Mail reports"
+		opts.on("--mail-from EMAIL", String, "From: field of the sent mails") do |from_email|
+		    mail[:from] = from_email
+		end
+		opts.on("--mail-to EMAILS", String, "comma-separated list of emails to which the reports should be sent") do |emails| 
+		    mail[:to] ||= []
+		    mail[:to] += emails.split(',')
+		end
+		opts.on("--mail-subject SUBJECT", String, "Subject: field of the sent mails") do |subject_email|
+		    mail[:subject] = subject_email
+		end
+		opts.on("--mail-smtp HOSTNAME", String, " address of the mail server written as hostname[:port]") do |smtp|
+		    raise "invalid SMTP specification #{smtp}" unless smtp =~ /^([^:]+)(?::(\d+))?$/
+		    mail[:smtp] = $1
+		    mail[:port] = Integer($2) unless $2.empty?
+		end
+		opts.on("--mail-only-errors", "send mail only on errors") do
+		    mail[:only_errors] = true
+		end
 
-        # Initializes the package
-        Package.build(package_type, name, config)
-    end
+            end
 
-    def self.get_package_config(config)
-        packages = config[:packages]
-        return if !packages
-        
-        # Get the common config block
-        common = packages[:common]
-        packages.each do |p, config|
-            next if p == :common
-
-            # Merge the common config
-            config = config.merge(common) { |k, v1, v2|
-                if v2.respond_to?(:to_ary)
-                    v1.to_a | v2.to_ary
-                elsif v2.respond_to?(:to_str)
-                    v1.to_s + " " + v2.to_str
-                end
-            }
-            # Remove p -> p dependency which may come from common
-            if config.has_key?(:depends)
-                config[:depends] = config[:depends].to_a.reject { |el| el == p.to_s }
+            parser.parse!(args)
+            if !args[0]
+                puts parser
+                exit
             end
 
-            add_package(p, config)
-        end
+            Rake.application.options.trace = debug
 
-        # Post-import, pre-build pass
-        Package.each(false) { |name, pkg| pkg.prepare }
+            args[0..-1]
+        end
     end
-
-    private_class_method :get_autobuild_config, :get_package_config, :add_package
 end