autobuild 0.4 → 0.5

data/lib/autobuild/packages/import.rb

@@ -1,20 +1,22 @@
 require 'autobuild/timestamps'
 require 'autobuild/package'
 
-class ImporterPackage < Package
-    def installstamp
-        "#{srcdir}/#{STAMPFILE}"
-    end
-    def initialize(target, options)
-        super(target, options)
-        source_tree srcdir, installstamp
-        file installstamp => srcdir do 
-            touch_stamp installstamp
+module Autobuild
+    class ImporterPackage < Package
+        def installstamp
+            "#{srcdir}/#{STAMPFILE}"
         end
-    end
-    def prepare; end
+        def initialize(target, options)
+            super(target, options)
+            source_tree srcdir, installstamp
+            file installstamp => srcdir do 
+                touch_stamp installstamp
+            end
+        end
+        def prepare; end
 
-    factory :import, ImporterPackage
+        factory :import, ImporterPackage
+    end
 end
 
 

data/lib/autobuild/reporting.rb

@@ -2,77 +2,113 @@ require 'rmail'
 require 'rmail/serialize'
 require 'net/smtp'
 require 'socket'
+require 'etc'
 
-module Reporting
-    def self.report
-        begin
-            yield
-        rescue Exception => e
-            raise unless e.respond_to?(:target)
-            error(e)
-            exit(1) if e.fatal?
+require 'autobuild/exceptions'
+
+module Autobuild
+    class Reporting
+        @@reporters = Array.new
+
+        def self.report
+            begin
+                yield
+            rescue Autobuild::Exception => e
+                raise unless e.kind_of?(Autobuild::Exception)
+                error(e)
+                exit(1) if e.fatal?
+            end
+        end
+        
+        def self.success
+            @@reporters.each do |rep| rep.success end
+        end
+
+        def self.error(error)
+            @@reporters.each do |rep| rep.error(error) end
         end
-    end
-    
-    def self.success
-        message = "Build finished successfully at #{Time.now}"
-        puts message
-        send_mail("Build success", message) if $MAIL
-    end
 
-    def self.error(object)
-        if object.kind_of?(SubcommandFailed)
-            body = <<EOF
-#{object.target}: #{object.message}
-    command '#{object.command}' failed with status #{object.status}
-    see #{File.basename(object.logfile)} for details
-EOF
-
-            message = <<EOF
-#{object.target}: #{object.message}
-    command '#{object.command}' failed with status #{object.status}
-    see #{object.logfile} for details
-EOF
-        else
-            body = message = "#{object.target}: #{object.message}"
+        def self.<<(reporter)
+            @@reporters << reporter
         end
 
-        puts message
-        send_mail("Build failed", body) if $MAIL && object.mail?
+        def self.each_log(&iter)
+            Dir.glob("#{$LOGDIR}/*.log", &iter)
+        end
     end
 
-    private
+    class Reporter
+        def error(error); end
+        def success; end
+    end
 
-    def self.send_mail(subject, body)
-        from = ($MAIL[:from] || "autobuild@#{Socket.gethostname}")
-        to = $MAIL[:to]
-        smtp = ($MAIL[:smtp]  || "localhost" )
+    class StdoutReporter < Reporter
+        def error(error)
+            puts "Build failed: #{error}"
+        end
+        def success
+            puts "Build finished successfully at #{Time.now}"
+        end
+    end
 
-        mail = RMail::Message.new
-        mail.header.date = Time.now
-        mail.header.from = from
-        mail.header.to = to
-        mail.header.subject = subject
+    class MailReporter < Reporter
+        def default_mail
+            Etc::endpwent
+            uname = while (pwent = Etc::getpwent)
+                        break (pwent.name) if pwent.uid == Process.uid
+                    end
 
-        part = RMail::Message.new
-        part.header.set('Content-Type', 'text/plain')
-        part.body = body
-        mail.add_part(part)
+            raise "FATAL: cannot find a user with uid=#{Process.uid}" unless uname
+            "#{pwent.name}@#{Socket.gethostname}"
+        end
+        
+        def initialize(config)
+            @from = (config[:from] || default_mail)
+            @to   = (config[:to]   || default_mail)
+            @smtp = (config[:smtp] || "localhost" )
+            @port = Integer(config[:port] || Socket.getservbyname('smtp'))
+        end
+
+        def error(error)
+            if error.mail?
+                send_mail("Build failed", error.to_s)
+            end
+        end
 
-        # Attach log files
-        Dir.glob("#{$LOGDIR}/*.log") do |file|
-            mail.add_file(file)
+        def success
+            send_mail("Build success", "finished successfully at #{Time.now}")
         end
 
-        # Send the mail
-        smtp = Net::SMTP.new(smtp, Integer($MAIL[:port] || 25))
-        smtp.start {
-            smtp.send_mail RMail::Serialize.write('', mail), from, to
-        }
+        def send_mail(subject, body)
+            mail = RMail::Message.new
+            mail.header.date = Time.now
+            mail.header.from = @from
+            mail.header.to = @to
+            mail.header.subject = subject
+
+            part = RMail::Message.new
+            part.header.set('Content-Type', 'text/plain')
+            part.body = body
+            mail.add_part(part)
+
+            # Attach log files
+            Reporting.each_log do |file|
+                mail.add_file(file)
+            end
+
+            # Send the mail
+            smtp = Net::SMTP.new(@smtp, @port)
+            smtp.start {
+                smtp.send_mail RMail::Serialize.write('', mail), @from, @to
+            }
+
+            # Notify the sending
+            puts "Sent notification mail to #{@to} with source #{@from}"
+
+        end
     end
 end
 
-
 module RMail
     class Message
         def add_file(path, content_type='text/plain')

data/lib/autobuild/subcommand.rb

@@ -1,58 +1,101 @@
 require 'autobuild/reporting'
 
-def subcommand(target, type, *command)
-    # Filter nil and empty? in 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.join(" ")}\n    (output goes to #{logname})"
-
-    input_streams = command.collect { |o| $1 if o =~ /^\<(.+)/ }.compact
-    command.reject! { |o| o =~ /^\<(.+)/ }
-
-    status = File.open(logname, "a") do |logfile|
-        pread, pwrite = IO.pipe
-
-        pid = fork { 
-            Process.setpriority(Process::PRIO_PROCESS, 0, $NICE) if $NICE
-            if $VERBOSE
-                $stderr.dup.reopen(logfile.dup)
-                $stdout.dup.reopen(logfile.dup)
-            else
-                $stderr.reopen(logfile.dup)
-                $stdout.reopen(logfile.dup)
-            end
+module Autobuild::Subprocess
+    @@nice = 0
+    def self.nice=(value)
+        @@nice = value
+    end
 
-            if !input_streams.empty?
-                pwrite.close
-                $stdin.reopen(pread)
-            end
-           
-            if !exec(*command)
-                raise SubcommandFailed.new(target, command.join(" "), logname, 0), "error running command"
+    class Failed < Exception
+        attr_reader :status
+        def initialize(status = 0)
+            @status = status
+        end
+    end
+
+    CONTROL_COMMAND_NOT_FOUND = 1
+    CONTROL_UNEXPECTED = 2
+    def self.run(target, phase, *command)
+        # Filter nil and empty? in command
+        command.reject!  { |o| o.nil? || (o.respond_to?(:empty?) && o.empty?) }
+        command.collect! { |o| o.to_s }
+        logname = "#{$LOGDIR}/#{target}-#{phase}.log"
+
+        puts "#{target}: running #{command.join(" ")}\n    (output goes to #{logname})"
+
+        input_streams = command.collect { |o| $1 if o =~ /^\<(.+)/ }.compact
+        command.reject! { |o| o =~ /^\<(.+)/ }
+
+        status = File.open(logname, "a") do |logfile|
+            pread, pwrite = IO.pipe # to feed subprocess stdin 
+            cread, cwrite = IO.pipe # to control that exec goes well
+
+            pid = fork { 
+                cwrite.sync = true
+                begin
+                    Process.setpriority(Process::PRIO_PROCESS, 0, @@nice)
+                    if $VERBOSE
+                        $stderr.dup.reopen(logfile.dup)
+                        $stdout.dup.reopen(logfile.dup)
+                    else
+                        $stderr.reopen(logfile.dup)
+                        $stdout.reopen(logfile.dup)
+                    end
+
+                    if !input_streams.empty?
+                        pwrite.close
+                        $stdin.reopen(pread)
+                    end
+                   
+                    exec(*command)
+                rescue Errno::ENOENT
+                    cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
+                    raise
+                rescue Exception
+                    cwrite.write([CONTROL_UNEXPECTED].pack('I'))
+                    raise
+                end
+            }
+
+            # Feed the input
+            pread.close
+            begin
+                input_streams.each do |infile|
+                    File.open(infile) do |instream|
+                        instream.each_line { |line| pwrite.write(line) }
+                    end
+                end
+            rescue Errno::ENOENT => e
+                raise Failed.new, "cannot open input files: #{e.message}"
             end
-        }
-
-        # Feed the input
-        pread.close
-        begin
-            input_streams.each do |infile|
-                File.open(infile) do |instream|
-                    instream.each_line { |line| pwrite.write(line) }
+            pwrite.close
+
+            # Get control status
+            cwrite.close
+            value = cread.read(4)
+            if value
+                # An error occured
+                value = value.unpack('I').first
+                if value == CONTROL_COMMAND_NOT_FOUND
+                    raise Failed.new, "file not found"
+                else
+                    raise Failed.new, "something unexpected happened"
                 end
             end
-        rescue Errno::ENOENT => e
-            logfile.puts "Cannot open input files: #{e.message}"
-            raise SubcommandFailed.new(target, command.join(" "), logname, 0), e.message
+
+            childpid, childstatus = Process.wait2(pid)
+            childstatus
         end
-        pwrite.close
 
-        childpid, childstatus = Process.wait2(pid)
-        childstatus
-    end
+        if status.exitstatus > 0
+            raise Failed.new(status.exitstatus), "command returned with status #{status.exitstatus}"
+        end
 
-    if status.exitstatus > 0
-        raise SubcommandFailed.new(target, command.join(" "), logname, status.exitstatus)
+    rescue Failed => e
+        error = SubcommandFailed.new(target, command.join(" "), logname, e.status)
+        error.phase = phase
+        raise error, e.message
     end
+
 end
 

data/lib/autobuild/timestamps.rb

@@ -4,47 +4,57 @@ require 'fileutils'
 
 STAMPFILE = "autobuild-stamp"
 
-def tree_timestamp(path, *exclude)
-    latest = Time.at(0)
-    latest_file = ""
-    dot = "."[0]
-
-    exclude.collect! { |e| File.expand_path(e, path) }
-    Find.find(path) { |p|
-        Find.prune if File.basename(p)[0] == dot
-        exclude.each { |pattern| 
-            Find.prune if File.fnmatch?(pattern, p) 
+module Autobuild
+    def tree_timestamp(path, *exclude)
+        # Exclude autobuild timestamps
+        exclude << "*-#{STAMPFILE}"
+
+        puts "getting tree timestamp for #{path}" if $DEBUG
+        latest = Time.at(0)
+        latest_file = ""
+
+        exclude.collect! { |e| File.expand_path(e, path) }
+        Find.find(path) { |p|
+            Find.prune if File.basename(p) =~ /^\./
+            exclude.each { |pattern| 
+                if File.fnmatch?(pattern, p) 
+                    puts "  excluding #{p}" if $DEBUG
+                    Find.prune
+                end
+            }
+            next if File.directory?(p)
+
+            p_time = File.mtime(p)
+            if latest < p_time
+                latest = p_time
+                latest_file = p
+            end
         }
-        next if File.directory?(p)
 
-        p_time = File.mtime(p)
-        if latest < p_time
-            latest = p_time
-            latest_file = p
-        end
-    }
-
-    return latest
-end
+        puts "  #{latest}" if $DEBUG
+        return latest
+    end
 
-class SourceTreeTask < Rake::Task
-    attr_accessor :exclude
-    def timestamp
-        tree_timestamp(name, "*CVS", *@exclude)
+    class SourceTreeTask < Rake::Task
+        attr_accessor :exclude
+        def timestamp
+            tree_timestamp(name, "*CVS", *@exclude)
+        end
+    end
+    def source_tree(path, exclude, &block)
+        task = SourceTreeTask.define_task(path, &block)
+        task.exclude = exclude
+    end
+            
+    def get_stamp(stampfile)
+        return Time.at(0) if !File.exists?(stampfile)
+        return File.mtime(stampfile)
     end
-end
-def source_tree(path, exclude, &block)
-    task = SourceTreeTask.define_task(path, &block)
-    task.exclude = exclude
-end
-        
-def get_stamp(stampfile)
-    return Time.at(0) if !File.exists?(stampfile)
-    return File.mtime(stampfile)
-end
 
-def touch_stamp(stampfile)
-    puts "Touching #{stampfile}" if $trace
-    FileUtils.touch(stampfile)
+    def touch_stamp(stampfile)
+        puts "Touching #{stampfile}" if $DEBUG
+        FileUtils.touch(stampfile)
+        sleep(1)
+    end
 end
 

metadata

@@ -3,100 +3,65 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2005-09-27 00:00:00 +02:00
+  version: "0.5"
+date: 2005-12-09 00:00:00 +01:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
-  - lib
-  - lib
+- lib
 email: sylvain.joyeux@m4x.org
-homepage: 
-rubyforge_project: 
-description: "autobuild imports, configures, builds and installs software packages (mainly 
-  C/C++ autotools packages for now) with dependencies. It can be used in 
-  community-based software development to make sure that nothing is broken in the
-  build process of a set of packages."
+homepage: http://autobuild.rubyforge.org
+rubyforge_project: autobuild
+description: Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.
 autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Sylvain Joyeux
+- Sylvain Joyeux
 files: 
-  - lib/autobuild/config.rb
-  - lib/autobuild/environment.rb
-  - lib/autobuild/importer.rb
-  - lib/autobuild/reporting.rb
-  - lib/autobuild/package.rb
-  - lib/autobuild/subcommand.rb
-  - lib/autobuild/timestamps.rb
-  - lib/autobuild/exceptions.rb
-  - lib/autobuild/options.rb
-  - lib/autobuild/config-interpolator.rb
-  - lib/autobuild/import/cvs.rb
-  - lib/autobuild/import/svn.rb
-  - lib/autobuild/packages/autotools.rb
-  - lib/autobuild/packages/genom.rb
-  - lib/autobuild/packages/import.rb
-  - bin/autobuild
-  - README
-test_files: 
-  - test/tc_subcommand.rb
-  - test/tc_config_interpolation.rb
-  - test/tc_config.rb
-  - test/tc_import.rb
-  - test/base.rb
-  - test/data
-  - test/tools.rb
+- README
+- Rakefile
+- CHANGES
+- lib/autobuild/importer.rb
+- lib/autobuild/config-interpolator.rb
+- lib/autobuild/subcommand.rb
+- lib/autobuild/options.rb
+- lib/autobuild/environment.rb
+- lib/autobuild/package.rb
+- lib/autobuild/reporting.rb
+- lib/autobuild/timestamps.rb
+- lib/autobuild/exceptions.rb
+- lib/autobuild/config.rb
+- lib/autobuild/import/svn.rb
+- lib/autobuild/import/cvs.rb
+- lib/autobuild/import/tar.rb
+- lib/autobuild/packages/import.rb
+- lib/autobuild/packages/autotools.rb
+- lib/autobuild/packages/genom.rb
+test_files: []
+
 rdoc_options: 
-  - "--title"
-  - Autobuild
-  - "--main"
-  - README
+- --title
+- Autobuild
+- --main
+- README
 extra_rdoc_files: 
-  - README
-executables: 
-  - autobuild
+- README
+- CHANGES
+executables: []
+
 extensions: []
+
 requirements: []
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.6.0
-      version: 
-  - !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: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
+
+dependencies: []
+