autoproj 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e9f51443df2835dca1ca6018c66c1ddddc191c
-  data.tar.gz: 90ddec45d88fad399a89f27b5125e64ce776a692
+  metadata.gz: fe336a236c728540d3c9490eaa77e358429bf5f0
+  data.tar.gz: a3aee015246de3a37f7b1e689918f28f88ebacfd
 SHA512:
-  metadata.gz: 8262c141ccda64777df11c91a3536bfe23feb48f9189fd16d04b7a891a1227ceb7c6a54bb5e5067ae7efce930a6cd965b47fcf38f951eb23c4ddc9c81bda0c20
-  data.tar.gz: 5ee4a343b0fafda6f82be49c87a87d60e8242521b0a532d726bf896f4b384bee2c8b6e5b9abb1ba2a5062981ba0883de04397431d3edd6da31ee918598c72399
+  metadata.gz: 4460ab6fbe3bfbdf2acdf5915fe7441c6cca8c378ebcdccec3e1cca26c06a71159a1b0d51398bdff83194408dfe2b26b9fb8a74ec98cd0f4d2f493c1f4e0e9f9
+  data.tar.gz: e2bf36c2a3907755a6303af154fd0bc534d51a9a9b88a90e4aa46a5e94e5719df468297496a21a7d2fcea5f6a267ea872aca2248f2c589105a0f518860db300e

data/autoproj.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "bundler"
-    s.add_runtime_dependency "autobuild", ">= 1.13.0"
+    s.add_runtime_dependency "autobuild", ">= 1.14.0"
     s.add_runtime_dependency "backports", '~> 3.0'
     s.add_runtime_dependency "utilrb", '~> 3.0.0', ">= 3.0.0"
     s.add_runtime_dependency "thor", '~> 0.20.0'

data/lib/autoproj/autobuild_extensions/dsl.rb

@@ -110,6 +110,9 @@ def self.package_handler_for(full_path)
             find_topmost_directory_containing(full_path, "lib/*.rb")
 
             return "ruby_package", dir
+        elsif (dir = find_topmost_directory_containing(full_path, 'setup.py')) ||
+             (dir = find_topmost_directory_containing(full_path, File.join(File.basename(full_path), "*.py")))
+            return 'python_package', dir
         end
     end
 end
@@ -156,6 +159,10 @@ def import_package(name, workspace: Autoproj.workspace, &block)
     package_common(:import, name, workspace: Autoproj.workspace, &block)
 end
 
+def python_package(name, workspace: Autoproj.workspace, &block)
+    package_common(:python, name, workspace: Autoproj.workspace, &block)
+end
+
 def common_make_based_package_setup(pkg)
     unless pkg.has_doc? && pkg.doc_dir
         pkg.with_doc do
@@ -197,6 +204,14 @@ def cmake_package(name, workspace: Autoproj.workspace)
     end
 end
 
+# Define a package that was originall designed for Catkin
+def catkin_package(name, workspace: Autoproj.workspace)
+    cmake_package(name, workspace: workspace) do |pkg|
+        pkg.use_package_xml = true
+        yield(pkg) if block_given?
+    end
+end
+
 # Define an autotools package
 #
 # Example:
@@ -230,7 +245,7 @@ def env_add(name, value)
 # Defines a Ruby package
 #
 # Example:
-#   
+#
 #   ruby_package 'package_name' do |pkg|
 #       pkg.doc_target = 'doc'
 #   end

data/lib/autoproj/autobuild_extensions/package.rb

@@ -23,8 +23,20 @@ def initialize(spec = Hash.new)
                 @added_tags = Set.new
                 @optional_dependencies = Set.new
                 @description = PackageManifest.new(self, null: true)
+                @use_package_xml = false
             end
 
+            # Whether we should use a package.xml file present in this package
+            # (parsed as ROS' catkin would) instead of Autoproj's manifest.xml
+            #
+            # @see use_package_xml=
+            def use_package_xml?
+                @use_package_xml
+            end
+
+            # Set {#use_package_xml?}
+            attr_writer :use_package_xml
+
             # The set of tags for this package. This is an union of the tags
             # contained in +description+ and the ones explicitely added with
             # #add_tag

data/lib/autoproj/cli/main.rb

@@ -207,7 +207,11 @@ def build(*packages)
                     tool_failure_mode: :report_silent)
                 if !failures.empty?
                     Autobuild.silent = false
-                    packages_failed = failures.
+                    package_failures, config_failures = failures.partition do |e|
+                        e.respond_to?(:target) && e.target.respond_to?(:name)
+                    end
+
+                    packages_failed = package_failures.
                         map do |e|
                             if e.respond_to?(:target) && e.target.respond_to?(:name)
                                 e.target.name
@@ -216,6 +220,9 @@ def build(*packages)
                     if !packages_failed.empty?
                         Autobuild.error "#{packages_failed.size} packages failed: #{packages_failed.sort.join(", ")}"
                     end
+                    config_failures.each do |e|
+                        Autobuild.error(e)
+                    end
                     exit 1
                 end
             end

data/lib/autoproj/cli/status.rb

@@ -85,12 +85,20 @@ def status_of_package(package_description, only_local: false, snapshot: false)
                 elsif !File.directory?(pkg.srcdir)
                     package_status.msg << Autoproj.color("  is not imported yet", :magenta)
                 else
-                    if importer.respond_to?(:snapshot)
+                    begin status = importer.status(pkg, only_local)
+                    rescue StandardError => e
+                        package_status.msg << Autoproj.color("  failed to fetch status information (#{e})", :red)
+                        return package_status
+                    end
+
+                    snapshot_useful = [Autobuild::Importer::Status::ADVANCED, Autobuild::Importer::Status::NEEDS_MERGE].
+                        include?(status.status)
+                    if snapshot && snapshot_useful && importer.respond_to?(:snapshot)
                         snapshot_version =
                             begin importer.snapshot(pkg, nil, exact_state: false, only_local: only_local)
                             rescue Autobuild::PackageException
                                 Hash.new
-                            rescue Exception => e
+                            rescue StandardError => e
                                 package_status.msg << Autoproj.color("  failed to fetch snapshotting information (#{e})", :red)
                                 return package_status
                             end
@@ -104,14 +112,6 @@ def status_of_package(package_description, only_local: false, snapshot: false)
                         end
                     end
 
-                    begin status = importer.status(pkg, only_local)
-                    rescue Interrupt
-                        raise
-                    rescue Exception => e
-                        package_status.msg << Autoproj.color("  failed to fetch status information (#{e})", :red)
-                        return package_status
-                    end
-
                     status.unexpected_working_copy_state.each do |msg|
                         package_status.msg << Autoproj.color("  #{msg}", :red, :bold)
                     end

data/lib/autoproj/default.osdeps

@@ -87,7 +87,10 @@ 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
+  default: ignore # we assume that if the user has a ruby 2.4 runtime, it is usable
+
+ruby25:
+  default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
 
 build-essential:
   debian,ubuntu: build-essential

data/lib/autoproj/manifest.rb

@@ -978,6 +978,8 @@ def whereis(package_name)
             '/'
         end
 
+        class NoPackageXML < ConfigError; end
+
         # Loads the package's manifest.xml file for the current package
         #
         # Right now, the absence of a manifest makes autoproj only issue a
@@ -994,23 +996,32 @@ def load_package_manifest(pkg)
 
             # Look for the package's manifest.xml, but fallback to a manifest in
             # the package set if present
-            manifest_paths = [File.join(package.srcdir, "manifest.xml")]
-            if package_set.local_dir
-                manifest_paths << File.join(package_set.local_dir, "manifests", package.name + ".xml")
-            end
-            manifest_path = manifest_paths.find do |path|
-                File.file?(path)
+            if package.use_package_xml?
+                manifest_path = File.join(package.srcdir, "package.xml")
+                raise NoPackageXML.new(package.srcdir), "#{package.name} from "\
+                    "#{package_set.name} has use_package_xml set, but the package has "\
+                    "no package.xml file" unless File.file?(manifest_path)
+
+                manifest = PackageManifest.load(package, manifest_path,
+                    ros_manifest: true)
+            else
+                manifest_paths = [File.join(package.srcdir, "manifest.xml")]
+                if package_set.local_dir
+                    manifest_paths << File.join(
+                        package_set.local_dir, "manifests", package.name + ".xml")
+                end
+                manifest_path = manifest_paths.find do |path|
+                    File.file?(path)
+                end
+                if manifest_path
+                    manifest = PackageManifest.load(package, manifest_path,
+                        ros_manifest: false)
+                end
             end
 
-            # Alternatively, use a ROS manifest file
-            ros_manifest_path = File.join(package.srcdir, 'package.xml')
-            ros_manifest_path = nil unless File.file?(ros_manifest_path)
-
-            if manifest_path
-                pkg.autobuild.description = PackageManifest.load(package, manifest_path)
-            elsif ros_manifest_path
-                pkg.autobuild.description = PackageManifest.load(package, ros_manifest_path, ros_manifest: true)
-            elsif pkg.autobuild.description.null?
+            if manifest
+                pkg.autobuild.description = manifest
+            else
                 Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
             end
 
@@ -1238,4 +1249,3 @@ def self.add_osdeps_overrides(*args, &block)
         manifest.add_osdeps_overrides(*args, &block)
     end
 end
-

data/lib/autoproj/reporter.rb

@@ -83,6 +83,12 @@ def self.report(root_dir: nil, silent: nil, debug: Autobuild.debug,
         reporter = Autoproj::Reporter.new
         Autobuild::Reporting << reporter
         interrupted = nil
+
+        if !silent.nil?
+            on_package_success = silent ? :silent : :report
+        end
+        silent_errors = [:report_silent, :exit_silent].include?(on_package_failures)
+
         package_failures = Autobuild::Reporting.report(on_package_failures: :report_silent) do
             begin
                 reporter.reset_timer
@@ -92,10 +98,6 @@ def self.report(root_dir: nil, silent: nil, debug: Autobuild.debug,
             end
         end
 
-        if !silent.nil?
-            on_package_success = silent ? :silent : :report
-        end
-        silent_errors = [:report_silent, :exit_silent].include?(on_package_failures)
 
         if package_failures.empty?
             if interrupted
@@ -116,6 +118,7 @@ def self.report(root_dir: nil, silent: nil, debug: Autobuild.debug,
             raise e
         elsif on_package_failures == :report
             Autoproj.error e.message
+            [e]
         elsif on_package_failures == :exit
             Autoproj.error e.message
             exit 1

data/lib/autoproj/test.rb

@@ -394,10 +394,27 @@ def ws_create_git_package_set(name, source_data = Hash.new)
             end
             dir
         end
+
+        def ws_create_package_set_file(pkg_set, name, content)
+            path = File.join(pkg_set.raw_local_dir, name)
+            FileUtils.mkdir_p File.dirname(path)
+            File.open(path, 'w') do |io|
+                io.write content
+            end
+            path
+        end
+
+        def ws_create_package_file(pkg, name, content)
+            path = File.join(pkg.autobuild.srcdir, name)
+            FileUtils.mkdir_p File.dirname(path)
+            File.open(path, 'w') do |io|
+                io.write content
+            end
+            path
+        end
     end
 end
 
 class Minitest::Test
     include Autoproj::SelfTest
 end
-

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.6.1"
+    VERSION = "2.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement