autobuild 1.24.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a551f16208e61f38188d81b0b944ef6ba663fbc3155ae7e55b009f2adda2e6
-  data.tar.gz: 60e5b9d1b8ffe8ff4e35d006960a251ef82467ee5d17adcb9d9d21e2e7f47b15
+  metadata.gz: e80fda7259afb401296183494e07a8a08f1ef22c2b8cab1f54577c7527aa72ed
+  data.tar.gz: 89a5471c0b5afb613757dd04ac92eeb2acc0fe3fdf3cb419eb729dc2c8661e98
 SHA512:
-  metadata.gz: 30af86ba246a653daac4299675fe4b248b36b2d30750feefd567dc32c6768b9f4b60f877021253699336c5d01c54b69f1d7db6808a6d49ea12ff612f425ca01c
-  data.tar.gz: 16e7849423378e7e5e89f0e40e7cc77173e87290954734aa86195cf15547388bce6a7b234aaf8857593e2d513b9daf4634759026706a6f2e54eb2044b7ee8b96
+  metadata.gz: 54d5bbccd77d298c58cc4b8e437fcb0de325252de23d83b73aafa02ad0a4c0476177913fdfc1634022dcc4b4abc90381534f081ff1d96f58a18f400c8985bc84
+  data.tar.gz: fa6f9ae365e2314d1844004924fbab9c6da73d5cebc7a3244bb6092462564d5538342496f85f79d2d54e2e13717dd140341571582b8867976cdfd8d86d3ddbc9

data/.github/workflows/lint.yml

@@ -8,7 +8,9 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.7", "2.6", "2.5"]
+        ruby-version:
+          - "3.0"
+          - "2.7"
 
     steps:
     - uses: actions/checkout@v2
@@ -19,7 +21,9 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
+    - name: Remove vscode gems
+      run: bundle config set --local without vscode
     - name: Install dependencies
       run: bundle install
     - name: Run rubocop
-      run: bundle exec rubocop
+      run: bundle exec rubocop

data/.github/workflows/test.yml

@@ -8,7 +8,12 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.7", "2.6", "2.5"]
+        ruby-version:
+          - "3.2"
+          - "3.1"
+          - "3.0"
+          - "2.7"
+          - "2.5"
 
     steps:
     - uses: actions/checkout@v2
@@ -19,8 +24,14 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
+    - name: Remove vscode gems
+      run: bundle config set --local without vscode
+    - name: Install subversion
+      run: sudo apt update && sudo apt install subversion
     - name: Install dependencies
       run: bundle install
+    - name: Enable file transport in git
+      run: git config --global protocol.file.allow always
     - name: Run tests
       run: bundle exec rake test
       env:

data/.gitignore

@@ -5,4 +5,5 @@ vendor/
 .bundle
 coverage/
 
-.yardoc/
+.yardoc/
+Gemfile.lock

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 inherit_gem:
   rubocop-rock: defaults.yml
 
@@ -111,4 +113,4 @@ Style/GlobalStdStream:
     Enabled: false
 
 Style/OptionalBooleanParameter:
-    Enabled: false
+    Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,14 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-07-10 18:16:42 UTC using RuboCop version 1.28.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RubyVersionGlobalsUsage:
+  Exclude:
+    - 'autobuild.gemspec'

data/Gemfile

@@ -2,12 +2,17 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :lint do
+    gem 'parallel', '1.24.0'
+    gem 'rubocop', '1.28.2'
+    gem 'rubocop-ast', '1.17.0'
+    gem 'rubocop-rock'
+end
+
 group :vscode do
     gem 'debase', '>= 0.2.2.beta10'
     gem 'pry'
     gem 'pry-byebug'
-    gem 'rubocop', '>= 0.6.0'
-    gem 'rubocop-rock'
     gem 'ruby-debug-ide', '>= 0.6.0'
     gem 'solargraph'
 end

data/autobuild.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
         .reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "concurrent-ruby", "~> 1.1"
+    s.add_runtime_dependency "net-smtp"
     s.add_runtime_dependency "pastel", "~> 0.7.0"
     s.add_runtime_dependency "rake", "~> 13.0"
     s.add_runtime_dependency 'tty-cursor', '~> 0.7.0'
@@ -31,8 +32,9 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency 'tty-screen', '~> 0.8.0'
     s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
     s.add_development_dependency "fakefs"
-    s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"
+    s.add_development_dependency "flexmock", ">= 2.4.0"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "simplecov"
     s.add_development_dependency "timecop"
+    s.add_development_dependency "webrick"
 end

data/lib/autobuild/build_logfile.rb

@@ -1,5 +1,3 @@
-require 'time'
-
 module Autobuild
     # Parse and manipulate the information stored in a build log file (usually
     # in prefix/log/stats.log)

data/lib/autobuild/environment.rb

@@ -1,7 +1,3 @@
-require 'set'
-require 'rbconfig'
-require 'utilrb/hash/map_value'
-
 module Autobuild
     @windows = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw|[Ww]indows)/
     def self.windows?
@@ -260,6 +256,7 @@ module Autobuild
             if flag
                 @inherited_variables |= names
                 names.each do |env_name|
+                    @environment[env_name] ||= []
                     init_from_env(env_name)
                 end
             else

data/lib/autobuild/import/archive.rb

@@ -1,10 +1,3 @@
-require 'autobuild/importer'
-require 'digest/sha1'
-require 'open-uri'
-require 'fileutils'
-require 'net/http'
-require 'net/https'
-
 module Autobuild
     class ArchiveImporter < Importer
         # rubocop:disable Naming/ConstantName

data/lib/autobuild/import/darcs.rb

@@ -1,7 +1,3 @@
-require 'autobuild/config'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-
 module Autobuild
     class DarcsImporter < Importer
         # Creates a new importer which gets the source from the Darcs

data/lib/autobuild/import/git.rb

@@ -1,10 +1,3 @@
-require 'fileutils'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-require 'utilrb/kernel/options'
-require 'open3'
-require 'English'
-
 module Autobuild
     class Git < Importer
         # Exception raised when a network access is needed while only_local is true

data/lib/autobuild/import/hg.rb

@@ -1,8 +1,3 @@
-require 'fileutils'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-require 'utilrb/kernel/options'
-
 module Autobuild
     class Hg < Importer
         # Creates an importer which tracks the given repository

data/lib/autobuild/import/svn.rb

@@ -1,7 +1,3 @@
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-require 'rexml/document'
-
 module Autobuild
     class SVN < Importer
         # Creates an importer which gets the source for the Subversion URL +source+.

data/lib/autobuild/importer.rb

@@ -1,6 +1,3 @@
-require 'autobuild/config'
-require 'autobuild/exceptions'
-
 # This class is the base class for objects that are used to get the source from
 # various RCS into the package source directory. A list of patches to apply
 # after the import can be given in the +:patches+ option.
@@ -540,10 +537,10 @@ module Autobuild
             File.readlines(patches_file).map do |line|
                 line = line.rstrip
                 if line =~ /^(.*)\s+(\d+)$/
-                    path = File.expand_path($1, package.srcdir)
+                    path = File.expand_path($1, package.importdir)
                     level = Integer($2)
                 else
-                    path = File.expand_path(line, package.srcdir)
+                    path = File.expand_path(line, package.importdir)
                     level = 0
                 end
                 [path, level, File.read(path)]
@@ -618,7 +615,7 @@ module Autobuild
             File.open(patchlist(package), 'w') do |f|
                 patch_state = cur_patches.map do |path, level|
                     path = Pathname.new(path).
-                        relative_path_from(Pathname.new(package.srcdir)).to_s
+                        relative_path_from(Pathname.new(package.importdir)).to_s
                     "#{path} #{level}"
                 end
                 f.write(patch_state.join("\n"))

data/lib/autobuild/packages/autotools.rb

@@ -1,11 +1,3 @@
-require 'pathname'
-require 'autobuild/timestamps'
-require 'autobuild/environment'
-require 'autobuild/package'
-require 'autobuild/subcommand'
-require 'shellwords'
-require 'fileutils'
-
 module Autobuild
     def self.autotools(opts, &proc)
         Autotools.new(opts, &proc)

data/lib/autobuild/packages/cmake.rb

@@ -1,6 +1,3 @@
-require 'autobuild/configurable'
-require 'autobuild/packages/gnumake'
-
 module Autobuild
     def self.cmake(options, &block)
         CMake.new(options, &block)
@@ -39,6 +36,11 @@ module Autobuild
 
             attr_reader :prefix_path, :module_path
 
+            # Arguments that will be passed to the 'make' test target
+            def test_args
+                @test_args ||= ["-V"]
+            end
+
             # Whether files that are not within CMake's install manifest but are
             # present in the prefix should be deleted. Note that the contents of
             # {#log_dir} are unaffected.
@@ -73,6 +75,9 @@ module Autobuild
             self.class.defines.merge(additional_defines).merge(defines)
         end
 
+        # Arguments to be passed to the 'make' test target
+        attr_reader :test_args
+
         # If true, always run cmake before make during the build
         attr_accessor :always_reconfigure
         # If true, we always remove the CMake cache before reconfiguring.
@@ -115,6 +120,7 @@ module Autobuild
         def initialize(options)
             @defines = Hash.new
             super
+            @test_args = self.class.test_args.dup
             @delete_obsolete_files_in_prefix = self.class.
                 delete_obsolete_files_in_prefix?
         end
@@ -272,10 +278,10 @@ module Autobuild
         def common_utility_handling( # rubocop:disable Metrics/ParameterLists
             utility,
             target,
-            *args,
             start_msg,
             done_msg,
-            post_process: nil
+            post_process: nil,
+            args: []
         )
             utility.source_ref_dir = builddir
             utility.task do
@@ -283,6 +289,9 @@ module Autobuild
                     if internal_doxygen_mode?
                         run_doxygen
                     else
+                        unless args.empty?
+                            args = ["ARGS=#{args.map { |a| %("#{a}") }.join(' ')}"]
+                        end
                         run(utility.name,
                             Autobuild.tool(:make),
                             "-j#{parallel_build_level}",
@@ -322,9 +331,10 @@ module Autobuild
 
         def with_tests(target = 'test', &block)
             common_utility_handling(
-                test_utility, target, "ARGS=-V",
+                test_utility, target,
                 "running tests for %s",
                 "successfully ran tests for %s",
+                args: test_args,
                 post_process: coverage_block, &block)
         end
 

data/lib/autobuild/packages/genom.rb

@@ -1,7 +1,3 @@
-require 'autobuild/packages/autotools'
-require 'open3'
-require 'autobuild/pkgconfig'
-
 module Autobuild
     def self.genom(opts, &proc)
         GenomModule.new(opts, &proc)

data/lib/autobuild/packages/gnumake.rb

@@ -1,5 +1,3 @@
-require 'rubygems/version'
-
 module Autobuild
     def self.reset_gnumake_detection
         @make_is_gnumake = Hash.new

data/lib/autobuild/packages/import.rb

@@ -1,6 +1,3 @@
-require 'autobuild/timestamps'
-require 'autobuild/package'
-
 module Autobuild
     def self.import(spec, &proc)
         ImporterPackage.new(spec, &proc)

data/lib/autobuild/packages/pkgconfig.rb

@@ -1,5 +1,3 @@
-require 'autobuild/pkgconfig'
-
 module Autobuild
     class InstalledPkgConfig < Package
         attr_reader :pkgconfig, :prefix

data/lib/autobuild/packages/python.rb

@@ -1,6 +1,3 @@
-require 'autobuild/configurable'
-require 'open3'
-
 # Main Autobuild module
 module Autobuild
     def self.python(opts, &proc)
@@ -88,7 +85,7 @@ module Autobuild
 
         # Install the result in prefix
         def install
-            return unless install_mode?
+            return super unless install_mode?
 
             command = generate_install_command
             command << '--force' if @forced

data/lib/autobuild/progress_display.rb

@@ -1,6 +1,3 @@
-require "concurrent/atomic/atomic_boolean"
-require "concurrent/array"
-
 module Autobuild
     # Management of the progress display
     class ProgressDisplay
@@ -277,7 +274,7 @@ module Autobuild
                 until messages.empty?
                     msg = messages.shift.strip
                     margin = messages.empty? ? 1 : 2
-                    if lines.last.size + margin + msg.size > width
+                    if lines.last.size + margin + msg.size + 1 > width
                         lines.last << ","
                         lines << +""
                         lines.last << indent << indent << msg

data/lib/autobuild/reporting.rb

@@ -1,5 +1,6 @@
-require 'autobuild/exceptions'
-require 'pastel'
+require "pastel"
+require "concurrent/atomic/atomic_boolean"
+require "concurrent/array"
 
 module Autobuild
     @colorizer = Pastel.new

data/lib/autobuild/{subcommand.rb → subprocess.rb}

@@ -1,9 +1,3 @@
-require 'set'
-require 'autobuild/exceptions'
-require 'autobuild/reporting'
-require 'fcntl'
-require 'English'
-
 module Autobuild
     @logfiles = Set.new
     def self.clear_logfiles
@@ -165,10 +159,6 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         end
     end
 
-    CONTROL_COMMAND_NOT_FOUND = 1
-    CONTROL_UNEXPECTED = 2
-    CONTROL_INTERRUPT = 3
-
     @transparent_mode = false
 
     def self.transparent_mode?
@@ -212,7 +202,7 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
     # @option options [String] :input the path to a file whose content should be
     #   fed to the command standard input
     # @return [String] the command standard output
-    def self.run(target, phase, *command)
+    def self.run(target, phase, *command, &output_filter)
         STDOUT.sync = true
 
         input_streams = []
@@ -242,13 +232,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         command.reject! { |o| o.nil? || (o.respond_to?(:empty?) && o.empty?) }
         command.collect!(&:to_s)
 
-        if target.respond_to?(:name)
-            target_name = target.name
-            target_type = target.class
-        else
-            target_name = target.to_str
-            target_type = nil
-        end
+        target_name, target_type = target_argument_to_name_and_type(target)
+
         logdir = if target.respond_to?(:logdir)
                      target.logdir
                  else
@@ -259,27 +244,6 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
             options[:working_directory] ||= target.working_directory
         end
 
-        logname = File.join(logdir, "#{target_name.gsub(/:/, '_')}-"\
-            "#{phase.to_s.gsub(/:/, '_')}.log")
-        unless File.directory?(File.dirname(logname))
-            FileUtils.mkdir_p File.dirname(logname)
-        end
-
-        if Autobuild.verbose
-            Autobuild.message "#{target_name}: running #{command.join(' ')}\n"\
-                "    (output goes to #{logname})"
-        end
-
-        open_flag = if Autobuild.keep_oldlogs then 'a'
-                    elsif Autobuild.registered_logfile?(logname) then 'a'
-                    else
-                        'w'
-                    end
-        open_flag << ":BINARY"
-
-        Autobuild.register_logfile(logname)
-        subcommand_output = Array.new
-
         env = options[:env].dup
         if options[:env_inherit]
             ENV.each do |k, v|
@@ -287,169 +251,101 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
             end
         end
 
-        status = File.open(logname, open_flag) do |logfile|
-            logfile.puts if Autobuild.keep_oldlogs
-            logfile.puts
-            logfile.puts "#{Time.now}: running"
-            logfile.puts "    #{command.join(' ')}"
-            logfile.puts "with environment:"
-            env.keys.sort.each do |key|
-                if (value = env[key])
-                    logfile.puts "  '#{key}'='#{value}'"
-                end
-            end
-            logfile.puts
-            logfile.puts "#{Time.now}: running"
-            logfile.puts "    #{command.join(' ')}"
-            logfile.flush
-            logfile.sync = true
-
-            unless input_streams.empty?
-                pread, pwrite = IO.pipe # to feed subprocess stdin
-            end
+        if Autobuild.windows?
+            windows_support(options, command)
+            return
+        end
 
-            outread, outwrite = IO.pipe
-            outread.sync = true
-            outwrite.sync = true
+        logname = compute_log_path(target_name, phase, logdir)
 
-            cread, cwrite = IO.pipe # to control that exec goes well
+        status, subcommand_output = open_logfile(logname) do |logfile|
+            logfile_header(logfile, command, env)
 
-            if Autobuild.windows?
-                Dir.chdir(options[:working_directory]) do
-                    unless system(*command)
-                        exit_code = $CHILD_STATUS.exitstatus
-                        raise Failed.new(exit_code, nil),
-                              "'#{command.join(' ')}' returned status #{exit_code}"
-                    end
-                end
-                return # rubocop:disable Lint/NonLocalExitFromIterator
+            if Autobuild.verbose
+                Autobuild.message "#{target_name}: running #{command.join(' ')}\n"\
+                    "    (output goes to #{logname})"
             end
 
-            cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-
-            pid = fork do
-                    logfile.puts "in directory #{options[:working_directory] || Dir.pwd}"
-
-                    cwrite.sync = true
-                    if Autobuild.nice
-                        Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
-                    end
-
-                    outread.close
-                    $stderr.reopen(outwrite.dup)
-                    $stdout.reopen(outwrite.dup)
-
-                    unless input_streams.empty?
-                        pwrite.close
-                        $stdin.reopen(pread)
-                    end
+            unless input_streams.empty?
+                stdin_r, stdin_w = IO.pipe # to feed subprocess stdin
+            end
 
-                    exec(env, *command,
-                         chdir: options[:working_directory] || Dir.pwd,
-                         close_others: false)
+            out_r, out_w = IO.pipe
+            out_r.sync = true
+            out_w.sync = true
+
+            logfile.puts "Spawning"
+            stdin_redir = { :in => stdin_r } if stdin_r
+            begin
+                pid = spawn(
+                    env, *command,
+                    {
+                        :chdir => options[:working_directory] || Dir.pwd,
+                        :close_others => false,
+                        %I[err out] => out_w
+                    }.merge(stdin_redir || {})
+                )
+                logfile.puts "Spawned, PID=#{pid}"
             rescue Errno::ENOENT
-                    cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
-                    exit(100)
-            rescue Interrupt
-                    cwrite.write([CONTROL_INTERRUPT].pack('I'))
-                    exit(100)
-            rescue ::Exception => e
-                    STDERR.puts e
-                    STDERR.puts e.backtrace.join("\n  ")
-                    cwrite.write([CONTROL_UNEXPECTED].pack('I'))
-                    exit(100)
+                raise Failed.new(nil, false), "command '#{command.first}' not found"
             end
 
-            readbuffer = StringIO.new
+            if Autobuild.nice
+                Process.setpriority(Process::PRIO_PROCESS, pid, Autobuild.nice)
+            end
 
             # Feed the input
             unless input_streams.empty?
-                pread.close
-                begin
-                    input_streams.each do |instream|
-                        instream.each_line do |line|
-                            while IO.select([outread], nil, nil, 0)
-                                readbuffer.write(outread.readpartial(128))
-                            end
-                            pwrite.write(line)
-                        end
-                    end
-                rescue Errno::ENOENT => e
-                    raise Failed.new(nil, false),
-                          "cannot open input files: #{e.message}", retry: false
-                end
-                pwrite.close
+                logfile.puts "Feeding STDIN"
+                stdin_r.close
+                readbuffer = feed_input(input_streams, out_r, stdin_w)
+                stdin_w.close
             end
 
-            # Get control status
-            cwrite.close
-            value = cread.read(4)
-            if value
-                # An error occured
-                value = value.unpack1('I')
-                case value
-                when CONTROL_COMMAND_NOT_FOUND
-                    raise Failed.new(nil, false), "command '#{command.first}' not found"
-                when CONTROL_INTERRUPT
-                    raise Interrupt, "command '#{command.first}': interrupted by user"
-                else
-                    raise Failed.new(nil, false), "something unexpected happened"
-                end
-            end
-
-            transparent_prefix = "#{target_name}:#{phase}: "
-            transparent_prefix = "#{target_type}:#{transparent_prefix}" if target_type
-
             # If the caller asked for process output, provide it to him
             # line-by-line.
-            outwrite.close
+            out_w.close
 
             unless input_streams.empty?
-                readbuffer.write(outread.read)
+                readbuffer.write(out_r.read)
                 readbuffer.seek(0)
-                outread.close
-                outread = readbuffer
+                out_r.close
+                out_r = readbuffer
             end
 
-            outread.each_line do |line|
-                line.force_encoding(options[:encoding])
-                line = line.chomp
-                subcommand_output << line
-
-                logfile.puts line
-
-                if Autobuild.verbose || transparent_mode?
-                    STDOUT.puts "#{transparent_prefix}#{line}"
-                elsif block_given?
-                    # Do not yield
-                    # would mix the progress output with the actual command
-                    # output. Assume that if the user wants the command output,
-                    # the autobuild progress output is unnecessary
-                    yield(line)
-                end
-            end
-            outread.close
+            transparent_prefix =
+                transparent_output_prefix(target_name, phase, target_type)
+            logfile.puts "Processing command output"
+            subcommand_output = process_output(
+                out_r, logfile, transparent_prefix, options[:encoding], &output_filter
+            )
+            out_r.close
 
+            logfile.puts "Waiting for #{pid} to finish"
             _, childstatus = Process.wait2(pid)
             logfile.puts "Exit: #{childstatus}"
-            childstatus
+            [childstatus, subcommand_output]
         end
 
-        if !status.exitstatus || status.exitstatus > 0
-            if status.termsig == 2 # SIGINT == 2
-                raise Interrupt, "subcommand #{command.join(' ')} interrupted"
-            end
+        handle_exit_status(status, command)
+        update_stats(target, phase, start_time)
 
-            if status.termsig
-                raise Failed.new(status.exitstatus, nil),
-                      "'#{command.join(' ')}' terminated by signal #{status.termsig}"
-            else
-                raise Failed.new(status.exitstatus, nil),
-                      "'#{command.join(' ')}' returned status #{status.exitstatus}"
-            end
-        end
+        subcommand_output
+    rescue Failed => e
+        error = Autobuild::SubcommandFailed.new(
+            target, command.join(" "), logname, e.status, subcommand_output || []
+        )
+        error.retry = if e.retry?.nil? then options[:retry]
+                      else
+                          e.retry?
+                      end
+        error.phase = phase
+        raise error, e.message
+    end
 
+    def self.update_stats(target, phase, start_time)
         duration = Time.now - start_time
+        target_name, = target_argument_to_name_and_type(target)
         Autobuild.add_stat(target, phase, duration)
         FileUtils.mkdir_p(Autobuild.logdir)
         File.open(File.join(Autobuild.logdir, "stats.log"), 'a') do |io|
@@ -458,15 +354,162 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
             io.puts "#{formatted_time} #{target_name} #{phase} #{duration}"
         end
         target.add_stat(phase, duration) if target.respond_to?(:add_stat)
+    end
+
+    def self.target_argument_to_name_and_type(target)
+        if target.respond_to?(:name)
+            [target.name, target.class]
+        else
+            [target.to_str, nil]
+        end
+    end
+
+    def self.target_argument_to_name(target)
+        if target.respond_to?(:name)
+            target.name
+        else
+            target.to_str
+        end
+    end
+
+    def self.target_argument_to_type(target, type)
+        return type if type
+
+        target.class if target.respond_to?(:name)
+    end
+
+    def self.handle_exit_status(status, command)
+        return if status.exitstatus == 0
+
+        if status.termsig == 2 # SIGINT == 2
+            raise Interrupt, "subcommand #{command.join(' ')} interrupted"
+        end
+
+        if status.termsig
+            raise Failed.new(status.exitstatus, nil),
+                  "'#{command.join(' ')}' terminated by signal #{status.termsig}"
+        else
+            raise Failed.new(status.exitstatus, nil),
+                  "'#{command.join(' ')}' returned status #{status.exitstatus}"
+        end
+    end
+
+    def self.windows_support(options, command)
+        Dir.chdir(options[:working_directory]) do
+            unless system(*command)
+                exit_code = $CHILD_STATUS.exitstatus
+                raise Failed.new(exit_code, nil),
+                      "'#{command.join(' ')}' returned status #{exit_code}"
+            end
+        end
+    end
+
+    def self.compute_log_path(target_name, phase, logdir)
+        File.join(logdir, "#{target_name.gsub(/:/, '_')}-"\
+            "#{phase.to_s.gsub(/:/, '_')}.log")
+    end
+
+    def self.open_logfile(logname, &block)
+        open_flag = if Autobuild.keep_oldlogs then 'a'
+                    elsif Autobuild.registered_logfile?(logname) then 'a'
+                    else
+                        'w'
+                    end
+        open_flag << ":BINARY"
+
+        unless File.directory?(File.dirname(logname))
+            FileUtils.mkdir_p File.dirname(logname)
+        end
+
+        Autobuild.register_logfile(logname)
+        File.open(logname, open_flag, &block)
+    end
+
+    def self.logfile_header(logfile, command, env)
+        logfile.puts if Autobuild.keep_oldlogs
+        logfile.puts
+        logfile.puts "#{Time.now}: running"
+        logfile.puts "    #{command.join(' ')}"
+        logfile.puts "with environment:"
+        env.keys.sort.each do |key|
+            if (value = env[key])
+                logfile.puts "  '#{key}'='#{value}'"
+            end
+        end
+        logfile.puts
+        logfile.puts "#{Time.now}: running"
+        logfile.puts "    #{command.join(' ')}"
+        logfile.flush
+        logfile.sync = true
+    end
+
+    def self.outpipe_each_line(out_r)
+        buffer = +""
+        while (data = out_r.readpartial(1024))
+            buffer << data
+            scanner = StringScanner.new(buffer)
+            while (line = scanner.scan_until(/\n/))
+                yield line
+            end
+            buffer = scanner.rest.dup
+        end
+    rescue EOFError
+        scanner = StringScanner.new(buffer)
+        while (line = scanner.scan_until(/\n/))
+            yield line
+        end
+        yield scanner.rest unless scanner.rest.empty?
+    end
+
+    def self.process_output(
+        out_r, logfile, transparent_prefix, encoding, &filter
+    )
+        subcommand_output = []
+        outpipe_each_line(out_r) do |line|
+            line.force_encoding(encoding)
+            line = line.chomp
+            subcommand_output << line
+
+            logfile.puts line
+
+            if Autobuild.verbose || transparent_mode?
+                STDOUT.puts "#{transparent_prefix}#{line}"
+            elsif filter
+                # Do not yield
+                # would mix the progress output with the actual command
+                # output. Assume that if the user wants the command output,
+                # the autobuild progress output is unnecessary
+                filter.call(line)
+            end
+        end
         subcommand_output
-    rescue Failed => e
-        error = Autobuild::SubcommandFailed.new(target, command.join(" "),
-                                                logname, e.status, subcommand_output)
-        error.retry = if e.retry?.nil? then options[:retry]
-                      else
-                          e.retry?
-                      end
-        error.phase = phase
-        raise error, e.message
+    end
+
+    def self.transparent_output_prefix(target_name, phase, target_type)
+        prefix = "#{target_name}:#{phase}: "
+        return prefix unless target_type
+
+        "#{target_type}:#{prefix}"
+    end
+
+    def self.feed_input(input_streams, out_r, stdin_w)
+        readbuffer = StringIO.new
+        input_streams.each do |instream|
+            instream.each_line do |line|
+                # Read the process output to avoid having it block on a full pipe
+                begin
+                    loop do
+                        readbuffer.write(out_r.read_nonblock(1024))
+                    end
+                rescue IO::WaitReadable # rubocop:disable Lint/SuppressedException
+                end
+
+                stdin_w.write(line)
+            end
+        end
+        readbuffer
+    rescue Errno::ENOENT => e
+        raise Failed.new(nil, false),
+              "cannot open input files: #{e.message}", retry: false
     end
 end

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.24.0".freeze unless defined? Autobuild::VERSION
+    VERSION = "1.25.1".freeze unless defined? Autobuild::VERSION
 end

data/lib/autobuild.rb

@@ -11,7 +11,6 @@ module Autobuild
     extend Logger::Root('Autobuild', Logger::INFO)
 end
 
-require 'net/smtp'
 require 'socket'
 require 'etc'
 require 'find'
@@ -21,8 +20,27 @@ require 'rake/tasklib'
 require 'fileutils'
 require 'optparse'
 require 'singleton'
+require 'open3'
+require 'English'
 require 'pastel'
+require 'fcntl'
+require 'rexml'
 require 'tty-prompt'
+require 'time'
+require 'set'
+require 'rbconfig'
+require 'digest/sha1'
+require 'open-uri'
+require 'net/http'
+require 'net/https'
+require 'net/smtp'
+require 'rubygems/version'
+
+require "concurrent/atomic/atomic_boolean"
+require "concurrent/array"
+
+require 'utilrb/hash/map_value'
+require 'utilrb/kernel/options'
 require 'autobuild/tools'
 
 require 'autobuild/version'
@@ -31,7 +49,7 @@ require 'autobuild/exceptions'
 require 'autobuild/pkgconfig'
 require 'autobuild/reporting'
 require 'autobuild/mail_reporter'
-require 'autobuild/subcommand'
+require 'autobuild/subprocess'
 require 'autobuild/timestamps'
 require 'autobuild/parallel'
 require 'autobuild/utility'
@@ -50,6 +68,7 @@ require 'autobuild/import/tar'
 require 'autobuild/package'
 require 'autobuild/configurable'
 require 'autobuild/packages/autotools'
+require 'autobuild/packages/gnumake'
 require 'autobuild/packages/cmake'
 require 'autobuild/packages/genom'
 require 'autobuild/packages/import'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2025-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -132,22 +146,16 @@ dependencies:
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +204,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
@@ -210,6 +232,7 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Changes.txt
 - Gemfile
 - Manifest.txt
@@ -249,7 +272,7 @@ files:
 - lib/autobuild/progress_display.rb
 - lib/autobuild/rake_task_extension.rb
 - lib/autobuild/reporting.rb
-- lib/autobuild/subcommand.rb
+- lib/autobuild/subprocess.rb
 - lib/autobuild/test.rb
 - lib/autobuild/test_utility.rb
 - lib/autobuild/timestamps.rb