autobuild 1.12.3 → 1.13.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6623e40c3f107c71c1f9637be0c944a3ffe2a2d
-  data.tar.gz: 7e3298cad9cb1215943573c57a0d70c29b36b676
+  metadata.gz: 221937ffc7554479e1190a3ebb88f288049bc56b
+  data.tar.gz: f2921614437608110ca0f9b5844df8e4f46e89a5
 SHA512:
-  metadata.gz: 405285def822d6a26bc51bd7d336e76e20ba74d434dbb68c67b41b90d8cdbe13f2bbbd0512a81d3575a6f9283a2968d516d3f899eba2ef13dd74cd26a26d0211
-  data.tar.gz: 20b5ebff2c2df256013c51e30064509ff7c99da00034de90816307cc163ca7af65d1593501b74e102b4f24252f5dc760a61520cb01622d09e7e4c1805f87b7e2
+  metadata.gz: 5a48c3e03b0ed90ac3557b8d02b511ce60b05afe25173695f29ffb0af154e6d3a9e387df3494aea55b12a2e11bcdff3ca1755f4a21754d08435d24708b9a42fd
+  data.tar.gz: 8418450a662dd4fc8f40bf9f515a750cf7cf95e0893f2bc215e767e05b1fa61556b8a673029a6b910a7923746598200b979c8e08bce64dbb8b19e70eb3a869fd

data/autobuild.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
     s.extensions = []
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
-    s.add_runtime_dependency "rake", "~> 12.0", ">= 12.0.0", '< 12.1.0'
+    s.add_runtime_dependency "rake", "~> 12.0", ">= 12.3.0"
     s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
-    s.add_runtime_dependency 'tty-prompt', '~> 0.12.0', '>= 0.12.0'
+    s.add_runtime_dependency 'tty-prompt', '~> 0.15.0'
     s.add_runtime_dependency 'pastel', '~> 0.7.0', '>= 0.7.0'
     s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"

data/lib/autobuild/config.rb

@@ -73,7 +73,7 @@ def create_utility(utility_name, package)
             else raise ArgumentError, "there is no utility called #{utility_name}, available utilities are #{utilities.keys.sort.join(", ")}"
             end
         end
-	# The directory in which logs are saved. Defaults to PREFIX/log.
+        # The directory in which logs are saved. Defaults to PREFIX/log.
         attr_writer :logdir
 
         # True if we build and if the build is applied on all packages
@@ -116,45 +116,45 @@ def self.color(message, *style)
 
     @post_install_handlers = Array.new
     def self.post_install(*args, &block)
-	if args.empty?
-	    @post_install_handlers << block
-	elsif !block
-	    @post_install_handlers << args
-	else
-	    raise ArgumentError, "cannot set both arguments and block"
-	end
+        if args.empty?
+            @post_install_handlers << block
+        elsif !block
+            @post_install_handlers << args
+        else
+            raise ArgumentError, "cannot set both arguments and block"
+        end
     end
     class << self
         attr_reader :post_install_handlers
     end
 
     def self.apply_post_install(pkg, info)
-	return unless info
-
-	case info
-	when Array
-	    args = info.dup
-	    tool = Autobuild.tool(args.shift)
-	    pkg.run 'post-install', tool, *args
-	when Proc
+        return unless info
+
+        case info
+        when Array
+            args = info.dup
+            tool = Autobuild.tool(args.shift)
+            pkg.run 'post-install', tool, *args
+        when Proc
             if info.arity == 1
                 info.call(pkg)
             else
                 info.call
             end
-	end
+        end
     end
 
     @mail = Hash.new
     class << self
-	# Mailing configuration. It is a hash with the following keys (as symbols)
-	# [:to] the mail destination. Defaults to USER@HOSTNAME, where USER is the username
-	#       of autobuild's caller, and HOSTNAME the hostname of the current machine.
-	# [:from] the mail origin. Defaults to the same value than +:to+
-	# [:smtp] the hostname of the SMTP server, defaults to localhost
-	# [:port] the port of the SMTP server, defauts to 22
-	# [:only_errors] mail only on errors. Defaults to false.
-	attr_reader :mail
+        # Mailing configuration. It is a hash with the following keys (as symbols)
+        # [:to] the mail destination. Defaults to USER@HOSTNAME, where USER is the username
+        #       of autobuild's caller, and HOSTNAME the hostname of the current machine.
+        # [:from] the mail origin. Defaults to the same value than +:to+
+        # [:smtp] the hostname of the SMTP server, defaults to localhost
+        # [:port] the port of the SMTP server, defauts to 22
+        # [:only_errors] mail only on errors. Defaults to false.
+        attr_reader :mail
         
         # call-seq:
         #   post_success_message => string
@@ -178,18 +178,18 @@ def post_success_message(*args, &block)
             end
         end
 
-	# The directory in which logs are saved
+        # The directory in which logs are saved
         def logdir; @logdir || "#{prefix}/log" end
 
-	# Removes all log files
+        # Removes all log files
         def clean_log!
             Reporting.each_log do |file|
                 FileUtils.rm_f file
             end
         end
 
-	# Gets autobuild options from the command line and returns the
-	# remaining elements
+        # Gets autobuild options from the command line and returns the
+        # remaining elements
         def commandline(args)
             parser = OptionParser.new do |opts|
                 opts.separator "Path specification"
@@ -204,9 +204,9 @@ def commandline(args)
                     puts opts
                     exit
                 end
-		if defined? Daemons
-		    opts.on("--[no-]daemon", "go into daemon mode") do |v| Autobuild.daemonize = v end
-		end
+                if defined? Daemons
+                    opts.on("--[no-]daemon", "go into daemon mode") do |v| Autobuild.daemonize = v end
+                end
                 opts.on("--no-update", "update already checked-out sources") do |v|  Autobuild.do_update = v end
                 opts.on("--no-build",  "only prepare packages, do not build them") do |v| Autobuild.do_build = v end 
                 opts.on("--forced-build",  "force the trigger of all the build commands") do |v| Autobuild.do_forced_build = v end 
@@ -226,25 +226,25 @@ def commandline(args)
                 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) if $2 && !$2.empty?
-		end
-		opts.on("--mail-only-errors", "send mail only on errors") do
-		    mail[:only_errors] = true
-		end
+                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) if $2 && !$2.empty?
+                end
+                opts.on("--mail-only-errors", "send mail only on errors") do
+                    mail[:only_errors] = true
+                end
 
             end
 

data/lib/autobuild/environment.rb

@@ -469,20 +469,15 @@ def source_after(file = nil)
             end
         end
 
-        # Generates a shell script that sets the environment variable listed in
-        # Autobuild.environment, following the inheritance setting listed in
-        # Autobuild.inherited_environment.
-        #
-        # It also sources the files added by source_file
-        def export_env_sh(io)
-            source_before.each do |path|
-                io.puts SHELL_SOURCE_SCRIPT % path
-            end
+        ExportedEnvironment = Struct.new :set, :unset, :update
 
-            unset_variables = Set.new
-            variables = []
+        # Computes the set of environment modification operations that should
+        # be applied to load this environment
+        #
+        # This is for instance used to generate the env.sh
+        def exported_environment
+            export = ExportedEnvironment.new(Hash.new, Array.new, Hash.new)
             environment.each_key do |name|
-                variables << name
                 value_with_inheritance    = value(name, inheritance_mode: :keep)
                 value_without_inheritance = value(name, inheritance_mode: :ignore)
                 if path_variable?(name)
@@ -492,25 +487,74 @@ def export_env_sh(io)
                 end
 
                 if !value_with_inheritance
-                    unset_variables << name
-                    shell_line = SHELL_UNSET_COMMAND % [name]
+                    export.unset << name
                 elsif value_with_inheritance == value_without_inheritance # no inheritance
-                    shell_line = SHELL_SET_COMMAND % [name, value_with_inheritance.join(File::PATH_SEPARATOR)]
+                    export.set[name] = value_with_inheritance
                 else
-                    shell_line = SHELL_CONDITIONAL_SET_COMMAND % [name, value_with_inheritance.join(File::PATH_SEPARATOR), value_without_inheritance.join(File::PATH_SEPARATOR)]
+                    export.update[name] = [value_with_inheritance, value_without_inheritance]
                 end
-                io.puts shell_line
             end
-            variables.each do |var|
-                if !unset_variables.include?(var)
-                    io.puts SHELL_EXPORT_COMMAND % [var]
-                end
+            export
+        end
+
+        # Generates a shell script that sets the environment variable listed in
+        # Autobuild.environment, following the inheritance setting listed in
+        # Autobuild.inherited_environment.
+        #
+        # It also sources the files added by source_file
+        def export_env_sh(io)
+            export = exported_environment
+            source_before.each do |path|
+                io.puts SHELL_SOURCE_SCRIPT % path
+            end
+            export.unset.each do |name|
+                io.puts SHELL_UNSET_COMMAND % [name]
+            end
+            export.set.each do |name, value|
+                io.puts SHELL_SET_COMMAND % [name, value.join(File::PATH_SEPARATOR)]
+                io.puts SHELL_EXPORT_COMMAND % [name]
+            end
+            export.update.each do |name, (with_inheritance, without_inheritance)|
+                io.puts SHELL_CONDITIONAL_SET_COMMAND % [name, with_inheritance.join(File::PATH_SEPARATOR), without_inheritance.join(File::PATH_SEPARATOR)]
+                io.puts SHELL_EXPORT_COMMAND % [name]
             end
             source_after.each do |path|
                 io.puts SHELL_SOURCE_SCRIPT % [path]
             end
         end
 
+        # Build an environment hash from an environment export and some initial state
+        #
+        # This is basically the programmatic version of what {#export_env_sh}
+        # instructs the shell to do
+        def self.environment_from_export(export, base_env = ENV)
+            result = Hash.new
+            export.set.each do |name, value|
+                result[name] = value.join(File::PATH_SEPARATOR)
+            end
+            base_env.each do |name, value|
+                result[name] ||= value
+            end
+            export.unset.each do |name|
+                result.delete(name)
+            end
+            export.update.each do |name, (with_inheritance, without_inheritance)|
+                if result[name]
+                    variable_expansion = "$#{name}"
+                    with_inheritance = with_inheritance.map do |value|
+                        if value == variable_expansion
+                            base_env[name]
+                        else value
+                        end
+                    end
+                    result[name] = with_inheritance.join(File::PATH_SEPARATOR)
+                else
+                    result[name] = without_inheritance.join(File::PATH_SEPARATOR)
+                end
+            end
+            result
+        end
+
         # DEPRECATED: use add_path instead
         def self.pathvar(path, varname)
             if File.directory?(path)
@@ -560,7 +604,7 @@ def arch_size
                 end
                 out = `#{cmdline.join(" ")}`.split
                 arch = out.grep(/DEB_TARGET_ARCH_BITS/).first ||
-		       out.grep(/DEB_BUILD_ARCH_BITS/).first
+                       out.grep(/DEB_BUILD_ARCH_BITS/).first
                 if arch
                     @arch_size = Integer(arch.chomp.split('=').last)
                 end
@@ -596,7 +640,7 @@ def arch_names
                 end
                 out = `#{cmdline.join(" ")}`.split
                 arch = out.grep(/DEB_TARGET_MULTIARCH/).first ||
-		       out.grep(/DEB_BUILD_MULTIARCH/).first
+                       out.grep(/DEB_BUILD_MULTIARCH/).first
                 if arch
                     result << arch.chomp.split('=').last
                 end
@@ -670,7 +714,11 @@ def add_prefix(newprefix, includes = nil)
         end
 
         def find_executable_in_path(file, path_var = 'PATH')
-            (value(path_var) || Array.new).each do |dir|
+            self.class.find_executable_in_path(file, value(path_var) || Array.new)
+        end
+
+        def self.find_executable_in_path(file, entries)
+            entries.each do |dir|
                 full = File.join(dir, file)
                 begin
                     stat = File.stat(full)
@@ -684,7 +732,11 @@ def find_executable_in_path(file, path_var = 'PATH')
         end
 
         def find_in_path(file, path_var = 'PATH')
-            (value(path_var) || Array.new).each do |dir|
+            self.class.find_in_path(file, value(path_var) || Array.new)
+        end
+
+        def self.find_in_path(file, entries)
+            entries.each do |dir|
                 full = File.join(dir, file)
                 if File.file?(full)
                     return full

data/lib/autobuild/exceptions.rb

@@ -122,5 +122,26 @@ def to_s
     class InteractionRequired < RuntimeError; end
 
     class AlreadyFailedError < RuntimeError; end
-end
 
+    # The exception type that is used to report multiple errors that occured
+    # when ignore_errors is set
+    class CompositeException < Autobuild::Exception
+        # The array of exception objects representing all the errors that
+        # occured during the build
+        attr_reader :original_errors
+
+        def initialize(original_errors)
+            @original_errors = original_errors
+        end
+
+        def mail?; true end
+
+        def to_s
+            result = ["#{original_errors.size} errors occured"]
+            original_errors.each_with_index do |e, i|
+                result << "(#{i}) #{e.to_s}"
+            end
+            result.join("\n")
+        end
+    end
+end

data/lib/autobuild/import/archive.rb

@@ -5,20 +5,20 @@
 
 WINDOWS = RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)! 
 if WINDOWS 
-	require 'net/http' 
-	require 'net/https'
-	require 'rubygems/package'
-	require 'zlib'
+        require 'net/http' 
+        require 'net/https'
+        require 'rubygems/package'
+        require 'zlib'
 end
 
 
 module Autobuild
     class ArchiveImporter < Importer
-	# The tarball is not compressed
+        # The tarball is not compressed
         Plain = 0
-	# The tarball is compressed with gzip
+        # The tarball is compressed with gzip
         Gzip  = 1
-	# The tarball is compressed using bzip
+        # The tarball is compressed using bzip
         Bzip  = 2
         # Not a tarball but a zip
         Zip   = 3
@@ -29,7 +29,7 @@ class ArchiveImporter < Importer
             Bzip => 'j'
         }
 
-	# Known URI schemes for +url+
+        # Known URI schemes for +url+
         VALID_URI_SCHEMES = [ 'file', 'http', 'https', 'ftp' ]
 
         class << self
@@ -67,7 +67,7 @@ def cachedir
         @timeout = 10
         @cachedir = nil
 
-	# Returns the unpack mode from the file name
+        # Returns the unpack mode from the file name
         #
         # @return [Integer,nil] either one of the pack constants (Zip, Plain,
         #   ...) or nil if it cannot be inferred
@@ -81,7 +81,7 @@ def self.find_mode_from_filename(filename)
             end
         end
 
-	# Returns the unpack mode from the file name
+        # Returns the unpack mode from the file name
         def self.filename_to_mode(filename)
             if mode = find_mode_from_filename(filename)
                 mode
@@ -104,9 +104,9 @@ def self.auto_update?
 
         def update_cached_file?; @options[:update_cached_file] end
 
-		
-	def get_url_on_windows(url, filename)
-            uri = URI(url)		
+                
+        def get_url_on_windows(url, filename)
+            uri = URI(url)              
 
             http = Net::HTTP.new(uri.host,uri.port)
             http.use_ssl = true if uri.port == 443
@@ -123,8 +123,8 @@ def get_url_on_windows(url, filename)
                     file.write(resp.body)
                 end
             end
-	end
-	
+        end
+        
         def extract_tar_on_windows(filename,target)
             Gem::Package::TarReader.new(Zlib::GzipReader.open(filename)).each do |entry|
                 newname = File.join(target,entry.full_name.slice(entry.full_name.index('/'),entry.full_name.size))
@@ -142,8 +142,8 @@ def extract_tar_on_windows(filename,target)
                 end
             end
         end
-	
-	# Updates the downloaded file in cache only if it is needed
+        
+        # Updates the downloaded file in cache only if it is needed
         def update_cache(package)
             do_update = false
 
@@ -206,18 +206,18 @@ def update_cache(package)
             do_update
         end
 
-	# The source URL
+        # The source URL
         attr_reader :url
-	# The local file (either a downloaded file if +url+ is not local, or +url+ itself)
-	attr_reader :cachefile
+        # The local file (either a downloaded file if +url+ is not local, or +url+ itself)
+        attr_reader :cachefile
         # The SHA1 digest of the current cachefile. It is updated only once the
         # cachefile has been downloaded
         #
         # @return [String] hexadecimal SHA1 digest of the file
         attr_reader :cachefile_digest
-	# The unpack mode. One of Zip, Bzip, Gzip or Plain
-	attr_reader :mode
-	# The directory in which remote files are cached
+        # The unpack mode. One of Zip, Bzip, Gzip or Plain
+        attr_reader :mode
+        # The directory in which remote files are cached
         #
         # Defaults to ArchiveImporter.cachedir
         attr_reader :cachedir
@@ -228,10 +228,10 @@ def cachedir=(dir)
             relocate(@url.to_s)
         end
 
-	# The directory contained in the tar file
+        # The directory contained in the tar file
         #
         # DEPRECATED use #archive_dir instead
-	def tardir; @options[:tardir] end
+        def tardir; @options[:tardir] end
         # The directory contained in the archive. If not set, we assume that it
         # is the same than the source dir
         def archive_dir; @options[:archive_dir] || tardir end
@@ -270,9 +270,9 @@ def has_subdirectory?
             !@options[:no_subdirectory]
         end
 
-	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
-	# are allowed:
-	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
+        # Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
+        # are allowed:
+        # [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
         # [:archive_dir] the directory contained in the archive file. If set,
         #       the importer will rename that directory to make it match
         #       Package#srcdir
@@ -414,7 +414,7 @@ def checkout(package, options = Hash.new) # :nodoc:
                 if !@options[:no_subdirectory]
                     cmd << '--strip-components=1'
                 end
-				
+                                
                 if(WINDOWS)
                     extract_tar_on_windows(cachefile,package.srcdir)
                 else
@@ -439,12 +439,12 @@ def checkout(package, options = Hash.new) # :nodoc:
     # Creates an importer which downloads a tarball from +source+ and unpacks
     # it. The allowed values in +options+ are described in ArchiveImporter.new.
     def self.archive(source, options = {})
-	ArchiveImporter.new(source, options)
+        ArchiveImporter.new(source, options)
     end
 
     # DEPRECATED. Use Autobuild.archive instead.
     def self.tar(source, options = {})
-	ArchiveImporter.new(source, options)
+        ArchiveImporter.new(source, options)
     end
 end