autobuild 1.9.6 → 1.10.0.b1

data/lib/autobuild/import/archive.rb

@@ -187,7 +187,7 @@ module Autobuild
                     if(WINDOWS)
                         get_url_on_windows(@url, "#{cachefile}.partial")
                     elsif Autobuild.bsd?
-                        Subprocess.run(package, :import, Autobuild.tool('curl'), '-Lso',"#{cachefile}.partial", @url)
+                        package.run(:import, Autobuild.tool('curl'), '-Lso',"#{cachefile}.partial", @url)
                     else
                         additional_options = []
                         if timeout = self.timeout
@@ -288,7 +288,7 @@ module Autobuild
         #       also used to infer the mode
         # [:mode] The unpack mode: one of Zip, Bzip, Gzip or Plain, this is
         #       usually automatically inferred from the filename
-        def initialize(url, options = Hash.new)
+        def initialize(url, options)
             sourceopts, options = Kernel.filter_options options,
                 :source_id, :repository_id, :filename, :mode
             super(options)
@@ -304,13 +304,13 @@ module Autobuild
 
         # Changes the URL from which we should pick the archive
         def relocate(url, options = Hash.new)
-            parsed_url = URI.parse(url).normalize
+            parsed_url = URI.parse(url)
             @url = parsed_url
             if !VALID_URI_SCHEMES.include?(@url.scheme)
                 raise ConfigException, "invalid URL #{@url} (local files must be prefixed with file://)" 
             end
-            @repository_id = options[:repository_id] || parsed_url.to_s
-            @source_id = options[:source_id] || parsed_url.to_s
+            @repository_id = options[:repository_id] || parsed_url
+            @source_id = options[:source_id] || parsed_url
 
             @filename = options[:filename] || @filename || File.basename(url).gsub(/\?.*/, '')
 
@@ -428,9 +428,7 @@ module Autobuild
         rescue OpenURI::HTTPError
             raise Autobuild::PackageException.new(package.name, :import)
         rescue SubcommandFailed
-            if cachefile != url.path
-                FileUtils.rm_f cachefile
-            end
+            FileUtils.rm_f cachefile
             raise
         end
     end

data/lib/autobuild/import/git.rb

@@ -116,6 +116,7 @@ module Autobuild
             @with_submodules = gitopts.delete(:with_submodules)
             @remote_name = 'autobuild'
             relocate(repository, gitopts)
+            @additional_remotes = Array.new
         end
 
         # The name of the remote that should be set up by the importer
@@ -173,6 +174,14 @@ module Autobuild
         # @return [Array<String>]
         attr_accessor :alternates
 
+        # A list of remotes that should be set up in the git config
+        #
+        # Use {#declare_alternate_repository} to add one
+        #
+        # @return [(String,String,String)] a list of (name, repository, push_to)
+        #   triplets
+        attr_reader :additional_remotes
+
         # The branch that should be used on the local clone
         #
         # Defaults to #branch
@@ -331,8 +340,7 @@ module Autobuild
             package.run(:import, Autobuild.tool(:git), '--git-dir', git_dir(package, false), *args)
         end
 
-        # Updates the git repository's configuration for the target remote
-        def update_remotes_configuration(package)
+        def setup_remote(package, remote_name, repository, push_to = repository)
             run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.url", repository)
             run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.pushurl", push_to || repository)
             run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.fetch",  "+refs/heads/*:refs/remotes/#{remote_name}/*")
@@ -342,6 +350,13 @@ module Autobuild
             else
                 run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.push",  "refs/heads/*:refs/heads/*")
             end
+        end
+
+        # Updates the git repository's configuration for the target remote
+        def update_remotes_configuration(package)
+            ([['autobuild', repository, push_to]] + additional_remotes).each do |args|
+                setup_remote(package, *args)
+            end
 
             if local_branch
                 run_git_bare(package, 'config', '--replace-all', "branch.#{local_branch}.remote",  remote_name)
@@ -825,6 +840,13 @@ module Autobuild
                 end
             end
         end
+
+        def declare_alternate_repository(name, repository, options = Hash.new)
+            if !name
+                raise ArgumentError, "cannot declare alternate repository #{repository} without a name"
+            end
+            additional_remotes << [name, repository, options[:push_to] || repository]
+        end
     end
 
     # Creates a git importer which gets the source for the given repository and branch

data/lib/autobuild/importer.rb

@@ -82,7 +82,6 @@ class Importer
     # two git importers that point to the same repository but different branches
     # would have the same repository_id but different source_id
     #
-    # @return [String]
     # @see source_id
     attr_reader :repository_id
 
@@ -93,7 +92,6 @@ class Importer
     # point to the same repository but different branches would have the same
     # repository_id but different source_id
     #
-    # @return [String]
     # @see repository_id
     attr_reader :source_id
 
@@ -269,11 +267,13 @@ class Importer
         options = Kernel.validate_options options,
             only_local: false,
             reset: false,
-            checkout_only: false
+            checkout_only: false,
+            ignore_errors: false
+        ignore_errors = options.delete(:ignore_errors)
 
         importdir = package.importdir
         if File.directory?(importdir)
-            package.isolate_errors(false) do
+            package.isolate_errors(mark_as_failed: false, ignore_errors: ignore_errors) do
                 if !options[:checkout_only] && package.update?
                     perform_update(package, options)
                 else
@@ -287,7 +287,9 @@ class Importer
         elsif File.exist?(importdir)
             raise ConfigException.new(package, 'import'), "#{importdir} exists but is not a directory"
         else
-            perform_checkout(package)
+            package.isolate_errors(mark_as_failed: true, ignore_errors: ignore_errors) do
+                perform_checkout(package)
+            end
         end
     end
 

data/lib/autobuild/mail_reporter.rb

@@ -0,0 +1,107 @@
+begin
+    require 'rmail'
+    require 'rmail/serialize'
+    Autobuild::HAS_RMAIL = true
+rescue LoadError
+    Autobuild::HAS_RMAIL = false
+end
+
+## Report by mail
+if Autobuild::HAS_RMAIL
+module Autobuild
+    class MailReporter < Reporter
+        def default_mail
+            Etc::endpwent
+            uname = while (pwent = Etc::getpwent)
+                        break (pwent.name) if pwent.uid == Process.uid
+                    end
+
+            raise "FATAL: cannot find a user with uid=#{Process.uid}" unless uname
+            "#{pwent.name}@#{Socket.gethostname}"
+        end
+        
+	attr_reader :from_email, :to_email, :smtp_hostname, :smtp_port, :subject, :only_errors
+        def initialize(config)
+            @from_email = (config[:from] || default_mail)
+            @to_email   = (config[:to]   || default_mail)
+	    @subject = (config[:subject] || "Build %result% on #{Socket.gethostname} at %time%")
+	    @only_errors = config[:only_errors]
+            @smtp_hostname = (config[:smtp] || "localhost" )
+            @smtp_port = Integer(config[:port] || Socket.getservbyname('smtp'))
+        end
+
+        def error(error)
+            if error.mail?
+                send_mail("failed", error.to_s)
+            end
+        end
+
+        def success
+	    unless only_errors
+		send_mail("success", Autobuild.post_success_message || "")
+	    end
+        end
+
+        def send_mail(result, body = "")
+            mail = RMail::Message.new
+            mail.header.date = Time.now
+            mail.header.from = from_email
+            mail.header.subject = subject.
+		gsub('%result%', result).
+		gsub('%time%', Time.now.to_s).
+		gsub('%hostname%', Socket.gethostname)
+
+            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|
+                name = file[Autobuild.logdir.size..-1]
+                mail.add_file(name, file)
+            end
+
+            # Send the mails
+            if smtp_hostname =~ /\// && File.directory?(File.dirname(smtp_hostname))
+                File.open(smtp_hostname, 'w') do |io|
+                    io.puts "From: #{from_email}"
+                    io.puts "To: #{to_email.join(" ")}"
+                    io.write RMail::Serialize.write('', mail)
+                end
+                puts "saved notification email in #{smtp_hostname}"
+            else
+                smtp = Net::SMTP.new(smtp_hostname, smtp_port)
+                smtp.start {
+                    to_email.each do |email|
+                        mail.header.to = email
+                        smtp.send_mail RMail::Serialize.write('', mail), from_email, email
+                    end
+                }
+
+                # Notify the sending
+                puts "sent notification mail to #{to_email} with source #{from_email}"
+            end
+        end
+    end
+end
+
+module RMail
+    class Message
+        ## Attachs a file to a message
+        def add_file(name, path, content_type='text/plain')
+            part = RMail::Message.new
+            part.header.set('Content-Type', content_type)
+            part.header.set('Content-Disposition', 'attachment', 'filename' => name)
+            part.body = ''
+            File.open(path) do |file|
+                part.body << file.readlines.join("")
+            end
+            self.add_part(part)
+        end
+    end
+end
+end # if Autobuild::HAS_RMAIL
+
+
+

data/lib/autobuild/package.rb

@@ -43,6 +43,8 @@ module Autobuild
         # The set of utilities attached to this package
         # @return [{String=>Utility}]
         attr_reader :utilities
+        # Whether {#apply_post_install} has been called
+        def applied_post_install?; !!@applied_post_install end
 	
 	# Sets importer object for this package. Defined for backwards compatibility.
 	# Use the #importer attribute instead
@@ -58,6 +60,14 @@ module Autobuild
         # Some statistics about the commands that have been run
         attr_reader :statistics
 
+        EnvOp = Struct.new :type, :name, :values
+
+        # List of environment values added by this package with {#env_add},
+        # {#env_add_path} or {#env_set}
+        #
+        # @return [Array<EnvOp>]
+        attr_reader :env
+
         def add_stat(phase, duration)
             @statistics[phase] ||= 0
             @statistics[phase] += duration
@@ -117,8 +127,10 @@ module Autobuild
             @statistics     = Hash.new
             @failures = Array.new
             @post_install_blocks = Array.new
+            @applied_post_install = false
             @in_dir_stack = Array.new
             @utilities = Hash.new
+            @env = Array.new
 
 	    if Hash === spec
 		name, depends = spec.to_a.first
@@ -167,6 +179,125 @@ module Autobuild
             @spec_dependencies = depends
 	end
 
+        # @api private
+        #
+        # Adds a new operation to this package's environment setup. This is a
+        # helper for the other env_* methods
+        #
+        # @param [EnvOp] op
+        # @return [void]
+        def add_env_op(op)
+            env << op
+        end
+
+        # Add value(s) to a list-based environment variable
+        #
+        # This differs from {#env_add_path} in that a value can be added
+        # multiple times in the list.
+        #
+        # @param [String] name the environment variable name
+        # @param [Array<String>] values list of values to be added
+        # @return [void]
+        def env_add(name, *values)
+            add_env_op EnvOp.new(:add, name, values)
+        end
+
+        # Add a new path to a PATH-like environment variable
+        #
+        # It differs from {#env_add} in its handling of duplicate values.  Any
+        # value already existing will be removed, and re-appended to the value
+        # so that it takes priority.
+        #
+        # @param [String] name the environment variable name
+        # @param [Array<String>] values list of values. They will be joined
+        #   using the platform's standard separator (e.g. : on Unices)
+        # @return [void]
+        def env_add_path(name, *values)
+            add_env_op EnvOp.new(:add_path, name, values)
+        end
+
+        # Set an environment variable to a list of values
+        #
+        # @param [String] name the environment variable name
+        # @param [Array<String>] values list of values. They will be joined
+        #   using the platform's standard separator (e.g. : on Unices)
+        # @return [void]
+        def env_set(name, *values)
+            add_env_op EnvOp.new(:set, name, values)
+        end
+
+        # Add a prefix to be resolved into the environment
+        #
+        # Autoproj will update all "standard" environment variables based on
+        # what it finds as subdirectories from the prefix
+        def env_add_prefix(prefix, includes = nil)
+            add_env_op EnvOp.new(:add_prefix, prefix, [includes])
+        end
+
+        # Hook called by autoproj to set up the default environment for this
+        # package
+        #
+        # By default, it calls {#env_add_prefix} with this package's prefix
+        def update_environment
+            env_add_prefix prefix
+        end
+
+        class IncompatibleEnvironment < ConfigException; end
+
+        # Apply this package's environment to the given {Environment} object
+        #
+        # It does *not* apply the dependencies' environment. Call
+        # {#resolved_env} for that.
+        #
+        # @param [Environment] env the environment to be updated
+        # @param [Set] set a set of environment variable names which have
+        #   already been set by a {#env_set}. Autoproj will verify that only one
+        #   package sets a variable as to avoid unexpected conflicts.
+        # @return [Array<EnvOp>] list of environment-modifying operations
+        #   applied so far
+        def apply_env(env, set = Set.new, ops = Array.new)
+            self.env.each do |env_op|
+                next if ops.last == env_op
+                if env_op.type == :set
+                    if last = set[env_op.name]
+                        last_pkg, last_values = *last
+                        if last_values != env_op.values
+                            raise IncompatibleEnvironment, "trying to reset #{name} to #{values} which conflicts with #{last_pkg.name} already setting it to #{last_values}"
+                        end
+                    else
+                        set[name] = [self, values]
+                    end
+                end
+                env.send(env_op.type, env_op.name, *env_op.values)
+                ops << env_op
+            end
+            ops
+        end
+
+        # Updates an {Environment} object with the environment of the package's
+        # dependencies
+        def resolve_dependency_env(env, set = Set.new, ops = Array.new)
+            all_dependencies.each do |pkg_name|
+                pkg = Autobuild::Package[pkg_name]
+                ops = pkg.apply_env(env, set, ops)
+            end
+            ops
+        end
+
+        # Resolves this package's environment into Hash form
+        #
+        # @param [Environment] root the base environment object to update
+        # @return [Hash<String,String>] the full environment
+        # @see Autobuild::Environment#resolved_env
+        def resolved_env(root = Autobuild.env)
+            set = Hash.new
+            env = root.dup
+            ops = Array.new
+            ops = resolve_dependency_env(env, set, ops)
+            apply_env(env, set, ops)
+            env.resolved_env
+        end
+
         # Called before a forced build. It should remove all the timestamp and
         # target files so that all the build phases of this package gets
         # retriggered. However, it should not clean the build products.
@@ -202,10 +333,17 @@ module Autobuild
         # Moreover, the package will be marked as "failed" and isolate_errors
         # will subsequently be a noop. I.e. if +build+ fails, +install+ will do
         # nothing.
-        def isolate_errors(mark_as_failed = true)
+        def isolate_errors(options = Hash.new)
             # Don't do anything if we already have failed
             return if failed?
 
+            if !options.kind_of?(Hash)
+                options = Hash[mark_as_failed: true]
+            end
+            options = validate_options options,
+                mark_as_failed: true,
+                ignore_errors: Autobuild.ignore_errors
+
             begin
                 toplevel = !Thread.current[:isolate_errors]
                 Thread.current[:isolate_errors] = true
@@ -214,11 +352,11 @@ module Autobuild
                 raise
             rescue ::Exception => e
                 @failures << e
-                if mark_as_failed
+                if options[:mark_as_failed]
                     @failed = true
                 end
 
-                if Autobuild.ignore_errors
+                if options[:ignore_errors]
                     lines = e.to_s.split("\n")
                     if lines.empty?
                         lines = e.message.split("\n")
@@ -258,14 +396,6 @@ module Autobuild
 
             # Add the dependencies declared in spec
             depends_on(*@spec_dependencies) if @spec_dependencies
-            update_environment
-        end
-
-        # Called to set/update all environment variables at import and after
-        # install time
-        def update_environment
-            super if defined? super
-            Autobuild.update_environment prefix
         end
 
         # Create all the dependencies required to reconfigure and/or rebuild the
@@ -347,23 +477,34 @@ module Autobuild
             Autobuild.progress_done(self)
         end
 
-        # Install the result in prefix
-        def install
+        def apply_post_install
             Autobuild.post_install_handlers.each do |b|
                 Autobuild.apply_post_install(self, b)
             end
             @post_install_blocks.each do |b|
                 Autobuild.apply_post_install(self, b)
             end
+            @applied_post_install = true
+        end
+
+        # Install the result in prefix
+        def install
+            apply_post_install
+
             # Safety net for forgotten progress_done
             progress_done
 
             Autobuild.touch_stamp(installstamp)
-            update_environment
         end
 
         def run(*args, &block)
-            Autobuild::Subprocess.run(self, *args, &block)
+            if args.last.kind_of?(Hash)
+                options = args.pop
+            else
+                options = Hash.new
+            end
+            options = options.merge(env: resolved_env)
+            Autobuild::Subprocess.run(self, *args, options, &block)
         end
 
         module TaskExtension
@@ -584,41 +725,6 @@ module Autobuild
             end
             super
         end
-
-        # For forward compatibility with autobuild 1.11+
-        #
-        # It simply calls the corresponding method on {Autobuild}
-        def env_add(name, *values)
-            Autobuild.env_add(name, *values)
-        end
-
-        # For forward compatibility with autobuild 1.11+
-        #
-        # It simply calls the corresponding method on {Autobuild}
-        def env_add_path(name, *values)
-            Autobuild.env_add_path(name, *values)
-        end
-
-        # For forward compatibility with autobuild 1.11+
-        #
-        # It simply calls the corresponding method on {Autobuild}
-        def env_set(name, *values)
-            Autobuild.env_add_path(name, *values)
-        end
-
-        # For forward compatibility with autobuild 1.11+
-        #
-        # It simply calls the corresponding method on {Autobuild}
-        def env_add_prefix(newprefix, includes = nil)
-            Autobuild.update_environment(newprefix, includes)
-        end
-
-        # For forward compatibility with autobuild 1.11+
-        #
-        # It returns ENV as the environment is global on autobuild 1.10
-        def resolved_env(_ignored = nil)
-            Hash[ENV]
-        end
     end
 
     def self.package_set(spec)