autoproj 1.13.7 → 2.0.0.b1

data/lib/autoproj/osdeps.rb

@@ -32,10 +32,6 @@ module Autoproj
                 @silent = true
             end
 
-            def parse_package_entry(entry)
-                entry
-            end
-
             # The primary name for this package manager
             def name
                 names.first
@@ -45,7 +41,7 @@ module Autoproj
             # order to have a properly functioning package manager
             #
             # This is e.g. needed for python pip or rubygems
-            def self.initialize_environment
+            def self.initialize_environment(_env = nil, _manifest = nil, _root_dir = Autoproj.root_dir)
             end
         end
 
@@ -310,7 +306,7 @@ fi
                         false)
             end
 
-            def filter_uptodate_packages(packages)
+            def filter_uptodate_packages(packages, options = Hash.new)
                 # TODO there might be duplicates in packages which should be fixed
                 # somewhere else
                 packages = packages.uniq
@@ -377,7 +373,7 @@ fi
                         "zypper -n install '%s'")
             end
 
-            def filter_uptodate_packages(packages)
+            def filter_uptodate_packages(packages, options = Hash.new)
                 result = `LANG=C rpm -q --whatprovides '#{packages.join("' '")}'`
                 has_all_pkgs = $?.success?
 
@@ -416,7 +412,7 @@ fi
                       "yum install -y '%s'")
             end
 
-            def filter_uptodate_packages(packages)
+            def filter_uptodate_packages(packages, options = Hash.new)
                 result = `LANG=C rpm -q --queryformat "%{NAME}\n" '#{packages.join("' '")}'`
 
                 installed_packages = []
@@ -519,7 +515,7 @@ fi
                 end
             end
             
-            def filter_uptodate_packages(packages)
+            def filter_uptodate_packages(packages, options = Hash.new)
                 packages.find_all do |package_name|
                     !installed?(package_name)
                 end
@@ -529,43 +525,65 @@ fi
         # Package manager interface for the RubyGems system
         class GemManager < Manager
             class << self
-                attr_accessor :with_prerelease
+                attr_writer :with_prerelease
                 attr_accessor :with_doc
             end
             @with_prerelease = false
             @with_doc = false
 
+            def self.with_prerelease(*value)
+                if value.empty?
+                    @with_prerelease
+                else
+                    begin
+                        saved_flag = @with_prerelease
+                        @with_prerelease = value.first
+                        yield
+                    ensure
+                        @with_prerelease = saved_flag
+                    end
+                end
+            end
+
             # Filters all paths that come from other autoproj installations out
             # of GEM_PATH
-            def self.initialize_environment
-                Autobuild::ORIGINAL_ENV['GEM_PATH'] =
-                    (ENV['GEM_PATH'] || "").split(File::PATH_SEPARATOR).find_all do |p|
+            def self.initialize_environment(env = Autobuild.env, manifest = Autoproj.manifest, root_dir = Autoproj.root_dir)
+                env.original_env['GEM_PATH'] =
+                    (env['GEM_PATH'] || "").split(File::PATH_SEPARATOR).find_all do |p|
                         !Autoproj.in_autoproj_installation?(p)
                     end.join(File::PATH_SEPARATOR)
-                Autobuild.env_inherit 'GEM_PATH'
-                Autobuild.env_init_from_env 'GEM_PATH'
+                env.inherit 'GEM_PATH'
+                env.init_from_env 'GEM_PATH'
 
-                orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(File::PATH_SEPARATOR)
-                Autobuild::SYSTEM_ENV['GEM_PATH'] = Gem.default_path
-                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
+                orig_gem_path = env.original_env['GEM_PATH'].split(File::PATH_SEPARATOR)
+                env.system_env['GEM_PATH'] = Gem.default_path
+                env.original_env['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
 
-                Autoproj.manifest.each_reused_autoproj_installation do |p|
+                manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(p, '.gems')
                     if File.directory?(p_gems)
-                        Autobuild.env_push_path 'GEM_PATH', p_gems
-                        Autobuild.env_push_path 'PATH', File.join(p_gems, 'bin')
+                        env.push_path 'GEM_PATH', p_gems
+                        env.push_path 'PATH', File.join(p_gems, 'bin')
                     end
                 end
-                Autobuild.env_push_path 'GEM_PATH', gem_home
-                Autobuild.env_set 'GEM_HOME', gem_home
-                Autobuild.env_push_path 'PATH', "#{gem_home}/bin"
+
+                @gem_home = (ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems"))
+                env.push_path 'GEM_PATH', gem_home
+                env.set 'GEM_HOME', gem_home
+                env.push_path 'PATH', "#{gem_home}/bin"
 
                 # Now, reset the directories in our own RubyGems instance
-                Gem.paths = ENV
+                Gem.paths = env.resolved_env
 
                 use_cache_dir
             end
 
+            # Override the gem home detected by {initialize_environment}, or set
+            # it in cases where calling {initialize_environment} is not possible
+            def self.gem_home=(gem_home)
+                @gem_home = gem_home
+            end
+
             # A global cache directory that should be used to avoid
             # re-downloading gems
             def self.cache_dir
@@ -591,7 +609,7 @@ fi
 
             # Return the directory in which RubyGems package should be installed
             def self.gem_home
-                ENV['AUTOPROJ_GEM_HOME'] || File.join(Autoproj.root_dir, ".gems")
+                @gem_home
             end
             
             # Returns the set of default options that are added to gem
@@ -685,7 +703,9 @@ fi
                     Autoproj.message "  installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
                     cmdlines.each do |c|
-                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
+                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c,
+                            env: Hash['GEM_HOME' => Gem.paths.home,
+                                      'GEM_PATH' => Gem.paths.path.join(":")]
                     end
                     gems.each do |name, v|
                         installed_gems << name
@@ -696,7 +716,10 @@ fi
 
             # Returns the set of RubyGem packages in +packages+ that are not already
             # installed, or that can be upgraded
-            def filter_uptodate_packages(gems)
+            def filter_uptodate_packages(gems, options = Hash.new)
+                options = validate_options options,
+                    install_only: !Autobuild.do_update
+
                 # Don't install gems that are already there ...
                 gems = gems.dup
                 gems.delete_if do |name, version|
@@ -714,7 +737,7 @@ fi
                             Gem.source_index.find_name(name, version_requirements)
                         end
 
-                    if !installed.empty? && Autobuild.do_update
+                    if !installed.empty? && !options[:install_only]
                         # Look if we can update the package ...
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
@@ -803,14 +826,14 @@ fi
 
             attr_reader :installed_gems
 
-            def self.initialize_environment
-                Autoproj.env_set 'PYTHONUSERBASE', pip_home
+            def self.initialize_environment(env = Autobuild.env, _manifest = nil, root_dir = Autoproj.root_dir)
+                env.set 'PYTHONUSERBASE', pip_home(env, root_dir)
             end
 
             # Return the directory where python packages are installed to.
             # The actual path is pip_home/lib/pythonx.y/site-packages.
-            def self.pip_home
-                ENV['AUTOPROJ_PYTHONUSERBASE'] || File.join(Autoproj.root_dir,".pip")
+            def self.pip_home(env = Autobuild.env, root_dir = Autobuild.root_dir)
+                env['AUTOPROJ_PYTHONUSERBASE'] || File.join(root_dir,".pip")
             end
 
 
@@ -1256,12 +1279,8 @@ fi
             # Validate the options. We check on the availability of
             # validate_options as to not break autoproj_bootstrap (in which
             # validate_options is not available)
-            options =
-                if Kernel.respond_to?(:validate_options)
-                    Kernel.validate_options options, :force => false
-                else
-                    options.dup
-                end
+            options = validate_options options, force: false, config: Autoproj.config
+            config  = options.fetch(:config)
 
             if user_os = ENV['AUTOPROJ_OS']
                 @operating_system =
@@ -1278,8 +1297,8 @@ fi
                 @operating_system = nil
             elsif !@operating_system.nil? # @operating_system can be set to false to simulate an unknown OS
                 return @operating_system
-            elsif Autoproj.has_config_key?('operating_system')
-                os = Autoproj.user_config('operating_system')
+            elsif config.has_value_for?('operating_system')
+                os = config.get('operating_system')
                 if os.respond_to?(:to_ary)
                     if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
                        os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
@@ -1318,7 +1337,7 @@ fi
             names, versions = normalize_os_representation(names, versions)
 
             @operating_system = [names, versions]
-            Autoproj.change_option('operating_system', @operating_system, true)
+            config.set('operating_system', @operating_system, true)
             Autobuild.progress :operating_system_autodetection, "operating system: #{(names - ['default']).join(",")} - #{(versions - ['default']).join(",")}"
             @operating_system
         ensure
@@ -1445,15 +1464,11 @@ fi
             end
 
             result.map do |handler, status, entries|
-                entries = entries.map do |e|
-                    if e.respond_to?(:to_str)
-                        handler.parse_package_entry(e)
-                    else
-                        e
-                    end
+                if handler.respond_to?(:parse_package_entry)
+                    [handler, status, entries.map { |s| handler.parse_package_entry(s) }]
+                else
+                    [handler, status, entries]
                 end
-
-                [handler, status, entries]
             end
         end
 
@@ -1603,8 +1618,6 @@ fi
             return found, result
         end
 
-        class MissingOSDep < ConfigError; end
-
         # Resolves the given OS dependencies into the actual packages that need
         # to be installed on this particular OS.
         #
@@ -1722,7 +1735,7 @@ fi
         HANDLE_OS   = 'os'
         HANDLE_NONE = 'none'
 
-        def self.osdeps_mode_option_unsupported_os
+        def self.osdeps_mode_option_unsupported_os(config = Autoproj.config)
             long_doc =<<-EOT
 The software packages that autoproj will have to build may require other
 prepackaged softwares (a.k.a. OS dependencies) to be installed (RubyGems
@@ -1753,13 +1766,13 @@ So, what do you want ? (all, none or a comma-separated list of: gem pip)
             EOT
             message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, none or a comma-separated list of: gem pip) ?", long_doc.strip ]
 
-	    Autoproj.configuration_option 'osdeps_mode', 'string',
+	    config.declare 'osdeps_mode', 'string',
 		:default => 'ruby',
 		:doc => message,
                 :lowercase => true
         end
 
-        def self.osdeps_mode_option_supported_os
+        def self.osdeps_mode_option_supported_os(config = Autoproj.config)
             long_doc =<<-EOT
 The software packages that autoproj will have to build may require other
 prepackaged softwares (a.k.a. OS dependencies) to be installed (RubyGems
@@ -1794,17 +1807,17 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             EOT
             message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, none or a comma-separated list of: os gem pip) ?", long_doc.strip ]
 
-	    Autoproj.configuration_option 'osdeps_mode', 'string',
+	    config.declare 'osdeps_mode', 'string',
 		:default => 'all',
 		:doc => message,
                 :lowercase => true
         end
 
-        def self.define_osdeps_mode_option
+        def self.define_osdeps_mode_option(config = Autoproj.config)
             if supported_operating_system?
-                osdeps_mode_option_supported_os
+                osdeps_mode_option_supported_os(config)
             else
-                osdeps_mode_option_unsupported_os
+                osdeps_mode_option_unsupported_os(config)
             end
         end
 
@@ -1856,10 +1869,10 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             @osdeps_mode = OSDependencies.osdeps_mode
         end
 
-        def self.osdeps_mode
+        def self.osdeps_mode(config = Autoproj.config)
             while true
                 mode =
-                    if !Autoproj.has_config_key?('osdeps_mode') &&
+                    if !config.has_value_for?('osdeps_mode') &&
                         mode_name = ENV['AUTOPROJ_OSDEPS_MODE']
                         begin OSDependencies.osdeps_mode_string_to_value(mode_name)
                         rescue ArgumentError
@@ -1867,7 +1880,7 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
                             nil
                         end
                     else
-                        mode_name = Autoproj.user_config('osdeps_mode')
+                        mode_name = config.get('osdeps_mode')
                         begin OSDependencies.osdeps_mode_string_to_value(mode_name)
                         rescue ArgumentError
                             Autoproj.warn "invalid osdeps mode stored in configuration file"
@@ -1877,12 +1890,12 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
 
                 if mode
                     @osdeps_mode = mode
-                    Autoproj.change_option('osdeps_mode', mode_name, true)
+                    config.set('osdeps_mode', mode_name, true)
                     return mode
                 end
 
                 # Invalid configuration values. Retry
-                Autoproj.reset_option('osdeps_mode')
+                config.reset('osdeps_mode')
                 ENV['AUTOPROJ_OSDEPS_MODE'] = nil
             end
         end
@@ -1904,7 +1917,8 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
         def setup_package_handlers(options = Hash.new)
             options =
                 if Kernel.respond_to?(:validate_options)
-                    Kernel.validate_options options, :osdeps_mode => osdeps_mode
+                    Kernel.validate_options options,
+                        osdeps_mode: osdeps_mode
                 else
                     options = options.dup
                     options[:osdeps_mode] ||= osdeps_mode
@@ -1947,7 +1961,7 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
         # This is usually called as a rebuild step to make sure that all these
         # packages are updated to whatever required the rebuild
         def pristine(packages, options = Hash.new)
-            setup_package_handlers(options)
+            install(packages, options.merge(install_only: true))
             packages = resolve_os_dependencies(packages)
 
             _, other_packages =
@@ -1965,12 +1979,16 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             packages = packages.to_set - installed_packages
             return false if packages.empty?
 
+            filter_options, options =
+                filter_options options, install_only: !Autobuild.do_update
             setup_package_handlers(options)
 
             packages = resolve_os_dependencies(packages)
+
+            needs_filter = (filter_uptodate_packages? || filter_options[:install_only])
             packages = packages.map do |handler, list|
-                if filter_uptodate_packages? && handler.respond_to?(:filter_uptodate_packages)
-                    list = handler.filter_uptodate_packages(list)
+                if needs_filter && handler.respond_to?(:filter_uptodate_packages)
+                    list = handler.filter_uptodate_packages(list, filter_options)
                 end
 
                 if !list.empty?
@@ -1990,6 +2008,17 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             end
             true
         end
+
+        def reinstall(options = Hash.new)
+            # We also reinstall the osdeps that provide the
+            # functionality
+            managers = setup_package_handlers(options)
+            managers.each do |mng|
+                if mng.enabled? && mng.respond_to?(:reinstall)
+                    mng.reinstall
+                end
+            end
+        end
     end
 end
 

data/lib/autoproj/package_selection.rb

@@ -1,14 +1,4 @@
 module Autoproj
-        # Exception raised by
-        # PackageSelection#filter_excluded_and_ignored_packages when a given
-        # selection is completely excluded
-        class ExcludedSelection < ConfigError
-            attr_reader :selection
-            def initialize(selection)
-                @selection = selection
-            end
-        end
-
         # Class holding information about which packages have been selected, and
         # why. It is used to decide whether some non-availability of packages
         # are errors or simply warnings (i.e. if the user really wants a given
@@ -37,6 +27,10 @@ module Autoproj
             # contains the set of package ignores that have been ignored because
             # the corresponding metapackage has a weak dependency policy
             attr_reader :ignores
+            # The set of source packages that have been selected
+            attr_reader :source_packages
+            # The set of osdeps that have been selected
+            attr_reader :osdeps
 
             def initialize
                 @selection = Hash.new { |h, k| h[k] = Set.new }
@@ -44,11 +38,8 @@ module Autoproj
                 @weak_dependencies = Hash.new
                 @ignores = Hash.new { |h, k| h[k] = Set.new }
                 @exclusions = Hash.new { |h, k| h[k] = Set.new }
-            end
-
-            # The set of packages that have been selected
-            def packages
-                selection.keys
+                @source_packages = Set.new
+                @osdeps = Set.new
             end
 
             def include?(pkg_name)
@@ -60,16 +51,44 @@ module Autoproj
             end
 
             def each(&block)
-                selection.each_key(&block)
+                Autoproj.warn_deprecated "PackageSelection#each", "use PackageSelection#each_source_package_name instead", 0
+                each_source_package_name(&block)
+            end
+
+            def each_source_package_name(&block)
+                source_packages.each(&block)
             end
 
-            def select(sel, packages, weak = false)
-                packages = Array(packages)
-                matches[sel] |= packages.to_set.dup
+            def each_osdep_package_name(&block)
+                osdeps.each(&block)
+            end
+
+            def packages
+                Autoproj.warn_deprecated "PackageSelection#packages", "use PackageSelection#source_packages instead", 0
+                source_packages
+            end
+
+            def select(sel, packages, options = Hash.new)
+                if !options.kind_of?(Hash)
+                    Autoproj.warn_deprecated "calling PackageSelection#select with a boolean as third argument", "use e.g. weak: true instead", 0
+                    options = Hash[weak: options]
+                end
+                options = Kernel.validate_options options,
+                    weak: false,
+                    osdep: false
+
+                packages = Array(packages).to_set
+                matches[sel].merge(packages)
                 packages.each do |pkg_name|
                     selection[pkg_name] << sel
                 end
-                weak_dependencies[sel] = weak
+                if options[:osdep]
+                    osdeps.merge(packages)
+                else
+                    source_packages.merge(packages)
+                end
+
+                weak_dependencies[sel] = options[:weak]
             end
 
             def initialize_copy(old)