autoproj 2.11.0 → 2.14.0

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.11.0"
+    VERSION = "2.14.0"
 end

data/lib/autoproj/workspace.rb

@@ -243,7 +243,7 @@ module Autoproj
             File.join(config_dir, OVERRIDES_DIR)
         end
 
-        IMPORT_REPORT_BASENAME = "import_report.json"
+        IMPORT_REPORT_BASENAME = "import_report.json".freeze
 
         # The full path to the update report
         #
@@ -252,7 +252,7 @@ module Autoproj
             File.join(log_dir, IMPORT_REPORT_BASENAME)
         end
 
-        BUILD_REPORT_BASENAME = "build_report.json"
+        BUILD_REPORT_BASENAME = "build_report.json".freeze
 
         # The full path to the build report
         #
@@ -282,7 +282,8 @@ module Autoproj
                     if (raw_vcs = config.get('manifest_source', nil))
                         VCSDefinition.from_raw(raw_vcs)
                     else
-                        VCSDefinition.from_raw(type: 'local', url: config_dir)
+                        local_vcs = { type: 'local', url: config_dir }
+                        VCSDefinition.from_raw(local_vcs)
                     end
 
                 if config.source_dir && Pathname.new(config.source_dir).absolute?
@@ -306,14 +307,18 @@ module Autoproj
         def autodetect_operating_system(force: false)
             if force || !os_package_resolver.operating_system
                 begin
-                    Autobuild.progress_start :operating_system_autodetection,
+                    Autobuild.progress_start(
+                        :operating_system_autodetection,
                         "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,
+                    Autobuild.progress(
+                        :operating_system_autodetection,
                         "operating system: #{(names - ['default']).join(',')} -"\
                         " #{(versions - ['default']).join(',')}"
+                    )
                 ensure
                     Autobuild.progress_done :operating_system_autodetection
                 end
@@ -343,7 +348,11 @@ module Autoproj
             osdep_suffixes << ruby_version_keyword
         end
 
-        def setup
+        # Perform initial configuration load and workspace setup
+        #
+        # @param [Boolean] load_global_configuration if true, load the global
+        #   autoprojrc file if it exists. Otherwise, ignore it.
+        def setup(load_global_configuration: true)
             setup_ruby_version_handling
             migrate_bundler_and_autoproj_gem_layout
             load_config
@@ -353,7 +362,7 @@ module Autoproj
             config.validate_ruby_executable
             Autobuild.programs['ruby'] = config.ruby_executable
             config.apply_autobuild_configuration
-            load_autoprojrc
+            load_autoprojrc if load_global_configuration
             load_main_initrb
             config.each_reused_autoproj_installation do |p|
                 manifest.reuse(p)
@@ -370,6 +379,14 @@ module Autoproj
             Autobuild.logdir = log_dir
             if (cache_dir = config.importer_cache_dir)
                 Autobuild::Importer.default_cache_dirs = cache_dir
+                os_package_installer.each_manager_with_name do |name, manager|
+                    next unless manager.respond_to?(:cache_dir=)
+
+                    manager_cache_path = File.join(cache_dir, 'package_managers', name)
+                    if File.directory?(manager_cache_path)
+                        manager.cache_dir = manager_cache_path
+                    end
+                end
             end
             setup_os_package_installer
             install_ruby_shims
@@ -408,7 +425,7 @@ module Autoproj
             gemfile  = File.join(dot_autoproj_dir, 'Gemfile')
             binstubs = File.join(dot_autoproj_dir, 'bin')
             Ops::Install.rewrite_shims(binstubs, config.ruby_executable,
-                root_dir, gemfile, config.gems_gem_home)
+                                       root_dir, gemfile, config.gems_gem_home)
         end
 
         def update_bundler
@@ -416,7 +433,11 @@ module Autoproj
             gem_program = Ops::Install.guess_gem_program
             install = Ops::Install.new(root_dir)
             Autoproj.message "  updating bundler"
-            install.install_bundler(gem_program, silent: true)
+            install.install_bundler(
+                gem_program,
+                version: config.bundler_version,
+                silent: true
+            )
         end
 
         def update_autoproj(restart_on_update: true)
@@ -430,18 +451,21 @@ module Autoproj
             binstubs = File.join(dot_autoproj_dir, 'bin')
             if restart_on_update
                 old_autoproj_path = PackageManagers::BundlerManager.bundle_gem_path(
-                    self, 'autoproj', gem_home: config.gems_gem_home, gemfile: gemfile)
+                    self, 'autoproj', gemfile: gemfile
+                )
             end
             begin
                 Autoproj.message "  updating autoproj"
                 PackageManagers::BundlerManager.run_bundler_install(
-                    self, gemfile, binstubs: binstubs)
+                    self, gemfile, binstubs: binstubs
+                )
             ensure
                 rewrite_shims
             end
             if restart_on_update
                 new_autoproj_path = PackageManagers::BundlerManager.bundle_gem_path(
-                    self, 'autoproj', gem_home: config.gems_gem_home, gemfile: gemfile)
+                    self, 'autoproj', gemfile: gemfile
+                )
             end
 
             # First things first, see if we need to update ourselves
@@ -586,6 +610,10 @@ module Autoproj
             current_workspaces = Workspace.registered_workspaces
             existing = current_workspaces.find { |w| w.root_dir == root_dir }
             if existing
+                if existing.prefix_dir == prefix_dir && existing.build_dir == build_dir
+                    return
+                end
+
                 existing.prefix_dir = prefix_dir
                 existing.build_dir  = build_dir
             else
@@ -779,6 +807,20 @@ module Autoproj
             full_env = self.full_env
             changed = save_cached_env(full_env)
             full_env.export_env_sh(shell_helpers: shell_helpers)
+
+            build_dir = Pathname(self.build_dir)
+            full_env.each_env_filename do |_, filename|
+                basename = File.basename(filename)
+                File.open(File.join(prefix_dir, basename), "w") do |io|
+                    io.puts "source \"#{filename}\""
+                end
+                if build_dir.absolute?
+                    build_dir.mkpath
+                    (build_dir + basename).open("w") do |io|
+                        io.puts "source \"#{filename}\""
+                    end
+                end
+            end
             changed
         end
 
@@ -803,10 +845,12 @@ module Autoproj
             if import_missing
                 ops = Autoproj::Ops::Import.new(self)
                 _, all_os_packages =
-                    ops.import_packages(manifest.default_packages,
-                                    checkout_only: true, only_local: true, reset: false,
-                                    recursive: true, keep_going: true, parallel: parallel,
-                                    retry_count: 0)
+                    ops.import_packages(
+                        manifest.default_packages,
+                        checkout_only: true, only_local: true, reset: false,
+                        recursive: true, keep_going: true, parallel: parallel,
+                        retry_count: 0
+                    )
                 all_os_packages
             else
                 manifest.all_selected_osdep_packages

data/lib/autoproj.rb

@@ -9,6 +9,8 @@ require 'backports/2.4.0/fixnum/dup'
 require 'backports/2.4.0/nil_class/dup'
 require 'backports/2.4.0/false_class/dup'
 require 'backports/2.4.0/true_class/dup'
+require 'backports/2.4.0/hash/transform_values'
+require 'backports/2.5.0/hash/transform_keys'
 
 require 'autobuild'
 require 'autoproj/autobuild'
@@ -44,6 +46,7 @@ require 'autoproj/query_base'
 require 'autoproj/source_package_query'
 require 'autoproj/os_package_query'
 
+require 'autoproj/ops/phase_reporting'
 require 'autoproj/ops/install'
 require 'autoproj/ops/tools'
 require 'autoproj/ops/loader'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -78,82 +78,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: tty-color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.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-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +364,7 @@ files:
 - lib/autoproj/ops/install.rb
 - lib/autoproj/ops/loader.rb
 - lib/autoproj/ops/main_config_switcher.rb
+- lib/autoproj/ops/phase_reporting.rb
 - lib/autoproj/ops/snapshot.rb
 - lib/autoproj/ops/tools.rb
 - lib/autoproj/ops/watch.rb
@@ -405,6 +394,7 @@ files:
 - lib/autoproj/package_manifest.rb
 - lib/autoproj/package_selection.rb
 - lib/autoproj/package_set.rb
+- lib/autoproj/python.rb
 - lib/autoproj/query_base.rb
 - lib/autoproj/reporter.rb
 - lib/autoproj/repository_managers/apt.rb
@@ -465,8 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: Easy installation and management of sets of software packages