autobuild 1.21.0 → 1.22.0

data/lib/autobuild/packages/dummy.rb

@@ -8,10 +8,6 @@ module Autobuild
             "#{srcdir}/#{STAMPFILE}"
         end
 
-        def initialize(*args)
-            super
-        end
-
         def import(options = Hash.new); end
 
         def prepare

data/lib/autobuild/packages/gnumake.rb

@@ -95,7 +95,7 @@ module Autobuild
     def self.make_subcommand(pkg, phase, *options, &block)
         invoke_make_parallel(pkg, Autobuild.tool(:make)) do |*make_parallel_options|
             pkg.run(phase, Autobuild.tool(:make),
-                *make_parallel_options, *options, &block)
+                    *make_parallel_options, *options, &block)
         end
     end
 end

data/lib/autobuild/packages/orogen.rb

@@ -97,19 +97,19 @@ module Autobuild
             end
         end
 
-        attr_writer :corba
+        attr_writer :corba, :orogen_file
+
         def corba
             @corba || (@corba.nil? && Orogen.corba)
         end
 
         # Overrides the global Orocos.extended_states for this particular package
         attr_writer :extended_states
+
         def extended_states
             @extended_states || (@extended_states.nil? && Orogen.extended_states)
         end
 
-        attr_writer :orogen_file
-
         # Path to the orogen file used for this package
         #
         # If not set, the class will look for a .orogen file in the package
@@ -128,7 +128,7 @@ module Autobuild
                     return File.basename(path)
                 end
                 raise ArgumentError,
-                    "cannot find an oroGen specification file in #{srcdir}"
+                      "cannot find an oroGen specification file in #{srcdir}"
             end
         end
 
@@ -235,6 +235,13 @@ module Autobuild
                 cmdline << "--type-export-policy=#{Orogen.default_type_export_policy}"
                 cmdline << "--transports=#{Orogen.transports.sort.uniq.join(',')}"
             end
+            if version >= "1.2"
+                cmdline << "--parallel-codegen=#{parallel_build_level}"
+                if (job_server = Autobuild.parallel_task_manager&.job_server)
+                    fds = "#{job_server.rio.fileno},#{job_server.wio.fileno}"
+                    cmdline << "--jobserver-auth=#{fds}"
+                end
+            end
 
             # Now, add raw options
             #

data/lib/autobuild/packages/pkgconfig.rb

@@ -2,8 +2,7 @@ require 'autobuild/pkgconfig'
 
 module Autobuild
     class InstalledPkgConfig < Package
-        attr_reader :pkgconfig
-        attr_reader :prefix
+        attr_reader :pkgconfig, :prefix
 
         def initialize(name)
             @pkgconfig = PkgConfig.new(name)
@@ -23,6 +22,7 @@ module Autobuild
             pcfile
         end
     end
+
     def self.installed_pkgconfig(name, &block)
         InstalledPkgConfig.new(name, &block)
     end

data/lib/autobuild/packages/python.rb

@@ -9,8 +9,7 @@ module Autobuild
 
     # Handler class to build python-based packages
     class Python < Configurable
-        attr_accessor   :buildflags
-        attr_accessor   :installflags
+        attr_accessor :buildflags, :installflags
 
         def configurestamp
             "#{builddir}/configure-autobuild-stamp"

data/lib/autobuild/packages/ruby.rb

@@ -40,7 +40,7 @@ module Autobuild
                                done_message: 'generated documentation for %s' do
                     run 'doc',
                         Autobuild.tool_in_path('ruby'), '-S',
-                            Autobuild.tool('rake'), rake_doc_task,
+                        Autobuild.tool('rake'), rake_doc_task,
                         working_directory: srcdir
                 end
             end
@@ -52,7 +52,7 @@ module Autobuild
                                done_message: 'tests passed for %s' do
                     run 'test',
                         Autobuild.tool_in_path('ruby'), '-S',
-                            Autobuild.tool('rake'), rake_test_task, *rake_test_options,
+                        Autobuild.tool('rake'), rake_test_task, *rake_test_options,
                         working_directory: srcdir
                 end
             end
@@ -62,7 +62,7 @@ module Autobuild
             if setup_task && File.file?(File.join(srcdir, 'Rakefile'))
                 run 'post-install',
                     Autobuild.tool_in_path('ruby'), '-S',
-                        Autobuild.tool('rake'), setup_task,
+                    Autobuild.tool('rake'), setup_task,
                     working_directory: srcdir
             end
         end
@@ -80,7 +80,7 @@ module Autobuild
             %w[ext tmp].each do |extdir|
                 if File.directory?(extdir)
                     Find.find(extdir) do |file|
-                        next if file !~ /\<Makefile\>|\<CMakeCache.txt\>$/
+                        next if file !~ /<Makefile>|<CMakeCache.txt>$/
 
                         FileUtils.rm_rf file
                     end
@@ -94,7 +94,7 @@ module Autobuild
                 begin
                     run 'clean',
                         Autobuild.tool_in_path('ruby'), '-S',
-                            Autobuild.tool('rake'), rake_clean_task,
+                        Autobuild.tool('rake'), rake_clean_task,
                         working_directory: srcdir
                 rescue Autobuild::SubcommandFailed => e
                     warn "%s: clean failed. If this package does not need a clean target,"

data/lib/autobuild/parallel.rb

@@ -4,15 +4,10 @@ module Autobuild
     # Since autobuild does not use task arguments, we don't support them for
     # simplicity
     class RakeTaskParallelism
-        attr_reader :available_workers
-        attr_reader :finished_workers
-        attr_reader :workers
-
-        attr_reader :job_server
+        attr_reader :available_workers, :finished_workers, :workers, :job_server
 
         class JobServer
-            attr_reader :rio
-            attr_reader :wio
+            attr_reader :rio, :wio
 
             def initialize(level)
                 @rio, @wio = IO.pipe
@@ -76,14 +71,10 @@ module Autobuild
         end
 
         class ProcessingState
-            attr_reader :reverse_dependencies
-            attr_reader :processed
-            attr_reader :started_packages
-            attr_reader :active_tasks
-            attr_reader :queue
-            attr_reader :priorities
-
-            def initialize(reverse_dependencies, completion_callback: proc { })
+            attr_reader :reverse_dependencies, :processed, :started_packages,
+                        :active_tasks, :queue, :priorities
+
+            def initialize(reverse_dependencies, completion_callback: proc {})
                 @reverse_dependencies = reverse_dependencies
                 @completion_callback = completion_callback
                 @processed = Set.new
@@ -156,7 +147,7 @@ module Autobuild
 
         # Invokes the provided tasks. Unlike the rake code, this is a toplevel
         # algorithm that does not use recursion
-        def invoke_parallel(required_tasks, completion_callback: proc { })
+        def invoke_parallel(required_tasks, completion_callback: proc {})
             tasks = Set.new
             reverse_dependencies = Hash.new { |h, k| h[k] = Set.new }
             required_tasks.each do |t|

data/lib/autobuild/pkgconfig.rb

@@ -5,6 +5,7 @@ class PkgConfig
 
         def initialize(name)
             @name = name
+            super()
         end
 
         def to_s

data/lib/autobuild/progress_display.rb

@@ -45,7 +45,7 @@ module Autobuild
         # Valid progress modes
         #
         # @see progress_mode=
-        PROGRESS_MODES = %I[single_line newline off]
+        PROGRESS_MODES = %I[single_line newline off].freeze
 
         # Sets how progress messages will be displayed
         #
@@ -57,7 +57,7 @@ module Autobuild
             unless PROGRESS_MODES.include?(mode)
                 raise ArgumentError,
                       "#{mode} is not a valid mode, expected one of "\
-                      "#{PROGRESS_MODES.join(", ")}"
+                      "#{PROGRESS_MODES.join(', ')}"
             end
             @progress_mode = mode
         end
@@ -72,9 +72,7 @@ module Autobuild
             @silent
         end
 
-        def silent=(flag)
-            @silent = flag
-        end
+        attr_writer :silent
 
         def silent
             silent = @silent
@@ -156,7 +154,7 @@ module Autobuild
             if changed
                 if message
                     message("  #{message}")
-                    # Note: message updates the display already
+                    # NOTE: message updates the display already
                 else
                     refresh_display
                 end
@@ -178,9 +176,7 @@ module Autobuild
             # Display queued messages
             until @message_queue.empty?
                 message, args, io = @message_queue.pop
-                if @progress_mode == :single_line
-                    io.print @cursor.clear_screen_down
-                end
+                io.print @cursor.clear_screen_down if @progress_mode == :single_line
                 io.puts @color.call(message, *args)
 
                 io.flush if @io != io

data/lib/autobuild/rake_task_extension.rb

@@ -1,5 +1,10 @@
 module Autobuild
     module RakeTaskExtension
+        def initialize(*, **)
+            super
+            @disabled = false
+        end
+
         def already_invoked?
             @already_invoked
         end
@@ -19,6 +24,7 @@ module Autobuild
         end
     end
 end
+
 class Rake::Task # rubocop:disable Style/ClassAndModuleChildren
     include Autobuild::RakeTaskExtension
 end

data/lib/autobuild/reporting.rb

@@ -105,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
@@ -118,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
@@ -170,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
@@ -244,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/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)