autobuild 0.4 → 0.5

data/lib/autobuild/config.rb

@@ -29,7 +29,7 @@ class Hash
     end
 end
 
-module Config
+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\''
@@ -70,7 +70,7 @@ module Config
             end
         }
 
-        $VERBOSE = autobuild_config[:verbose]
+        $verbose = $VERBOSE = autobuild_config[:verbose]
         $trace = $DEBUG   = autobuild_config[:debug]
 
         get_autobuild_config(config)
@@ -81,9 +81,10 @@ module 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", $PREFIX)
+        $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)
@@ -92,7 +93,21 @@ module Config
             FileUtils.rm_rf Dir.glob("#{$LOGDIR}/*.log")
         end
 
-        $MAIL   = autobuild[:mail]
+        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"
+            
+            end
+            Reporting << MailReporter.new(mail_config)
+        end
         $UPDATE = autobuild[:update]
         $NICE   = autobuild[:nice]
 

data/lib/autobuild/environment.rb

@@ -1,16 +1,18 @@
-def pathvar(path, varname)
-    if File.directory?(path)
-        oldpath = ENV[varname]
-        if oldpath.empty?
-            ENV[varname] = path
-        else
-            ENV[varname] = "#{path}:#{oldpath}"
+module Autobuild
+    def self.pathvar(path, varname)
+        if File.directory?(path)
+            oldpath = ENV[varname]
+            if oldpath.empty?
+                ENV[varname] = path
+            else
+                ENV[varname] = "#{path}:#{oldpath}"
+            end
         end
     end
-end
 
-def update_environment(newprefix)
-    pathvar("#{newprefix}/bin", 'PATH')
-    pathvar("#{newprefix}/lib/pkgconfig", 'PKG_CONFIG_PATH')
+    def self.update_environment(newprefix)
+        pathvar("#{newprefix}/bin", 'PATH')
+        pathvar("#{newprefix}/lib/pkgconfig", 'PKG_CONFIG_PATH')
+    end
 end
 

data/lib/autobuild/exceptions.rb

@@ -1,51 +1,52 @@
-class SubcommandFailed < Exception
-    def mail?;  false end
-    def fatal?; true end
-
-    attr_reader :target, :command, :logfile, :status
-    def initialize(target, command, logfile, status)
-        @target = target
-        @command = command
-        @logfile = logfile
-        @status = status
-    end
-end
-        
-class ConfigException < Exception
-    def mail?;  false end
-    def fatal?; true end
-
-    def initialize(target = nil)
-        @target = target
+module Autobuild
+    class Exception < RuntimeError
+        def mail?;  false end
+        def fatal?; true end
+        attr_accessor :target, :phase
+
+        def initialize(target = nil, phase = nil)
+            @target = target
+            @phase = phase
+        end
+
+        alias :exception_message :to_s 
+        def to_s
+            "#{target}: failed in #{phase} phase"
+            "   #{super}"
+        end
     end
-    attr_accessor :target
-end
-
-class PackageException < Exception
-    def mail?; true end
-    def fatal?; true end
-
-    def initialize(target = nil)
-        @target = target
+    class ConfigException  < Exception; end
+    class PackageException < Exception
+        def mail?; true end
     end
-    attr_accessor :target
-end
-
-class ImportException < SubcommandFailed
-    def mail?;  true end
-    def fatal?; true end
-
-    def initialize(subcommand)
-        super(subcommand.target, subcommand.command, subcommand.logfile, subcommand.status)
-    end
-end
-
-class BuildException < SubcommandFailed
-    def mail?;  true end
-    def fatal?; true end
 
-    def initialize(subcommand)
-        super(subcommand.target, subcommand.command, subcommand.logfile, subcommand.status)
+    class CommandNotFound  < Exception; end
+    class SubcommandFailed < Exception
+        def mail?; true end
+        attr_reader :command, :logfile, :status
+        def initialize(*args)
+            if args.size == 1
+                sc = args[0]
+                target, command, logfile, status = 
+                    sc.target, sc.command, sc.logfile, sc.status
+                @orig_message = sc.exception_message
+            elsif args.size == 4
+                target, command, logfile, status = *args
+            else
+                raise ArgumentError, "wrong number of arguments, should be 1 or 4"
+            end
+
+            super(target)
+            @command = command
+            @logfile = logfile
+            @status = status
+        end
+
+        def to_s
+            prefix = "#{super}\n    command '#{command}' failed"
+            prefix << ": " + @orig_message if @orig_message
+            prefix << "\n    see #{File.basename(logfile)} for details\n"
+        end
     end
 end
 

data/lib/autobuild/import/cvs.rb

@@ -1,51 +1,46 @@
 require 'autobuild/subcommand'
 require 'autobuild/importer'
 
-class CVSImporter < Importer
-    def initialize(root, name, options)
-        @root = root
-        @module = name
+module Autobuild
+    class CVSImporter < Importer
+        def initialize(root, name, options)
+            @root = root
+            @module = name
 
-        @program = ($PROGRAMS[:cvs] || 'cvs')
-        @up = (options[:cvsup] || '-dP')
-        @co = (options[:cvsco] || '-P')
-        super(options)
-    end
-    
-    def modulename
-        @module
-    end
+            @program    = ($PROGRAMS[:cvs] || 'cvs')
+            @options_up = ( options[:cvsup] || '-dP' ).to_a
+            @options_co = ( options[:cvsco] || '-P' ).to_a
+            super(options)
+        end
+        
+        def modulename
+            @module
+        end
 
-    private
+        private
 
-    def update(package)
-        Dir.chdir(package.srcdir) {
-            begin
-                subcommand(package.target, 'cvs', @program, 'up' , @up)
-            rescue SubcommandFailed => e
-                raise ImportException.new(e), "failed to update #{modulename}"
-            end
-        }
-    end
+        def update(package)
+            Dir.chdir(package.srcdir) {
+                Subprocess.run(package.target, :import, @program, 'up', *@options_up)
+            }
+        end
 
-    def checkout(package)
-        head, tail = File.split(package.srcdir)
-        cvsroot = @root
-           
-        FileUtils.mkdir_p(head) if !File.directory?(head)
-        Dir.chdir(head) {
-            begin
-                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
-        }
+        def checkout(package)
+            head, tail = File.split(package.srcdir)
+            cvsroot = @root
+               
+            FileUtils.mkdir_p(head) if !File.directory?(head)
+            Dir.chdir(head) {
+                options = [ @program, '-d', cvsroot, 'co', '-d', tail ] + @options_co + [ modulename ]
+                Subprocess.run(package.target, :import, *options)
+            }
+        end
     end
-end
 
-module Import
-    def self.cvs(source, package_options)
-        CVSImporter.new(source[0], source[1], package_options)
+    module Import
+        def self.cvs(source, package_options)
+            CVSImporter.new(source[0], source[1], package_options)
+        end
     end
 end
 

data/lib/autobuild/import/svn.rb

@@ -1,41 +1,35 @@
-require 'autobuild/subcommand' 
+require 'autobuild/subcommand'
 require 'autobuild/importer'
 
-class SVNImporter < Importer
-    def initialize(source, options)
-        @source = source.to_a.join("/")
+module Autobuild
+    class SVNImporter < Importer
+        def initialize(source, options)
+            @source = source.to_a.join("/")
 
-        @program = ($PROGRAMS[:svn] || 'svn')
-        @up = options[:svnup] || ""
-        @co = options[:svnco] || ""
-
-        super(options)
-    end
+            @program = ($PROGRAMS[:svn] || 'svn')
+            @options_up = options[:svnup].to_a
+            @options_co = options[:svnco].to_a
+            super(options)
+        end
 
-    private
+        private
 
-    def update(package)
-        Dir.chdir(package.srcdir) {
-            begin
-                subcommand(package.target, 'svn', @program, 'up', @up)
-            rescue SubcommandFailed => e
-                raise ImportException.new(e), "failed to update #{package.target}"
-            end
-        }
-    end
+        def update(package)
+            Dir.chdir(package.srcdir) {
+                Subprocess.run(package.target, :import, @program, 'up', *@options_up)
+            }
+        end
 
-    def checkout(package)
-        begin
-            subcommand(package.target, 'svn', @program, 'co', @co, @source, package.srcdir)
-        rescue SubcommandFailed => e
-            raise ImportException.new(e), "failed to check out #{package.target}"
+        def checkout(package)
+            options = [ @program, 'co' ] + @options_co + [ @source, package.srcdir ]
+            Subprocess.run(package.target, :import, *options)
         end
     end
-end
 
-module Import
-    def self.svn(source, options)
-        SVNImporter.new(source, options)
+    module Import
+        def self.svn(source, options)
+            SVNImporter.new(source, options)
+        end
     end
 end
 

data/lib/autobuild/import/tar.rb

@@ -0,0 +1,120 @@
+require 'open-uri'
+
+module Autobuild
+    class TarImporter < Importer
+        Plain = 0
+        Gzip  = 1
+        Bzip  = 2
+
+        TAR_OPTION = {
+            Plain => '',
+            Gzip => 'z',
+            Bzip => 'j'
+        }
+
+        VALID_URI_SCHEMES = [ 'file', 'http', 'ftp' ]
+
+        def self.url_to_mode(url)
+            ext = File.extname(url)
+            mode =  case ext
+                        when '.tar'; Plain
+                        when '.gz'; Gzip
+                        when '.bz2'; Bzip
+                    end
+
+            unless ext == '.tar'
+                raise "Invalid file type in #{url}" unless File.basename(url, ext) != '.tar'
+            end
+            mode
+        end
+
+        def update_cache
+            do_update = true
+
+            if File.file?(cachefile)
+                cached_size = File.lstat(cachefile).size
+                cached_mtime = File.lstat(cachefile).mtime
+
+                size, mtime = nil
+                open @url, :content_length_proc => lambda { |size| } do |file| 
+                    mtime = file.last_modified
+                end
+
+                if mtime && size
+                    do_update = (size != cached_size || mtime > cached_mtime)
+                elsif mtime
+                    $stderr.puts "WARNING: size is not available for #{@url}, relying on modification time"
+                    do_update = (mtime > cached_mtime)
+                elsif size
+                    $stderr.puts "WARNING: modification time is not available for #{@url}, relying on size"
+                    do_update = (size != cached_size)
+                else
+                    $stderr.puts "WARNING: neither size nor modification time available for #{@url}, will always update"
+                end
+            end
+
+            if do_update
+                puts "downloading #{url}"
+                FileUtils.mkdir_p(cachedir)
+                File.open(cachefile, 'w') do |cache|
+                    open @url do |file|
+                        while block = file.read(4096)
+                            cache.write block
+                        end
+                    end
+                end
+                true
+            end
+        end
+
+        def url=(url)
+            @url = URI.parse(url)
+            raise ConfigException, "invalid URL #{url}" unless VALID_URI_SCHEMES.include?(@url.scheme)
+
+            @mode = TarImporter.url_to_mode(url)
+            if @url.scheme == 'file'
+                @cachefile = @url
+            else
+                @cachefile = File.join(cachedir, File.basename(@url.path))
+            end
+        end
+
+        attr_reader :url, :cachefile, :mode
+        def cachedir; @options[:cachedir] end
+
+        def initialize(url, options)
+            @options = options.dup
+            @options[:cachedir] ||= $CACHEDIR
+            self.url = url
+        end
+
+        def update(package)
+            checkout if update_cache
+        rescue OpenURI::HTTPError
+            raise Autobuild::Exception.new(package.target, :import)
+        end
+
+        def checkout(package)
+            update_cache
+
+            base_dir = File.dirname(package.srcdir)
+            FileUtils.mkdir_p base_dir
+            cmd = [ 'tar', "x#{TAR_OPTION[mode]}f", cachefile, '-C', base_dir ]
+            
+            Subprocess.run(package.target, :import, *cmd)
+
+        rescue OpenURI::HTTPError
+            raise Autobuild::Exception.new(package.target, :import)
+        rescue SubcommandFailed
+            FileUtils.rm_f cachefile
+            raise
+        end
+    end
+
+    module Import
+        def self.tar(source, package_options)
+            TarImporter.new(source, package_options)
+        end
+    end
+end
+