autoproj 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf7f7d0c8d98b09aff6103fed65c4c4c5b9f20b
-  data.tar.gz: 5175feae1b29209f1cd5d3706737e2561d3f982c
+  metadata.gz: 225ebf408df3b402e49ba4fb88968d99ca7516d4
+  data.tar.gz: 5e6c520db390621a7fc4f5b9a6ac772d9b08e459
 SHA512:
-  metadata.gz: cab8e9584a00aebb183cacdafc88487830a73d94ea3228d62cb8f3e8524b10a5980526d62f2bf52f696c60dd8a0615d765736c178db9f1ec085da7d56b97e829
-  data.tar.gz: da39b66b640c0e62143e520d9e6adebc16a02c2b333728133f685ae263f4057893d1e1c8f9086cc8033bf8a788b89d8fc753d1294372a38e1b5cdb5b43b5e69a
+  metadata.gz: be6bdb315d178d9980fa5f769fc044ba2dfdc1a9cfd605e3a184142f8d7a6132777778ecf75e3f33bcf0c4184139e8dac3a4aafdf5668efd9903d94be4488ee5
+  data.tar.gz: 89e2b7a9ada6aff9be121e91c087f6d476f94a78dd022bbb2bdb8a59dfc866bf1bafa463ce8df47b47404a0a654a38b5e42bf53b98e1aa1bc446e138a31d9b21

data/lib/autoproj/autobuild_extensions/package.rb

@@ -130,7 +130,7 @@ def optional_dependency(name)
 
             def partition_package(pkg_name)
                 pkg_autobuild, pkg_osdeps = [], []
-                ws.manifest.resolve_package_name(pkg_name).each do |type, dep_name|
+                ws.manifest.resolve_package_name(pkg_name, include_unavailable: true).each do |type, dep_name|
                     if type == :osdeps
                         pkg_osdeps << dep_name
                     elsif type == :package

data/lib/autoproj/default.osdeps

@@ -86,6 +86,9 @@ ruby22:
 ruby23:
   default: ignore # we assume that if the user has a ruby 2.3 runtime, it is usable
 
+ruby24:
+  default: ignore # we assume that if the user has a ruby 2.3 runtime, it is usable
+
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore

data/lib/autoproj/exceptions.rb

@@ -29,8 +29,9 @@ def initialize(original_errors, source_packages: [], osdep_packages: [])
     end
 
     # Exception raised when trying to resolve a package name and it failed
-    class PackageNotFound < ConfigError
-    end
+    class PackageNotFound < ConfigError; end
+
+    class PackageUnavailable < PackageNotFound; end
 
     class UnregisteredPackage < ArgumentError
     end

data/lib/autoproj/manifest.rb

@@ -661,7 +661,7 @@ def main_package_set
         #   defined by {#os_package_resolver}), and there has been no source
         #   fallback defined with {#add_osdeps_overrides}. If true, it will
         #   return such a package as an osdep.
-        def resolve_package_name(name)
+        def resolve_package_name(name, include_unavailable: false)
             if pkg_set = find_metapackage(name)
                 pkg_names = pkg_set.each_package.map(&:name)
             else
@@ -672,8 +672,14 @@ def resolve_package_name(name)
             pkg_names.each do |pkg|
                 begin
                     result.concat(resolve_single_package_name(pkg))
+                rescue PackageUnavailable => e
+                    if include_unavailable
+                        result.concat([[:osdeps, pkg]])
+                    else
+                        raise e, "cannot resolve #{pkg}: #{e}", e.backtrace
+                    end
                 rescue PackageNotFound => e
-                    raise PackageNotFound, "cannot resolve #{pkg}: #{e}", e.backtrace
+                    raise e, "cannot resolve #{pkg}: #{e}", e.backtrace
                 end
             end
             result
@@ -696,7 +702,7 @@ def resolve_single_package_name(name)
             begin
                 resolve_package_name_as_source_package(name)
             rescue PackageNotFound
-                raise PackageNotFound, "#{osdep_error} and it cannot be resolved as a source package"
+                raise osdep_error, "#{osdep_error} and it cannot be resolved as a source package"
             end
         end
 
@@ -754,11 +760,11 @@ def resolve_package_name_as_osdep(name)
             elsif osdeps_available || accept_unavailable_osdeps?
                 return [[:osdeps, name]]
             elsif osdeps_availability == OSPackageResolver::WRONG_OS
-                raise PackageNotFound, "#{name} is an osdep, but it is not available for this operating system (#{os_package_resolver.operating_system})"
+                raise PackageUnavailable, "#{name} is an osdep, but it is not available for this operating system (#{os_package_resolver.operating_system})"
             elsif osdeps_availability == OSPackageResolver::UNKNOWN_OS
-                raise PackageNotFound, "#{name} is an osdep, but the local operating system is unavailable"
+                raise PackageUnavailable, "#{name} is an osdep, but the local operating system is unavailable"
             elsif osdeps_availability == OSPackageResolver::NONEXISTENT
-                raise PackageNotFound, "#{name} is an osdep, but it is explicitely marked as 'nonexistent' for this operating system (#{os_package_resolver.operating_system})"
+                raise PackageUnavailable, "#{name} is an osdep, but it is explicitely marked as 'nonexistent' for this operating system (#{os_package_resolver.operating_system})"
             end
         end
 

data/lib/autoproj/ops/configuration.rb

@@ -554,11 +554,11 @@ def mark_unavailable_osdeps_as_excluded
 
                 case os_package_resolver.availability_of(osdep_name)
                 when OSPackageResolver::UNKNOWN_OS
-                    manifest.exclude_package(osdep_name, "this operating system is unknown to autoproj")
+                    manifest.exclude_package(osdep_name, "the current operating system is unknown to autoproj")
                 when OSPackageResolver::WRONG_OS
-                    manifest.exclude_package(osdep_name, "there are definitions for it, but not for this operating system")
+                    manifest.exclude_package(osdep_name, "#{osdep_name} is defined, but not for this operating system")
                 when OSPackageResolver::NONEXISTENT
-                    manifest.exclude_package(osdep_name, "it is marked as unavailable for this operating system")
+                    manifest.exclude_package(osdep_name, "#{osdep_name} is marked as unavailable for this operating system")
                 end
             end
         end

data/lib/autoproj/ops/install.rb

@@ -180,10 +180,10 @@ def self.guess_gem_program
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.0.0.a")
+            def default_gemfile_contents(autoproj_version = ">= 2.0.0")
                 ["source \"#{gem_source}\"",
                  "gem \"autoproj\", \"#{autoproj_version}\"",
-                 "gem \"utilrb\", \">= 3.0.0.a\""].join("\n")
+                 "gem \"utilrb\", \">= 3.0.1\""].join("\n")
             end
 
             # Parse the provided command line options and returns the non-options

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -254,6 +254,7 @@ def merge_gemfiles(*path, unlock: [])
                     end
                     contents << "source '#{g.to_s}'"
                 end
+                valid_keys = %w{group groups git path glob name branch ref tag require submodules platform platforms type source install_if}
                 dependencies.each do |group_name, by_platform|
                     contents << "group :#{group_name} do"
                     by_platform.each do |platform_name, deps|
@@ -265,8 +266,7 @@ def merge_gemfiles(*path, unlock: [])
                         deps.each do |d|
                             if d.source
                                 options = d.source.options.dup
-                                options.delete 'root_path'
-                                options.delete 'uri'
+                                options.delete_if { |k, _| !valid_keys.include?(k) }
                                 options = options.map { |k, v| "#{k}: \"#{v}\"" }
                             end
                             contents << ["  #{platform_indent}gem \"#{d.name}\", \"#{d.requirement}\"", *options].join(", ")

data/lib/autoproj/package_managers/homebrew_manager.rb

@@ -14,18 +14,23 @@ def filter_uptodate_packages(packages)
                 # TODO there might be duplicates in packages which should be fixed
                 # somewhere else
                 packages = packages.uniq
-                result = `brew info --json=v1 '#{packages.join("' '")}'`
-                result = begin
-                             JSON.parse(result)
-                         rescue JSON::ParserError
-                             if result && !result.empty?
-                                 Autoproj.warn "Error while parsing result of brew info --json=v1"
-                             else
-                                 # one of the packages is unknown fallback to install all
-                                 # packaes which will complain about it
-                             end
-                             return packages
-                         end
+                command_line = "brew info --json=v1 #{packages.join(' ')}"
+                result = Bundler.with_clean_env do
+                    (Autobuild::Subprocess.run 'autoproj', 'osdeps', command_line).first
+                end
+
+                begin
+                    JSON.parse(result)
+                rescue JSON::ParserError
+                    if result && !result.empty?
+                        Autoproj.warn "Error while parsing result of brew info --json=v1"
+                    else
+                        # one of the packages is unknown fallback to install all
+                        # packaes which will complain about it
+                    end
+                    return packages
+                end
+                
                 # fall back if something else went wrong
                 if packages.size != result.size
                     Autoproj.warn "brew info returns less or more packages when requested. Falling back to install all packages"

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler