autobuild 1.22.1 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e8645a039ab9b7fa950f3264bc9e15a53901a82c34fef9a32e008f123b275e
-  data.tar.gz: e6cfbaba2cf060c25c8bced04d8577c20275d2aabbdc0aac123ed1b43a9df4a7
+  metadata.gz: 56a551f16208e61f38188d81b0b944ef6ba663fbc3155ae7e55b009f2adda2e6
+  data.tar.gz: 60e5b9d1b8ffe8ff4e35d006960a251ef82467ee5d17adcb9d9d21e2e7f47b15
 SHA512:
-  metadata.gz: 490828e178d20f24bc84d819cf9ac6fb3e6880cf5b9eb938fef540e18e8023008cd467d26fac61b46f531bb7abeadaa1822fd257437a7eb36d8c23ec8dc10906
-  data.tar.gz: e7eb1e3bc9bfb1f59852766113cfdb981331c595a78c9ef2f7bc530a9cf3594a64f8775b498c27f9ac534296e12393011e172c79129d7abbca69cae7581f6525
+  metadata.gz: 30af86ba246a653daac4299675fe4b248b36b2d30750feefd567dc32c6768b9f4b60f877021253699336c5d01c54b69f1d7db6808a6d49ea12ff612f425ca01c
+  data.tar.gz: 16e7849423378e7e5e89f0e40e7cc77173e87290954734aa86195cf15547388bce6a7b234aaf8857593e2d513b9daf4634759026706a6f2e54eb2044b7ee8b96

data/lib/autobuild/environment.rb

@@ -29,37 +29,44 @@ module Autobuild
 
     SHELL_VAR_EXPANSION =
         if windows? then "%%%s%%".freeze
-        else "$%s".freeze
+        else
+            "$%s".freeze
         end
     SHELL_SET_COMMAND =
         if windows? then "set %s=%s".freeze
-        else "%s=\"%s\"".freeze
+        else
+            "%s=\"%s\"".freeze
         end
     SHELL_CONDITIONAL_SET_COMMAND =
         if windows? then "set %s=%s".freeze
-        else "if test -z \"$%1$s\"; then\n  %1$s=\"%3$s\"\n"\
+        else
+            "if test -z \"$%1$s\"; then\n  %1$s=\"%3$s\"\n"\
             "else\n  %1$s=\"%2$s\"\nfi".freeze
         end
     SHELL_UNSET_COMMAND = "unset %s".freeze
     SHELL_EXPORT_COMMAND =
         if windows? then "set %s".freeze
-        else "export %s".freeze
+        else
+            "export %s".freeze
         end
     SHELL_SOURCE_SCRIPT =
         if windows? then "%s".freeze
-        else '. "%s"'.freeze
+        else
+            '. "%s"'.freeze
         end
 
     LIBRARY_PATH =
         if macos? then 'DYLD_LIBRARY_PATH'.freeze
         elsif windows? then 'PATH'.freeze
-        else 'LD_LIBRARY_PATH'.freeze
+        else
+            'LD_LIBRARY_PATH'.freeze
         end
 
     LIBRARY_SUFFIX =
         if macos? then 'dylib'
         elsif windows? then 'dll'
-        else 'so'
+        else
+            'so'
         end
 
     ORIGINAL_ENV = Hash.new
@@ -211,7 +218,8 @@ module Autobuild
             if @inherit
                 if name
                     @inherited_variables.include?(name)
-                else true
+                else
+                    true
                 end
             end
         end
@@ -245,7 +253,8 @@ module Autobuild
             flag =
                 if !names.last.respond_to?(:to_str)
                     names.pop
-                else true
+                else
+                    true
                 end
 
             if flag
@@ -342,7 +351,8 @@ module Autobuild
                         inherited_environment[name] || []
                     elsif inheritance_mode == :keep && inherit?(name)
                         ["$#{name}"]
-                    else []
+                    else
+                        []
                     end
 
                 value = []
@@ -439,7 +449,8 @@ module Autobuild
             if file
                 @source_before << { file: file, shell: shell }
                 source_before(shell: shell) # for backwards compatibility
-            else @source_before.select { |pair| pair[:shell] == shell }
+            else
+                @source_before.select { |pair| pair[:shell] == shell }
                                .map { |item| item[:file] }
             end
         end
@@ -457,7 +468,8 @@ module Autobuild
             if file
                 @source_after << { file: file, shell: shell }
                 source_after(shell: shell) # for backwards compatibility
-            else @source_after.select { |pair| pair[:shell] == shell }
+            else
+                @source_after.select { |pair| pair[:shell] == shell }
                               .map { |item| item[:file] }
             end
         end
@@ -542,7 +554,8 @@ module Autobuild
                     with_inheritance = with_inheritance.map do |value|
                         if value == variable_expansion
                             base_env[name]
-                        else value
+                        else
+                            value
                         end
                     end
                     result[name] = with_inheritance.join(File::PATH_SEPARATOR)
@@ -604,7 +617,8 @@ module Autobuild
             @arch_size ||=
                 if RbConfig::CONFIG['host_cpu'] =~ /64/
                     64
-                else 32
+                else
+                    32
                 end
             @arch_size
         end
@@ -633,17 +647,83 @@ module Autobuild
             add_prefix(newprefix, includes)
         end
 
+        def default_cmake_search_globs(prefix, *file_globs)
+            lib_globs = %w[lib]
+
+            case arch_size
+            when 32
+                lib_globs << "lib32"
+                lib_globs << "libx32"
+            when 64
+                lib_globs << "lib64"
+            end
+
+            unless arch_names.empty?
+                arch_names.each do |arch_name|
+                    lib_globs << File.join("lib", arch_name)
+                end
+            end
+
+            lib_share_glob = "{#{lib_globs.join(',')},share}"
+            file_glob = "{#{file_globs.join(',')}}"
+
+            # Reference: https://cmake.org/cmake/help/latest/command/find_package.html
+            #
+            # <prefix>/                                                       (W)
+            # <prefix>/(cmake|CMake)/                                         (W)
+            # <prefix>/<name>*/                                               (W)
+            # <prefix>/<name>*/(cmake|CMake)/                                 (W)
+            # <prefix>/(lib/<arch>|lib*|share)/cmake/<name>*/                 (U)
+            # <prefix>/(lib/<arch>|lib*|share)/<name>*/                       (U)
+            # <prefix>/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/         (U)
+            # <prefix>/<name>*/(lib/<arch>|lib*|share)/cmake/<name>*/         (W/U)
+            # <prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/               (W/U)
+            # <prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/ (W/U)
+            [
+                File.join(prefix, file_glob),
+                File.join(prefix, "{cmake,CMake}", file_glob),
+                File.join(prefix, "*", file_glob),
+                File.join(prefix, "*", "{cmake/CMake}", file_glob),
+                File.join(prefix, lib_share_glob, "cmake", "*", file_glob),
+                File.join(prefix, lib_share_glob, "*", file_glob),
+                File.join(prefix, lib_share_glob, "*", "{cmake,CMake}", file_glob),
+                File.join(prefix, "*", lib_share_glob, "cmake", "*", file_glob),
+                File.join(prefix, "*", lib_share_glob, "*", file_glob),
+                File.join(prefix, "*", lib_share_glob, "*", "{cmake,CMake}", file_glob)
+            ]
+        end
+
+        def has_cmake_files?(prefix, *file_globs)
+            default_cmake_search_globs(prefix, *file_globs).each do |glob_path|
+                return true unless Dir[glob_path].empty?
+            end
+            false
+        end
+
         PKGCONFIG_PATH_RX = %r{.*/((?:lib|lib64|share)/.*)}.freeze
 
+        def pkgconfig_tool_path
+            @pkgconfig_tool_path ||= Autobuild.tool_in_path("pkg-config", env: self)
+        rescue ArgumentError
+            nil
+        end
+
         # Returns the system-wide search path that is embedded in pkg-config
         def default_pkgconfig_search_suffixes
+            return [] unless pkgconfig_tool_path
+
             @default_pkgconfig_search_suffixes ||=
-                `LANG=C #{Autobuild.tool("pkg-config")} --variable pc_path pkg-config`
+                `LANG=C #{pkgconfig_tool_path} --variable pc_path pkg-config`
                     .strip
                     .split(":")
                     .grep(PKGCONFIG_PATH_RX)
                     .map { |l| l.gsub(PKGCONFIG_PATH_RX, '\1') }
                     .to_set
+                    .add("/lib/pkgconfig")
+            # /lib/pkgconfig is added for packages that always install their
+            # libraries in /lib/ instead of the system mandated directory
+            # (/lib/x86_64-linux-gnu/ for 64bit x86 ubuntu multiarch,
+            # /lib64/ for some other 64bit systems)
         end
 
         # Updates the environment when a new prefix has been added
@@ -670,6 +750,16 @@ module Autobuild
                 end
             end
 
+            cmake_pairs = []
+            cmake_pairs << ["CMAKE_PREFIX_PATH", ["*-config.cmake", "*Config.cmake"]]
+            cmake_pairs << ["CMAKE_MODULE_PATH", ["Find*.cmake"]]
+            cmake_pairs.each do |cmake_var, cmake_file_globs|
+                if !includes || includes.include?(cmake_var)
+                    has_cmake = has_cmake_files?(newprefix, *cmake_file_globs)
+                    add_path(cmake_var, newprefix) if has_cmake
+                end
+            end
+
             # Validate the new rubylib path
             if !includes || includes.include?('RUBYLIB')
                 new_rubylib = "#{newprefix}/lib"

data/lib/autobuild/exceptions.rb

@@ -33,7 +33,8 @@ module Autobuild
             target_name =
                 if target.respond_to?(:name)
                     target.name
-                else target.to_str
+                else
+                    target.to_str
                 end
 
             if target && phase

data/lib/autobuild/import/archive.rb

@@ -529,7 +529,8 @@ module Autobuild
 
             if mode == Zip
                 main_dir = if @options[:no_subdirectory] then package.srcdir
-                           else base_dir
+                           else
+                               base_dir
                            end
 
                 FileUtils.mkdir_p base_dir

data/lib/autobuild/import/git.rb

@@ -10,7 +10,26 @@ module Autobuild
         # Exception raised when a network access is needed while only_local is true
         class NetworkAccessNeeded < RuntimeError; end
 
+        @default_fingerprint_mode = "commit"
+
         class << self
+            # Sets the single_branch option globally for all Git importers
+            # This can can be overriden in the oporter options
+            attr_writer :single_branch
+
+            # Whether single_branch is enabled globally
+            def single_branch?
+                !!@single_branch
+            end
+
+            # Sets shallow clones globally (applies to submodules as well)
+            attr_writer :shallow
+
+            # Whether shallow clones is enabled globally
+            def shallow?
+                !!@shallow
+            end
+
             # Sets the default alternates path used by all Git importers
             #
             # Setting it explicitly overrides any value we get from the
@@ -40,9 +59,22 @@ module Autobuild
                     @default_alternates = cache_dirs.map do |path|
                         File.join(File.expand_path(path), '%s')
                     end
-                else Array.new
+                else
+                    Array.new
                 end
             end
+
+            # What git repository fingerprinting uses as reference
+            #
+            # Can either be
+            # - "commit" (the default). Use the commit hash of HEAD
+            # - "tree". Use the tree hash. This will return the same fingerprint
+            #    for new commits that do not change the source code. However, it
+            #    will fail to detect changes to the working copy that are due
+            #    to git checkout filters.
+            #
+            # @return [String]
+            attr_accessor :default_fingerprint_mode
         end
 
         def self.default_config
@@ -141,17 +173,22 @@ module Autobuild
                 Autobuild.warn "    branch: 'master'"
             end
 
-            gitopts, common = Kernel.filter_options options,
-                                                    push_to: nil,
-                                                    branch: nil,
-                                                    local_branch: nil,
-                                                    remote_branch: nil,
-                                                    tag: nil,
-                                                    commit: nil,
-                                                    repository_id: nil,
-                                                    source_id: nil,
-                                                    with_submodules: false,
-                                                    single_branch: false
+            gitopts, common = Kernel.filter_options(
+                options,
+                push_to: nil,
+                branch: nil,
+                local_branch: nil,
+                remote_branch: nil,
+                tag: nil,
+                commit: nil,
+                repository_id: nil,
+                source_id: nil,
+                with_submodules: false,
+                fingerprint_mode: Git.default_fingerprint_mode,
+                single_branch: Git.single_branch?,
+                shallow: Git.shallow?
+            )
+
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash "\
                     "and the explicit parameter"
@@ -161,6 +198,7 @@ module Autobuild
             super(common)
 
             @single_branch = gitopts[:single_branch]
+            @shallow = gitopts[:shallow]
             @with_submodules = gitopts.delete(:with_submodules)
             @alternates =
                 if @with_submodules
@@ -171,12 +209,13 @@ module Autobuild
 
             @remote_name = 'autobuild'
             @push_to = nil
+            @fingerprint_mode = gitopts[:fingerprint_mode]
             relocate(repository, gitopts)
             @additional_remotes = Array.new
         end
 
         def vcs_fingerprint(package)
-            rev_parse(package, 'HEAD')
+            rev_parse(package, "HEAD", @fingerprint_mode)
         end
 
         # The name of the remote that should be set up by the importer
@@ -285,9 +324,17 @@ module Autobuild
             @single_branch
         end
 
+        # Whether clones should be shallow
+        def shallow?
+            @shallow
+        end
+
         # Set the {#single_branch?} predicate
         attr_writer :single_branch
 
+        # Set the {#shallow?} predicate
+        attr_writer :shallow
+
         # @api private
         #
         # Verifies that the package's {Package#importdir} points to a git
@@ -764,7 +811,8 @@ module Autobuild
         rescue SubcommandFailed => e
             if e.status == 1
                 false
-            else raise
+            else
+                raise
             end
         end
 
@@ -775,7 +823,8 @@ module Autobuild
         rescue SubcommandFailed => e
             if e.status == 1
                 false
-            else raise
+            else
+                raise
             end
         end
 
@@ -1020,7 +1069,8 @@ module Autobuild
                     File.readlines(alternates_path)
                         .map(&:strip)
                         .find_all { |l| !l.empty? }
-                else Array.new
+                else
+                    Array.new
                 end
 
             alternates = each_alternate_path(package).map do |path|
@@ -1251,19 +1301,60 @@ module Autobuild
             @lfs_installed = status.success?
         end
 
+        def validate_shallow(package)
+            return false unless shallow?
+
+            if commit
+                Autoproj.warn "#{package.name}: "\
+                              "Cannot pin a commit while doing a shallow clone"
+                return false
+            end
+            if tag && !single_branch?
+                Autoproj.warn "#{package.name}: "\
+                              "Cannot pin a tag while doing a shallow clone"
+                return false
+            end
+            if @remote_branch
+                Autoproj.warn "#{package.name}: "\
+                              "Cannot use remote_branch while doing a shallow clone"
+                return false
+            end
+            true
+        end
+
         def checkout(package, _options = Hash.new)
+            shallow_clone = validate_shallow(package)
+
             base_dir = File.expand_path('..', package.importdir)
             FileUtils.mkdir_p(base_dir) unless File.directory?(base_dir)
 
             clone_options = Array.new
-            clone_options << '--recurse-submodules' if with_submodules?
+            if with_submodules?
+                clone_options << '--recurse-submodules'
+                clone_options << '--shallow-submodules' if shallow_clone
+            end
+
+            clone_options << '--depth' << '1' if shallow_clone
+
             if single_branch?
-                if remote_branch.start_with?("refs/")
-                    raise ArgumentError, "you cannot provide a full ref for"\
-                        " the remote branch while cloning a single branch"
+                if tag
+                    if tag.start_with?("refs/")
+                        raise ArgumentError, "you cannot provide a full ref for"\
+                            " the tag while cloning a single branch"
+                    end
+                    clone_options << "--branch=#{tag}"
+                elsif remote_branch
+                    if remote_branch.start_with?("refs/")
+                        raise ArgumentError, "you cannot provide a full ref for"\
+                            " the remote branch while cloning a single branch"
+                    end
+                    clone_options << "--branch=#{remote_branch}"
                 end
-                clone_options << "--branch=#{remote_branch}" << "--single-branch"
+                clone_options << "--single-branch"
+            elsif shallow_clone
+                clone_options << "--no-single-branch"
             end
+
             each_alternate_path(package) do |path|
                 clone_options << '--reference' << path
             end
@@ -1274,7 +1365,7 @@ module Autobuild
                         Autobuild.tool('git'), 'clone', '-o', remote_name, *clone_options,
                         repository, package.importdir, retry: true)
 
-            update_remotes_configuration(package)
+            update_remotes_configuration(package, only_local: false)
             update(package, only_local: !remote_branch.start_with?("refs/"),
                             reset: :force)
             if with_submodules?

data/lib/autobuild/import/svn.rb

@@ -202,7 +202,8 @@ module Autobuild
                     # Try svn upgrade and info again
                     run_svn(package, 'upgrade', retry: false)
                     svninfo = run_svn(package, 'info')
-                else raise
+                else
+                    raise
                 end
             end
 

data/lib/autobuild/importer.rb

@@ -357,7 +357,8 @@ module Autobuild
                 message = Autobuild.color('interrupted', :red)
                 if last_error
                     raise last_error
-                else raise
+                else
+                    raise
                 end
             rescue ::Exception => e
                 message = Autobuild.color('update failed', :red)
@@ -410,7 +411,8 @@ module Autobuild
                     execute_post_hooks(package)
                 rescue Interrupt
                     if last_error then raise last_error
-                    else raise
+                    else
+                        raise
                     end
                 rescue ::Exception => e
                     last_error = e

data/lib/autobuild/package.rb

@@ -119,7 +119,8 @@ module Autobuild
         def update?
             if @update.nil?
                 Autobuild.do_update
-            else @update
+            else
+                @update
             end
         end
 
@@ -287,6 +288,11 @@ module Autobuild
             add_env_op EnvOp.new(:add_prefix, prefix, [includes])
         end
 
+        # Add a file to be sourced at the end of the generated env file
+        def env_source_after(file, shell: "sh")
+            add_env_op EnvOp.new(:source_after, file, shell: shell)
+        end
+
         # Hook called by autoproj to set up the default environment for this
         # package
         #
@@ -327,7 +333,11 @@ module Autobuild
                         set[env_op.name] = [self, env_op.values]
                     end
                 end
-                env.send(env_op.type, env_op.name, *env_op.values)
+                if env_op.type == :source_after
+                    env.send(env_op.type, env_op.name, **env_op.values)
+                else
+                    env.send(env_op.type, env_op.name, *env_op.values)
+                end
                 ops << env_op
             end
             ops
@@ -492,7 +502,8 @@ module Autobuild
                     suffix << token.gsub(/%s/, name)
                 elsif suffix.empty?
                     prefix << token
-                else suffix << token
+                else
+                    suffix << token
                 end
             end
             if suffix.empty?

data/lib/autobuild/packages/autotools.rb

@@ -206,7 +206,8 @@ module Autobuild
                         varname, = o.split("=").first
                         if (current_flag = testflags.find { |fl| fl =~ /^#{varname}=/ })
                             current_flag != o
-                        else false
+                        else
+                            false
                         end
                     end
                 end

data/lib/autobuild/packages/cmake.rb

@@ -269,7 +269,14 @@ module Autobuild
             run('doc', Autobuild.tool(:doxygen), doxyfile)
         end
 
-        def common_utility_handling(utility, target, *args, start_msg, done_msg)
+        def common_utility_handling( # rubocop:disable Metrics/ParameterLists
+            utility,
+            target,
+            *args,
+            start_msg,
+            done_msg,
+            post_process: nil
+        )
             utility.source_ref_dir = builddir
             utility.task do
                 progress_start start_msg, :done_message => done_msg do
@@ -284,6 +291,24 @@ module Autobuild
                     end
                     yield if block_given?
                 end
+
+                post_process&.call
+            end
+        end
+
+        def with_coverage(&block)
+            @with_coverage ||= block
+        end
+
+        def coverage_block
+            proc do
+                next unless test_utility.coverage_enabled?
+                next unless @with_coverage
+
+                progress_start "generating coverage report for %s",
+                               done_message: "generated coverage report for %s" do
+                    @with_coverage.call
+                end
             end
         end
 
@@ -299,7 +324,8 @@ module Autobuild
             common_utility_handling(
                 test_utility, target, "ARGS=-V",
                 "running tests for %s",
-                "successfully ran tests for %s", &block)
+                "successfully ran tests for %s",
+                post_process: coverage_block, &block)
         end
 
         CMAKE_EQVS = {
@@ -440,7 +466,8 @@ module Autobuild
         def show_make_messages?
             if !@show_make_messages.nil?
                 @show_make_messages
-            else CMake.show_make_messages?
+            else
+                CMake.show_make_messages?
             end
         end
 

data/lib/autobuild/packages/python.rb

@@ -27,12 +27,14 @@ module Autobuild
 
         def prepare_for_forced_build
             super
-            FileUtils.rm_f configurestamp
             @forced = true
         end
 
         def generate_build_command
-            command = ['python', 'setup.py', 'build']
+            command = %w[python setup.py]
+            command << "egg_info"
+            command << "--egg-base=#{builddir}"
+            command << "build"
             command << "--build-base=#{builddir}"
             command += buildflags.flatten
             command
@@ -42,25 +44,35 @@ module Autobuild
             command = generate_build_command
             command << 'install'
             command << "--prefix=#{prefix}"
+            command << "--record=#{builddir}/install.log"
+            command << "--single-version-externally-managed"
             command += installflags.flatten
             command
         end
 
-        def python_path
+        def self.user_site(prefix)
+            return File.join(prefix, @user_site) if @user_site
+
             begin
-                _, output, _, ret = Open3.popen3({ 'PYTHONUSERBASE' => prefix },
-                                                 'python -m site --user-site')
+                env = Autobuild.env.resolved_env.merge({ 'PYTHONUSERBASE' => "/" })
+                _, output, _, ret = Open3.popen3(env, 'python -m site --user-site')
             rescue Exception => e
                 raise "Unable to set PYTHONPATH: #{e.message}"
             end
 
             if ret.value.success?
-                output.read.chomp
+                @user_site = Pathname.new(output.read.chomp)
+                                     .relative_path_from(Pathname.new("/"))
+                File.join(prefix, @user_site)
             else
                 raise 'Unable to set PYTHONPATH: user site directory disabled?'
             end
         end
 
+        def python_path
+            self.class.user_site(prefix)
+        end
+
         # Do the build in builddir
         def build
             return unless install_mode?

data/lib/autobuild/parallel.rb

@@ -88,7 +88,8 @@ module Autobuild
                 if task.respond_to?(:package)
                     started_packages[task.package] ||= -started_packages.size
                     queue[task] = started_packages[task.package]
-                else queue[task] = base_priority
+                else
+                    queue[task] = base_priority
                 end
             end
 

data/lib/autobuild/progress_display.rb

@@ -246,7 +246,8 @@ module Autobuild
                             groups.last[1] = (current_group.first..group_end_index)
                             groups << [prefix, [idx, other_idx]]
                             grouping = true
-                        else break
+                        else
+                            break
                         end
                     end
                 end

data/lib/autobuild/reporting.rb

@@ -130,7 +130,8 @@ module Autobuild
         # :exit if debug is false, or :raise if it is true
         def self.default_report_on_package_failures
             if Autobuild.debug then :raise
-            else :exit
+            else
+                :exit
             end
         end
 
@@ -163,7 +164,8 @@ module Autobuild
                 raise interrupted_by if interrupted_by
 
                 e = if errors.size == 1 then errors.first
-                    else CompositeException.new(errors)
+                    else
+                        CompositeException.new(errors)
                     end
                 raise e
             elsif %i[report_silent report].include?(on_package_failures)

data/lib/autobuild/subcommand.rb

@@ -251,7 +251,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         end
         logdir = if target.respond_to?(:logdir)
                      target.logdir
-                 else Autobuild.logdir
+                 else
+                     Autobuild.logdir
                  end
 
         if target.respond_to?(:working_directory)
@@ -271,7 +272,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
 
         open_flag = if Autobuild.keep_oldlogs then 'a'
                     elsif Autobuild.registered_logfile?(logname) then 'a'
-                    else 'w'
+                    else
+                        'w'
                     end
         open_flag << ":BINARY"
 
@@ -461,7 +463,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         error = Autobuild::SubcommandFailed.new(target, command.join(" "),
                                                 logname, e.status, subcommand_output)
         error.retry = if e.retry?.nil? then options[:retry]
-                      else e.retry?
+                      else
+                          e.retry?
                       end
         error.phase = phase
         raise error, e.message

data/lib/autobuild/test_utility.rb

@@ -24,7 +24,8 @@ module Autobuild
         def coverage_enabled?
             if @coverage_enabled.nil?
                 TestUtility.coverage_enabled?
-            else @coverage_enabled
+            else
+                @coverage_enabled
             end
         end
 
@@ -53,7 +54,8 @@ module Autobuild
             if @coverage_source_dir
                 relative = if package.respond_to?(:builddir)
                                package.builddir
-                           else package.srcdir
+                           else
+                               package.srcdir
                            end
                 File.expand_path(@coverage_source_dir, relative)
             end

data/lib/autobuild/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.22.1
+  version: 1.24.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms