autoproj 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f873ef54ef817b4d8c0a029092ed0be7d645ee12
-  data.tar.gz: 38cfd4ae602a9c92b2a611eade91692060e6ef18
+  metadata.gz: 68e9f51443df2835dca1ca6018c66c1ddddc191c
+  data.tar.gz: 90ddec45d88fad399a89f27b5125e64ce776a692
 SHA512:
-  metadata.gz: dce1888ec2edf6cd54a9c1e0fa158431be3b52d30c777a58781fb684cdb9f0580ddcf12488b323f425a5cfe3fd22f1a1661f30e5b402d060cd9703fbb8660d7f
-  data.tar.gz: 0b1702cd8ba4c0950f6e4023df314a804c05f00ef0f10295981aac6d1c495bce3b00af1e90e137d75ec3766ed338107bcf9cb3faed9ff400dea248505c80a143
+  metadata.gz: 8262c141ccda64777df11c91a3536bfe23feb48f9189fd16d04b7a891a1227ceb7c6a54bb5e5067ae7efce930a6cd965b47fcf38f951eb23c4ddc9c81bda0c20
+  data.tar.gz: 5ee4a343b0fafda6f82be49c87a87d60e8242521b0a532d726bf896f4b384bee2c8b6e5b9abb1ba2a5062981ba0883de04397431d3edd6da31ee918598c72399

data/lib/autoproj/package_manifest.rb

@@ -139,14 +139,36 @@ def each_author
 
         # @api private
         #
-        # REXML stream parser object used to load the XML contents into a
-        # {PackageManifest} object
-        class Loader
+        # REXML stream parser object used to filter nested tags
+        class BaseLoader
             include REXML::StreamListener
 
+            def initialize
+                @tag_level = 0
+            end
+
+            def tag_start(name, attributes)
+                toplevel_tag_start(name, attributes) if (@tag_level += 1) == 2
+            end
+
+            def tag_end(name)
+                toplevel_tag_end(name) if (@tag_level -= 1) == 1
+            end
+
+            def text(text)
+                @tag_text << text if @tag_text
+            end
+        end
+
+        # @api private
+        #
+        # REXML stream parser object used to load the XML contents into a
+        # {PackageManifest} object
+        class Loader < BaseLoader
             attr_reader :path, :manifest
 
             def initialize(path, manifest)
+                super()
                 @path = path
                 @manifest = manifest
             end
@@ -178,7 +200,7 @@ def parse_contact_field(text)
             TEXT_FIELDS = Set['url', 'license', 'version', 'description']
             AUTHOR_FIELDS = Set['author', 'maintainer', 'rock_maintainer']
 
-            def tag_start(name, attributes)
+            def toplevel_tag_start(name, attributes)
                 if name == 'depend'
                     parse_depend_tag(name, attributes)
                 elsif name == 'depend_optional'
@@ -200,12 +222,7 @@ def tag_start(name, attributes)
                     @tag_text = nil
                 end
             end
-            def text(text)
-                if @tag_text
-                    @tag_text << text
-                end
-            end
-            def tag_end(name)
+            def toplevel_tag_end(name)
                 if AUTHOR_FIELDS.include?(name)
                     manifest.send("#{name}s").concat(parse_contact_field(@tag_text))
                 elsif TEXT_FIELDS.include?(name)
@@ -225,11 +242,12 @@ def tag_end(name)
         # REXML stream parser object used to load the XML contents into a
         # {PackageManifest} object
         class RosLoader < Loader
+            SUPPORTED_MODES = ['test'].freeze
             DEPEND_TAGS = Set['depend', 'build_depend', 'build_export_depend',
                               'buildtool_depend', 'buildtool_export_depend',
                               'exec_depend', 'test_depend', 'run_depend']
 
-            def tag_start(name, attributes)
+            def toplevel_tag_start(name, attributes)
                 if DEPEND_TAGS.include?(name)
                     @tag_text = ''
                 elsif TEXT_FIELDS.include?(name)
@@ -242,10 +260,16 @@ def tag_start(name, attributes)
                 end
             end
 
-            def tag_end(name)
+            def toplevel_tag_end(name)
                 if DEPEND_TAGS.include?(name)
                     raise InvalidPackageManifest, "found '#{name}' tag in #{path} without content" if @tag_text.strip.empty?
-                    manifest.add_dependency(@tag_text)
+
+                    mode = []
+                    if name =~ /^(\w+)_depend$/
+                        mode = SUPPORTED_MODES & [$1]
+                    end
+
+                    manifest.add_dependency(@tag_text, modes: mode)
                 elsif AUTHOR_FIELDS.include?(name)
                     author_name = @tag_text.strip
                     email = @author_email ? @author_email.strip : nil

data/lib/autoproj/reporter.rb

@@ -49,8 +49,28 @@ def error(error)
                 Autoproj.message line, STDERR
             end
         end
+
+        def reset_timer
+            @timer_start = Time.now
+        end
+
+        def elapsed_time
+            return unless @timer_start
+            secs = Time.now - @timer_start
+            return if secs < 1
+
+            [[60, 'sec'], [60, 'min'], [24, 'hour'], [1000, 'day']].map do |count, name|
+                if secs > 0
+                    secs, n = secs.divmod(count)
+                    next if (val = n.to_i) == 0
+                    "#{val} #{val > 1 ? name + 's' : name}"
+                end
+            end.compact.reverse.join(' ')
+        end
+
         def success
-            Autoproj.message("Command finished successfully at #{Time.now}", :bold, :green)
+            elapsed_string = elapsed_time ? " (took #{elapsed_time})" : ''
+            Autoproj.message("Command finished successfully at #{Time.now}#{elapsed_string}", :bold, :green)
             if Autobuild.post_success_message
                 Autoproj.message Autobuild.post_success_message
             end
@@ -65,6 +85,7 @@ def self.report(root_dir: nil, silent: nil, debug: Autobuild.debug,
         interrupted = nil
         package_failures = Autobuild::Reporting.report(on_package_failures: :report_silent) do
             begin
+                reporter.reset_timer
                 yield
             rescue Interrupt => e
                 interrupted = e

data/lib/autoproj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler