autoproj 2.10.1 → 2.13.0

data/lib/autoproj/repository_managers/apt.rb

@@ -143,7 +143,6 @@ def key_exist?(key)
                 Open3.popen3({'LANG' => 'C'}, 'apt-key', 'export', key) do |_, _, stderr, wait_thr|
                     success = wait_thr.value.success?
                     stderr = stderr.read
-                    puts stderr.inspect
                     has_error = stderr.match(/WARNING: nothing exported/)
                     exist = success && !has_error
                 end

data/lib/autoproj/test.rb

@@ -71,6 +71,7 @@ def setup
             Autobuild.logdir = make_tmpdir
             ws_define_package_manager 'os'
             ws_define_package_manager 'os_indep'
+            Autobuild.progress_display_period = 0
 
             super
         end
@@ -80,6 +81,7 @@ def teardown
             @tmpdir.each do |dir|
                 FileUtils.remove_entry_secure dir
             end
+            Rake::Task.clear
             Autobuild::Package.clear
             Autoproj.silent = false
 
@@ -94,6 +96,11 @@ def teardown
             end
         end
 
+        def data_path(*args)
+            File.expand_path(File.join(*args),
+                             File.join(__dir__, '..', '..', 'test', 'data'))
+        end
+
         def create_bootstrap
             ws_create
         end
@@ -170,7 +177,7 @@ def invoke_test_script(name, *arguments,
                     'PACKAGE_BASE_DIR' => package_base_dir,
                     'RUBY' => Gem.ruby
                 ]
-                result = Bundler.clean_system(
+                result = Autoproj.bundler_unbundled_system(
                     default_env.merge(env), script, *arguments,
                     in: :close, **Hash[chdir: dir].merge(system_options))
             end
@@ -201,7 +208,7 @@ def prepare_fixture_gem_home
             cached_bundler_gem = File.join(vendor, bundler_filename)
             unless File.file?(cached_bundler_gem)
                 FileUtils.mkdir_p vendor
-                Bundler.clean_system(
+                Autoproj.bundler_unbundled_system(
                     Ops::Install.guess_gem_program, 'fetch', '-v',
                     Bundler::VERSION, 'bundler', chdir: vendor)
 
@@ -211,7 +218,7 @@ def prepare_fixture_gem_home
             end
 
             capture_subprocess_io do
-                Bundler.clean_system(
+                Autoproj.bundler_unbundled_system(
                     Hash['GEM_HOME' => fixture_gem_home, 'GEM_PATH' => nil],
                     Ops::Install.guess_gem_program, 'install', '--no-document',
                     cached_bundler_gem)
@@ -256,7 +263,7 @@ def capture_deprecation_message
 
         def find_bundled_gem_path(bundler, gem_name, gemfile)
             out_r, out_w = IO.pipe
-            result = Bundler.clean_system(
+            result = Autoproj.bundler_unbundled_system(
                 bundler, 'show', gem_name,
                 out: out_w,
                 chdir: File.dirname(gemfile))
@@ -316,6 +323,9 @@ def ws_create(dir = make_tmpdir, partial_config: false)
             ws.config.set 'gems_install_path', File.join(dir, 'gems')
             ws.prefix_dir = make_tmpdir
             ws.config.save
+
+            # Make a valid (albeit empty) Gemfile
+            File.open(File.join(ws.dot_autoproj_dir, 'Gemfile'), 'w').close
             ws
         end
 
@@ -323,8 +333,9 @@ def ws_clear_layout
             ws.manifest.clear_layout
         end
 
-        def ws_define_package_set(name, vcs = VCSDefinition.from_raw(type: 'none'),
-                                  **options)
+        def ws_define_package_set(
+            name, vcs = VCSDefinition.from_raw({ type: 'none' }), **options
+        )
             package_set = PackageSet.new(ws, vcs, name: name, **options)
             ws.manifest.register_package_set(package_set)
             package_set
@@ -341,8 +352,9 @@ def ws_create_local_package_set(name, path, source_data: Hash.new, **options)
             package_set
         end
 
-        def ws_add_package_set_to_layout(name, vcs = VCSDefinition.from_raw(type: 'none'),
-                                         **options)
+        def ws_add_package_set_to_layout(
+            name, vcs = VCSDefinition.from_raw({ type: 'none' }), **options
+        )
             package_set = ws_define_package_set(name, vcs, **options)
             ws.manifest.add_package_set_to_layout(package_set)
             package_set
@@ -367,9 +379,16 @@ def ws_add_osdep_entries_to_layout(entries)
 
         def ws_define_package(package_type, package_name,
                               package_set: ws.manifest.main_package_set,
-                              create: true)
+                              create: true, &block)
             package = Autobuild.send(package_type, package_name)
-            package.srcdir = File.join(ws.root_dir, package_name.to_s)
+            ws_setup_package(
+                package, package_set: package_set, create: create, &block
+            )
+        end
+
+        def ws_setup_package(package, package_set: ws.manifest.main_package_set,
+                                      create: true)
+            package.srcdir = File.join(ws.root_dir, package.name.to_s)
             FileUtils.mkdir_p package.srcdir if create
             autoproj_package = ws.register_package(package, nil, package_set)
             yield(package) if block_given?

data/lib/autoproj/variable_expansion.rb

@@ -80,7 +80,9 @@ def self.expand(value, definitions = Hash.new)
     end
 
     # True if the given string contains expansions
-    def self.contains_expansion?(string); string =~ /\$/ end
+    def self.contains_expansion?(string)
+        string.respond_to?(:to_str) && string.to_str =~ /\$/
+    end
 
     def self.resolve_one_constant(name, value, result, definitions)
         result[name] ||= single_expansion(value, result) do |missing_name|

data/lib/autoproj/vcs_definition.rb

@@ -33,7 +33,7 @@ class VCSDefinition
         HistoryEntry  = Struct.new :package_set, :vcs
         RawEntry      = Struct.new :package_set, :file, :vcs
 
-        def initialize(type, url, vcs_options, from: nil, raw: Array.new, history: Array.new)
+        def initialize(type, url, vcs_options, from: nil, raw: [], history: [])
             if !raw.respond_to?(:to_ary)
                 raise ArgumentError, "wrong format for the raw field (#{raw.inspect})"
             end
@@ -49,7 +49,7 @@ def initialize(type, url, vcs_options, from: nil, raw: Array.new, history: Array
 
         # Create a null VCS object
         def self.none
-            from_raw(type: 'none')
+            from_raw({ type: 'none' })
         end
 
         # Whether there is actually a version control definition
@@ -113,6 +113,8 @@ def self.update_raw_vcs_spec(old, new)
         #
         #   - package_name
         #     branch: value
+        #
+        # @raise ArgumentError if the given spec cannot be normalized
         def self.normalize_vcs_hash(spec, base_dir: nil)
             plain = Array.new
             filtered_spec = Hash.new
@@ -130,7 +132,7 @@ def self.normalize_vcs_hash(spec, base_dir: nil)
             end
 
             if plain.size > 1
-                raise ConfigError.new, "invalid syntax"
+                raise ArgumentError, "invalid syntax"
             elsif plain.size == 1
                 short_url = plain.first
                 vcs, *url = short_url.split(':')
@@ -149,10 +151,14 @@ def self.normalize_vcs_hash(spec, base_dir: nil)
                         elsif base_dir
                             File.expand_path(short_url, base_dir)
                         else
-                            raise ArgumentError, "VCS path '#{short_url}' is relative and no base_dir was given"
+                            raise ArgumentError,
+                                  "VCS path '#{short_url}' is relative and no "\
+                                  "base_dir was given"
                         end
                     if !File.directory?(source_dir)
-                        raise ArgumentError, "'#{short_url}' is neither a remote source specification, nor an existing local directory"
+                        raise ArgumentError,
+                              "'#{short_url}' is neither a remote source "\
+                              'specification, nor an existing local directory'
                     end
                     spec.merge!(type: 'local', url: source_dir)
                 end
@@ -193,17 +199,26 @@ def self.raw_spec_to_s(spec)
         # @return [VCSDefinition]
         # @raise ArgumentError if the raw specification does not match an
         #   expected format
-        def self.from_raw(spec, from: nil, raw: Array.new, history: Array.new)
+        def self.from_raw(spec, from: nil, raw: [], history: [])
             normalized_spec = normalize_vcs_hash(spec)
             if !(type = normalized_spec.delete(:type))
-                raise ArgumentError, "the source specification #{raw_spec_to_s(spec)} normalizes into #{raw_spec_to_s(normalized_spec)}, which does not have a VCS type"
-            elsif !(url  = normalized_spec.delete(:url))
-                if type != 'none'
-                    raise ArgumentError, "the source specification #{raw_spec_to_s(spec)} normalizes into #{raw_spec_to_s(normalized_spec)}, which does not have a URL. Only VCS of type 'none' do not require one"
-                end
+                raise ArgumentError,
+                      "the source specification #{raw_spec_to_s(spec)} normalizes "\
+                      "into #{raw_spec_to_s(normalized_spec)}, "\
+                      'which does not have a VCS type'
             end
 
-            VCSDefinition.new(type, url, normalized_spec, from: from, history: history, raw: raw)
+            if !(url  = normalized_spec.delete(:url)) && type != 'none'
+                raise ArgumentError,
+                      "the source specification #{raw_spec_to_s(spec)} normalizes "\
+                      "into #{raw_spec_to_s(normalized_spec)}, "\
+                      'which does not have a URL. '\
+                      'Only VCS of type \'none\' do not require one'
+            end
+
+            VCSDefinition.new(
+                type, url, normalized_spec, from: from, history: history, raw: raw
+            )
         end
 
         def ==(other_vcs)
@@ -274,7 +289,7 @@ def create_autobuild_importer
         end
 
         # Returns a pretty representation of this VCS definition
-        def to_s 
+        def to_s
             if type == "none"
                 "none"
             else
@@ -305,7 +320,7 @@ def self.call_source_handler(vcs, url, options)
         if !handler
             raise ArgumentError, "there is no source handler for #{vcs}"
         else
-            return handler.call(url, options)
+            handler.call(url, **options)
         end
     end
 
@@ -326,7 +341,7 @@ def self.call_source_handler(vcs, url, options)
     #       - tools/orocos.rb:
     #         github: rock-core/base-types
     #         branch: test
-    # 
+    #
     # @yieldparam [String] url the url given to the handler
     # @yieldparam [Hash] the rest of the VCS hash
     # @return [Hash] a VCS hash with the information expanded

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.10.1"
+    VERSION = "2.13.0"
 end

data/lib/autoproj/workspace.rb

@@ -243,7 +243,16 @@ def overrides_dir
             File.join(config_dir, OVERRIDES_DIR)
         end
 
-        BUILD_REPORT_BASENAME = "build_report.json"
+        IMPORT_REPORT_BASENAME = "import_report.json".freeze
+
+        # The full path to the update report
+        #
+        # @return [String]
+        def import_report_path
+            File.join(log_dir, IMPORT_REPORT_BASENAME)
+        end
+
+        BUILD_REPORT_BASENAME = "build_report.json".freeze
 
         # The full path to the build report
         #
@@ -252,6 +261,13 @@ def build_report_path
             File.join(log_dir, BUILD_REPORT_BASENAME)
         end
 
+        # The full path to the report generated by the given utility
+        #
+        # @return [String]
+        def utility_report_path(name)
+            File.join(log_dir, "#{name}_report.json")
+        end
+
         # Load the configuration for this workspace from
         # config_file_path
         #
@@ -266,7 +282,8 @@ def load_config(reconfigure = false)
                     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?
@@ -290,14 +307,18 @@ def save_config
         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
@@ -354,6 +375,14 @@ def setup
             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
@@ -392,7 +421,7 @@ def rewrite_shims
             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
@@ -400,7 +429,11 @@ def update_bundler
             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)
@@ -414,18 +447,21 @@ def update_autoproj(restart_on_update: true)
             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
@@ -570,6 +606,10 @@ def register_workspace
             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
@@ -787,10 +827,12 @@ def all_os_packages(import_missing: false, parallel: config.parallel_import_leve
             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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.13.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.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
@@ -264,6 +252,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
@@ -321,6 +323,7 @@ files:
 - lib/autoproj/cli/locate.rb
 - lib/autoproj/cli/log.rb
 - lib/autoproj/cli/main.rb
+- lib/autoproj/cli/main_doc.rb
 - lib/autoproj/cli/main_global.rb
 - lib/autoproj/cli/main_plugin.rb
 - lib/autoproj/cli/main_test.rb
@@ -336,6 +339,7 @@ files:
 - lib/autoproj/cli/tag.rb
 - lib/autoproj/cli/test.rb
 - lib/autoproj/cli/update.rb
+- lib/autoproj/cli/utility.rb
 - lib/autoproj/cli/version.rb
 - lib/autoproj/cli/versions.rb
 - lib/autoproj/cli/watch.rb
@@ -360,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
@@ -449,8 +454,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