autoproj 2.8.8 → 2.9.0

data/lib/autoproj/repository_managers/manager.rb

@@ -0,0 +1,26 @@
+module Autoproj
+    module RepositoryManagers
+        # Base class for all repository managers. Subclasses must add the
+        # #install(entries) method
+        #
+        # Repository managers must be registered in OS_REPOSITORY_MANAGERS
+        class Manager
+            # @return [Workspace] the workspace
+            attr_reader :ws
+
+            # Create a repository manager
+            #
+            # @param [Workspace] ws the underlying workspace
+            def initialize(ws)
+                @ws = ws
+            end
+
+            def install(definitions)
+            end
+
+            def os_dependencies
+                []
+            end
+        end
+    end
+end

data/lib/autoproj/repository_managers/unknown_os_manager.rb

@@ -0,0 +1,30 @@
+module Autoproj
+    module RepositoryManagers
+        # Dummy repository manager used for unknown OSes. It simply displays a
+        # message to the user when repositories are needed
+        class UnknownOSManager < Manager
+            def initialize(ws)
+                @installed_osrepos = Set.new
+                super(ws)
+            end
+
+            def osrepos_interaction_unknown_os
+                Autoproj.message 'The build process requires some repositories to be added on our operating system', :bold
+                Autoproj.message 'If they are already added, simply ignore this message', :bold
+                Autoproj.message 'Press ENTER to continue ', :bold
+
+                STDIN.readline
+                nil
+            end
+
+            def install(osrepos)
+                super
+                osrepos = osrepos.to_set
+                osrepos -= @installed_osrepos
+                result = osrepos_interaction_unknown_os unless osrepos.empty?
+                @installed_osrepos |= osrepos
+                result
+            end
+        end
+    end
+end

data/lib/autoproj/test.rb

@@ -281,6 +281,7 @@ def ws_create(dir = make_tmpdir)
                 dir, os_package_resolver: ws_os_package_resolver,
                      package_managers: ws_package_managers)
             ws.config.set 'osdeps_mode', 'all'
+            ws.config.set 'apt_dpkg_update', true
             ws.config.set 'GITHUB', 'http,ssh', true
             ws.config.set 'GITORIOUS', 'http,ssh', true
             ws.config.set 'gems_install_path', File.join(dir, 'gems')

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.8.8"
+    VERSION = "2.9.0"
 end

data/lib/autoproj/workspace.rb

@@ -23,6 +23,8 @@ class Workspace < Ops::Loader
 
         attr_reader :loader
 
+        attr_reader :os_repository_resolver
+        attr_reader :os_repository_installer
         attr_reader :os_package_resolver
         attr_reader :os_package_installer
 
@@ -51,7 +53,9 @@ class Workspace < Ops::Loader
 
         def initialize(root_dir,
                        os_package_resolver: OSPackageResolver.new,
-                       package_managers: OSPackageInstaller::PACKAGE_MANAGERS)
+                       package_managers: OSPackageInstaller::PACKAGE_MANAGERS,
+                       os_repository_resolver: OSRepositoryResolver.new(operating_system: os_package_resolver.operating_system),
+                       os_repository_installer: OSRepositoryInstaller.new(self))
             @root_dir = root_dir
             @root_path = Pathname.new(root_dir)
             @ruby_version_keyword = "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
@@ -62,6 +66,8 @@ def initialize(root_dir,
             env.prepare(root_dir)
             env.source_before(File.join(dot_autoproj_dir, 'env.sh'))
 
+            @os_repository_resolver = os_repository_resolver
+            @os_repository_installer = os_repository_installer
             @os_package_resolver = os_package_resolver
             @manifest = Manifest.new(self, os_package_resolver: os_package_resolver)
             @config = Configuration.new(config_file_path)
@@ -247,6 +253,7 @@ def load_config(reconfigure = false)
 
                 os_package_resolver.prefer_indep_over_os_packages = config.prefer_indep_over_os_packages?
                 os_package_resolver.operating_system ||= config.get('operating_system', nil)
+                os_repository_resolver.operating_system ||= config.get('operating_system', nil)
             end
             @config
         end
@@ -262,6 +269,7 @@ def autodetect_operating_system(force: false)
                         "autodetecting the operating system"
                     names, versions = OSPackageResolver.autodetect_operating_system
                     os_package_resolver.operating_system = [names, versions]
+                    os_repository_resolver.operating_system = [names, versions]
                     Autobuild.progress :operating_system_autodetection,
                         "operating system: #{(names - ['default']).join(",")} - #{(versions - ['default']).join(",")}"
                 ensure
@@ -287,6 +295,7 @@ def setup_os_package_installer
             os_package_resolver.load_default
             os_package_installer.define_osdeps_mode_option
             os_package_installer.osdeps_mode
+            os_package_installer.configure_manager
         end
 
         def setup_ruby_version_handling
@@ -730,10 +739,13 @@ def full_env
         end
 
         # Export the workspace's env.sh file
+        #
+        # @return [Boolean] true if the environment has been changed, false otherwise
         def export_env_sh(package_names = nil, shell_helpers: true)
             full_env = self.full_env
-            save_cached_env(full_env)
+            changed = save_cached_env(full_env)
             full_env.export_env_sh(shell_helpers: shell_helpers)
+            changed
         end
 
         def save_cached_env(env = self.full_env)
@@ -763,11 +775,7 @@ def all_os_packages(import_missing: false, parallel: config.parallel_import_leve
                                     retry_count: 0)
                 all_os_packages
             else
-                result = Set.new
-                manifest.all_selected_source_packages.each do |source_package|
-                    result.merge(source_package.autobuild.os_packages)
-                end
-                result
+                manifest.all_selected_osdep_packages
             end
         end
 
@@ -775,6 +783,12 @@ def install_os_packages(packages, all: all_os_packages, **options)
             os_package_installer.install(packages, all: all, **options)
         end
 
+        def install_os_repositories
+            return unless os_package_installer.osdeps_mode.include?('os')
+
+            os_repository_installer.install_os_repositories
+        end
+
         # Define and register an autobuild package on this workspace
         #
         # @param [Symbol] package_type a package-creation method on {Autobuild},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.9.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -366,9 +366,12 @@ files:
 - lib/autoproj/os_package_installer.rb
 - lib/autoproj/os_package_query.rb
 - lib/autoproj/os_package_resolver.rb
+- lib/autoproj/os_repository_installer.rb
+- lib/autoproj/os_repository_resolver.rb
 - lib/autoproj/package_definition.rb
 - lib/autoproj/package_managers/apt_dpkg_manager.rb
 - lib/autoproj/package_managers/bundler_manager.rb
+- lib/autoproj/package_managers/debian_version.rb
 - lib/autoproj/package_managers/emerge_manager.rb
 - lib/autoproj/package_managers/gem_manager.rb
 - lib/autoproj/package_managers/homebrew_manager.rb
@@ -386,6 +389,9 @@ files:
 - lib/autoproj/package_set.rb
 - lib/autoproj/query_base.rb
 - lib/autoproj/reporter.rb
+- lib/autoproj/repository_managers/apt.rb
+- lib/autoproj/repository_managers/manager.rb
+- lib/autoproj/repository_managers/unknown_os_manager.rb
 - lib/autoproj/shell_completion.rb
 - lib/autoproj/source_package_query.rb
 - lib/autoproj/system.rb