autobuild 0.1 → 0.2

data/README

@@ -100,12 +100,14 @@ Autobuild uses three sections:
 *programs*::                the programs used by importers and builders. See each tool 
                             documentation for the list of used options
 *packages*::                the list of packages to build. See <b>Package configuration</b> below
-
+*defines*::                 this is used for variable interpolation. Any key/value pair defined in
+                            this section can be used later in other parts of the config files using
+                            the $key or ${key} notation
 
 == Autobuild configuration (<tt>autobuild-config</tt>)
 === Misc options
-*noupdate*::  if true, do not update the packages that are already imported (default: false). You
-              can also add the <tt>--noupdate</tt> on the command line
+*update*::    if false, do not update the packages that are already imported (default: true). You
+              can also use the <tt>--no-update</tt> on the command line
 
 === Directories (<tt>autobuild-config/srcdir</tt>, <tt>autobuild-config/prefix</tt> and <tt>autobuild-config/logdir</tt>)
 *srcdir*::    the path where programs are to be imported. See <b>Packages configuration</b> for 
@@ -193,7 +195,7 @@ source and the builder to build and install it.
 
 <b>importer/source</b>:: 
             where the importer should get the sources. The format of this options depends on
-            the importer used.
+            the importer used. See Available importers.
 
 *prefix*::  where the program is to be installed. If this is a relative path, it is relative to the global
             <tt>/autobuild-config/prefix</tt> option. Otherwise, the absolute path is used. If no prefix
@@ -234,7 +236,7 @@ to set up the importer and +srcdir+. +prefix+ is ignored.
             type: import
             import: cvs
             source: [ *my_repository, "bar" ]
-            srcdir: &bar_srcdir bar
+            srcdir: bar
 
 === Autotools (<tt>type: autotools</tt>)
 Use this to build GNU autotools-based packages. This handles autoconf-only packages as 
@@ -249,9 +251,10 @@ instance, to be sure that automake 1.9 is used, you set
         automake: automake-1.9
 
 Autobuild tries to detect what tools it should run
-* +aclocal+ and +autoheader+ are always used
-* +autoconf+ is used if there is <tt>configure.ac</tt> or <tt>configure.in</tt> in the import dir
-* +automake+ is used if there is a <tt>Makefile.am</tt> file in the import dir
+* +autoheader+ is never used by default
+* +autoconf+ is used if there is <tt>configure.ac</tt> or <tt>configure.in</tt> in the imported dir
+* +aclocal+ is used if +autoconf+ is enabled (either explicitely or by autodetection)
+* +automake+ is used if there is a <tt>Makefile.am</tt> file in the imported dir
 * you can force to enable or disable any of these four tools in each package config by setting the tool
   flag to true or false. For instance, if you don't want package +foo+ to use automake, you say
 
@@ -269,14 +272,13 @@ The only program used during the build phase is +make+. The make command can too
 ==== Other options
 *builddir*::    the directory where the build takes place. For now, it has to be a relative path, 
                 which is added to the import dir. The default value is "build"
-*configureflags*::  array of options to add to the +configure+ command line. To ease the reuse of 
-                    Yaml references (the <tt>*label</tt> form), you can use an array of arrays, in which
-                    case the second array levels are joined using ''. For example if our +foo+ package 
-                    needs the source of the +bar+ package we added as an import package earlier,
-
-                        configureflags: [ [ --with-bar-source=, *srcdir, '/', *bar_srcdir ] ]
+*configureflags*::  array of options to add to the +configure+ command line
+                        configureflags: [ --with-bar-source=$srcdir/$bar_srcdir ]
                         depends: bar
 
+= Running autobuild in daemon mode
+The <tt>--daemon</tt> command line options makes autobuild go into daemon mode.
+ 
 = Copyright and license
 Author::    Sylvain Joyeux <sylvain.joyeux@m4x.org>
 Copyright:: Copyright (c) 2005 Sylvain Joyeux

data/bin/autobuild

@@ -8,41 +8,40 @@ require 'optparse'
 
 require 'autobuild/config'
 require 'autobuild/logging'
+require 'daemons'
+
+DEFAULT_HTTP_PORT = 2000
 
 def parse_options(args)
     options = OpenStruct.new
-    options.noupdate = false
+    options.update = false
     options.srcdir = nil
     options.prefix = nil
     options.builddir = "build"
     options.logdir = nil
+    options.daemonize = false
+    options.use_http = false
     $VERBOSE = false
 
     parser = OptionParser.new do |opts|
         opts.banner = "Usage: autobuild [options] config.yml"
         opts.separator ""
 
-        opts.on("--srcdir PATH", "Find or imports sources in PATH") do |p|
-            options.srcdir = p
-        end
-
-        opts.on("--prefix PATH", "Packages are installed in PATH") do |p|
-            options.prefix = p
-            options.logdir = "#{p}/autobuild"
+        opts.on("--srcdir PATH", "Find or imports sources in PATH") do |options.srcdir| end
+        opts.on("--prefix PATH", "Packages are installed in PATH") do |options.prefix|
+            options.logdir = "#{options.prefix}/autobuild"
         end
 
-        opts.on("--logdir", "Where logs are saved (default: <prefix>/autobuild)") do |p|
-            options.logdir = p
-        end
-
-        opts.on("--noupdate", "Do not update already checked-out sources") do
-            options.noupdate = true
-        end
-
-        opts.on("--verbose", "Display output of commands on stdout") do
-            $VERBOSE = true
-        end
+        opts.on("--logdir", "Where logs are saved (default: <prefix>/autobuild)") do |options.logdir| end
+        opts.on("--[no-]update", "Update already checked-out sources") do |options.update| end
+        opts.on("--verbose", "Display output of commands on stdout") do |$VERBOSE| end
 
+        opts.on("--[no-]daemon", "Go into daemon mode") do |options.daemonize| end
+        #opts.on("--http [PORT]", Integer, 
+        #        "Display a HTTP information page on PORT (PORT default: #{DEFAULT_HTTP_PORT})") do |port| 
+        #    options.http = (port || DEFAULT_HTTP_PORT)
+        #end
+        opts.on("--[no-]debug", "Verbose information (for debugging purposes)") do |options.debug| end
         opts.on_tail("-h", "--help", "Show this message") do
             puts opts
             exit
@@ -60,18 +59,20 @@ end
 
 # Load the command line options
 options, conffile, targets = parse_options(ARGV)
+if options.daemonize
+    puts "Going into daemon mode ..."
+    Daemons.daemonize 
+end
+
 Config.load(conffile, options)
 
-$DEBUG = true
-if $DEBUG
-    $trace = true
-end
+$trace = $DEBUG = options.debug
 
 begin
     if targets.empty?
-        Task[:default].invoke
+        Rake::Task[:default].invoke
     else
-        targets.each { |t| Task[t.to_sym].invoke }
+        targets.each { |t| Rake::Task[t.to_sym].invoke }
     end
     success
 rescue BuildException => error

data/lib/autobuild/config.rb

@@ -5,9 +5,101 @@ require 'autobuild/logging'
 require 'autobuild/package'
 require 'autobuild/importer'
 
+class Regexp
+    def each_match(string)
+        string = string.to_str
+        while data = match(string)
+            yield(data)
+            string = data.post_match
+        end
+    end
+end
+
+class UndefinedVariable < Exception
+    attr_reader :name
+    def initialize(name); @name = name end
+end
+
+class Interpolator
+    VarDefKey = 'defines'
+    InterpolationMatch = Regexp.new('\$\{([^}]+)\}|\$(\w+)')
+
+    def self.interpolate(config, parent = nil)
+        Interpolator.new(config, parent).interpolate
+    end
+
+    def initialize(node, parent = nil, variables = {})
+        @node = node
+        @variables = {}
+        @defines = {}
+        @parent = parent
+    end
+
+    def interpolate
+        case @node
+        when Hash
+            @defines = (@node[VarDefKey] || {})
+
+            interpolated = Hash.new
+            @node.each do |k, v|
+                next if k == VarDefKey
+                interpolated[k] = Interpolator.interpolate(v, self)
+            end
+
+            interpolated
+
+        when Array
+            @node.collect { |v| Interpolator.interpolate(v, self) }
+
+        else
+            if @node.respond_to?(:to_str)
+                do_string(@node.to_str) { |varname| value_of(varname) }
+            else
+                @node
+            end
+        end
+    end
+
+    def value_of(name)
+        if @defines.has_key?(name)
+            value = @defines.delete(name)
+            @variables[name] = do_string(value) { |varname|
+                begin
+                    value_of(varname)
+                rescue UndefinedVariable => e
+                    if e.varname == name
+                        raise "Cyclic reference found in definition of #{name}"
+                    else
+                        raise
+                    end
+                end
+            }
+        elsif @variables.has_key?(name)
+            @variables[name]
+        elsif @parent
+            @parent.value_of(name)
+        else
+            raise UndefinedVariable.new(name), "Interpolated variable #{name} is not defined"
+        end
+    end
+
+    def do_string(value)
+        return value if value.empty?
+
+        interpolated = ''
+        data = nil
+        InterpolationMatch.each_match(value) do |data|
+            varname = data[1] || data[2]
+            interpolated << data.pre_match << yield(varname)
+        end
+        return data ? (interpolated << data.post_match) : value
+    end
+end
+
 module Config
     def self.load(conffile, user_options)
         data = YAML.load( File.open(conffile) )
+        data = Interpolator.interpolate(data)
 
         get_autobuild_config(data, user_options)
         get_package_config(data)
@@ -37,15 +129,17 @@ module Config
         FileUtils.mkdir_p $LOGDIR if !File.directory?($LOGDIR)
         if setup["clean-log"]
             puts "Cleaning log dir #{$LOGDIR}"
-            FileUtils.rm_rf Dir.glob("#{$LOGDIR}/*")
+            FileUtils.rm_rf Dir.glob("#{$LOGDIR}/*.log")
         end
 
         $MAIL = setup["mail"]
-        $NOUPDATE = (options.noupdate or setup["noupdate"] or false)
+        $UPDATE = options.update
+        $UPDATE = setup["update"] if $UPDATE.nil?
+        $UPDATE = true if $UPDATE.nil?
 
         envvars = setup["environment"]
         envvars.each { |k, v|
-            ENV[k] = ( v.to_a.collect { |path| path.to_a.join("") }.join(":") )
+            ENV[k] = v.to_a.join(":")
         }
     end
 
@@ -100,7 +194,7 @@ module Config
             }
             # Remove p -> p dependency which may come from common_config
             if config.has_key?(:depends)
-                config[:depends] = config[:depends].to_a.find_all { |el| el != p }
+                config[:depends] = config[:depends].to_a.reject { |el| el == p }
             end
 
             add_package(p, config)

data/lib/autobuild/import/cvs.rb

@@ -9,6 +9,7 @@ class CVSImporter < Importer
         @program = ($PROGRAMS[:cvs] || 'cvs')
         @up = (options[:cvsup] || '-dP')
         @co = (options[:cvsco] || '-P')
+        super(options)
     end
 
     private
@@ -16,7 +17,7 @@ class CVSImporter < Importer
     def update(package)
         Dir.chdir(package.srcdir) {
             begin
-                subcommand(package.target, 'cvs', "#{@program} up #{@up}")
+                subcommand(package.target, 'cvs', @program, 'up' , @up)
             rescue SubcommandFailed => e
                 raise ImportException.new(e), "failed to update #{modulename}"
             end
@@ -31,7 +32,7 @@ class CVSImporter < Importer
         FileUtils.mkdir_p(head) if !File.directory?(head)
         Dir.chdir(head) {
             begin
-                subcommand(package.target, 'cvs', "#{@program} -d #{cvsroot} co #{@co} -d #{tail} #{modulename}")
+                subcommand(package.target, 'cvs', @program, '-d', cvsroot, 'co', @co, '-d', tail, modulename)
             rescue SubcommandFailed => e
                 raise ImportException.new(e), "failed to check out #{modulename}"
             end

data/lib/autobuild/import/svn.rb

@@ -6,8 +6,10 @@ class SVNImporter < Importer
         @source = source.to_a.join("/")
 
         @program = ($PROGRAMS[:svn] || 'svn')
-        @up = options[:svnup]
-        @co = options[:svnco]
+        @up = options[:svnup] || ""
+        @co = options[:svnco] || ""
+
+        super(options)
     end
 
     private
@@ -15,18 +17,18 @@ class SVNImporter < Importer
     def update(package)
         Dir.chdir(package.srcdir) {
             begin
-                subcommand(package.target, 'svn', "#{program} up #{@up}")
+                subcommand(package.target, 'svn', @program, 'up', @up)
             rescue SubcommandFailed => e
-                raise ImportException.new(e), "failed to update #{modulename}"
+                raise ImportException.new(e), "failed to update #{package.target}"
             end
         }
     end
 
     def checkout(package)
         begin
-            subcommand(package.target, 'svn', "#{program} co #{@co} #{@source} #{package.srcdir}")
+            subcommand(package.target, 'svn', @program, 'co', @co, @source, package.srcdir)
         rescue SubcommandFailed => e
-            raise ImportException.new(e), "failed to check out #{modulename}"
+            raise ImportException.new(e), "failed to check out #{package.target}"
         end
     end
 end

data/lib/autobuild/importer.rb

@@ -1,24 +1,37 @@
 class Importer
+    def initialize(options)
+        @options = options
+    end
+
     def import(package)
         srcdir = package.srcdir
         if File.directory?(srcdir)
-            if $NOUPDATE
-                puts "Not updating #{package.target} since noupdate is set"
+            if $UPDATE
+                update(package)
+            else
+                puts "Not updating #{package.target}"
                 return
             end
 
-            update(package)
-
         elsif File.exists?(srcdir)
             raise ImportException, "#{srcdir} exists but is not a directory"
         else
             begin
                 checkout(package)
+                patch(package)
             rescue ImportException => error
                 FileUtils.rm_rf package.srcdir
                 raise error
             end
         end
     end
+
+    #    def patch(package)
+    #        patch = $PROGRAMS['patch'] || 'patch'
+    #        # Apply patches, if any
+    #        @options[:patch].to_a.each do |path|
+    #            subcommand(package.target, 'patch', patch
+    #        end
+    #    end
 end
 

data/lib/autobuild/package.rb

@@ -42,7 +42,6 @@ class Package
 
     def depends_on(p)
         p = Package.name2target(p)
-        raise :bla if !(Symbol === p)
         task target => p
         puts "#{target} depends on #{p}"
 

data/lib/autobuild/packages/autotools.rb

@@ -3,19 +3,44 @@ require 'autobuild/environment'
 require 'autobuild/package'
 require 'autobuild/subcommand'
 
+## 
+# ==== Handles autotools-based packages
+#
+# == Used programs
+# - aclocal, autoheader, autoconf, automake
+#
+# == Available options
+# - aclocal (default: true if autoconf is enabled, false otherwise) run aclocal
+# - autoconf (default: autodetect) run autoconf. Will be enabled if there is 
+#   +configure.in+ or +configure.ac+ in the source directory
+# - autoheader (default: false) run autoheader
+# - automake (default: autodetect) run automake. Will run automake if there is a 
+#   +Makefile.am+ in the source directory
+# 
 class Autotools < Package
     factory :autotools, self
 
     attr_reader :builddir
 
-    def buildstamp; 
+    DefaultOptions = {
+        :autoheader => false,
+        :aclocal => nil,
+        :autoconf => nil,
+        :automake => nil,
+        :builddir => 'build'
+    }
+
+    def buildstamp
         "#{builddir}/#{target}-#{STAMPFILE}"
     end
 
     def initialize(target, options)
+        options = DefaultOptions.merge(options) { |key, old, new|
+            (new.nil? || (new.respond_to?(:empty) && new.empty?)) ? old : new
+        }
         super(target, options)
 
-        @builddir = (options[:builddir] || "build")
+        @builddir = options[:builddir]
         raise ConfigException, "Autotools packages need a non-empty builddir" if (@builddir.nil? || @builddir.empty?)
         raise ConfigException, "No support for absolute builddirs" if (Pathname.new(@builddir).absolute?)
         @builddir = File.expand_path(builddir, srcdir)
@@ -27,11 +52,16 @@ class Autotools < Package
         end
 
         source_tree srcdir, builddir
-        file srcdir => dependencies if !dependencies.empty?
         file buildstamp => [ srcdir, "#{builddir}/config.status" ] do 
             build
         end
-        file installstamp => [ buildstamp ] do 
+
+        if !dependencies.empty?
+            file buildstamp => dependencies
+            file srcdir => dependencies
+        end
+
+        file installstamp => buildstamp do 
             install
             update_environment(prefix)
         end
@@ -47,16 +77,27 @@ class Autotools < Package
         end
         file conffile do
             Dir.chdir(srcdir) {
-                $PROGRAMS["aclocal"] ||= "aclocal"
-                $PROGRAMS["autoconf"] ||= "autoconf"
-                $PROGRAMS["autoheader"] ||= "autoheader"
-                $PROGRAMS["automake"] ||= "automake"
+                $PROGRAMS['aclocal']     ||= 'aclocal'
+                $PROGRAMS['autoconf']    ||= 'autoconf'
+                $PROGRAMS['autoheader']  ||= 'autoheader'
+                $PROGRAMS['automake']    ||= 'automake'
 
                 begin
-                    subcommand(target, "configure", $PROGRAMS["aclocal"]) if @options[:aclocal]
-                    subcommand(target, "configure", $PROGRAMS["autoconf"]) if @options[:autoconf]
-                    subcommand(target, "configure", $PROGRAMS["autoheader"]) if @options[:autoheader]
-                    subcommand(target, "configure", $PROGRAMS["automake"]) if @options[:automake]
+                    # Autodetect autoconf/aclocal/automake
+                    if @options[:autoconf].nil?
+                        @options[:autoconf] = 
+                            File.exists?(File.join(srcdir, 'configure.in')) ||
+                            File.exists?(File.join(srcdir, 'configure.ac'))
+                    end
+                    @options[:aclocal] ||= @options[:autoconf]
+                    if @options[:automake].nil?
+                        @options[:automake] = File.exists?(File.join(srcdir, 'Makefile.am'))
+                    end
+
+                    subcommand(target, 'configure', $PROGRAMS['aclocal'])    if @options[:aclocal]
+                    subcommand(target, 'configure', $PROGRAMS['autoconf'])   if @options[:autoconf]
+                    subcommand(target, 'configure', $PROGRAMS['autoheader']) if @options[:autoheader]
+                    subcommand(target, 'configure', $PROGRAMS['automake'])   if @options[:automake]
                 rescue SubcommandFailed => e
                     raise BuildException.new(e), "failed to build the configure environment of #{target}"
                 end
@@ -71,15 +112,11 @@ class Autotools < Package
 
         FileUtils.mkdir_p builddir if !File.directory?(builddir)
         Dir.chdir(builddir) {
-            command = "#{srcdir}/configure --no-create --prefix=#{prefix}"
-
-            configureflags = @options[:configureflags].to_a.collect { |item|
-                item.to_a.join("")
-            }.join(" ")
-            command += " #{configureflags}" if !configureflags.empty?
+            command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
+            command |= @options[:configureflags].to_a
             
             begin
-                subcommand(target, "configure", command)
+                subcommand(target, 'configure', *command)
             rescue SubcommandFailed => e
                 raise BuildException.new(e), "failed to configure #{target}"
             end
@@ -89,9 +126,9 @@ class Autotools < Package
     def build
         Dir.chdir(builddir) {
             begin
-                subcommand(target, "build", "./config.status")
-                $PROGRAMS["make"] ||= "make"
-                subcommand(target, "build", $PROGRAMS["make"])
+                subcommand(target, 'build', './config.status')
+                $PROGRAMS['make'] ||= 'make'
+                subcommand(target, 'build', $PROGRAMS['make'])
             rescue SubcommandFailed => e
                 raise BuildException.new(e), "failed to build #{target}"
             end
@@ -101,9 +138,9 @@ class Autotools < Package
 
     def install
         Dir.chdir(builddir) {
-            make = ($PROGRAMS["make"] or "make")
+            make = ($PROGRAMS['make'] or 'make')
             begin
-                subcommand(target, "install", "#{make} install")
+                subcommand(target, 'install', make, 'install')
             rescue SubcommandFailed => e
                 raise BuildException.new(e), "failed to install #{builddir}"
             end

data/lib/autobuild/packages/genom.rb

@@ -9,16 +9,21 @@ class GenomModule < Autotools
 
     def genomstamp; "#{srcdir}/.genom/genom-stamp" end
 
+    def cpp_options
+        @options[:genomflags].to_a.find_all { |opt| opt =~ /^-D/ }
+    end
+
     def get_requires
-        File.open("#{srcdir}/#{target}.gen") do |f|
-            f.each_line { |line|
-                if line =~ /^require\s*:\s*([\w\-]+(?:\s*,\s*[\w\-]+)*);/
+        cpp = ($PROGRAMS['cpp'] || 'cpp')
+        Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{target}.gen") do |in, out, err|
+            out.each_line { |line|
+                if line =~ /^\s*requires\s*:\s*([\w\-]+(?:\s*,\s*[\w\-]+)*);/
                     $1.split(/, /).each { |name| 
                         depends_on name
                         file genomstamp => Package.name2target(name)
                     }
-                elsif line =~ /^require/
-                    puts "failed to math #{line}"
+                elsif line =~ /^\s*requires/
+                    puts "failed to match #{line}"
                 end
             }
         end
@@ -38,12 +43,13 @@ class GenomModule < Autotools
         
 
     def regen_targets
+        cmdline = [ 'genom', target ] | @options[:genomflags].to_a
+
         file buildstamp => genomstamp
         file genomstamp => [ :genom, "#{srcdir}/#{target}.gen" ] do
             Dir.chdir(srcdir) {
-                cmdline = "genom " + @options[:genomflags].to_a.join(" ") + " #{target}"
                 begin
-                    subcommand(target, 'genom', cmdline)
+                    subcommand(target, 'genom', *cmdline)
                 rescue SubcommandFailed => e
                     raise BuildException.new(e), "failed to generate module #{target}"
                 end
@@ -57,7 +63,7 @@ class GenomModule < Autotools
                 # since the generation takes care of rebuilding configure
                 # if .gen has changed
                 begin
-                    subcommand(target, 'genom', cmdline)
+                    subcommand(target, 'genom', *cmdline)
                 rescue SubcommandFailed => e
                     raise BuildException.new(e), "failed to generate module #{target}"
                 end

data/lib/autobuild/subcommand.rb

@@ -1,8 +1,12 @@
 require 'autobuild/logging'
 
-def subcommand(target, type, command)
+def subcommand(target, type, *command)
+    # Filter nil and empty? in command
+    command = command.reject { |o| o.nil? || (o.respond_to?(:empty?) && o.empty?) }
+    command.collect! { |o| o.to_s }
+
     logname = "#{$LOGDIR}/#{target}-#{type}.log"
-    puts "#{target}: running #{command}\n    (output goes to #{logname})"
+    puts "#{target}: running #{command.join(" ")}\n    (output goes to #{logname})"
 
     status = File.open(logname, "a") { |logfile|
         pid = fork { 
@@ -14,7 +18,7 @@ def subcommand(target, type, command)
                 $stdout.reopen(logfile.dup)
             end
            
-            if !exec(*command.split(" "))
+            if !exec(*command)
                 raise "Error running command"
             end
         }
@@ -23,7 +27,7 @@ def subcommand(target, type, command)
     }
 
     if status.exitstatus > 0
-        raise SubcommandFailed.new(target, command, logname, status.exitstatus)
+        raise SubcommandFailed.new(target, command.join(" "), logname, status.exitstatus)
         return false
     else
         return true

data/lib/autobuild/timestamps.rb

@@ -1,5 +1,6 @@
 require 'find'
 require 'rake/tasklib'
+require 'fileutils'
 
 STAMPFILE = "autobuild-stamp"
 
@@ -26,7 +27,7 @@ def tree_timestamp(path, *exclude)
     return latest
 end
 
-class SourceTreeTask < Task
+class SourceTreeTask < Rake::Task
     attr_accessor :exclude
     def timestamp
         tree_timestamp(name, "*CVS", *@exclude)
@@ -43,6 +44,7 @@ def get_stamp(stampfile)
 end
 
 def touch_stamp(stampfile)
-    File.open(stampfile, "w") { |*| }
+    puts "Touching #{stampfile}" if $trace
+    FileUtils.touch(stampfile)
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2005-08-31 00:00:00 +02:00
+  version: "0.2"
+date: 2005-09-12 00:00:00 +02:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
   - lib
@@ -34,12 +34,12 @@ authors:
   - Sylvain Joyeux
 files: 
   - lib/autobuild/config.rb
+  - lib/autobuild/environment.rb
   - lib/autobuild/importer.rb
-  - lib/autobuild/package.rb
-  - lib/autobuild/timestamps.rb
   - lib/autobuild/logging.rb
+  - lib/autobuild/package.rb
   - lib/autobuild/subcommand.rb
-  - lib/autobuild/environment.rb
+  - lib/autobuild/timestamps.rb
   - lib/autobuild/import/cvs.rb
   - lib/autobuild/import/svn.rb
   - lib/autobuild/packages/autotools.rb
@@ -73,6 +73,16 @@ dependencies:
   - !ruby/object:Gem::Dependency 
     name: rmail
     version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">"
+          - !ruby/object:Gem::Version 
+            version: 0.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: daemons
+    version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         -