autobuild 1.11.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7312415bcb69bcece2a0aa8e681e1dd4529b4c80
-  data.tar.gz: d7a7524b339349a1ad8ac04b82b23cb93ef201a8
+  metadata.gz: 2aa8495a7fa559f22d689834414b45c31f51fb5b
+  data.tar.gz: 8e4d55676e5c79de59a77157501aa7e2f3c7af8a
 SHA512:
-  metadata.gz: 0b08b2582d59d9ad3e8624f4cc15a065fc7c3570320f0561c5a9e2b76092408cbd07aad538bf30b6095558b6a9d29303aa8e0d0f374b3bd57ebe0df36a506679
-  data.tar.gz: c7dbe5e4248e8ef9a74fc9a10fa6186aa822cf29c0e7d231ddca22e7f27bce7fd0065bedac712b08762dedb4b119be4cec263a702d6bbfc0868211f2ef01c2fb
+  metadata.gz: aedbeb75280b0ec1bae6a57bb2c35268d47709af81823f7e06e706ee36046f83433e66745a2bbe3546078daed1769c5997019353677275edb12653706ef1ddf9
+  data.tar.gz: 9bbcf11269f27b6939cd4641e56f7db9eefbce5a292b9888a5422c875a8e504ab1933c70b70263b05147df450858aca136d00e6c7b3d982fa87e0a9ff97b1e37

data/lib/autobuild/environment.rb

@@ -699,6 +699,8 @@ def self.env=(env)
         @env = env
     end
 
+    @env = nil
+
     def self.env
         if !@env
             @env = Environment.new

data/lib/autobuild/import/archive.rb

@@ -289,6 +289,7 @@ def initialize(url, options = Hash.new)
                 :source_id, :repository_id, :filename, :mode
             super(options)
 
+            @filename = nil
             if !@options.has_key?(:update_cached_file)
                 @options[:update_cached_file] = false
             end

data/lib/autobuild/reporting.rb

@@ -46,7 +46,9 @@ def self.display_message(*args)
             end
 
         if !Autobuild.progress_display_enabled?
-            io.puts msg
+            if !silent?
+                io.puts msg
+            end
             return
         end
 
@@ -270,9 +272,8 @@ def to_s
         end
     end
 
-    ## The reporting module provides the framework
-    # to run commands in autobuild and report errors 
-    # to the user
+    ## The reporting module provides the framework # to run commands in
+    # autobuild and report errors # to the user
     #
     # It does not use a logging framework like Log4r, but it should ;-)
     module Reporting
@@ -280,10 +281,12 @@ module Reporting
 
         ## Run a block and report known exception
         # If an exception is fatal, the program is terminated using exit()
-        def self.report
+        def self.report(on_package_failures: default_report_on_package_failures)
             begin yield
-            rescue Interrupt
-                interrupted = true
+            rescue Interrupt => e
+                interrupted = e
+            rescue Autobuild::Exception => e
+                return report_finish_on_error([e], on_package_failures: on_package_failures, interrupted_by: interrupted)
             end
 
             # If ignore_erorrs is true, check if some packages have failed
@@ -294,23 +297,62 @@ def self.report
                 errors.concat(pkg.failures)
             end
 
-            if !errors.empty?
-                raise CompositeException.new(errors)
-            elsif interrupted
-                raise Interrupt
+            report_finish_on_error(errors, on_package_failures: on_package_failures, interrupted_by: interrupted)
+        end
+
+        # @api private
+        #
+        # Helper that returns the default for on_package_failures
+        #
+        # The result depends on the value for Autobuild.debug. It is either
+        # :exit if debug is false, or :raise if it is true
+        def self.default_report_on_package_failures
+            if Autobuild.debug then :raise
+            else :exit
+            end
+        end
+
+        # @api private
+        #
+        # Handle how Reporting.report is meant to finish in case of error(s)
+        #
+        # @param [Symbol] on_package_failures how does the reporting should behave.
+        #
+        def self.report_finish_on_error(errors, on_package_failures: default_report_on_package_failures, interrupted_by: nil)
+            if ![:raise, :report_silent, :exit_silent].include?(on_package_failures)
+                errors.each { |e| error(e) }
+            end
+            fatal = errors.any?(&:fatal?)
+            if !fatal
+                if interrupted_by
+                    raise interrupted_by
+                else
+                    return errors
+                end
             end
 
-        rescue Autobuild::Exception => e
-            error(e)
-            if e.fatal?
-                if Autobuild.debug
-                    raise
+            if on_package_failures == :raise
+                if interrupted_by
+                    raise interrupted_by
+                end
+
+                e = if errors.size == 1 then errors.first
+                else CompositeException.new(errors)
+                end
+                raise e
+            elsif [:report_silent, :report].include?(on_package_failures)
+                if interrupted_by
+                    raise interrupted_by
                 else
-                    exit 1
+                    return errors
                 end
+            elsif [:exit, :exit_silent].include?(on_package_failures)
+                exit 1
+            else
+                raise ArgumentError, "unexpected value for on_package_failures: #{on_package_failures}"
             end
         end
-        
+
         ## Reports a successful build to the user
         def self.success
             each_reporter { |rep| rep.success }
@@ -334,9 +376,9 @@ def self.clear_reporters
             @@reporters.clear
         end
 
-	def self.each_reporter(&iter)
-	    @@reporters.each(&iter)
-	end
+        def self.each_reporter(&iter)
+            @@reporters.each(&iter)
+        end
 
         ## Iterate on all log files
         def self.each_log(&block)
@@ -363,4 +405,3 @@ def success
         end
     end
 end
-

data/lib/autobuild/subcommand.rb

@@ -160,6 +160,16 @@ def initialize(status, do_retry)
     CONTROL_UNEXPECTED = 2
     CONTROL_INTERRUPT = 3
 
+    @transparent_mode = false
+
+    def self.transparent_mode?
+        @transparent_mode
+    end
+
+    def self.transparent_mode=(flag)
+        @transparent_mode = flag
+    end
+
     # Run a subcommand and return its standard output
     #
     # The command's standard and error outputs, as well as the full command line
@@ -383,15 +393,15 @@ def self.run(target, phase, *command)
                 line = line.chomp
                 subcommand_output << line
 
-                if Autobuild.verbose
-                    STDOUT.puts line
-                end
                 logfile.puts line
-                # Do not yield the line if Autobuild.verbose is true, as it
-                # would mix the progress output with the actual command
-                # output. Assume that if the user wants the command output,
-                # the autobuild progress output is unnecessary
-                if !Autobuild.verbose && block_given?
+
+                if Autobuild.verbose || transparent_mode?
+                    STDOUT.puts "#{target_name}:#{phase}: #{line}"
+                elsif block_given?
+                    # Do not yield 
+                    # would mix the progress output with the actual command
+                    # output. Assume that if the user wants the command output,
+                    # the autobuild progress output is unnecessary
                     yield(line)
                 end
             end

data/lib/autobuild/version.rb

@@ -1,5 +1,3 @@
 module Autobuild
-    VERSION = "1.11.2" unless defined? Autobuild::VERSION
+    VERSION = "1.12.0" unless defined? Autobuild::VERSION
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -247,4 +247,3 @@ signing_key:
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
 test_files: []
-has_rdoc: