autobuild 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b347c81cc5ac09e4f967df3dd5f53bca82fb3ba2a1a4a2e76b1b2d20ba19869
-  data.tar.gz: 6eaa54db5306f069ce5e9809b708df1bb4c5def84dc1553c953a3e38319cbf26
+  metadata.gz: ab39a53575bd73cfcf5468577e0a331dcb0ffac4cd3a44a56d6485b0185d8d9c
+  data.tar.gz: 5612683a6a53e89787892fc54bb0f1b2e7f98251b1204d1986b115afd57bd536
 SHA512:
-  metadata.gz: ccefa69f82809031debaeee77adde985c2de4d88c738e9b439cf7e839bc511f2f4c757486625f88a91541d97c16566217a544831c35924ea76cae98920d9f59d
-  data.tar.gz: 9f4b9b5c38e9072104dc052c630ca7a49a915331526cdbc624d2ef725eef44987b97b97667ebcafead9afb145fcbb3cee5a921f699aed101ec99efd611c28352
+  metadata.gz: 278baf14e748956b8f45e65e13b5156b875559d36ac2a973afa0a82de1840e7faa02d6f4bb5179c2d4c811048e69673d916c70d757b625d7586a4bc192653893
+  data.tar.gz: 65ad33b5793db30fd126101e1bb36e933265cc0727845c97e866295e4248b3de9b5f0b93e07dc6046adf4f791085687fb568c633e426f6b648d8991bd0ee22f2

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - '2.3'
   - '2.4'
   - '2.5'
+  - '2.6'
+  - '2.7'
   - 'jruby-9.1.15.0'
 matrix:
     allow_failures:

data/autobuild.gemspec

@@ -23,11 +23,12 @@ 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 'pastel', '~> 0.7.0', '>= 0.7.0'
-    s.add_runtime_dependency "rake", "~> 12.0", ">= 12.3.0"
-    s.add_runtime_dependency 'tty-cursor', '~> 0.5.0'
-    s.add_runtime_dependency 'tty-prompt', '~> 0.15.0'
-    s.add_runtime_dependency 'tty-screen', '~> 0.6.4'
+    s.add_runtime_dependency "concurrent-ruby", "~> 1.1"
+    s.add_runtime_dependency "pastel", "~> 0.7.0"
+    s.add_runtime_dependency "rake", "~> 13.0"
+    s.add_runtime_dependency 'tty-cursor', '~> 0.7.0'
+    s.add_runtime_dependency 'tty-prompt', '~> 0.21.0'
+    s.add_runtime_dependency 'tty-screen', '~> 0.8.0'
     s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
     s.add_development_dependency "fakefs"
     s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"

data/lib/autobuild/progress_display.rb

@@ -1,3 +1,6 @@
+require "concurrent/atomic/atomic_boolean"
+require "concurrent/array"
+
 module Autobuild
     # Management of the progress display
     class ProgressDisplay
@@ -5,7 +8,7 @@ def initialize(io, color: ::Autobuild.method(:color))
             @io = io
             @cursor = TTY::Cursor
             @last_formatted_progress = []
-            @progress_messages = []
+            @progress_messages = Concurrent::Array.new
 
             @silent = false
             @color = color
@@ -14,6 +17,15 @@ def initialize(io, color: ::Autobuild.method(:color))
             @next_progress_display = Time.at(0)
             @progress_mode = :single_line
             @progress_period = 0.1
+
+            @message_queue = Queue.new
+            @forced_progress_display = Concurrent::AtomicBoolean.new(false)
+        end
+
+        def synchronize(&block)
+            result = @display_lock.synchronize(&block)
+            refresh_display
+            result
         end
 
         # Set the minimum time between two progress messages
@@ -86,17 +98,9 @@ def message(message, *args, io: @io, force: false)
             return if silent? && !force
 
             io = args.pop if args.last.respond_to?(:to_io)
+            @message_queue << [message, args, io]
 
-            @display_lock.synchronize do
-                if @progress_mode == :single_line
-                    io.print @cursor.clear_screen_down
-                end
-                io.puts @color.call(message, *args)
-
-                io.flush if @io != io
-                display_progress
-                @io.flush
-            end
+            refresh_display
         end
 
         def progress_start(key, *args, done_message: nil)
@@ -105,13 +109,13 @@ def progress_start(key, *args, done_message: nil)
             formatted_message = @color.call(*args)
             @progress_messages << [key, formatted_message]
             if progress_enabled?
-                @display_lock.synchronize do
-                    display_progress(consider_period: false)
-                end
+                @forced_progress_display.make_true
             else
                 message "  #{formatted_message}"
             end
 
+            refresh_display
+
             if block_given?
                 begin
                     result = yield
@@ -125,46 +129,69 @@ def progress_start(key, *args, done_message: nil)
         end
 
         def progress(key, *args)
-            @display_lock.synchronize do
-                found = false
-                @progress_messages.map! do |msg_key, msg|
-                    if msg_key == key
-                        found = true
-                        [msg_key, @color.call(*args)]
-                    else
-                        [msg_key, msg]
-                    end
+            found = false
+            @progress_messages.map! do |msg_key, msg|
+                if msg_key == key
+                    found = true
+                    [msg_key, @color.call(*args)]
+                else
+                    [msg_key, msg]
                 end
-                @progress_messages << [key, @color.call(*args)] unless found
-                display_progress
             end
+            @progress_messages << [key, @color.call(*args)] unless found
+
+            refresh_display
         end
 
         def progress_done(key, display_last = true, message: nil)
-            changed = @display_lock.synchronize do
-                current_size = @progress_messages.size
-                @progress_messages.delete_if do |msg_key, msg|
-                    if msg_key == key
-                        message = msg if display_last && !message
-                        true
-                    end
+            current_size = @progress_messages.size
+            @progress_messages.delete_if do |msg_key, msg|
+                if msg_key == key
+                    message = msg if display_last && !message
+                    true
                 end
-                current_size != @progress_messages.size
             end
+            changed = current_size != @progress_messages.size
 
             if changed
                 if message
                     message("  #{message}")
-                    # Note: message calls display_progress already
+                    # Note: message updates the display already
                 else
-                    @display_lock.synchronize do
-                        display_progress
-                    end
+                    refresh_display
                 end
                 true
             end
         end
 
+        def refresh_display
+            return unless @display_lock.try_lock
+
+            begin
+                refresh_display_under_lock
+            ensure
+                @display_lock.unlock
+            end
+        end
+
+        def refresh_display_under_lock
+            # Display queued messages
+            until @message_queue.empty?
+                message, args, io = @message_queue.pop
+                if @progress_mode == :single_line
+                    io.print @cursor.clear_screen_down
+                end
+                io.puts @color.call(message, *args)
+
+                io.flush if @io != io
+            end
+
+            # And re-display the progress
+            display_progress(consider_period: @forced_progress_display.false?)
+            @forced_progress_display.make_false
+            @io.flush
+        end
+
         def display_progress(consider_period: true)
             return unless progress_enabled?
             return if consider_period && (@next_progress_display > Time.now)

data/lib/autobuild/reporting.rb

@@ -47,6 +47,10 @@ def self.progress_display_enabled?
         @display.progress_enabled?
     end
 
+    def self.progress_display_synchronize(&block)
+        @display.synchronize(&block)
+    end
+
     # @deprecated use {progress_display_mode=} instead
     def self.progress_display_enabled=(value)
         @display.progress_enabled = value

data/lib/autobuild/test_utility.rb

@@ -73,7 +73,8 @@ def coverage_source_dir
         def coverage_target_dir
             if @coverage_target_dir
                 File.expand_path(@coverage_target_dir, package.prefix)
-            else File.join(target_dir, 'coverage')
+            elsif (target_dir = self.target_dir)
+                File.join(target_dir, 'coverage')
             end
         end
 

data/lib/autobuild/utility.rb

@@ -30,6 +30,7 @@ def initialize(name, package, install_on_error: false)
             @target_dir = nil
             @install_on_error = install_on_error
 
+            @no_results = false
             @invoked = false
             @success = false
             @installed = false
@@ -58,6 +59,23 @@ def source_dir
         #   not install anything
         attr_writer :target_dir
 
+        # Controls whether this utility generates results or not
+        # 
+        # By default, Autobuild assumes that utilities generate report or
+        # artifact files, that are saved in {#target_dir}. Set this flag to
+        # true to disable this behavior, in which case the only report will
+        # be the console output during run
+        #
+        # @see no_results?
+        attr_writer :no_results
+
+        # Whether this utility generates results or not
+        # 
+        # @see no_results=
+        def no_results?
+            @no_results
+        end
+
         # Absolute path to where the utility product files have to be installed.
         # Returns nil if {target_dir} is not set.
         #
@@ -108,13 +126,13 @@ def call_task_block
                 yield if block_given?
                 @success = true
             rescue StandardError => e
-                install if install_on_error? && !@installed && target_dir
+                install if install_on_error? && !@installed && !no_results?
                 raise
             end
 
             # Allow the user to install manually in the task
             # block
-            install if !@installed && target_dir
+            install if !@installed && !no_results?
         rescue StandardError => e
             @success = false
 
@@ -138,7 +156,7 @@ def call_task_block
         #
         # @return [Boolean]
         def available?
-            @available && (source_dir && @task)
+            @available && @task && (no_results? || source_dir)
         end
 
         # True if this utility should be executed

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.20.0".freeze unless defined? Autobuild::VERSION
+    VERSION = "1.21.0".freeze unless defined? Autobuild::VERSION
 end

metadata

@@ -1,33 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-    - - ">="
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
@@ -36,62 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: tty-cursor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
@@ -274,8 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms