autoproj 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a2de5ee91090c29e14337e48e9adbf9673a719e79e2d6610bb037ea4bb0d02
-  data.tar.gz: fb693ef03ade583a5bf4d1e0d8c3cb24a0b909e66a640d471d2b2ec14c414ebb
+  metadata.gz: e19c3ca78afb4d42f58b65effbed3ff1aed2fe83210e6fa2ee0d46ed12793430
+  data.tar.gz: 2b1a0802811156df47ac64a869f9ccf1de2ba5734d6d0316d2f857a5b18fa638
 SHA512:
-  metadata.gz: 35e62e7f4719c7ee187b492b1042e520595167ca2f7183380f505460e40ea878dcb1549b36d85fef60a319789f267dc090e88eb12bd32a06023d60644ab61a72
-  data.tar.gz: 3e8c66e8e46236041fd11a808f2249357c88f65d98daf863b4edf92a718d3e949d89dc3372e0149182c045683dc6f5f0432c25efa47c6d2b801768fc05a67d45
+  metadata.gz: b46ab523d1b83ef75128c8707d65899b8eb770706b391252bb1826578acc6505ad67169964ef9e9c1c7653962d8ed50ff5e20a6b48d765a2298afbcdf5c973c1
+  data.tar.gz: 21cc35037beb50b30ee0879c680b9c68ef401c07c394270b8d1e81ae678f8e9c931b53b35bc205b877224b440e745674cd48e49cf566aef575332324a309516c

data/bin/autoproj_bootstrap

@@ -264,14 +264,22 @@ module Autoproj
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.16.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.17.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options

data/bin/autoproj_install

@@ -264,14 +264,22 @@ module Autoproj
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.16.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.17.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options

data/lib/autoproj/default.osdeps

@@ -101,6 +101,10 @@ ruby27:
 ruby30:
   default: ignore # we assume that if the user has a ruby 3.0 runtime, it is usable
 
+ruby32:
+  default: ignore # we assume that if the user has a ruby 3.0 runtime, it is usable
+
+
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore

data/lib/autoproj/git_server_configuration.rb

@@ -73,7 +73,8 @@ module Autoproj
         disabled_methods: [],
         config: Autoproj.config,
         fallback_to_http: nil,
-        lazy: false)
+        lazy: false,
+        add_suffix: true)
 
         disabled_methods = Array(disabled_methods)
 
@@ -100,7 +101,7 @@ module Autoproj
         end
 
         Autoproj.add_source_handler name.downcase do |url, private: false, **vcs_options|
-            url += ".git" if url !~ /\.git$/
+            url += ".git" if add_suffix && url !~ /\.git$/
             url = "/#{url}" if url !~ /^\//
 
             unless GIT_SERVER_CONFIG_VARS.all? { |v| config.has_value_for?("#{name}#{v}") }

data/lib/autoproj/manifest.rb

@@ -1088,7 +1088,7 @@ module Autoproj
 
         # Remove any OSDeps override that has previously been added with
         # #add_osdeps_overrides
-        def remove_osdeps_overrides(osdep_name)
+        def remove_osdeps_overrides(osdeps_name)
             @osdeps_overrides.delete(osdeps_name.to_s)
         end
 

data/lib/autoproj/ops/configuration.rb

@@ -585,7 +585,7 @@ module Autoproj
                     when OSPackageResolver::UNKNOWN_OS
                         manifest.exclude_package(osdep_name, "the current operating system is unknown to autoproj")
                     when OSPackageResolver::WRONG_OS
-                        manifest.exclude_package(osdep_name, "#{osdep_name} is defined, but not for this operating system")
+                        manifest.exclude_package(osdep_name, "#{osdep_name} is defined in #{os_package_resolver.source_of(osdep_name)}, but not for this operating system")
                     when OSPackageResolver::NONEXISTENT
                         manifest.exclude_package(osdep_name, "#{osdep_name} is marked as unavailable for this operating system")
                     end

data/lib/autoproj/ops/install.rb

@@ -260,8 +260,16 @@ module Autoproj
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.17.0"
+    VERSION = "2.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild