autobuild 1.18.1 → 1.22.0

data/lib/autobuild/rake_task_extension.rb

@@ -1,19 +1,30 @@
 module Autobuild
     module RakeTaskExtension
+        def initialize(*, **)
+            super
+            @disabled = false
+        end
+
         def already_invoked?
             @already_invoked
         end
 
         attr_writer :already_invoked
 
-        def disable!
-            @already_invoked = true
-            singleton_class.class_eval do
-                define_method(:needed?) { false }
-            end
+        def disabled?
+            @disabled
+        end
+
+        def disabled!
+            disable
+        end
+
+        def disable
+            @disabled = true
         end
     end
 end
+
 class Rake::Task # rubocop:disable Style/ClassAndModuleChildren
     include Autobuild::RakeTaskExtension
 end

data/lib/autobuild/reporting.rb

@@ -47,10 +47,23 @@ module Autobuild
         @display.progress_enabled?
     end
 
+    def self.progress_display_synchronize(&block)
+        @display.synchronize(&block)
+    end
+
+    # @deprecated use {progress_display_mode=} instead
     def self.progress_display_enabled=(value)
         @display.progress_enabled = value
     end
 
+    def self.progress_display_mode=(value)
+        @display.progress_mode = value
+    end
+
+    def self.progress_display_period=(value)
+        @display.progress_period = value
+    end
+
     def self.message(*args, **options)
         @display.message(*args, **options)
     end
@@ -92,8 +105,8 @@ module Autobuild
                 interrupted = e
             rescue Autobuild::Exception => e
                 return report_finish_on_error([e],
-                    on_package_failures: on_package_failures,
-                    interrupted_by: interrupted)
+                                              on_package_failures: on_package_failures,
+                                              interrupted_by: interrupted)
             end
 
             # If ignore_erorrs is true, check if some packages have failed
@@ -105,8 +118,8 @@ module Autobuild
             end
 
             report_finish_on_error(errors,
-                on_package_failures: on_package_failures,
-                interrupted_by: interrupted)
+                                   on_package_failures: on_package_failures,
+                                   interrupted_by: interrupted)
         end
 
         # @api private
@@ -157,7 +170,7 @@ module Autobuild
                 if interrupted_by
                     raise interrupted_by
                 else
-                    return errors
+                    errors
                 end
             elsif %i[exit exit_silent].include?(on_package_failures)
                 exit 1
@@ -231,8 +244,8 @@ module Autobuild
             scaled_size = (size / scale)
             if scaled_size > 1
                 return format("%3.1<scaled>f%<scale_name>s",
-                    scaled: scaled_size,
-                    scale_name: name)
+                              scaled: scaled_size,
+                              scale_name: name)
             end
         end
     end

data/lib/autobuild/subcommand.rb

@@ -161,6 +161,7 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         def initialize(status, do_retry)
             @status = status
             @retry = do_retry
+            super()
         end
     end
 
@@ -222,12 +223,14 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
 
         if command.last.kind_of?(Hash)
             options = command.pop
-            options = Kernel.validate_options options,
+            options = Kernel.validate_options(
+                options,
                 input: nil, working_directory: nil, retry: false,
                 input_streams: [],
                 env: ENV.to_hash,
                 env_inherit: true,
                 encoding: 'BINARY'
+            )
 
             input_streams << File.open(options[:input]) if options[:input]
             input_streams.concat(options[:input_streams]) if options[:input_streams]
@@ -255,8 +258,8 @@ 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")
+        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
@@ -312,8 +315,9 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
             if Autobuild.windows?
                 Dir.chdir(options[:working_directory]) do
                     unless system(*command)
-                        raise Failed.new($CHILD_STATUS.exitstatus, nil),
-                            "'#{command.join(' ')}' returned status #{status.exitstatus}"
+                        exit_code = $CHILD_STATUS.exitstatus
+                        raise Failed.new(exit_code, nil),
+                              "'#{command.join(' ')}' returned status #{exit_code}"
                     end
                 end
                 return # rubocop:disable Lint/NonLocalExitFromIterator
@@ -322,7 +326,6 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
             cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
             pid = fork do
-                begin
                     logfile.puts "in directory #{options[:working_directory] || Dir.pwd}"
 
                     cwrite.sync = true
@@ -340,20 +343,19 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
                     end
 
                     exec(env, *command,
-                        chdir: options[:working_directory] || Dir.pwd,
-                        close_others: false)
-                rescue Errno::ENOENT
+                         chdir: options[:working_directory] || Dir.pwd,
+                         close_others: false)
+            rescue Errno::ENOENT
                     cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
                     exit(100)
-                rescue Interrupt
+            rescue Interrupt
                     cwrite.write([CONTROL_INTERRUPT].pack('I'))
                     exit(100)
-                rescue ::Exception => e
+            rescue ::Exception => e
                     STDERR.puts e
                     STDERR.puts e.backtrace.join("\n  ")
                     cwrite.write([CONTROL_UNEXPECTED].pack('I'))
                     exit(100)
-                end
             end
 
             readbuffer = StringIO.new
@@ -372,7 +374,7 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
                     end
                 rescue Errno::ENOENT => e
                     raise Failed.new(nil, false),
-                        "cannot open input files: #{e.message}", retry: false
+                          "cannot open input files: #{e.message}", retry: false
                 end
                 pwrite.close
             end
@@ -382,15 +384,14 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
             value = cread.read(4)
             if value
                 # An error occured
-                value = value.unpack('I').first
-                if value == CONTROL_COMMAND_NOT_FOUND
-                    raise Failed.new(nil, false),
-                        "command '#{command.first}' not found"
-                elsif value == CONTROL_INTERRUPT
+                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"
+                    raise Failed.new(nil, false), "something unexpected happened"
                 end
             end
 
@@ -439,10 +440,10 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
 
             if status.termsig
                 raise Failed.new(status.exitstatus, nil),
-                    "'#{command.join(' ')}' terminated by signal #{status.termsig}"
+                      "'#{command.join(' ')}' terminated by signal #{status.termsig}"
             else
                 raise Failed.new(status.exitstatus, nil),
-                    "'#{command.join(' ')}' returned status #{status.exitstatus}"
+                      "'#{command.join(' ')}' returned status #{status.exitstatus}"
             end
         end
 
@@ -458,7 +459,7 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         subcommand_output
     rescue Failed => e
         error = Autobuild::SubcommandFailed.new(target, command.join(" "),
-            logname, e.status, subcommand_output)
+                                                logname, e.status, subcommand_output)
         error.retry = if e.retry?.nil? then options[:retry]
                       else e.retry?
                       end

data/lib/autobuild/test_utility.rb

@@ -73,7 +73,8 @@ module Autobuild
         def coverage_target_dir
             if @coverage_target_dir
                 File.expand_path(@coverage_target_dir, package.prefix)
-            else File.join(target_dir, 'coverage')
+            elsif (target_dir = self.target_dir)
+                File.join(target_dir, 'coverage')
             end
         end
 

data/lib/autobuild/timestamps.rb

@@ -58,8 +58,7 @@ module Autobuild
     class SourceTreeTask < Rake::Task
         attr_accessor :exclude
 
-        attr_reader :newest_file
-        attr_reader :newest_time
+        attr_reader :newest_file, :newest_time
 
         def initialize(*args, &block)
             @exclude = Autobuild.ignored_files.dup
@@ -71,10 +70,11 @@ module Autobuild
 
             @newest_file, @newest_time =
                 Autobuild.tree_timestamp(name,
-                    %r{(?:^|/)(?:CVS|_darcs|\.svn)$}, *@exclude)
+                                         %r{(?:^|/)(?:CVS|_darcs|\.svn)$}, *@exclude)
             @newest_time
         end
     end
+
     def self.source_tree(path, &block)
         task = SourceTreeTask.define_task(path)
         block&.call(task)

data/lib/autobuild/utility.rb

@@ -29,6 +29,11 @@ module Autobuild
             @source_dir = nil
             @target_dir = nil
             @install_on_error = install_on_error
+
+            @no_results = false
+            @invoked = false
+            @success = false
+            @installed = false
         end
 
         # Directory in which the utility will generate some files The
@@ -54,6 +59,23 @@ module Autobuild
         #   not install anything
         attr_writer :target_dir
 
+        # Controls whether this utility generates results or not
+        #
+        # By default, Autobuild assumes that utilities generate report or
+        # artifact files, that are saved in {#target_dir}. Set this flag to
+        # true to disable this behavior, in which case the only report will
+        # be the console output during run
+        #
+        # @see no_results?
+        attr_writer :no_results
+
+        # Whether this utility generates results or not
+        #
+        # @see no_results=
+        def no_results?
+            @no_results
+        end
+
         # Absolute path to where the utility product files have to be installed.
         # Returns nil if {target_dir} is not set.
         #
@@ -62,7 +84,7 @@ module Autobuild
             if @target_dir
                 utility_prefix = Autobuild.send("#{name}_prefix") || name
                 File.expand_path(@target_dir,
-                    File.expand_path(utility_prefix, package.prefix))
+                                 File.expand_path(utility_prefix, package.prefix))
             else
                 File.join(package.logdir, "#{name}-results", package.name)
             end
@@ -98,15 +120,21 @@ module Autobuild
         end
 
         def call_task_block
-            yield if block_given?
+            @invoked = true
+
+            begin
+                yield if block_given?
+                @success = true
+            rescue StandardError => e
+                install if install_on_error? && !@installed && !no_results?
+                raise
+            end
 
             # Allow the user to install manually in the task
             # block
-            install if !@installed && target_dir
-        rescue Interrupt
-            raise
-        rescue ::Exception => e
-            install if install_on_error? && !@installed && target_dir
+            install if !@installed && !no_results?
+        rescue StandardError => e
+            @success = false
 
             if Autobuild.send("pass_#{name}_errors")
                 raise
@@ -128,7 +156,7 @@ module Autobuild
         #
         # @return [Boolean]
         def available?
-            @available && (source_dir && @task)
+            @available && @task && (no_results? || source_dir)
         end
 
         # True if this utility should be executed
@@ -167,6 +195,24 @@ module Autobuild
             @installed = true
         end
 
+        # True if the utility has been invoked
+        def invoked?
+            @invoked
+        end
+
+        # True if the utility has been successful
+        #
+        # Combine with {#invoked?} to determine whether 'false' means 'not run'
+        # or 'failed'
+        def success?
+            @success
+        end
+
+        # True if the utility's results have been installed
+        def installed?
+            @installed
+        end
+
         # Can be called in the block given to {task} to announce that the
         # utility is to be disabled for that package. This is mainly used
         # when a runtime check is necessary to know if a package can run

data/lib/autobuild/version.rb

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

data/lib/autobuild.rb

@@ -17,11 +17,9 @@ require 'etc'
 require 'find'
 require 'pathname'
 require 'shellwords'
-require 'find'
 require 'rake/tasklib'
 require 'fileutils'
 require 'optparse'
-require 'rake'
 require 'singleton'
 require 'pastel'
 require 'tty-prompt'
@@ -43,7 +41,6 @@ require 'autobuild/config'
 require 'autobuild/importer'
 require 'autobuild/import/cvs'
 require 'autobuild/import/darcs'
-require 'autobuild/importer'
 require 'autobuild/import/git'
 require 'autobuild/import/hg'
 require 'autobuild/import/svn'

metadata

@@ -1,33 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.22.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-    - - ">="
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
@@ -36,62 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: tty-cursor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +182,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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)
@@ -190,9 +206,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Changes.txt
 - Gemfile
 - Manifest.txt
@@ -253,15 +270,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms