autoproj 2.13.0 → 2.15.2

data/lib/autoproj/package_managers/shell_script_manager.rb

@@ -3,33 +3,43 @@ module Autoproj
         # Base class for all package managers that simply require the call of a
         # shell script to install packages (e.g. yum, apt, ...)
         class ShellScriptManager < Manager
-            def self.execute(command_line, with_locking, with_root, env: Autobuild.env)
+            def self.execute(command_line, with_locking, with_root,
+                env: Autoproj.workspace.env, inherit: Set.new)
                 if with_locking
-                    File.open('/tmp/autoproj_osdeps_lock', 'w') do |lock_io|
-                        begin
-                            until lock_io.flock(File::LOCK_EX | File::LOCK_NB)
-                                Autoproj.message "  waiting for other autoproj "\
-                                                 "instances to finish their osdeps "\
-                                                 "installation"
-                                sleep 5
-                            end
-                            return execute(command_line, false, with_root, env: env)
-                        ensure
-                            lock_io.flock(File::LOCK_UN)
+                    File.open("/tmp/autoproj_osdeps_lock", "w") do |lock_io|
+                        until lock_io.flock(File::LOCK_EX | File::LOCK_NB)
+                            Autoproj.message "  waiting for other autoproj "\
+                                             "instances to finish their osdeps "\
+                                             "installation"
+                            sleep 5
                         end
+                        return execute(command_line, false, with_root,
+                                       env: env, inherit: inherit)
+                    ensure
+                        lock_io.flock(File::LOCK_UN)
                     end
                 end
 
+                process_env = env
                 if with_root
-                    sudo = Autobuild.tool_in_path('sudo', env: env)
-                    command_line = [sudo, *command_line]
+                    process_env = Autobuild::Environment.new
+                    process_env.isolate
+                    process_env.add_path("PATH", "/usr/local/sbin",
+                                         "/usr/sbin", "/sbin")
+
+                    inherit.each { |var| process_env.set(var, env[var]) }
+                    sudo = Autobuild.tool_in_path("sudo", env: process_env)
+                    command_line = [sudo, "--preserve-env", *command_line]
                 end
 
-                Autobuild::Subprocess.run 'autoproj', 'osdeps', *command_line
+                Autobuild::Subprocess.run "autoproj", "osdeps", *command_line,
+                                          env: process_env.resolved_env,
+                                          env_inherit: false
             end
 
             # Overrides the {#needs_locking?} flag
             attr_writer :needs_locking
+
             # Whether two autoproj instances can run this package manager at the
             # same time
             #
@@ -45,6 +55,7 @@ module Autoproj
 
             # Overrides the {#needs_root?} flag
             attr_writer :needs_root
+
             # Whether this package manager needs root access.
             #
             # This declares if the command line(s) for this package manager
@@ -90,7 +101,7 @@ module Autoproj
             # @param [Boolean] needs_root if the command lines should be started
             #   as root or not. See {#needs_root?}
             def initialize(ws, needs_locking, user_install_cmd,
-                           auto_install_cmd, needs_root = true)
+                auto_install_cmd, needs_root = true)
                 super(ws)
                 @needs_locking = needs_locking
                 @user_install_cmd = user_install_cmd
@@ -108,10 +119,11 @@ module Autoproj
             #   If given, it overrides the default value stored in
             #   {#user_install_cmd]
             def generate_user_os_script(os_packages,
-                                        user_install_cmd: self.user_install_cmd)
+                user_install_cmd: self.user_install_cmd)
                 if user_install_cmd
-                    user_install_cmd.join(" ") + " " + os_packages.join("' '")
-                else generate_auto_os_script(os_packages)
+                    generate_script(user_install_cmd, os_packages)
+                else
+                    generate_auto_os_script(os_packages)
                 end
             end
 
@@ -125,8 +137,15 @@ module Autoproj
             #   If given, it overrides the default value stored in
             #   {#auto_install_cmd]
             def generate_auto_os_script(os_packages,
-                                        auto_install_cmd: self.auto_install_cmd)
-                auto_install_cmd.join(" ") + " " + os_packages.join("' '")
+                auto_install_cmd: self.auto_install_cmd)
+                generate_script(auto_install_cmd, os_packages)
+            end
+
+            # Helper for {#generate_user_os_script} and {#generate_auto_os_script}
+            def generate_script(cmd, args)
+                cmd = cmd.join(" ")
+                args = args.join("' '")
+                "#{cmd} #{args}"
             end
 
             # Handles interaction with the user
@@ -152,7 +171,9 @@ module Autoproj
 
                 #{Autoproj.color('The build process and/or the packages require some other software to be installed', :bold)}
                 #{Autoproj.color('and you required autoproj to not install them itself', :bold)}
-                #{Autoproj.color('\nIf these packages are already installed, simply ignore this message\n', :red) unless respond_to?(:filter_uptodate_packages)}
+                #{unless respond_to?(:filter_uptodate_packages)
+                      Autoproj.color('\nIf these packages are already installed, simply ignore this message\n', :red)
+                  end}
     The following packages are available as OS dependencies, i.e. as prebuilt
     packages provided by your distribution / operating system. You will have to
     install them manually if they are not already installed
@@ -183,8 +204,9 @@ module Autoproj
             #   packages. See the option in {#generate_auto_os_script}
             # @return [Boolean] true if packages got installed, false otherwise
             def install(packages, filter_uptodate_packages: false, install_only: false,
-                        auto_install_cmd: self.auto_install_cmd,
-                        user_install_cmd: self.user_install_cmd)
+                auto_install_cmd: self.auto_install_cmd,
+                user_install_cmd: self.user_install_cmd,
+                inherit: Set.new)
                 return if packages.empty?
 
                 handled_os = ws.supported_operating_system?
@@ -208,7 +230,7 @@ module Autoproj
 
                     ShellScriptManager.execute(
                         [*auto_install_cmd, *packages], needs_locking?,
-                        needs_root?, env: ws.env
+                        needs_root?, env: ws.env, inherit: inherit
                     )
                     return true
                 end

data/lib/autoproj/package_managers/unknown_os_manager.rb

@@ -10,8 +10,8 @@ module Autoproj
 
             def osdeps_interaction_unknown_os(osdeps)
                 puts <<-EOMSG
-  #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
-  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
+  #{Autoproj.color('The build process requires some other software packages to be installed on our operating system', :bold)}
+  #{Autoproj.color('If they are already installed, simply ignore this message', :red)}
 
     #{osdeps.to_a.sort.join("\n    ")}
 
@@ -25,18 +25,15 @@ module Autoproj
 
             def install(osdeps)
                 if silent?
-                    return false
+                    false
                 else
                     osdeps = osdeps.to_set
                     osdeps -= @installed_osdeps
-                    if !osdeps.empty?
-                        result = osdeps_interaction_unknown_os(osdeps)
-                    end
+                    result = osdeps_interaction_unknown_os(osdeps) unless osdeps.empty?
                     @installed_osdeps |= osdeps
-                    return result
+                    result
                 end
             end
         end
     end
 end
-

data/lib/autoproj/package_managers/yum_manager.rb

@@ -4,8 +4,8 @@ module Autoproj
         class YumManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                      %w{yum install},
-                      %w{yum install -y})
+                      %w[yum install],
+                      %w[yum install -y])
             end
 
             def filter_uptodate_packages(packages)
@@ -17,15 +17,17 @@ module Autoproj
                     line = line.strip
                     if line =~ /package (.*) is not installed/
                         package_name = $1
-                        if !packages.include?(package_name) # something is wrong, fallback to installing everything
+                        unless packages.include?(package_name) # something is wrong, fallback to installing everything
                             return packages
                         end
+
                         new_packages << package_name
-                    else 
+                    else
                         package_name = line.strip
-                        if !packages.include?(package_name) # something is wrong, fallback to installing everything
+                        unless packages.include?(package_name) # something is wrong, fallback to installing everything
                             return packages
                         end
+
                         installed_packages << package_name
                     end
                 end
@@ -33,21 +35,17 @@ module Autoproj
             end
 
             def install(packages, filter_uptodate_packages: false, install_only: false)
-                if filter_uptodate_packages
-                    packages = filter_uptodate_packages(packages)
-                end
+                packages = filter_uptodate_packages(packages) if filter_uptodate_packages
 
                 patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
                 patterns = patterns.map { |str| str[1..-1] }
                 result = false
-                if !patterns.empty?
+                unless patterns.empty?
                     result |= super(patterns,
-                                    auto_install_cmd: %w{yum groupinstall -y},
-                                    user_install_cmd: %w{yum groupinstall})
-                end
-                if !packages.empty?
-                    result |= super(packages)
+                                    auto_install_cmd: %w[yum groupinstall -y],
+                                    user_install_cmd: %w[yum groupinstall])
                 end
+                result |= super(packages) unless packages.empty?
                 if result
                     # Invalidate caching of installed packages, as we just
                     # installed new packages !
@@ -57,4 +55,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/package_managers/zypper_manager.rb

@@ -1,21 +1,21 @@
 module Autoproj
     module PackageManagers
-        #Package manger for OpenSuse and Suse (untested)
+        # Package manger for OpenSuse and Suse (untested)
         class ZypperManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        %w{zypper install},
-                        %w{zypper -n install})
+                        %w[zypper install],
+                        %w[zypper -n install])
             end
 
             def filter_uptodate_packages(packages)
                 `LANG=C rpm -q --whatprovides '#{packages.join("' '")}'`
                 has_all_pkgs = $?.success?
 
-                if !has_all_pkgs
-                    return packages # let zypper filter, we need root now anyways
-                else 
-                    return []
+                if has_all_pkgs
+                    []
+                else
+                    packages # let zypper filter, we need root now anyways
                 end
             end
 
@@ -27,14 +27,12 @@ module Autoproj
                 patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
                 patterns = patterns.map { |str| str[1..-1] }
                 result = false
-                if !patterns.empty?
+                unless patterns.empty?
                     result |= super(patterns,
-                                    auto_install_cmd: %w{zypper --non-interactive install --type pattern},
-                                    user_install_cmd: %w{zypper install --type pattern})
-                end
-                if !packages.empty?
-                    result |= super(packages)
+                                    auto_install_cmd: %w[zypper --non-interactive install --type pattern],
+                                    user_install_cmd: %w[zypper install --type pattern])
                 end
+                result |= super(packages) unless packages.empty?
                 if result
                     # Invalidate caching of installed packages, as we just
                     # installed new packages !
@@ -44,4 +42,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/package_manifest.rb

@@ -17,7 +17,7 @@ module Autoproj
         # @return [PackageManifest]
         # @see parse
         def self.load(package, file, ros_manifest: false)
-            loader_class = ros_manifest ? RosLoader : Loader
+            loader_class = ros_manifest ? RosPackageManifest::Loader : Loader
             parse(package, File.read(file), path: file, loader_class: loader_class)
         end
 
@@ -31,13 +31,13 @@ module Autoproj
         # @return [PackageManifest]
         # @see load
         def self.parse(package, contents,
-                       path: '<loaded from string>', loader_class: Loader)
-            manifest = PackageManifest.new(package, path)
+            path: "<loaded from string>", loader_class: Loader)
+            manifest = loader_class::MANIFEST_CLASS.new(package, path)
             loader = loader_class.new(path, manifest)
             begin
                 REXML::Document.parse_stream(contents, loader)
             rescue REXML::ParseException => e
-                raise Autobuild::PackageException.new(package.name, 'prepare'),
+                raise Autobuild::PackageException.new(package.name, "prepare"),
                       "invalid #{file}: #{e.message}"
             end
             manifest
@@ -167,6 +167,7 @@ module Autoproj
             end
 
             def text(text)
+                @tag_text = @tag_text.dup
                 @tag_text << text if @tag_text
             end
         end
@@ -178,6 +179,8 @@ module Autoproj
         class Loader < BaseLoader
             attr_reader :path, :manifest
 
+            MANIFEST_CLASS = PackageManifest
+
             def initialize(path, manifest)
                 super()
                 @path = path
@@ -185,52 +188,53 @@ module Autoproj
             end
 
             def parse_depend_tag(tag_name, attributes, modes: [], optional: false)
-                package = attributes['package'] || attributes['name']
+                package = attributes["package"] || attributes["name"]
                 unless package
                     raise InvalidPackageManifest,
                           "found '#{tag_name}' tag in #{path} "\
                           "without a 'package' attribute"
                 end
 
-                if (tag_modes = attributes['modes'])
-                    modes += tag_modes.split(',')
+                if (tag_modes = attributes["modes"])
+                    modes += tag_modes.split(",")
                 end
 
                 manifest.add_dependency(
                     package,
-                    optional: optional || (attributes['optional'] == '1'),
-                    modes: modes)
+                    optional: optional || (attributes["optional"] == "1"),
+                    modes: modes
+                )
             end
 
             def parse_contact_field(text)
-                text.strip.split(',').map do |str|
-                    name, email = str.split('/').map(&:strip)
+                text.strip.split(",").map do |str|
+                    name, email = str.split("/").map(&:strip)
                     email = nil if email&.empty?
                     ContactInfo.new(name, email)
                 end
             end
 
-            TEXT_FIELDS = Set['url', 'license', 'version', 'description']
-            AUTHOR_FIELDS = Set['author', 'maintainer', 'rock_maintainer']
+            TEXT_FIELDS = Set["url", "license", "version", "description"]
+            AUTHOR_FIELDS = Set["author", "maintainer", "rock_maintainer"]
 
             def toplevel_tag_start(name, attributes)
-                if name == 'depend'
+                if name == "depend"
                     parse_depend_tag(name, attributes)
-                elsif name == 'depend_optional'
+                elsif name == "depend_optional"
                     parse_depend_tag(name, attributes, optional: true)
-                elsif name == 'rosdep'
+                elsif name == "rosdep"
                     parse_depend_tag(name, attributes)
                 elsif name =~ /^(\w+)_depend$/
                     parse_depend_tag(name, attributes, modes: [$1])
-                elsif name == 'description'
-                    if (brief = attributes['brief'])
+                elsif name == "description"
+                    if (brief = attributes["brief"])
                         manifest.brief_description = brief
                     end
-                    @tag_text = ''
+                    @tag_text = ""
                 elsif TEXT_FIELDS.include?(name) || AUTHOR_FIELDS.include?(name)
-                    @tag_text = ''
-                elsif name == 'tags'
-                    @tag_text = ''
+                    @tag_text = ""
+                elsif name == "tags"
+                    @tag_text = ""
                 else
                     @tag_text = nil
                 end
@@ -242,58 +246,8 @@ module Autoproj
                 elsif TEXT_FIELDS.include?(name)
                     field = @tag_text.strip
                     manifest.send("#{name}=", field) unless field.empty?
-                elsif name == 'tags'
-                    manifest.tags.concat(@tag_text.strip.split(',').map(&:strip))
-                end
-                @tag_text = nil
-            end
-        end
-
-        # @api private
-        #
-        # REXML stream parser object used to load the XML contents into a
-        # {PackageManifest} object
-        class RosLoader < Loader
-            SUPPORTED_MODES = %w[test doc].freeze
-            DEPEND_TAGS = %w[depend build_depend build_export_depend
-                             buildtool_depend buildtool_export_depend
-                             exec_depend test_depend run_depend doc_depend].to_set.freeze
-
-            def toplevel_tag_start(name, attributes)
-                if DEPEND_TAGS.include?(name)
-                    @tag_text = ''
-                elsif TEXT_FIELDS.include?(name)
-                    @tag_text = ''
-                elsif AUTHOR_FIELDS.include?(name)
-                    @author_email = attributes['email']
-                    @tag_text = ''
-                else
-                    @tag_text = nil
-                end
-            end
-
-            def toplevel_tag_end(name)
-                if DEPEND_TAGS.include?(name)
-                    if @tag_text.strip.empty?
-                        raise InvalidPackageManifest, "found '#{name}' tag in #{path} "\
-                                                      "without content"
-                    end
-
-                    mode = []
-                    if (m = /^(\w+)_depend$/.match(name))
-                        mode = SUPPORTED_MODES & [m[1]]
-                    end
-
-                    manifest.add_dependency(@tag_text, modes: mode)
-                elsif AUTHOR_FIELDS.include?(name)
-                    author_name = @tag_text.strip
-                    email = @author_email ? @author_email.strip : nil
-                    email = nil if email&.empty?
-                    contact = ContactInfo.new(author_name, email)
-                    manifest.send("#{name}s").concat([contact])
-                elsif TEXT_FIELDS.include?(name)
-                    field = @tag_text.strip
-                    manifest.send("#{name}=", field) unless field.empty?
+                elsif name == "tags"
+                    manifest.tags.concat(@tag_text.strip.split(",").map(&:strip))
                 end
                 @tag_text = nil
             end